Merge pull request #1856 from asger-semmle/ts-base-types

Approved by xiemaisi

Author: semmle-qlci

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

@@ -974,8 +974,10 @@ export class TypeTable {
             if (superType == null) continue;
             let baseTypeSymbol = superType.symbol;
             if (baseTypeSymbol == null) continue;
+            let baseId = this.getSymbolId(baseTypeSymbol);
+            // Note: take care not to perform a recursive call between the two `push` calls.
             this.baseTypes.symbols.push(symbolId);
-            this.baseTypes.baseTypeSymbols.push(this.getSymbolId(baseTypeSymbol));
+            this.baseTypes.baseTypeSymbols.push(baseId);
           }
         }
       }

javascript/ql/src/semmle/javascript/CanonicalNames.qll

@@ -210,7 +210,9 @@ class CanonicalName extends @symbol {
 class TypeName extends CanonicalName {
   TypeName() {
     exists(TypeReference ref | type_symbol(ref, this)) or
-    exists(TypeDefinition def | ast_node_symbol(def, this))
+    exists(TypeDefinition def | ast_node_symbol(def, this)) or
+    base_type_names(_, this) or
+    base_type_names(this, _)
   }
 
   /**

javascript/ql/test/library-tests/TypeScript/ExternalBaseTypes/BaseTypes.expected

@@ -0,0 +1,3 @@
+| B in module 'mylib' | A in module 'mylib' |
+| C in module 'mylib' | B in module 'mylib' |
+| D in module 'mylib' | C in module 'mylib' |

javascript/ql/test/library-tests/TypeScript/ExternalBaseTypes/BaseTypes.ql

@@ -0,0 +1,5 @@
+import javascript
+
+from TypeName tn
+where tn.hasQualifiedName("mylib", _)
+select tn, tn.getABaseTypeName()

javascript/ql/test/library-tests/TypeScript/ExternalBaseTypes/node_modules/@types/mylib/index.d.ts

@@ -0,0 +1 @@
+semmle-extractor-options:--exclude node_modules/**

javascript/ql/test/library-tests/TypeScript/ExternalBaseTypes/options

@@ -0,0 +1,5 @@
+{
+	"compilerOptions": {
+		"baseUrl": "./"
+	}
+}

javascript/ql/test/library-tests/TypeScript/ExternalBaseTypes/tsconfig.json

@@ -0,0 +1,3 @@
+import { D } from "mylib";
+
+export var foo: D = null;