@babel/traverse 7.16.7 → 7.17.3

package/lib/index.js

@@ -23,8 +23,6 @@ Object.defineProperty(exports, "Scope", {
 });
 exports.visitors = exports.default = void 0;
 
-var _context = require("./context");
-
 var visitors = require("./visitors");
 
 exports.visitors = visitors;
@@ -33,6 +31,8 @@ var _t = require("@babel/types");
 
 var cache = require("./cache");
 
+var _traverseNode = require("./traverse-node");
+
 var _path = require("./path");
 
 var _scope = require("./scope");
@@ -59,7 +59,7 @@ function traverse(parent, opts = {}, scope, state, parentPath) {
   }
 
   visitors.explode(opts);
-  traverse.node(parent, opts, scope, state, parentPath);
+  (0, _traverseNode.traverseNode)(parent, opts, scope, state, parentPath);
 }
 
 var _default = traverse;
@@ -72,15 +72,8 @@ traverse.cheap = function (node, enter) {
   return traverseFast(node, enter);
 };
 
-traverse.node = function (node, opts, scope, state, parentPath, skipKeys) {
-  const keys = VISITOR_KEYS[node.type];
-  if (!keys) return;
-  const context = new _context.default(scope, opts, state, parentPath);
-
-  for (const key of keys) {
-    if (skipKeys && skipKeys[key]) continue;
-    if (context.visit(node, key)) return;
-  }
+traverse.node = function (node, opts, scope, state, path, skipKeys) {
+  (0, _traverseNode.traverseNode)(node, opts, scope, state, path, skipKeys);
 };
 
 traverse.clearNode = function (node, opts) {

package/lib/path/context.js

@@ -24,9 +24,9 @@ exports.skipKey = skipKey;
 exports.stop = stop;
 exports.visit = visit;
 
-var _index = require("../index");
+var _traverseNode = require("../traverse-node");
 
-var _index2 = require("./index");
+var _index = require("./index");
 
 function call(key) {
   const opts = this.opts;
@@ -104,9 +104,7 @@ function visit() {
 
   restoreContext(this, currentContext);
   this.debug("Recursing into...");
-
-  _index.default.node(this.node, this.opts, this.scope, this.state, this, this.skipKeys);
-
+  this.shouldStop = (0, _traverseNode.traverseNode)(this.node, this.opts, this.scope, this.state, this, this.skipKeys);
   restoreContext(this, currentContext);
   this.call("exit");
   return this.shouldStop;
@@ -125,7 +123,7 @@ function skipKey(key) {
 }
 
 function stop() {
-  this._traverseFlags |= _index2.SHOULD_SKIP | _index2.SHOULD_STOP;
+  this._traverseFlags |= _index.SHOULD_SKIP | _index.SHOULD_STOP;
 }
 
 function setScope() {

package/lib/path/conversion.js

@@ -28,6 +28,8 @@ const {
   identifier,
   isIdentifier,
   jsxIdentifier,
+  logicalExpression,
+  LOGICAL_OPERATORS,
   memberExpression,
   metaProperty,
   numericLiteral,
@@ -302,20 +304,34 @@ function hoistFunctionEnvironment(fnPath, noNewArrows = true, allowInsertArrow =
   };
 }
 
+function isLogicalOp(op) {
+  return LOGICAL_OPERATORS.includes(op);
+}
+
 function standardizeSuperProperty(superProp) {
   if (superProp.parentPath.isAssignmentExpression() && superProp.parentPath.node.operator !== "=") {
     const assignmentPath = superProp.parentPath;
     const op = assignmentPath.node.operator.slice(0, -1);
     const value = assignmentPath.node.right;
-    assignmentPath.node.operator = "=";
+    const isLogicalAssignment = isLogicalOp(op);
 
     if (superProp.node.computed) {
       const tmp = superProp.scope.generateDeclaredUidIdentifier("tmp");
-      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));
+      const object = superProp.node.object;
+      const property = superProp.node.property;
+      assignmentPath.get("left").replaceWith(memberExpression(object, assignmentExpression("=", tmp, property), true));
+      assignmentPath.get("right").replaceWith(rightExpression(isLogicalAssignment ? "=" : op, memberExpression(object, identifier(tmp.name), true), value));
+    } else {
+      const object = superProp.node.object;
+      const property = superProp.node.property;
+      assignmentPath.get("left").replaceWith(memberExpression(object, property));
+      assignmentPath.get("right").replaceWith(rightExpression(isLogicalAssignment ? "=" : op, memberExpression(object, identifier(property.name)), value));
+    }
+
+    if (isLogicalAssignment) {
+      assignmentPath.replaceWith(logicalExpression(op, assignmentPath.node.left, assignmentPath.node.right));
     } else {
-      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));
+      assignmentPath.node.operator = "=";
     }
 
     return [assignmentPath.get("left"), assignmentPath.get("right").get("left")];
@@ -323,7 +339,7 @@ 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 = [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)))];
+    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(superProp.parentPath.node.operator[0], identifier(tmp.name), numericLiteral(1)))];
 
     if (!superProp.parentPath.node.prefix) {
       parts.push(identifier(tmp.name));
@@ -336,6 +352,14 @@ function standardizeSuperProperty(superProp) {
   }
 
   return [superProp];
+
+  function rightExpression(op, left, right) {
+    if (op === "=") {
+      return assignmentExpression("=", left, right);
+    } else {
+      return binaryExpression(op, left, right);
+    }
+  }
 }
 
 function hasSuperClass(thisEnvFn) {

package/lib/path/index.js

@@ -135,6 +135,10 @@ class NodePath {
     return val;
   }
 
+  hasNode() {
+    return this.node != null;
+  }
+
   buildCodeFrameError(msg, Error = SyntaxError) {
     return this.hub.buildError(this.node, msg, Error);
   }

package/lib/path/modification.js

@@ -30,7 +30,13 @@ const {
   callExpression,
   cloneNode,
   expressionStatement,
-  isExpression
+  isAssignmentExpression,
+  isCallExpression,
+  isExpression,
+  isIdentifier,
+  isSequenceExpression,
+  isSuper,
+  thisExpression
 } = _t;
 
 function insertBefore(nodes_) {
@@ -96,9 +102,28 @@ function _containerInsertAfter(nodes) {
   return this._containerInsert(this.key + 1, nodes);
 }
 
+const last = arr => arr[arr.length - 1];
+
+function isHiddenInSequenceExpression(path) {
+  return isSequenceExpression(path.parent) && (last(path.parent.expressions) !== path.node || isHiddenInSequenceExpression(path.parentPath));
+}
+
+function isAlmostConstantAssignment(node, scope) {
+  if (!isAssignmentExpression(node) || !isIdentifier(node.left)) {
+    return false;
+  }
+
+  const blockScope = scope.getBlockParent();
+  return blockScope.hasOwnBinding(node.left.name) && blockScope.getOwnBinding(node.left.name).constantViolations.length <= 1;
+}
+
 function insertAfter(nodes_) {
   this._assertUnremoved();
 
+  if (this.isSequenceExpression()) {
+    return last(this.get("expressions")).insertAfter(nodes_);
+  }
+
   const nodes = this._verifyNodeList(nodes_);
 
   const {
@@ -123,16 +148,28 @@ function insertAfter(nodes_) {
         return [this];
       }
 
-      if (parentPath.isMethod({
-        computed: true,
-        key: node
-      })) {
-        scope = scope.parent;
+      if (isHiddenInSequenceExpression(this)) {
+        nodes.unshift(node);
+      } else if (isCallExpression(node) && isSuper(node.callee)) {
+        nodes.unshift(node);
+        nodes.push(thisExpression());
+      } else if (isAlmostConstantAssignment(node, scope)) {
+        nodes.unshift(node);
+        nodes.push(cloneNode(node.left));
+      } else if (scope.isPure(node, true)) {
+        nodes.push(node);
+      } else {
+        if (parentPath.isMethod({
+          computed: true,
+          key: node
+        })) {
+          scope = scope.parent;
+        }
+
+        const temp = scope.generateDeclaredUidIdentifier();
+        nodes.unshift(expressionStatement(assignmentExpression("=", cloneNode(temp), node)));
+        nodes.push(expressionStatement(cloneNode(temp)));
       }
-
-      const temp = scope.generateDeclaredUidIdentifier();
-      nodes.unshift(expressionStatement(assignmentExpression("=", cloneNode(temp), node)));
-      nodes.push(expressionStatement(cloneNode(temp)));
     }
 
     return this.replaceExpressionWithStatements(nodes);

package/lib/scope/index.js

@@ -467,7 +467,7 @@ class Scope {
   checkBlockScopedCollisions(local, kind, name, id) {
     if (kind === "param") return;
     if (local.kind === "local") return;
-    const duplicate = kind === "let" || local.kind === "let" || local.kind === "const" || local.kind === "module" || local.kind === "param" && (kind === "let" || kind === "const");
+    const duplicate = kind === "let" || local.kind === "let" || local.kind === "const" || local.kind === "module" || local.kind === "param" && kind === "const";
 
     if (duplicate) {
       throw this.hub.buildError(id, `Duplicate declaration "${name}"`, TypeError);
@@ -848,8 +848,8 @@ class Scope {
     }
 
     const declarator = variableDeclarator(opts.id, opts.init);
-    declarPath.node.declarations.push(declarator);
-    this.registerBinding(kind, declarPath.get("declarations").pop());
+    const len = declarPath.node.declarations.push(declarator);
+    path.scope.registerBinding(kind, declarPath.get("declarations")[len - 1]);
   }
 
   getProgramParent() {

package/lib/traverse-node.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.traverseNode = traverseNode;
+
+var _context = require("./context");
+
+var _t = require("@babel/types");
+
+const {
+  VISITOR_KEYS
+} = _t;
+
+function traverseNode(node, opts, scope, state, path, skipKeys) {
+  const keys = VISITOR_KEYS[node.type];
+  if (!keys) return false;
+  const context = new _context.default(scope, opts, state, path);
+
+  for (const key of keys) {
+    if (skipKeys && skipKeys[key]) continue;
+
+    if (context.visit(node, key)) {
+      return true;
+    }
+  }
+
+  return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/traverse",
-  "version": "7.16.7",
+  "version": "7.17.3",
   "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,13 +17,13 @@
   "main": "./lib/index.js",
   "dependencies": {
     "@babel/code-frame": "^7.16.7",
-    "@babel/generator": "^7.16.7",
+    "@babel/generator": "^7.17.3",
     "@babel/helper-environment-visitor": "^7.16.7",
     "@babel/helper-function-name": "^7.16.7",
     "@babel/helper-hoist-variables": "^7.16.7",
     "@babel/helper-split-export-declaration": "^7.16.7",
-    "@babel/parser": "^7.16.7",
-    "@babel/types": "^7.16.7",
+    "@babel/parser": "^7.17.3",
+    "@babel/types": "^7.17.0",
     "debug": "^4.1.0",
     "globals": "^11.1.0"
   },