@babel/traverse 7.15.0 → 7.15.4

package/lib/context.js

@@ -7,7 +7,11 @@ exports.default = void 0;
 
 var _path = require("./path");
 
-var t = require("@babel/types");
+var _t = require("@babel/types");
+
+const {
+  VISITOR_KEYS
+} = _t;
 
 class TraversalContext {
   constructor(scope, opts, state, parentPath) {
@@ -23,7 +27,7 @@ class TraversalContext {
     const opts = this.opts;
     if (opts.enter || opts.exit) return true;
     if (opts[node.type]) return true;
-    const keys = t.VISITOR_KEYS[node.type];
+    const keys = VISITOR_KEYS[node.type];
     if (!(keys != null && keys.length)) return false;
 
     for (const key of keys) {

package/lib/index.js

@@ -29,7 +29,7 @@ var visitors = require("./visitors");
 
 exports.visitors = visitors;
 
-var t = require("@babel/types");
+var _t = require("@babel/types");
 
 var cache = require("./cache");
 
@@ -39,6 +39,12 @@ var _scope = require("./scope");
 
 var _hub = require("./hub");
 
+const {
+  VISITOR_KEYS,
+  removeProperties,
+  traverseFast
+} = _t;
+
 function traverse(parent, opts = {}, scope, state, parentPath) {
   if (!parent) return;
 
@@ -48,7 +54,7 @@ function traverse(parent, opts = {}, scope, state, parentPath) {
     }
   }
 
-  if (!t.VISITOR_KEYS[parent.type]) {
+  if (!VISITOR_KEYS[parent.type]) {
     return;
   }
 
@@ -63,11 +69,11 @@ traverse.verify = visitors.verify;
 traverse.explode = visitors.explode;
 
 traverse.cheap = function (node, enter) {
-  return t.traverseFast(node, enter);
+  return traverseFast(node, enter);
 };
 
 traverse.node = function (node, opts, scope, state, parentPath, skipKeys) {
-  const keys = t.VISITOR_KEYS[node.type];
+  const keys = VISITOR_KEYS[node.type];
   if (!keys) return;
   const context = new _context.default(scope, opts, state, parentPath);
 
@@ -78,12 +84,12 @@ traverse.node = function (node, opts, scope, state, parentPath, skipKeys) {
 };
 
 traverse.clearNode = function (node, opts) {
-  t.removeProperties(node, opts);
+  removeProperties(node, opts);
   cache.path.delete(node);
 };
 
 traverse.removeProperties = function (tree, opts) {
-  t.traverseFast(tree, traverse.clearNode, opts);
+  traverseFast(tree, traverse.clearNode, opts);
   return tree;
 };
 

package/lib/path/ancestry.js

@@ -14,10 +14,14 @@ exports.isAncestor = isAncestor;
 exports.isDescendant = isDescendant;
 exports.inType = inType;
 
-var t = require("@babel/types");
+var _t = require("@babel/types");
 
 var _index = require("./index");
 
+const {
+  VISITOR_KEYS
+} = _t;
+
 function findParent(callback) {
   let path = this;
 
@@ -63,7 +67,7 @@ function getStatementParent() {
 function getEarliestCommonAncestorFrom(paths) {
   return this.getDeepestCommonAncestorFrom(paths, function (deepest, i, ancestries) {
     let earliest;
-    const keys = t.VISITOR_KEYS[deepest.type];
+    const keys = VISITOR_KEYS[deepest.type];
 
     for (const ancestry of ancestries) {
       const path = ancestry[i + 1];

package/lib/path/comments.js

@@ -7,7 +7,12 @@ exports.shareCommentsWithSiblings = shareCommentsWithSiblings;
 exports.addComment = addComment;
 exports.addComments = addComments;
 
-var t = require("@babel/types");
+var _t = require("@babel/types");
+
+const {
+  addComment: _addComment,
+  addComments: _addComments
+} = _t;
 
 function shareCommentsWithSiblings() {
   if (typeof this.key === "string") return;
@@ -29,9 +34,9 @@ function shareCommentsWithSiblings() {
 }
 
 function addComment(type, content, line) {
-  t.addComment(this.node, type, content, line);
+  _addComment(this.node, type, content, line);
 }
 
 function addComments(type, comments) {
-  t.addComments(this.node, type, comments);
+  _addComments(this.node, type, comments);
 }

package/lib/path/conversion.js

@@ -9,10 +9,35 @@ exports.arrowFunctionToShadowed = arrowFunctionToShadowed;
 exports.unwrapFunctionEnvironment = unwrapFunctionEnvironment;
 exports.arrowFunctionToExpression = arrowFunctionToExpression;
 
-var t = require("@babel/types");
+var _t = require("@babel/types");
 
 var _helperFunctionName = require("@babel/helper-function-name");
 
+const {
+  arrowFunctionExpression,
+  assignmentExpression,
+  binaryExpression,
+  blockStatement,
+  callExpression,
+  conditionalExpression,
+  expressionStatement,
+  identifier,
+  isIdentifier,
+  jsxIdentifier,
+  memberExpression,
+  metaProperty,
+  numericLiteral,
+  objectExpression,
+  restElement,
+  returnStatement,
+  sequenceExpression,
+  spreadElement,
+  stringLiteral,
+  super: _super,
+  thisExpression,
+  unaryExpression
+} = _t;
+
 function toComputedKey() {
   let key;
 
@@ -25,7 +50,7 @@ function toComputedKey() {
   }
 
   if (!this.node.computed) {
-    if (t.isIdentifier(key)) key = t.stringLiteral(key.name);
+    if (isIdentifier(key)) key = stringLiteral(key.name);
   }
 
   return key;
@@ -61,14 +86,14 @@ function ensureBlock() {
 
     if (this.isFunction()) {
       key = "argument";
-      statements.push(t.returnStatement(body.node));
+      statements.push(returnStatement(body.node));
     } else {
       key = "expression";
-      statements.push(t.expressionStatement(body.node));
+      statements.push(expressionStatement(body.node));
     }
   }
 
-  this.node.body = t.blockStatement(statements);
+  this.node.body = blockStatement(statements);
   const parentPath = this.get(stringPath);
   body.setup(parentPath, listKey ? parentPath.node[listKey] : parentPath.node, listKey, key);
   return this.node;
@@ -106,12 +131,12 @@ function arrowFunctionToExpression({
     if (checkBinding) {
       this.parentPath.scope.push({
         id: checkBinding,
-        init: t.objectExpression([])
+        init: objectExpression([])
       });
     }
 
-    this.get("body").unshiftContainer("body", t.expressionStatement(t.callExpression(this.hub.addHelper("newArrowCheck"), [t.thisExpression(), checkBinding ? t.identifier(checkBinding.name) : t.identifier(thisBinding)])));
-    this.replaceWith(t.callExpression(t.memberExpression((0, _helperFunctionName.default)(this, true) || this.node, t.identifier("bind")), [checkBinding ? t.identifier(checkBinding.name) : t.thisExpression()]));
+    this.get("body").unshiftContainer("body", expressionStatement(callExpression(this.hub.addHelper("newArrowCheck"), [thisExpression(), checkBinding ? identifier(checkBinding.name) : identifier(thisBinding)])));
+    this.replaceWith(callExpression(memberExpression((0, _helperFunctionName.default)(this, true) || this.node, identifier("bind")), [checkBinding ? identifier(checkBinding.name) : thisExpression()]));
   }
 }
 
@@ -159,7 +184,7 @@ function hoistFunctionEnvironment(fnPath, noNewArrows = true, allowInsertArrow =
     });
     const superBinding = getSuperBinding(thisEnvFn);
     allSuperCalls.forEach(superCall => {
-      const callee = t.identifier(superBinding);
+      const callee = identifier(superBinding);
       callee.loc = superCall.node.callee.loc;
       superCall.get("callee").replaceWith(callee);
     });
@@ -167,25 +192,25 @@ function hoistFunctionEnvironment(fnPath, noNewArrows = true, allowInsertArrow =
 
   if (argumentsPaths.length > 0) {
     const argumentsBinding = getBinding(thisEnvFn, "arguments", () => {
-      const args = () => t.identifier("arguments");
+      const args = () => identifier("arguments");
 
       if (thisEnvFn.scope.path.isProgram()) {
-        return t.conditionalExpression(t.binaryExpression("===", t.unaryExpression("typeof", args()), t.stringLiteral("undefined")), thisEnvFn.scope.buildUndefinedNode(), args());
+        return conditionalExpression(binaryExpression("===", unaryExpression("typeof", args()), stringLiteral("undefined")), thisEnvFn.scope.buildUndefinedNode(), args());
       } else {
         return args();
       }
     });
     argumentsPaths.forEach(argumentsChild => {
-      const argsRef = t.identifier(argumentsBinding);
+      const argsRef = identifier(argumentsBinding);
       argsRef.loc = argumentsChild.node.loc;
       argumentsChild.replaceWith(argsRef);
     });
   }
 
   if (newTargetPaths.length > 0) {
-    const newTargetBinding = getBinding(thisEnvFn, "newtarget", () => t.metaProperty(t.identifier("new"), t.identifier("target")));
+    const newTargetBinding = getBinding(thisEnvFn, "newtarget", () => metaProperty(identifier("new"), identifier("target")));
     newTargetPaths.forEach(targetChild => {
-      const targetRef = t.identifier(newTargetBinding);
+      const targetRef = identifier(newTargetBinding);
       targetRef.loc = targetChild.node.loc;
       targetChild.replaceWith(targetRef);
     });
@@ -217,11 +242,11 @@ function hoistFunctionEnvironment(fnPath, noNewArrows = true, allowInsertArrow =
         args.push(value);
       }
 
-      const call = t.callExpression(t.identifier(superBinding), args);
+      const call = callExpression(identifier(superBinding), args);
 
       if (isCall) {
-        superProp.parentPath.unshiftContainer("arguments", t.thisExpression());
-        superProp.replaceWith(t.memberExpression(call, t.identifier("call")));
+        superProp.parentPath.unshiftContainer("arguments", thisExpression());
+        superProp.replaceWith(memberExpression(call, identifier("call")));
         thisPaths.push(superProp.parentPath.get("arguments.0"));
       } else if (isAssignment) {
         superProp.parentPath.replaceWith(call);
@@ -238,7 +263,7 @@ function hoistFunctionEnvironment(fnPath, noNewArrows = true, allowInsertArrow =
 
     if (noNewArrows || inConstructor && hasSuperClass(thisEnvFn)) {
       thisPaths.forEach(thisChild => {
-        const thisRef = thisChild.isJSX() ? t.jsxIdentifier(thisBinding) : t.identifier(thisBinding);
+        const thisRef = thisChild.isJSX() ? jsxIdentifier(thisBinding) : identifier(thisBinding);
         thisRef.loc = thisChild.node.loc;
         thisChild.replaceWith(thisRef);
       });
@@ -258,11 +283,11 @@ function standardizeSuperProperty(superProp) {
 
     if (superProp.node.computed) {
       const tmp = superProp.scope.generateDeclaredUidIdentifier("tmp");
-      assignmentPath.get("left").replaceWith(t.memberExpression(superProp.node.object, t.assignmentExpression("=", tmp, superProp.node.property), true));
-      assignmentPath.get("right").replaceWith(t.binaryExpression(op, t.memberExpression(superProp.node.object, t.identifier(tmp.name), true), value));
+      assignmentPath.get("left").replaceWith(memberExpression(superProp.node.object, assignmentExpression("=", tmp, superProp.node.property), true));
+      assignmentPath.get("right").replaceWith(binaryExpression(op, memberExpression(superProp.node.object, identifier(tmp.name), true), value));
     } else {
-      assignmentPath.get("left").replaceWith(t.memberExpression(superProp.node.object, superProp.node.property));
-      assignmentPath.get("right").replaceWith(t.binaryExpression(op, t.memberExpression(superProp.node.object, t.identifier(superProp.node.property.name)), value));
+      assignmentPath.get("left").replaceWith(memberExpression(superProp.node.object, superProp.node.property));
+      assignmentPath.get("right").replaceWith(binaryExpression(op, memberExpression(superProp.node.object, identifier(superProp.node.property.name)), value));
     }
 
     return [assignmentPath.get("left"), assignmentPath.get("right").get("left")];
@@ -270,13 +295,13 @@ function standardizeSuperProperty(superProp) {
     const updateExpr = superProp.parentPath;
     const tmp = superProp.scope.generateDeclaredUidIdentifier("tmp");
     const computedKey = superProp.node.computed ? superProp.scope.generateDeclaredUidIdentifier("prop") : null;
-    const parts = [t.assignmentExpression("=", tmp, t.memberExpression(superProp.node.object, computedKey ? t.assignmentExpression("=", computedKey, superProp.node.property) : superProp.node.property, superProp.node.computed)), t.assignmentExpression("=", t.memberExpression(superProp.node.object, computedKey ? t.identifier(computedKey.name) : superProp.node.property, superProp.node.computed), t.binaryExpression("+", t.identifier(tmp.name), t.numericLiteral(1)))];
+    const parts = [assignmentExpression("=", tmp, memberExpression(superProp.node.object, computedKey ? assignmentExpression("=", computedKey, superProp.node.property) : superProp.node.property, superProp.node.computed)), assignmentExpression("=", memberExpression(superProp.node.object, computedKey ? identifier(computedKey.name) : superProp.node.property, superProp.node.computed), binaryExpression("+", identifier(tmp.name), numericLiteral(1)))];
 
     if (!superProp.parentPath.node.prefix) {
-      parts.push(t.identifier(tmp.name));
+      parts.push(identifier(tmp.name));
     }
 
-    updateExpr.replaceWith(t.sequenceExpression(parts));
+    updateExpr.replaceWith(sequenceExpression(parts));
     const left = updateExpr.get("expressions.0.right");
     const right = updateExpr.get("expressions.1.left");
     return [left, right];
@@ -291,7 +316,7 @@ function hasSuperClass(thisEnvFn) {
 
 function getThisBinding(thisEnvFn, inConstructor) {
   return getBinding(thisEnvFn, "this", thisBinding => {
-    if (!inConstructor || !hasSuperClass(thisEnvFn)) return t.thisExpression();
+    if (!inConstructor || !hasSuperClass(thisEnvFn)) return thisExpression();
     const supers = new WeakSet();
     thisEnvFn.traverse({
       Function(child) {
@@ -307,7 +332,7 @@ function getThisBinding(thisEnvFn, inConstructor) {
         if (!child.get("callee").isSuper()) return;
         if (supers.has(child.node)) return;
         supers.add(child.node);
-        child.replaceWithMultiple([child.node, t.assignmentExpression("=", t.identifier(thisBinding), t.identifier("this"))]);
+        child.replaceWithMultiple([child.node, assignmentExpression("=", identifier(thisBinding), identifier("this"))]);
       }
 
     });
@@ -317,7 +342,7 @@ function getThisBinding(thisEnvFn, inConstructor) {
 function getSuperBinding(thisEnvFn) {
   return getBinding(thisEnvFn, "supercall", () => {
     const argsBinding = thisEnvFn.scope.generateUidIdentifier("args");
-    return t.arrowFunctionExpression([t.restElement(argsBinding)], t.callExpression(t.super(), [t.spreadElement(t.identifier(argsBinding.name))]));
+    return arrowFunctionExpression([restElement(argsBinding)], callExpression(_super(), [spreadElement(identifier(argsBinding.name))]));
   });
 }
 
@@ -328,20 +353,20 @@ function getSuperPropBinding(thisEnvFn, isAssignment, propName) {
     let fnBody;
 
     if (propName) {
-      fnBody = t.memberExpression(t.super(), t.identifier(propName));
+      fnBody = memberExpression(_super(), identifier(propName));
     } else {
       const method = thisEnvFn.scope.generateUidIdentifier("prop");
       argsList.unshift(method);
-      fnBody = t.memberExpression(t.super(), t.identifier(method.name), true);
+      fnBody = memberExpression(_super(), identifier(method.name), true);
     }
 
     if (isAssignment) {
       const valueIdent = thisEnvFn.scope.generateUidIdentifier("value");
       argsList.push(valueIdent);
-      fnBody = t.assignmentExpression("=", fnBody, t.identifier(valueIdent.name));
+      fnBody = assignmentExpression("=", fnBody, identifier(valueIdent.name));
     }
 
-    return t.arrowFunctionExpression(argsList, fnBody);
+    return arrowFunctionExpression(argsList, fnBody);
   });
 }
 

package/lib/path/family.js

@@ -20,8 +20,15 @@ exports.getOuterBindingIdentifierPaths = getOuterBindingIdentifierPaths;
 
 var _index = require("./index");
 
-var t = require("@babel/types");
-
+var _t = require("@babel/types");
+
+const {
+  getBindingIdentifiers: _getBindingIdentifiers,
+  getOuterBindingIdentifiers: _getOuterBindingIdentifiers,
+  isDeclaration,
+  numericLiteral,
+  unaryExpression
+} = _t;
 const NORMAL_COMPLETION = 0;
 const BREAK_COMPLETION = 1;
 
@@ -50,7 +57,10 @@ function getOpposite() {
 }
 
 function addCompletionRecords(path, records, context) {
-  if (path) return records.concat(_getCompletionRecords(path, context));
+  if (path) {
+    records.push(..._getCompletionRecords(path, context));
+  }
+
   return records;
 }
 
@@ -79,10 +89,10 @@ function completionRecordForSwitch(cases, records, context) {
       lastNormalCompletions = normalCompletions;
     }
 
-    records = records.concat(breakCompletions);
+    records.push(...breakCompletions);
   }
 
-  records = records.concat(lastNormalCompletions);
+  records.push(...lastNormalCompletions);
   return records;
 }
 
@@ -98,7 +108,7 @@ function replaceBreakStatementInBreakCompletion(completions, reachable) {
       label: null
     })) {
       if (reachable) {
-        c.path.replaceWith(t.unaryExpression("void", t.numericLiteral(0)));
+        c.path.replaceWith(unaryExpression("void", numericLiteral(0)));
       } else {
         c.path.remove();
       }
@@ -107,7 +117,7 @@ function replaceBreakStatementInBreakCompletion(completions, reachable) {
 }
 
 function getStatementListCompletion(paths, context) {
-  let completions = [];
+  const completions = [];
 
   if (context.canHaveBreak) {
     let lastNormalCompletions = [];
@@ -119,8 +129,8 @@ function getStatementListCompletion(paths, context) {
       });
 
       if (path.isBlockStatement() && (context.inCaseClause || context.shouldPopulateBreak)) {
-          newContext.shouldPopulateBreak = true;
-        } else {
+        newContext.shouldPopulateBreak = true;
+      } else {
         newContext.shouldPopulateBreak = false;
       }
 
@@ -131,16 +141,16 @@ function getStatementListCompletion(paths, context) {
           label: null
         }))) {
           normalCompletionToBreak(lastNormalCompletions);
-          completions = completions.concat(lastNormalCompletions);
+          completions.push(...lastNormalCompletions);
 
           if (lastNormalCompletions.some(c => c.path.isDeclaration())) {
-            completions = completions.concat(statementCompletions);
+            completions.push(...statementCompletions);
             replaceBreakStatementInBreakCompletion(statementCompletions, true);
           }
 
           replaceBreakStatementInBreakCompletion(statementCompletions, false);
         } else {
-          completions = completions.concat(statementCompletions);
+          completions.push(...statementCompletions);
 
           if (!context.shouldPopulateBreak) {
             replaceBreakStatementInBreakCompletion(statementCompletions, true);
@@ -151,10 +161,21 @@ function getStatementListCompletion(paths, context) {
       }
 
       if (i === paths.length - 1) {
-        completions = completions.concat(statementCompletions);
+        completions.push(...statementCompletions);
       } else {
-        completions = completions.concat(statementCompletions.filter(c => c.type === BREAK_COMPLETION));
-        lastNormalCompletions = statementCompletions.filter(c => c.type === NORMAL_COMPLETION);
+        lastNormalCompletions = [];
+
+        for (let i = 0; i < statementCompletions.length; i++) {
+          const c = statementCompletions[i];
+
+          if (c.type === BREAK_COMPLETION) {
+            completions.push(c);
+          }
+
+          if (c.type === NORMAL_COMPLETION) {
+            lastNormalCompletions.push(c);
+          }
+        }
       }
     }
   } else if (paths.length) {
@@ -162,7 +183,7 @@ function getStatementListCompletion(paths, context) {
       const pathCompletions = _getCompletionRecords(paths[i], context);
 
       if (pathCompletions.length > 1 || pathCompletions.length === 1 && !pathCompletions[0].path.isVariableDeclaration()) {
-        completions = completions.concat(pathCompletions);
+        completions.push(...pathCompletions);
         break;
       }
     }
@@ -178,24 +199,24 @@ function _getCompletionRecords(path, context) {
     records = addCompletionRecords(path.get("consequent"), records, context);
     records = addCompletionRecords(path.get("alternate"), records, context);
   } else if (path.isDoExpression() || path.isFor() || path.isWhile() || path.isLabeledStatement()) {
-    records = addCompletionRecords(path.get("body"), records, context);
+    return addCompletionRecords(path.get("body"), records, context);
   } else if (path.isProgram() || path.isBlockStatement()) {
-    records = records.concat(getStatementListCompletion(path.get("body"), context));
+    return getStatementListCompletion(path.get("body"), context);
   } else if (path.isFunction()) {
     return _getCompletionRecords(path.get("body"), context);
   } else if (path.isTryStatement()) {
     records = addCompletionRecords(path.get("block"), records, context);
     records = addCompletionRecords(path.get("handler"), records, context);
   } else if (path.isCatchClause()) {
-    records = addCompletionRecords(path.get("body"), records, context);
+    return addCompletionRecords(path.get("body"), records, context);
   } else if (path.isSwitchStatement()) {
-    records = completionRecordForSwitch(path.get("cases"), records, context);
+    return completionRecordForSwitch(path.get("cases"), records, context);
   } else if (path.isSwitchCase()) {
-    records = records.concat(getStatementListCompletion(path.get("consequent"), {
+    return getStatementListCompletion(path.get("consequent"), {
       canHaveBreak: true,
       shouldPopulateBreak: false,
       inCaseClause: true
-    }));
+    });
   } else if (path.isBreakStatement()) {
     records.push(BreakCompletion(path));
   } else {
@@ -313,23 +334,23 @@ function _getPattern(parts, context) {
 }
 
 function getBindingIdentifiers(duplicates) {
-  return t.getBindingIdentifiers(this.node, duplicates);
+  return _getBindingIdentifiers(this.node, duplicates);
 }
 
 function getOuterBindingIdentifiers(duplicates) {
-  return t.getOuterBindingIdentifiers(this.node, duplicates);
+  return _getOuterBindingIdentifiers(this.node, duplicates);
 }
 
 function getBindingIdentifierPaths(duplicates = false, outerOnly = false) {
   const path = this;
-  let search = [].concat(path);
+  const search = [path];
   const ids = Object.create(null);
 
   while (search.length) {
     const id = search.shift();
     if (!id) continue;
     if (!id.node) continue;
-    const keys = t.getBindingIdentifiers.keys[id.node.type];
+    const keys = _getBindingIdentifiers.keys[id.node.type];
 
     if (id.isIdentifier()) {
       if (duplicates) {
@@ -346,7 +367,7 @@ function getBindingIdentifierPaths(duplicates = false, outerOnly = false) {
     if (id.isExportDeclaration()) {
       const declaration = id.get("declaration");
 
-      if (declaration.isDeclaration()) {
+      if (isDeclaration(declaration)) {
         search.push(declaration);
       }
 
@@ -369,8 +390,10 @@ function getBindingIdentifierPaths(duplicates = false, outerOnly = false) {
         const key = keys[i];
         const child = id.get(key);
 
-        if (Array.isArray(child) || child.node) {
-          search = search.concat(child);
+        if (Array.isArray(child)) {
+          search.push(...child);
+        } else if (child.node) {
+          search.push(child);
         }
       }
     }

package/lib/path/index.js

@@ -13,7 +13,9 @@ var _index = require("../index");
 
 var _scope = require("../scope");
 
-var t = require("@babel/types");
+var _t = require("@babel/types");
+
+var t = _t;
 
 var _cache = require("../cache");
 
@@ -41,6 +43,10 @@ var NodePath_family = require("./family");
 
 var NodePath_comments = require("./comments");
 
+const {
+  validate
+} = _t;
+
 const debug = _debug("babel");
 
 const REMOVED = 1 << 0;
@@ -138,7 +144,7 @@ class NodePath {
   }
 
   set(key, node) {
-    t.validate(this.node, key, node);
+    validate(this.node, key, node);
     this.node[key] = node;
   }