JavaScript: Make AMD dependencies Imports.

Author: Max Schaefer

javascript/ql/src/semmle/javascript/AMD.qll

@@ -196,6 +196,23 @@ private predicate amdModuleTopLevel(AMDModuleDefinition def, TopLevel tl) {
   not def.getParent+() instanceof AMDModuleDefinition
 }
 
+/**
+ * An AMD dependency, viewed as an import.
+ */
+private class AmdDependencyImport extends Import {
+  AmdDependencyImport() {
+    this = any(AMDModuleDefinition def).getADependency()
+  }
+
+  override Module getEnclosingModule() {
+    this = result.(AMDModule).getDefine().getADependency()
+  }
+
+  override PathExpr getImportedPath() {
+    result = this
+  }
+}
+
 /**
  * An AMD-style module.
  */

javascript/ql/src/semmle/javascript/Modules.qll

@@ -92,8 +92,8 @@ abstract class Module extends TopLevel {
 }
 
 /**
- * An import in a module, which may either be an ECMAScript 2015-style
- * `import` statement or a CommonJS-style `require` import.
+ * An import in a module, which may be an ECMAScript 2015-style
+ * `import` statement, a CommonJS-style `require` import, or an AMD dependency.
  */
 abstract class Import extends ASTNode {
   /** Gets the module in which this import appears. */