Merge pull request #2580 from asger-semmle/typescript-unbounded-recursion

Approved by max-schaefer

Author: semmle-qlci

javascript/extractor/lib/typescript/src/ast_extractor.ts

@@ -67,6 +67,17 @@ function forEachNode(ast: ts.Node, callback: (node: ts.Node) => void) {
     visit(ast);
 }
 
+function tryGetTypeOfNode(typeChecker: ts.TypeChecker, node: AugmentedNode): ts.Type | null {
+    try {
+        return typeChecker.getTypeAtLocation(node);
+    } catch (e) {
+        let sourceFile = node.getSourceFile();
+        let { line, character } = sourceFile.getLineAndCharacterOfPosition(node.pos);
+        console.warn(`Could not compute type of ${ts.SyntaxKind[node.kind]} at ${sourceFile.fileName}:${line+1}:${character+1}`);
+        return null;
+    }
+}
+
 export function augmentAst(ast: AugmentedSourceFile, code: string, project: Project | null) {
     ast.$lineStarts = ast.getLineStarts();
 
@@ -196,7 +207,7 @@ export function augmentAst(ast: AugmentedSourceFile, code: string, project: Proj
                 let contextualType = isContextuallyTypedNode(node)
                     ? typeChecker.getContextualType(node)
                     : null;
-                let type = contextualType || typeChecker.getTypeAtLocation(node);
+                let type = contextualType || tryGetTypeOfNode(typeChecker, node);
                 if (type != null) {
                     let parent = node.parent;
                     let unfoldAlias = ts.isTypeAliasDeclaration(parent) && node === parent.type;

javascript/extractor/lib/typescript/src/main.ts

@@ -243,6 +243,7 @@ function parseSingleFile(filename: string): {ast: ts.SourceFile, code: string} {
 }
 
 function handleOpenProjectCommand(command: OpenProjectCommand) {
+    Error.stackTraceLimit = Infinity;
     let tsConfigFilename = String(command.tsConfig);
     let tsConfig = ts.readConfigFile(tsConfigFilename, ts.sys.readFile);
     let basePath = pathlib.dirname(tsConfigFilename);

javascript/extractor/lib/typescript/src/type_table.ts

@@ -766,6 +766,16 @@ export class TypeTable {
     return hash;
   }
 
+  /** Returns the type of `symbol` or `null` if it could not be computed. */
+  private tryGetTypeOfSymbol(symbol: ts.Symbol) {
+    try {
+      return this.typeChecker.getTypeOfSymbolAtLocation(symbol, this.arbitraryAstNode)
+    } catch (e) {
+      console.warn(`Could not compute type of '${this.typeChecker.symbolToString(symbol)}'`);
+      return null;
+    }
+  }
+
   /**
    * Returns a type string consisting of all the members of the given type.
    *
@@ -775,7 +785,7 @@ export class TypeTable {
   private makeStructuralTypeVector(tag: string, type: ts.ObjectType): string | null {
     let hash = tag;
     for (let property of type.getProperties()) {
-      let propertyType = this.typeChecker.getTypeOfSymbolAtLocation(property, this.arbitraryAstNode);
+      let propertyType = this.tryGetTypeOfSymbol(property);
       if (propertyType == null) return null;
       let propertyTypeId = this.getId(propertyType, false);
       if (propertyTypeId == null) return null;
@@ -882,7 +892,7 @@ export class TypeTable {
     let props = this.tryGetProperties(type);
     if (props == null) return;
     for (let symbol of props) {
-      let propertyType = this.typeChecker.getTypeOfSymbolAtLocation(symbol, this.arbitraryAstNode);
+      let propertyType = this.tryGetTypeOfSymbol(symbol);
       if (propertyType == null) continue;
       let propertyTypeId = this.getId(propertyType, false);
       if (propertyTypeId == null) continue;
@@ -938,7 +948,7 @@ export class TypeTable {
       }
       if (parameters.length === 0) return null;
       let restParameter = parameters[parameters.length - 1];
-      let restParameterType = this.typeChecker.getTypeOfSymbolAtLocation(restParameter, this.arbitraryAstNode);
+      let restParameterType = this.tryGetTypeOfSymbol(restParameter);
       if (restParameterType == null) return null;
       let restParameterTypeId = this.getId(restParameterType, false);
       if (restParameterTypeId == null) return null;
@@ -961,7 +971,7 @@ export class TypeTable {
     }
     for (let paramIndex = 0; paramIndex < parameters.length; ++paramIndex) {
       let parameter = parameters[paramIndex];
-      let parameterType = this.typeChecker.getTypeOfSymbolAtLocation(parameter, this.arbitraryAstNode);
+      let parameterType = this.tryGetTypeOfSymbol(parameter);
       if (parameterType == null) {
         return null;
       }
@@ -1178,7 +1188,7 @@ export class TypeTable {
       stack.push(id);
 
       for (let symbol of type.getProperties()) {
-        let propertyType: ts.Type = typeTable.typeChecker.getTypeOfSymbolAtLocation(symbol, typeTable.arbitraryAstNode);
+        let propertyType = this.tryGetTypeOfSymbol(symbol);
         if (propertyType == null) continue;
         traverseType(propertyType);
       }
@@ -1255,7 +1265,7 @@ export class TypeTable {
       if (objectFlags & ts.ObjectFlags.Anonymous) {
         // Anonymous interface type like `{ x: number }`.
         for (let symbol of type.getProperties()) {
-          let propertyType = this.typeChecker.getTypeOfSymbolAtLocation(symbol, this.arbitraryAstNode);
+          let propertyType = this.tryGetTypeOfSymbol(symbol);
           if (propertyType == null) continue;
           callback(propertyType);
         }
@@ -1280,7 +1290,7 @@ export class TypeTable {
   private forEachChildTypeOfSignature(signature: ts.Signature, callback: (type: ts.Type) => void): void {
     callback(signature.getReturnType());
     for (let parameter of signature.getParameters()) {
-      let paramType = this.typeChecker.getTypeOfSymbolAtLocation(parameter, this.arbitraryAstNode);
+      let paramType = this.tryGetTypeOfSymbol(parameter);
       if (paramType == null) continue;
       callback(paramType);
     }

javascript/ql/test/library-tests/TypeScript/RegressionTests/ImportSelf/bar.ts

@@ -0,0 +1,3 @@
+import { A } from "@blah/foo";
+
+var x: A;

javascript/ql/test/library-tests/TypeScript/RegressionTests/ImportSelf/node_modules/@blah/foo/index.d.ts

@@ -0,0 +1,12 @@
+| bar.ts:1:10:1:10 | A | any |
+| bar.ts:1:10:1:10 | A | any |
+| bar.ts:1:19:1:29 | "@blah/foo" | any |
+| bar.ts:3:5:3:5 | x | any |
+| node_modules/@blah/foo/index.d.ts:1:8:1:15 | FooArray | typeof FooArray in library-tests/TypeScript/RegressionTests/ImportSelf/node_modules/@blah/foo/index.d.ts |
+| node_modules/@blah/foo/index.d.ts:1:20:1:20 | A | any |
+| node_modules/@blah/foo/index.d.ts:1:20:1:20 | A | any |
+| node_modules/@blah/foo/index.d.ts:1:29:1:39 | '@blah/foo' | any |
+| node_modules/@blah/foo/index.d.ts:3:11:3:18 | FooArray | typeof FooArray in library-tests/TypeScript/RegressionTests/ImportSelf/node_modules/@blah/foo/index.d.ts |
+| node_modules/@blah/foo/index.d.ts:4:12:4:15 | blah | () => void |
+| node_modules/@blah/foo/index.d.ts:8:10:8:10 | A | any |
+| node_modules/@blah/foo/index.d.ts:8:10:8:10 | A | any |

javascript/ql/test/library-tests/TypeScript/RegressionTests/ImportSelf/test.expected

@@ -0,0 +1,5 @@
+import javascript
+
+// We're mainly testing extraction succeeds, so just test that some types are extracted.
+
+from Expr e select e, e.getType()

javascript/ql/test/library-tests/TypeScript/RegressionTests/ImportSelf/test.ql

@@ -0,0 +1,3 @@
+{
+    "include": ["."]
+}