JavaScript: Add a convenience method to AMDModuleDefinition.

Max Schaefer · Max Schaefer · commit a441bfb751b9 · 2018-11-14T11:36:40.000Z
diff --git a/javascript/ql/src/semmle/javascript/AMD.qll b/javascript/ql/src/semmle/javascript/AMD.qll
@@ -83,6 +83,11 @@ class AMDModuleDefinition extends CallExpr {
     )
   }
 
+  /** Gets a source node whose value becomes the definition of this module. */
+  DataFlow::SourceNode getAModuleSource() {
+    result.flowsToExpr(getModuleExpr())
+  }
+
   /**
    * Holds if `p` is the parameter corresponding to dependency `dep`.
    */
diff --git a/javascript/ql/test/library-tests/AMD/AMDModuleExpr.expected b/javascript/ql/test/library-tests/AMD/AMDModuleExpr.expected
@@ -1,4 +1,4 @@
-| a.js:1:1:3:2 | define( ... 2 };\\n}) | a.js:2:12:2:22 | { foo: 42 } |
-| dir/b.js:1:1:3:2 | define( ... : 42\\n}) | dir/b.js:1:8:3:1 | {\\n    bar: 42\\n} |
-| tst.js:1:1:6:2 | define( ...   };\\n}) | tst.js:2:12:5:5 | {\\n      ... r\\n    } |
-| umd.js:4:9:4:43 | define( ... actory) | umd.js:10:12:13:5 | {\\n      ... r\\n    } |
+| a.js:1:1:3:2 | define( ... 2 };\\n}) | a.js:2:12:2:22 | { foo: 42 } | a.js:2:12:2:22 | { foo: 42 } |
+| dir/b.js:1:1:3:2 | define( ... : 42\\n}) | dir/b.js:1:8:3:1 | {\\n    bar: 42\\n} | dir/b.js:1:8:3:1 | {\\n    bar: 42\\n} |
+| tst.js:1:1:6:2 | define( ...   };\\n}) | tst.js:2:12:5:5 | {\\n      ... r\\n    } | tst.js:2:12:5:5 | {\\n      ... r\\n    } |
+| umd.js:4:9:4:43 | define( ... actory) | umd.js:10:12:13:5 | {\\n      ... r\\n    } | umd.js:10:12:13:5 | {\\n      ... r\\n    } |
diff --git a/javascript/ql/test/library-tests/AMD/AMDModuleExpr.ql b/javascript/ql/test/library-tests/AMD/AMDModuleExpr.ql
@@ -1,4 +1,4 @@
 import javascript
 
 from AMDModuleDefinition d
-select d, d.getModuleExpr()
+select d, d.getModuleExpr(), d.getAModuleSource()

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,11 @@ class AMDModuleDefinition extends CallExpr {`
`83`	`83`	`)`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ /** Gets a source node whose value becomes the definition of this module. */`
	`87`	`+ DataFlow::SourceNode getAModuleSource() {`
	`88`	`+ result.flowsToExpr(getModuleExpr())`
	`89`	`+ }`
	`90`	`+`
`86`	`91`	`/**`
`87`	`92`	* Holds if `p` is the parameter corresponding to dependency `dep`.
`88`	`93`	`*/`