JS: rename getNamespaceId to getClosureNamespace

asger-semmle · asger-semmle · commit 8d78731ff014 · 2019-02-15T14:28:06.000Z
diff --git a/javascript/ql/src/semmle/javascript/Closure.qll b/javascript/ql/src/semmle/javascript/Closure.qll
@@ -38,9 +38,7 @@ module Closure {
     Expr getAnArgument() { result = getArgument(_) }
   }
 
-  abstract private class GoogNamespaceRef extends ExprOrStmt {
-    abstract string getNamespaceId();
-  }
+  abstract private class GoogNamespaceRef extends ExprOrStmt { abstract string getClosureNamespace(); }
 
   /**
    * A call to `goog.provide`.
@@ -49,7 +47,7 @@ module Closure {
     GoogProvide() { getFunctionName() = "provide" }
 
     /** Gets the identifier of the namespace created by this call. */
-    override string getNamespaceId() { result = getArgument(0).getStringValue() }
+    override string getClosureNamespace() { result = getArgument(0).getStringValue() }
   }
 
   /**
@@ -59,7 +57,7 @@ module Closure {
     GoogRequire() { getFunctionName() = "require" }
 
     /** Gets the identifier of the namespace imported by this call. */
-    override string getNamespaceId() { result = getArgument(0).getStringValue() }
+    override string getClosureNamespace() { result = getArgument(0).getStringValue() }
   }
 
   private class GoogRequireImport extends GoogRequire, Import {
@@ -80,7 +78,7 @@ module Closure {
     }
 
     /** Gets the identifier of the namespace imported by this call. */
-    override string getNamespaceId() { result = getArgument(0).getStringValue() }
+    override string getClosureNamespace() { result = getArgument(0).getStringValue() }
   }
 
   /**
@@ -97,12 +95,12 @@ module Closure {
     /**
      * Gets the namespace of this module.
      */
-    string getNamespaceId() { result = getModuleDeclaration().getNamespaceId() }
+    string getClosureNamespace() { result = getModuleDeclaration().getClosureNamespace() }
 
     override Module getAnImportedModule() {
       exists(GoogRequireImport imprt |
         imprt.getEnclosingModule() = this and
-        result.(ClosureModule).getNamespaceId() = imprt.getNamespaceId()
+        result.(ClosureModule).getClosureNamespace() = imprt.getClosureNamespace()
       )
     }
 
@@ -146,19 +144,19 @@ module Closure {
 
     /** Gets the identifier of a namespace required by this module. */
     string getARequiredNamespace() {
-      result = getAChildStmt().(ExprStmt).getExpr().(GoogRequire).getNamespaceId()
+      result = getAChildStmt().(ExprStmt).getExpr().(GoogRequire).getClosureNamespace()
     }
 
     /** Gets the identifer of a namespace provided by this module. */
-    string getAProvidedNamespace() { result = getAChildStmt().(GoogProvide).getNamespaceId() }
+    string getAProvidedNamespace() { result = getAChildStmt().(GoogProvide).getClosureNamespace() }
   }
 
   /**
    * Holds if `name` is a closure namespace, including proper namespace prefixes.
    */
   pragma[noinline]
   predicate isLibraryNamespacePath(string name) {
-    exists(string namespace | namespace = any(GoogNamespaceRef provide).getNamespaceId() |
+    exists(string namespace | namespace = any(GoogNamespaceRef provide).getClosureNamespace() |
       name = namespace.substring(0, namespace.indexOf("."))
       or
       name = namespace
@@ -187,7 +185,7 @@ module Closure {
       result = getWrittenLibraryAccessPath(write)
     )
     or
-    result = node.asExpr().(GoogRequire).getNamespaceId()
+    result = node.asExpr().(GoogRequire).getClosureNamespace()
   }
 
   /**
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
@@ -371,7 +371,7 @@ private class AnalyzedClosureGlobalAccessPath extends AnalyzedNode, AnalyzedProp
 
   override predicate reads(AbstractValue base, string propName) {
     exists(Closure::ClosureModule mod |
-      mod.getNamespaceId() = accessPath and
+      mod.getClosureNamespace() = accessPath and
       base = TAbstractModuleObject(mod) and
       propName = "exports"
     )

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ private class AnalyzedClosureGlobalAccessPath extends AnalyzedNode, AnalyzedProp`
`371`	`371`
`372`	`372`	`override predicate reads(AbstractValue base, string propName) {`
`373`	`373`	`exists(Closure::ClosureModule mod \|`
`374`		`- mod.getNamespaceId() = accessPath and`
	`374`	`+ mod.getClosureNamespace() = accessPath and`
`375`	`375`	`base = TAbstractModuleObject(mod) and`
`376`	`376`	`propName = "exports"`
`377`	`377`	`)`