Merge pull request #2579 from asger-semmle/typescript-trace-resolution

Approved by max-schaefer

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

@@ -12,7 +12,9 @@ export class Project {
   }
 
   public load(): void {
-    this.program = ts.createProgram(this.config.fileNames, this.config.options);
+    let host = ts.createCompilerHost(this.config.options, true);
+    host.trace = undefined; // Disable tracing which would otherwise go to standard out
+    this.program = ts.createProgram(this.config.fileNames, this.config.options, host);
     this.typeTable.setProgram(this.program);
   }
 

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

@@ -0,0 +1 @@
+export function foo();

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

@@ -0,0 +1,6 @@
+| node_modules/@types/foo/index.d.ts:1:17:1:19 | foo | () => any |
+| test.ts:1:10:1:12 | foo | () => any |
+| test.ts:1:10:1:12 | foo | () => any |
+| test.ts:1:21:1:25 | "foo" | any |
+| test.ts:3:1:3:3 | foo | () => any |
+| test.ts:3:1:3:5 | foo() | any |

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

@@ -0,0 +1,3 @@
+import javascript
+
+from Expr e select e, e.getType()

javascript/ql/test/library-tests/TypeScript/RegressionTests/TraceResolution/test.ts

@@ -0,0 +1,3 @@
+import { foo } from "foo";
+
+foo();

javascript/ql/test/library-tests/TypeScript/RegressionTests/TraceResolution/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "include": ["."],
+  "compilerOptions": {
+    "traceResolution": true
+  }
+}