JS: handle .mjs files correctly

asger-semmle · asger-semmle · commit c52ed9152f56 · 2019-02-06T09:12:10.000Z
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -553,7 +553,7 @@ public Label visit(Program nd, Context c) {
 			if (sourceType.hasLocalScope()) {
 				Label moduleScopeKey = trapwriter.globalID("module;{" + locationManager.getFileLabel() + "}," + locationManager.getStartLine() + "," + locationManager.getStartColumn());
 				scopeManager.enterScope(3, moduleScopeKey, toplevelLabel);
-				scopeManager.addVariables(sourceType.getPredefinedLocals(platform));
+				scopeManager.addVariables(sourceType.getPredefinedLocals(platform, locationManager.getSourceFileExtension()));
 				trapwriter.addTuple("isModule", toplevelLabel);
 			}
 
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java b/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java
@@ -107,14 +107,14 @@ public boolean isStrictMode() {
          * <p/>
          * If this source type has no local scope, the empty set is returned.
          */
-        public Set<String> getPredefinedLocals(Platform platform) {
+        public Set<String> getPredefinedLocals(Platform platform, String extension) {
             switch (this) {
             case CLOSURE_MODULE:
                 return closureLocals;
             case COMMONJS_MODULE:
                 return commonJsLocals;
             case MODULE:
-                if (platform == Platform.NODE) {
+                if (platform == Platform.NODE && !extension.equals(".mjs")) {
                     // An ES2015 module that is compiled to a Node.js module effectively has the locals
                     // from Node.js even if they are not part of the ES2015 standard.
                     return commonJsLocals;

Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,7 @@ public Label visit(Program nd, Context c) {`
`553`	`553`	`if (sourceType.hasLocalScope()) {`
`554`	`554`	`Label moduleScopeKey = trapwriter.globalID("module;{" + locationManager.getFileLabel() + "}," + locationManager.getStartLine() + "," + locationManager.getStartColumn());`
`555`	`555`	`scopeManager.enterScope(3, moduleScopeKey, toplevelLabel);`
`556`		`- scopeManager.addVariables(sourceType.getPredefinedLocals(platform));`
	`556`	`+ scopeManager.addVariables(sourceType.getPredefinedLocals(platform, locationManager.getSourceFileExtension()));`
`557`	`557`	`trapwriter.addTuple("isModule", toplevelLabel);`
`558`	`558`	`}`
`559`	`559`