@babel/traverse 7.14.7 → 7.15.4

package/lib/scope/index.js

@@ -13,24 +13,63 @@ var _binding = require("./binding");
 
 var _globals = require("globals");
 
-var t = require("@babel/types");
+var _t = require("@babel/types");
 
 var _cache = require("../cache");
 
+const {
+  NOT_LOCAL_BINDING,
+  callExpression,
+  cloneNode,
+  getBindingIdentifiers,
+  identifier,
+  isArrayExpression,
+  isBinary,
+  isClass,
+  isClassBody,
+  isClassDeclaration,
+  isExportAllDeclaration,
+  isExportDefaultDeclaration,
+  isExportNamedDeclaration,
+  isFunctionDeclaration,
+  isIdentifier,
+  isImportDeclaration,
+  isLiteral,
+  isMethod,
+  isModuleDeclaration,
+  isModuleSpecifier,
+  isObjectExpression,
+  isProperty,
+  isPureish,
+  isSuper,
+  isTaggedTemplateExpression,
+  isTemplateLiteral,
+  isThisExpression,
+  isUnaryExpression,
+  isVariableDeclaration,
+  matchesPattern,
+  memberExpression,
+  numericLiteral,
+  toIdentifier,
+  unaryExpression,
+  variableDeclaration,
+  variableDeclarator
+} = _t;
+
 function gatherNodeParts(node, parts) {
   switch (node == null ? void 0 : node.type) {
     default:
-      if (t.isModuleDeclaration(node)) {
-        if ((t.isExportAllDeclaration(node) || t.isExportNamedDeclaration(node) || t.isImportDeclaration(node)) && node.source) {
+      if (isModuleDeclaration(node)) {
+        if ((isExportAllDeclaration(node) || isExportNamedDeclaration(node) || isImportDeclaration(node)) && node.source) {
           gatherNodeParts(node.source, parts);
-        } else if ((t.isExportNamedDeclaration(node) || t.isImportDeclaration(node)) && node.specifiers && node.specifiers.length) {
+        } else if ((isExportNamedDeclaration(node) || isImportDeclaration(node)) && node.specifiers && node.specifiers.length) {
           for (const e of node.specifiers) gatherNodeParts(e, parts);
-        } else if ((t.isExportDefaultDeclaration(node) || t.isExportNamedDeclaration(node)) && node.declaration) {
+        } else if ((isExportDefaultDeclaration(node) || isExportNamedDeclaration(node)) && node.declaration) {
           gatherNodeParts(node.declaration, parts);
         }
-      } else if (t.isModuleSpecifier(node)) {
+      } else if (isModuleSpecifier(node)) {
         gatherNodeParts(node.local, parts);
-      } else if (t.isLiteral(node)) {
+      } else if (isLiteral(node)) {
         parts.push(node.value);
       }
 
@@ -159,24 +198,31 @@ function gatherNodeParts(node, parts) {
 }
 
 const collectorVisitor = {
-  For(path) {
-    for (const key of t.FOR_INIT_KEYS) {
-      const declar = path.get(key);
+  ForStatement(path) {
+    const declar = path.get("init");
 
-      if (declar.isVar()) {
-        const parentScope = path.scope.getFunctionParent() || path.scope.getProgramParent();
-        parentScope.registerBinding("var", declar);
-      }
+    if (declar.isVar()) {
+      const {
+        scope
+      } = path;
+      const parentScope = scope.getFunctionParent() || scope.getProgramParent();
+      parentScope.registerBinding("var", declar);
     }
   },
 
   Declaration(path) {
     if (path.isBlockScoped()) return;
+    if (path.isImportDeclaration()) return;
     if (path.isExportDeclaration()) return;
     const parent = path.scope.getFunctionParent() || path.scope.getProgramParent();
     parent.registerDeclaration(path);
   },
 
+  ImportDeclaration(path) {
+    const parent = path.scope.getBlockParent();
+    parent.registerDeclaration(path);
+  },
+
   ReferencedIdentifier(path, state) {
     state.references.push(path);
   },
@@ -186,6 +232,12 @@ const collectorVisitor = {
 
     if (left.isPattern() || left.isIdentifier()) {
       state.constantViolations.push(path);
+    } else if (left.isVar()) {
+      const {
+        scope
+      } = path;
+      const parentScope = scope.getFunctionParent() || scope.getProgramParent();
+      parentScope.registerBinding("var", left);
     }
   },
 
@@ -195,19 +247,19 @@ const collectorVisitor = {
         node,
         scope
       } = path;
-      if (t.isExportAllDeclaration(node)) return;
+      if (isExportAllDeclaration(node)) return;
       const declar = node.declaration;
 
-      if (t.isClassDeclaration(declar) || t.isFunctionDeclaration(declar)) {
+      if (isClassDeclaration(declar) || isFunctionDeclaration(declar)) {
         const id = declar.id;
         if (!id) return;
         const binding = scope.getBinding(id.name);
-        if (binding) binding.reference(path);
-      } else if (t.isVariableDeclaration(declar)) {
+        binding == null ? void 0 : binding.reference(path);
+      } else if (isVariableDeclaration(declar)) {
         for (const decl of declar.declarations) {
-          for (const name of Object.keys(t.getBindingIdentifiers(decl))) {
+          for (const name of Object.keys(getBindingIdentifiers(decl))) {
             const binding = scope.getBinding(name);
-            if (binding) binding.reference(path);
+            binding == null ? void 0 : binding.reference(path);
           }
         }
       }
@@ -251,7 +303,7 @@ const collectorVisitor = {
   },
 
   Function(path) {
-    if (path.isFunctionExpression() && path.has("id") && !path.get("id").node[t.NOT_LOCAL_BINDING]) {
+    if (path.isFunctionExpression() && path.has("id") && !path.get("id").node[NOT_LOCAL_BINDING]) {
       path.scope.registerBinding("local", path.get("id"), path);
     }
 
@@ -263,7 +315,7 @@ const collectorVisitor = {
   },
 
   ClassExpression(path) {
-    if (path.has("id") && !path.get("id").node[t.NOT_LOCAL_BINDING]) {
+    if (path.has("id") && !path.get("id").node[NOT_LOCAL_BINDING]) {
       path.scope.registerBinding("local", path);
     }
   }
@@ -336,15 +388,15 @@ class Scope {
     this.push({
       id
     });
-    return t.cloneNode(id);
+    return cloneNode(id);
   }
 
   generateUidIdentifier(name) {
-    return t.identifier(this.generateUid(name));
+    return identifier(this.generateUid(name));
   }
 
   generateUid(name = "temp") {
-    name = t.toIdentifier(name).replace(/^_+/, "").replace(/[0-9]+$/g, "");
+    name = toIdentifier(name).replace(/^_+/, "").replace(/[0-9]+$/g, "");
     let uid;
     let i = 1;
 
@@ -374,15 +426,15 @@ class Scope {
   }
 
   generateUidIdentifierBasedOnNode(node, defaultName) {
-    return t.identifier(this.generateUidBasedOnNode(node, defaultName));
+    return identifier(this.generateUidBasedOnNode(node, defaultName));
   }
 
   isStatic(node) {
-    if (t.isThisExpression(node) || t.isSuper(node)) {
+    if (isThisExpression(node) || isSuper(node)) {
       return true;
     }
 
-    if (t.isIdentifier(node)) {
+    if (isIdentifier(node)) {
       const binding = this.getBinding(node.name);
 
       if (binding) {
@@ -405,7 +457,7 @@ class Scope {
         this.push({
           id
         });
-        return t.cloneNode(id);
+        return cloneNode(id);
       }
 
       return id;
@@ -461,7 +513,7 @@ class Scope {
   }
 
   toArray(node, i, arrayLikeIsIterable) {
-    if (t.isIdentifier(node)) {
+    if (isIdentifier(node)) {
       const binding = this.getBinding(node.name);
 
       if (binding != null && binding.constant && binding.path.isGenericType("Array")) {
@@ -469,14 +521,14 @@ class Scope {
       }
     }
 
-    if (t.isArrayExpression(node)) {
+    if (isArrayExpression(node)) {
       return node;
     }
 
-    if (t.isIdentifier(node, {
+    if (isIdentifier(node, {
       name: "arguments"
     })) {
-      return t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.identifier("Array"), t.identifier("prototype")), t.identifier("slice")), t.identifier("call")), [node]);
+      return callExpression(memberExpression(memberExpression(memberExpression(identifier("Array"), identifier("prototype")), identifier("slice")), identifier("call")), [node]);
     }
 
     let helperName;
@@ -485,7 +537,7 @@ class Scope {
     if (i === true) {
       helperName = "toConsumableArray";
     } else if (i) {
-      args.push(t.numericLiteral(i));
+      args.push(numericLiteral(i));
       helperName = "slicedToArray";
     } else {
       helperName = "toArray";
@@ -496,7 +548,7 @@ class Scope {
       helperName = "maybeArrayLike";
     }
 
-    return t.callExpression(this.hub.addHelper(helperName), args);
+    return callExpression(this.hub.addHelper(helperName), args);
   }
 
   hasLabel(name) {
@@ -542,7 +594,7 @@ class Scope {
   }
 
   buildUndefinedNode() {
-    return t.unaryExpression("void", t.numericLiteral(0), true);
+    return unaryExpression("void", numericLiteral(0), true);
   }
 
   registerConstantViolation(path) {
@@ -624,56 +676,56 @@ class Scope {
   }
 
   isPure(node, constantsOnly) {
-    if (t.isIdentifier(node)) {
+    if (isIdentifier(node)) {
       const binding = this.getBinding(node.name);
       if (!binding) return false;
       if (constantsOnly) return binding.constant;
       return true;
-    } else if (t.isClass(node)) {
+    } else if (isClass(node)) {
       if (node.superClass && !this.isPure(node.superClass, constantsOnly)) {
         return false;
       }
 
       return this.isPure(node.body, constantsOnly);
-    } else if (t.isClassBody(node)) {
+    } else if (isClassBody(node)) {
       for (const method of node.body) {
         if (!this.isPure(method, constantsOnly)) return false;
       }
 
       return true;
-    } else if (t.isBinary(node)) {
+    } else if (isBinary(node)) {
       return this.isPure(node.left, constantsOnly) && this.isPure(node.right, constantsOnly);
-    } else if (t.isArrayExpression(node)) {
+    } else if (isArrayExpression(node)) {
       for (const elem of node.elements) {
         if (!this.isPure(elem, constantsOnly)) return false;
       }
 
       return true;
-    } else if (t.isObjectExpression(node)) {
+    } else if (isObjectExpression(node)) {
       for (const prop of node.properties) {
         if (!this.isPure(prop, constantsOnly)) return false;
       }
 
       return true;
-    } else if (t.isMethod(node)) {
+    } else if (isMethod(node)) {
       if (node.computed && !this.isPure(node.key, constantsOnly)) return false;
       if (node.kind === "get" || node.kind === "set") return false;
       return true;
-    } else if (t.isProperty(node)) {
+    } else if (isProperty(node)) {
       if (node.computed && !this.isPure(node.key, constantsOnly)) return false;
       return this.isPure(node.value, constantsOnly);
-    } else if (t.isUnaryExpression(node)) {
+    } else if (isUnaryExpression(node)) {
       return this.isPure(node.argument, constantsOnly);
-    } else if (t.isTaggedTemplateExpression(node)) {
-      return t.matchesPattern(node.tag, "String.raw") && !this.hasBinding("String", true) && this.isPure(node.quasi, constantsOnly);
-    } else if (t.isTemplateLiteral(node)) {
+    } else if (isTaggedTemplateExpression(node)) {
+      return matchesPattern(node.tag, "String.raw") && !this.hasBinding("String", true) && this.isPure(node.quasi, constantsOnly);
+    } else if (isTemplateLiteral(node)) {
       for (const expression of node.expressions) {
         if (!this.isPure(expression, constantsOnly)) return false;
       }
 
       return true;
     } else {
-      return t.isPureish(node);
+      return isPureish(node);
     }
   }
 
@@ -788,13 +840,13 @@ class Scope {
     let declarPath = !unique && path.getData(dataKey);
 
     if (!declarPath) {
-      const declar = t.variableDeclaration(kind, []);
+      const declar = variableDeclaration(kind, []);
       declar._blockHoist = blockHoist;
       [declarPath] = path.unshiftContainer("body", [declar]);
       if (!unique) path.setData(dataKey, declarPath);
     }
 
-    const declarator = t.variableDeclarator(opts.id, opts.init);
+    const declarator = variableDeclarator(opts.id, opts.init);
     declarPath.node.declarations.push(declarator);
     this.registerBinding(kind, declarPath.get("declarations").pop());
   }

package/lib/scope/lib/renamer.js

@@ -9,8 +9,16 @@ var _binding = require("../binding");
 
 var _helperSplitExportDeclaration = require("@babel/helper-split-export-declaration");
 
-var t = require("@babel/types");
-
+var _t = require("@babel/types");
+
+const {
+  VISITOR_KEYS,
+  assignmentExpression,
+  identifier,
+  toExpression,
+  variableDeclaration,
+  variableDeclarator
+} = _t;
 const renameVisitor = {
   ReferencedIdentifier({
     node
@@ -62,20 +70,20 @@ class Renamer {
     return;
     if (!path.isFunctionDeclaration() && !path.isClassDeclaration()) return;
     if (this.binding.kind !== "hoisted") return;
-    path.node.id = t.identifier(this.oldName);
+    path.node.id = identifier(this.oldName);
     path.node._blockHoist = 3;
-    path.replaceWith(t.variableDeclaration("let", [t.variableDeclarator(t.identifier(this.newName), t.toExpression(path.node))]));
+    path.replaceWith(variableDeclaration("let", [variableDeclarator(identifier(this.newName), toExpression(path.node))]));
   }
 
   maybeConvertFromClassFunctionExpression(path) {
     return;
     if (!path.isFunctionExpression() && !path.isClassExpression()) return;
     if (this.binding.kind !== "local") return;
-    path.node.id = t.identifier(this.oldName);
+    path.node.id = identifier(this.oldName);
     this.binding.scope.parent.push({
-      id: t.identifier(this.newName)
+      id: identifier(this.newName)
     });
-    path.replaceWith(t.assignmentExpression("=", t.identifier(this.newName), path.node));
+    path.replaceWith(assignmentExpression("=", identifier(this.newName), path.node));
   }
 
   rename(block) {
@@ -130,7 +138,7 @@ function skipAllButComputedMethodKey(path) {
     return;
   }
 
-  const keys = t.VISITOR_KEYS[path.type];
+  const keys = VISITOR_KEYS[path.type];
 
   for (const key of keys) {
     if (key !== "key") path.skipKey(key);

package/lib/types.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var t = require("@babel/types");
-
 var _index = require("./index");
 
 var _virtualTypes = require("./path/generated/virtual-types");

package/lib/visitors.js

@@ -9,7 +9,13 @@ exports.merge = merge;
 
 var virtualTypes = require("./path/lib/virtual-types");
 
-var t = require("@babel/types");
+var _t = require("@babel/types");
+
+const {
+  DEPRECATED_KEYS,
+  FLIPPED_ALIAS_KEYS,
+  TYPES
+} = _t;
 
 function explode(visitor) {
   if (visitor._exploded) return visitor;
@@ -60,8 +66,8 @@ function explode(visitor) {
   for (const nodeType of Object.keys(visitor)) {
     if (shouldIgnoreKey(nodeType)) continue;
     const fns = visitor[nodeType];
-    let aliases = t.FLIPPED_ALIAS_KEYS[nodeType];
-    const deprecatedKey = t.DEPRECATED_KEYS[nodeType];
+    let aliases = FLIPPED_ALIAS_KEYS[nodeType];
+    const deprecatedKey = DEPRECATED_KEYS[nodeType];
 
     if (deprecatedKey) {
       console.trace(`Visitor defined for ${nodeType} but it has been renamed to ${deprecatedKey}`);
@@ -104,7 +110,7 @@ function verify(visitor) {
 
     if (shouldIgnoreKey(nodeType)) continue;
 
-    if (t.TYPES.indexOf(nodeType) < 0) {
+    if (TYPES.indexOf(nodeType) < 0) {
       throw new Error(`You gave us a visitor for the node type ${nodeType} but it's not a valid type`);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/traverse",
-  "version": "7.14.7",
+  "version": "7.15.4",
   "description": "The Babel Traverse module maintains the overall tree state, and is responsible for replacing, removing, and adding nodes",
   "author": "The Babel Team (https://babel.dev/team)",
   "homepage": "https://babel.dev/docs/en/next/babel-traverse",
@@ -17,12 +17,12 @@
   "main": "./lib/index.js",
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
-    "@babel/generator": "^7.14.5",
-    "@babel/helper-function-name": "^7.14.5",
-    "@babel/helper-hoist-variables": "^7.14.5",
-    "@babel/helper-split-export-declaration": "^7.14.5",
-    "@babel/parser": "^7.14.7",
-    "@babel/types": "^7.14.5",
+    "@babel/generator": "^7.15.4",
+    "@babel/helper-function-name": "^7.15.4",
+    "@babel/helper-hoist-variables": "^7.15.4",
+    "@babel/helper-split-export-declaration": "^7.15.4",
+    "@babel/parser": "^7.15.4",
+    "@babel/types": "^7.15.4",
     "debug": "^4.1.0",
     "globals": "^11.1.0"
   },

package/scripts/generators/validators.js

@@ -9,6 +9,7 @@ export default function generateValidators() {
  */
 import * as t from "@babel/types";
 import NodePath from "../index";
+import type { VirtualTypeAliases } from "./virtual-types";
 
 export interface NodePathValidators {
 `;
@@ -18,10 +19,18 @@ export interface NodePathValidators {
   }
 
   for (const type of Object.keys(virtualTypes)) {
+    const { types } = virtualTypes[type];
     if (type[0] === "_") continue;
     if (definitions.NODE_FIELDS[type] || definitions.FLIPPED_ALIAS_KEYS[type]) {
       output += `is${type}(opts?: object): this is NodePath<t.${type}>;`;
+    } else if (types /* in VirtualTypeAliases */) {
+      output += `is${type}(opts?: object): this is NodePath<VirtualTypeAliases["${type}"]>;`;
     } else {
+      // if it don't have types, then VirtualTypeAliases[type] is t.Node
+      // which TS marked as always true
+      // eg. if (path.isBlockScope()) return;
+      //     path resolved to `never` here
+      // so we have to return boolean instead of this is NodePath<t.Node> here
       output += `is${type}(opts?: object): boolean;`;
     }
   }