JS: Fix extraction of identifiers in EXPORT_BASE context

asgerf · asgerf · commit d7e3e9e5db90 · 2022-05-24T14:30:36.000+02:00
This is needed to ensure that the base of the RHS of an ImportEqualsDeclaration is bound to a namespace. That is, B below should be bound to a namespace:

import A = B.C.D;
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -747,7 +747,7 @@ public Label visit(MemberExpression nd, Context c) {
         visit(nd.getProperty(), key, 1, IdContext.TYPE_LABEL);
       } else {
         IdContext baseIdContext =
-            c.idcontext == IdContext.EXPORT ? IdContext.EXPORT_BASE : IdContext.VAR_BIND;
+            (c.idcontext == IdContext.EXPORT || c.idcontext == IdContext.EXPORT_BASE) ? IdContext.EXPORT_BASE : IdContext.VAR_BIND;
         visit(nd.getObject(), key, 0, baseIdContext);
         visit(nd.getProperty(), key, 1, nd.isComputed() ? IdContext.VAR_BIND : IdContext.LABEL);
       }
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportBaseResolution/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportBaseResolution/test.expected
@@ -1 +1,2 @@
+| A | namespace | test.d.ts:1:19:1:19 | A | test.d.ts:10:14:10:14 | A |
 | A | variable | test.d.ts:1:19:1:19 | A | test.d.ts:10:14:10:14 | A |

Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ public Label visit(MemberExpression nd, Context c) {`
`747`	`747`	`visit(nd.getProperty(), key, 1, IdContext.TYPE_LABEL);`
`748`	`748`	`} else {`
`749`	`749`	`IdContext baseIdContext =`
`750`		`- c.idcontext == IdContext.EXPORT ? IdContext.EXPORT_BASE : IdContext.VAR_BIND;`
	`750`	`+ (c.idcontext == IdContext.EXPORT \|\| c.idcontext == IdContext.EXPORT_BASE) ? IdContext.EXPORT_BASE : IdContext.VAR_BIND;`
`751`	`751`	`visit(nd.getObject(), key, 0, baseIdContext);`
`752`	`752`	`visit(nd.getProperty(), key, 1, nd.isComputed() ? IdContext.VAR_BIND : IdContext.LABEL);`
`753`	`753`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+\| A \| namespace \| test.d.ts:1:19:1:19 \| A \| test.d.ts:10:14:10:14 \| A \|`
`1`	`2`	`\| A \| variable \| test.d.ts:1:19:1:19 \| A \| test.d.ts:10:14:10:14 \| A \|`