TS: Disable export analysis for type-only exports

asgerf · asgerf · commit 47673c6e21c8 · 2020-02-24T11:40:27.000Z
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
@@ -405,10 +405,16 @@ private class AnalyzedClosureGlobalAccessPath extends AnalyzedNode, AnalyzedProp
  */
 private class AnalyzedExportNamespaceSpecifier extends AnalyzedPropertyWrite, DataFlow::ValueNode {
   override ExportNamespaceSpecifier astNode;
+  ReExportDeclaration decl;
+
+  AnalyzedExportNamespaceSpecifier() {
+    decl = astNode.getExportDeclaration() and
+    not decl.isTypeOnly()
+  }
 
   override predicate writesValue(AbstractValue baseVal, string propName, AbstractValue value) {
     baseVal = TAbstractExportsObject(getTopLevel()) and
     propName = astNode.getExportedName() and
-    value = TAbstractExportsObject(astNode.getExportDeclaration().(ReExportDeclaration).getReExportedModule())
+    value = TAbstractExportsObject(decl.getReExportedModule())
   }
 }
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/exportFunction.ts b/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/exportFunction.ts
@@ -0,0 +1 @@
+export function f() {}
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/importFunction.ts b/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/importFunction.ts
@@ -0,0 +1,3 @@
+import { ns } from "./importType";
+
+ns.f(); // Calls local method in 'importType'
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/importType.ts b/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/importType.ts
@@ -0,0 +1,3 @@
+export type * as ns from "./exportFunction";
+
+export var ns = { f() {} };
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/test.expected b/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/test.expected
@@ -1,7 +1,14 @@
 getAVarReference
 | Foo | tst.ts:5:5:5:7 | Foo |
+| f | exportFunction.ts:1:17:1:17 | f |
+| ns | importFunction.ts:1:10:1:11 | ns |
+| ns | importFunction.ts:3:1:3:2 | ns |
+| ns | importType.ts:3:12:3:13 | ns |
 getAnExportAccess
 | Foo | tst.ts:3:15:3:17 | Foo |
 getATypeDecl
 | Foo | tst.ts:1:15:1:17 | Foo |
+| ns | importFunction.ts:1:10:1:11 | ns |
 | types | tst.ts:7:18:7:22 | types |
+calls
+| importFunction.ts:3:1:3:6 | ns.f() | importType.ts:3:19:3:24 | f() {} |
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/test.ql b/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/test.ql
@@ -11,3 +11,7 @@ query VarRef getAnExportAccess(LocalTypeName t) {
 query TypeDecl getATypeDecl(LocalTypeName t) {
     result = t.getADeclaration()
 }
+
+query Function calls(DataFlow::InvokeNode invoke) {
+    result = invoke.getACallee()
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { ns } from "./importType";`
	`2`	`+`
	`3`	`+ns.f(); // Calls local method in 'importType'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export type * as ns from "./exportFunction";`
	`2`	`+`
	`3`	`+export var ns = { f() {} };`
Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,7 @@ query VarRef getAnExportAccess(LocalTypeName t) {`
`11`	`11`	`query TypeDecl getATypeDecl(LocalTypeName t) {`
`12`	`12`	`result = t.getADeclaration()`
`13`	`13`	`}`
	`14`	`+`
	`15`	`+query Function calls(DataFlow::InvokeNode invoke) {`
	`16`	`+ result = invoke.getACallee()`
	`17`	`+}`