JS: Avoid unwanted recursion

Author: asgerf

javascript/ql/lib/semmle/javascript/ES2015Modules.qll

@@ -92,6 +92,11 @@ private predicate hasDefaultExport(ES2015Module mod) {
 class ImportDeclaration extends Stmt, Import, @import_declaration {
   override ES2015Module getEnclosingModule() { result = this.getTopLevel() }
 
+  /**
+   * Internal use only. Use `getImportedPathExpr` instead.
+   */
+  string getRawImportPath() { result = this.getChildExpr(-1).getStringValue() }
+
   override Expr getImportedPathExpr() { result = this.getChildExpr(-1) }
 
   /**

javascript/ql/lib/semmle/javascript/NodeJS.qll

@@ -237,7 +237,7 @@ private class RequireVariable extends Variable {
 }
 
 private predicate isModuleModule(EarlyStageNode nd) {
-  exists(ImportDeclaration imp | imp.getImportedPathString() = "module" |
+  exists(ImportDeclaration imp | imp.getRawImportPath() = "module" |
     nd = TDestructuredModuleImportNode(imp)
     or
     nd = TValueNode(imp.getASpecifier().(ImportNamespaceSpecifier))
@@ -263,7 +263,7 @@ private predicate isCreateRequire(EarlyStageNode nd) {
   )
   or
   exists(ImportDeclaration decl, NamedImportSpecifier spec |
-    decl.getImportedPathString() = "module" and
+    decl.getRawImportPath() = "module" and
     spec = decl.getASpecifier() and
     spec.getImportedName() = "createRequire" and
     nd = TValueNode(spec)