move the pruning for module resolution of TypeExprs

Author: erik-krogh

ql/ql/src/codeql_ql/ast/Ast.qll

@@ -683,16 +683,7 @@ class TypeExpr extends TType, TypeRef {
     resolveTypeExpr(this, result)
     or
     // if it resolves to a module,
-    exists(FileOrModule mod | resolveModuleRef(this, mod) | result = mod.toType()) and
-    result instanceof ModuleType and
-    // we can get spurious results in some cases, so we restrict to where it is possible to have a module.
-    (
-      // only possible if this is inside a moduleInstantiation.
-      this = any(ModuleExpr mod).getArgument(_).asType()
-      or
-      // or if it's a parameter to a parameterized module
-      this = any(SignatureExpr sig, Module mod | mod.hasParameter(_, _, sig) | sig).asType()
-    )
+    exists(FileOrModule mod | resolveModuleRef(this, mod) | result = mod.toType())
   }
 
   override AstNode getAChild(string pred) {

ql/ql/src/codeql_ql/ast/internal/Module.qll

@@ -218,6 +218,20 @@ private module Cached {
     not exists(me.(ModuleExpr).getQualifier()) and
     exists(ContainerOrModule enclosing, string name | resolveModuleRefHelper(me, enclosing, name) |
       definesModule(enclosing, name, m, _)
+    ) and
+    (
+      not me instanceof TypeExpr
+      or
+      // remove some spurious results that can happen with `TypeExpr`
+      me instanceof TypeExpr and
+      m instanceof Module_ and // TypeExpr can only resolve to a Module, and only in some scenarios
+      (
+        // only possible if this is inside a moduleInstantiation.
+        me = any(ModuleExpr mod).getArgument(_).asType()
+        or
+        // or if it's a parameter to a parameterized module
+        me = any(SignatureExpr sig, Module mod | mod.hasParameter(_, _, sig) | sig).asType()
+      )
     )
     or
     exists(FileOrModule mid |