JS: rename getDefaultNode to getImportedModuleNode

This commit is contained in:
Esben Sparre Andreasen
2019-05-15 10:45:49 +02:00
parent 0660db37f6
commit c143e31fb5
7 changed files with 8 additions and 8 deletions

View File

@@ -264,7 +264,7 @@ private class AmdDependencyImport extends Import {
result = resolveByAbsolutePath() result = resolveByAbsolutePath()
} }
override DataFlow::Node getDefaultNode() { override DataFlow::Node getImportedModuleNode() {
exists(Parameter param | exists(Parameter param |
any(AmdModuleDefinition def).dependencyParameter(this, param) and any(AmdModuleDefinition def).dependencyParameter(this, param) and
result = DataFlow::parameterNode(param) result = DataFlow::parameterNode(param)

View File

@@ -44,7 +44,7 @@ class ImportDeclaration extends Stmt, Import, @importdeclaration {
/** Gets an import specifier of this import declaration. */ /** Gets an import specifier of this import declaration. */
ImportSpecifier getASpecifier() { result = getSpecifier(_) } ImportSpecifier getASpecifier() { result = getSpecifier(_) }
override DataFlow::Node getDefaultNode() { override DataFlow::Node getImportedModuleNode() {
// `import * as http from 'http'` or `import http from `http`' // `import * as http from 'http'` or `import http from `http`'
exists(ImportSpecifier is | exists(ImportSpecifier is |
is = getASpecifier() and is = getASpecifier() and

View File

@@ -1563,7 +1563,7 @@ class DynamicImportExpr extends @dynamicimport, Expr, Import {
override Module getEnclosingModule() { result = getTopLevel() } override Module getEnclosingModule() { result = getTopLevel() }
override DataFlow::Node getDefaultNode() { result = DataFlow::valueNode(this) } override DataFlow::Node getImportedModuleNode() { result = DataFlow::valueNode(this) }
} }
/** A literal path expression appearing in a dynamic import. */ /** A literal path expression appearing in a dynamic import. */

View File

@@ -164,7 +164,7 @@ abstract class Import extends ASTNode {
/** /**
* Gets the data flow node that the default import of this import is available at. * Gets the data flow node that the default import of this import is available at.
*/ */
abstract DataFlow::Node getDefaultNode(); abstract DataFlow::Node getImportedModuleNode();
} }
/** /**

View File

@@ -235,7 +235,7 @@ class Require extends CallExpr, Import {
) )
} }
override DataFlow::Node getDefaultNode() { result = DataFlow::valueNode(this) } override DataFlow::Node getImportedModuleNode() { result = DataFlow::valueNode(this) }
} }
/** An argument to `require` or `require.resolve`, considered as a path expression. */ /** An argument to `require` or `require.resolve`, considered as a path expression. */

View File

@@ -213,7 +213,7 @@ class ExternalModuleReference extends Expr, Import, @externalmodulereference {
result = getExpression().getFirstControlFlowNode() result = getExpression().getFirstControlFlowNode()
} }
override DataFlow::Node getDefaultNode() { result = DataFlow::valueNode(this) } override DataFlow::Node getImportedModuleNode() { result = DataFlow::valueNode(this) }
} }
/** A literal path expression appearing in an external module reference. */ /** A literal path expression appearing in an external module reference. */

View File

@@ -463,7 +463,7 @@ module ModuleImportNode {
DefaultRange() { DefaultRange() {
exists(Import i | exists(Import i |
this = i.getDefaultNode() and this = i.getImportedModuleNode() and
i.getImportedPath().getValue() = path i.getImportedPath().getValue() = path
) )
or or
@@ -494,7 +494,7 @@ ModuleImportNode moduleImport(string path) { result.getPath() = path }
* `"lodash"` as a dependency. * `"lodash"` as a dependency.
*/ */
ModuleImportNode dependencyModuleImport(Dependency dep) { ModuleImportNode dependencyModuleImport(Dependency dep) {
result = dep.getAUse("import").(Import).getDefaultNode() result = dep.getAUse("import").(Import).getImportedModuleNode()
} }
/** /**