Skip to content

Commit d541bd5

Browse files
author
Max Schaefer
committed
JavaScript: Unify (most) overrides of getAnImportedModule.
1 parent 6a78e37 commit d541bd5

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ class AMDModule extends Module {
222222
/** Gets the definition of this module. */
223223
AMDModuleDefinition getDefine() { amdModuleTopLevel(result, this) }
224224

225-
override Module getAnImportedModule() { result.getFile() = resolve(getDefine().getADependency()) }
226-
227225
override predicate exports(string name, ASTNode export) {
228226
exists(DataFlow::PropWrite pwn | export = pwn.getAstNode() |
229227
pwn.getBase().analyze().getAValue() = getDefine().getAModuleExportsValue() and

javascript/ql/src/semmle/javascript/ES2015Modules.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ class ES2015Module extends Module {
1919
/** Gets an export declaration in this module. */
2020
ExportDeclaration getAnExport() { result.getTopLevel() = this }
2121

22-
override Module getAnImportedModule() { result = getAnImport().getImportedModule() }
23-
2422
override predicate exports(string name, ASTNode export) {
2523
exists(ExportDeclaration ed | ed = getAnExport() and ed = export | ed.exportsAs(_, name))
2624
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ abstract class Module extends TopLevel {
2121
Import getAnImport() { result.getTopLevel() = this }
2222

2323
/** Gets a module from which this module imports. */
24-
abstract Module getAnImportedModule();
24+
Module getAnImportedModule() { result = getAnImport().getImportedModule() }
2525

2626
/** Gets a symbol exported by this module. */
2727
string getAnExportedSymbol() { exports(result, _) }

javascript/ql/src/semmle/javascript/NodeJS.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ class NodeModule extends Module {
2121
/** Gets the scope induced by this module. */
2222
override ModuleScope getScope() { result.getScopeElement() = this }
2323

24-
/** Gets a module imported by this module. */
25-
override Module getAnImportedModule() { result = getAnImport().getImportedModule() }
26-
2724
/**
2825
* Gets an abstract value representing one or more values that may flow
2926
* into this module's `module.exports` property.

0 commit comments

Comments
 (0)