Merge pull request #1298 from asger-semmle/full-mode-fixes-rc120

Max Schaefer · web-flow · commit e0e622498708 · 2019-05-03T13:57:47.000+01:00
TS: Backport full-mode fixes to rc/1.20
diff --git a/javascript/extractor/lib/typescript/src/ast_extractor.ts b/javascript/extractor/lib/typescript/src/ast_extractor.ts
@@ -156,7 +156,21 @@ export function augmentAst(ast: AugmentedSourceFile, code: string, project: Proj
         }
     }
 
-    forEachNode(ast, (node: AugmentedNode) => {
+    // Number of conditional type expressions the visitor is currently inside.
+    // We disable type extraction inside such type expressions, to avoid complications
+    // with `infer` types.
+    let insideConditionalTypes = 0;
+
+    visitAstNode(ast);
+    function visitAstNode(node: AugmentedNode) {
+        if (node.kind === ts.SyntaxKind.ConditionalType) {
+            ++insideConditionalTypes;
+        }
+        ts.forEachChild(node, visitAstNode);
+        if (node.kind === ts.SyntaxKind.ConditionalType) {
+            --insideConditionalTypes;
+        }
+
         // fill in line/column info
         if ("pos" in node) {
             node.$pos = augmentPos(node.pos, true);
@@ -176,7 +190,7 @@ export function augmentAst(ast: AugmentedSourceFile, code: string, project: Proj
             }
         }
 
-        if (typeChecker != null) {
+        if (typeChecker != null && insideConditionalTypes === 0) {
             if (isTypedNode(node)) {
                 let type = typeChecker.getTypeAtLocation(node);
                 if (type != null) {
@@ -247,7 +261,7 @@ export function augmentAst(ast: AugmentedSourceFile, code: string, project: Proj
                 }
             }
         }
-    });
+    }
 }
 
 type NamedNodeWithSymbol = AugmentedNode & (ts.ClassDeclaration | ts.InterfaceDeclaration
diff --git a/javascript/extractor/lib/typescript/src/main.ts b/javascript/extractor/lib/typescript/src/main.ts
@@ -372,7 +372,9 @@ function handleOpenProjectCommand(command: OpenProjectCommand) {
     function getEffectiveExportTarget(symbol: ts.Symbol) {
         if (symbol.exports != null && symbol.exports.has(ts.InternalSymbolName.ExportEquals)) {
             let exportAlias = symbol.exports.get(ts.InternalSymbolName.ExportEquals);
-            return typeChecker.getAliasedSymbol(exportAlias);
+            if (exportAlias.flags & ts.SymbolFlags.Alias) {
+                return typeChecker.getAliasedSymbol(exportAlias);
+            }
         }
         return symbol;
     }
diff --git a/javascript/extractor/lib/typescript/src/type_table.ts b/javascript/extractor/lib/typescript/src/type_table.ts
@@ -819,8 +819,24 @@ export class TypeTable {
     this.isInShallowTypeContext = false;
   }
 
+  /**
+   * Returns the properties of the given type, or `null` if the properties of this
+   * type could not be computed.
+   */
+  private tryGetProperties(type: ts.Type) {
+    // Workaround for https://github.com/Microsoft/TypeScript/issues/30845
+    // Should be safe to remove once that has been fixed.
+    try {
+      return type.getProperties();
+    } catch (e) {
+      return null;
+    }
+  }
+
   private extractProperties(type: ts.Type, id: number) {
-    for (let symbol of type.getProperties()) {
+    let props = this.tryGetProperties(type);
+    if (props == null) return;
+    for (let symbol of props) {
       let propertyType = this.typeChecker.getTypeOfSymbolAtLocation(symbol, this.arbitraryAstNode);
       if (propertyType == null) continue;
       let propertyTypeId = this.getId(propertyType);
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/extern.d.ts b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/extern.d.ts
@@ -0,0 +1,14 @@
+class Foo {}
+
+declare module 'foo' {
+  export = new Foo();
+}
+
+declare module 'bar' {
+  import * as baz from "baz";
+  export = baz;
+}
+
+declare module 'baz' {
+  export class C {}
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected
@@ -0,0 +1,7 @@
+| "bar" in global scope |
+| C in module 'bar' |
+| Foo in global scope |
+| Foo in tst.ts |
+| module 'bar' |
+| module 'foo' |
+| tst.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.ql b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.ql
@@ -0,0 +1,4 @@
+import javascript
+
+from CanonicalName name
+select name
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/tsconfig.json b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "include": ["."],
+  "compilerOptions": {
+    "esModuleInterop": true
+  }
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/tst.ts b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/tst.ts
@@ -0,0 +1,5 @@
+import self from "./tst";
+
+class Foo {}
+
+export = new Foo();
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/GlobalThis/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/GlobalThis/test.expected
@@ -0,0 +1 @@
+| Success |
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/GlobalThis/test.ql b/javascript/ql/test/library-tests/TypeScript/RegressionTests/GlobalThis/test.ql
@@ -0,0 +1,3 @@
+import javascript
+
+select "Success"
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/GlobalThis/tsconfig.json b/javascript/ql/test/library-tests/TypeScript/RegressionTests/GlobalThis/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "include": ["."]
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/GlobalThis/tst.ts b/javascript/ql/test/library-tests/TypeScript/RegressionTests/GlobalThis/tst.ts
@@ -0,0 +1,13 @@
+'use strict';
+
+var _myGlobal = this;
+
+module Test {
+  var global = _myGlobal || {};
+
+  export class C {}
+
+  export function f(x: C) {
+    global.field = x || {};
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,21 @@ export function augmentAst(ast: AugmentedSourceFile, code: string, project: Proj`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`159`		`- forEachNode(ast, (node: AugmentedNode) => {`
	`159`	`+ // Number of conditional type expressions the visitor is currently inside.`
	`160`	`+ // We disable type extraction inside such type expressions, to avoid complications`
	`161`	+ // with `infer` types.
	`162`	`+ let insideConditionalTypes = 0;`
	`163`	`+`
	`164`	`+ visitAstNode(ast);`
	`165`	`+ function visitAstNode(node: AugmentedNode) {`
	`166`	`+ if (node.kind === ts.SyntaxKind.ConditionalType) {`
	`167`	`+ ++insideConditionalTypes;`
	`168`	`+ }`
	`169`	`+ ts.forEachChild(node, visitAstNode);`
	`170`	`+ if (node.kind === ts.SyntaxKind.ConditionalType) {`
	`171`	`+ --insideConditionalTypes;`
	`172`	`+ }`
	`173`	`+`
`160`	`174`	`// fill in line/column info`
`161`	`175`	`if ("pos" in node) {`
`162`	`176`	`node.$pos = augmentPos(node.pos, true);`
`@@ -176,7 +190,7 @@ export function augmentAst(ast: AugmentedSourceFile, code: string, project: Proj`
`176`	`190`	`}`
`177`	`191`	`}`
`178`	`192`
`179`		`- if (typeChecker != null) {`
	`193`	`+ if (typeChecker != null && insideConditionalTypes === 0) {`
`180`	`194`	`if (isTypedNode(node)) {`
`181`	`195`	`let type = typeChecker.getTypeAtLocation(node);`
`182`	`196`	`if (type != null) {`
`@@ -247,7 +261,7 @@ export function augmentAst(ast: AugmentedSourceFile, code: string, project: Proj`
`247`	`261`	`}`
`248`	`262`	`}`
`249`	`263`	`}`
`250`		`- });`
	`264`	`+ }`
`251`	`265`	`}`
`252`	`266`
`253`	`267`	`type NamedNodeWithSymbol = AugmentedNode & (ts.ClassDeclaration \| ts.InterfaceDeclaration`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,9 @@ function handleOpenProjectCommand(command: OpenProjectCommand) {`
`372`	`372`	`function getEffectiveExportTarget(symbol: ts.Symbol) {`
`373`	`373`	`if (symbol.exports != null && symbol.exports.has(ts.InternalSymbolName.ExportEquals)) {`
`374`	`374`	`let exportAlias = symbol.exports.get(ts.InternalSymbolName.ExportEquals);`
`375`		`- return typeChecker.getAliasedSymbol(exportAlias);`
	`375`	`+ if (exportAlias.flags & ts.SymbolFlags.Alias) {`
	`376`	`+ return typeChecker.getAliasedSymbol(exportAlias);`
	`377`	`+ }`
`376`	`378`	`}`
`377`	`379`	`return symbol;`
`378`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import javascript`
	`2`	`+`
	`3`	`+select "Success"`