Merge pull request #1621 from asger-semmle/no-recursive-import

Approved by xiemaisi

Author: semmle-qlci

javascript/ql/src/semmle/javascript/dataflow/AbstractProperties.qll

@@ -1,4 +1,4 @@
-import javascript
+private import javascript
 private import semmle.javascript.dataflow.internal.AbstractValuesImpl
 private import semmle.javascript.dataflow.InferredTypes
 private import semmle.javascript.dataflow.internal.AbstractPropertiesImpl

javascript/ql/src/semmle/javascript/dataflow/AbstractValues.qll

@@ -38,7 +38,7 @@
  * the source of imprecision that caused them to arise.
  */
 
-import javascript
+private import javascript
 private import semmle.javascript.dataflow.internal.AbstractValuesImpl
 private import InferredTypes
 

javascript/ql/src/semmle/javascript/dataflow/Configuration.qll

@@ -68,7 +68,7 @@
  * computed by `onPath`.
  */
 
-import javascript
+private import javascript
 private import internal.FlowSteps
 private import internal.AccessPaths
 

javascript/ql/src/semmle/javascript/dataflow/CustomAbstractValueDefinitions.qll

@@ -8,7 +8,7 @@
  * should be part of the standard library.
  */
 
-import javascript
+private import javascript
 private import internal.AbstractValuesImpl
 private import InferredTypes
 

javascript/ql/src/semmle/javascript/dataflow/LocalObjects.qll

@@ -14,7 +14,7 @@ private predicate isEscape(DataFlow::Node escape, string cause) {
   or
   escape = any(ThrowStmt t).getExpr().flow() and cause = "throw"
   or
-  escape = any(DataFlow::GlobalVariable v).getAnAssignedExpr().flow() and cause = "global"
+  escape = any(GlobalVariable v).getAnAssignedExpr().flow() and cause = "global"
   or
   escape = any(DataFlow::PropWrite write).getRhs() and cause = "heap"
   or

javascript/ql/src/semmle/javascript/dataflow/Nodes.qll

@@ -4,8 +4,8 @@
  * parameters.
  */
 
-import javascript
-import semmle.javascript.dependencies.Dependencies
+private import javascript
+private import semmle.javascript.dependencies.Dependencies
 
 /** A data flow node corresponding to an expression. */
 class ExprNode extends DataFlow::ValueNode {

javascript/ql/src/semmle/javascript/dataflow/Sources.qll

@@ -6,7 +6,7 @@
  * local tracking within a function.
  */
 
-import javascript
+private import javascript
 private import semmle.javascript.dataflow.TypeTracking
 
 /**

javascript/ql/src/semmle/javascript/dataflow/TrackedNodes.qll

@@ -3,7 +3,7 @@
  * set of data flow nodes.
  */
 
-import javascript
+private import javascript
 private import internal.FlowSteps as FlowSteps
 
 /**

javascript/ql/src/semmle/javascript/dataflow/TypeInference.qll

@@ -25,7 +25,7 @@
  * read are marked as indefinite.
  */
 
-import javascript
+private import javascript
 import AbstractValues
 import AbstractProperties
 private import InferredTypes

javascript/ql/src/semmle/javascript/dataflow/TypeTracking.qll

@@ -6,7 +6,7 @@
  * a given value came from.
  */
 
-import javascript
+private import javascript
 private import internal.FlowSteps
 
 private class PropertyName extends string {