@babel/traverse 7.12.17 → 7.13.0

package/lib/path/context.js

@@ -121,6 +121,7 @@ function stop() {
 function setScope() {
   if (this.opts && this.opts.noScope) return;
   let path = this.parentPath;
+  if (this.key === "key" && path.isMethod()) path = path.parentPath;
   let target;
 
   while (path && !target) {

package/lib/path/conversion.js

@@ -95,17 +95,18 @@ function unwrapFunctionEnvironment() {
 
 function arrowFunctionToExpression({
   allowInsertArrow = true,
-  specCompliant = false
+  specCompliant = false,
+  noNewArrows = !specCompliant
 } = {}) {
   if (!this.isArrowFunctionExpression()) {
     throw this.buildCodeFrameError("Cannot convert non-arrow function to a function expression.");
   }
 
-  const thisBinding = hoistFunctionEnvironment(this, specCompliant, allowInsertArrow);
+  const thisBinding = hoistFunctionEnvironment(this, noNewArrows, allowInsertArrow);
   this.ensureBlock();
   this.node.type = "FunctionExpression";
 
-  if (specCompliant) {
+  if (!noNewArrows) {
     const checkBinding = thisBinding ? null : this.parentPath.scope.generateUidIdentifier("arrowCheckId");
 
     if (checkBinding) {
@@ -120,7 +121,7 @@ function arrowFunctionToExpression({
   }
 }
 
-function hoistFunctionEnvironment(fnPath, specCompliant = false, allowInsertArrow = true) {
+function hoistFunctionEnvironment(fnPath, noNewArrows = true, allowInsertArrow = true) {
   const thisEnvFn = fnPath.findParent(p => {
     return p.isFunction() && !p.isArrowFunctionExpression() || p.isProgram() || p.isClassProperty({
       static: false
@@ -230,16 +231,16 @@ function hoistFunctionEnvironment(fnPath, specCompliant = false, allowInsertArro
 
   let thisBinding;
 
-  if (thisPaths.length > 0 || specCompliant) {
+  if (thisPaths.length > 0 || !noNewArrows) {
     thisBinding = getThisBinding(thisEnvFn, inConstructor);
 
-    if (!specCompliant || inConstructor && hasSuperClass(thisEnvFn)) {
+    if (noNewArrows || inConstructor && hasSuperClass(thisEnvFn)) {
       thisPaths.forEach(thisChild => {
         const thisRef = thisChild.isJSX() ? t.jsxIdentifier(thisBinding) : t.identifier(thisBinding);
         thisRef.loc = thisChild.node.loc;
         thisChild.replaceWith(thisRef);
       });
-      if (specCompliant) thisBinding = null;
+      if (!noNewArrows) thisBinding = null;
     }
   }
 

package/lib/path/introspection.js

@@ -111,7 +111,17 @@ function isStatementOrBlock() {
 }
 
 function referencesImport(moduleSource, importName) {
-  if (!this.isReferencedIdentifier()) return false;
+  if (!this.isReferencedIdentifier()) {
+    if ((this.isMemberExpression() || this.isOptionalMemberExpression()) && (this.node.computed ? t.isStringLiteral(this.node.property, {
+      value: importName
+    }) : this.node.property.name === importName)) {
+      const object = this.get("object");
+      return object.isReferencedIdentifier() && object.referencesImport(moduleSource, "*");
+    }
+
+    return false;
+  }
+
   const binding = this.scope.getBinding(this.node.name);
   if (!binding || binding.kind !== "module") return false;
   const path = binding.path;

package/lib/scope/index.js

@@ -310,8 +310,19 @@ class Scope {
   }
 
   get parent() {
-    const parent = this.path.findParent(p => p.isScope());
-    return parent == null ? void 0 : parent.scope;
+    var _parent;
+
+    let parent,
+        path = this.path;
+
+    do {
+      const isKey = path.key === "key";
+      path = path.parentPath;
+      if (isKey && path.isMethod()) path = path.parentPath;
+      if (path && path.isScope()) parent = path;
+    } while (path && !parent);
+
+    return (_parent = parent) == null ? void 0 : _parent.scope;
   }
 
   get parentBlock() {
@@ -455,7 +466,7 @@ class Scope {
     console.log(sep);
   }
 
-  toArray(node, i, allowArrayLike) {
+  toArray(node, i, arrayLikeIsIterable) {
     if (t.isIdentifier(node)) {
       const binding = this.getBinding(node.name);
 
@@ -486,7 +497,7 @@ class Scope {
       helperName = "toArray";
     }
 
-    if (allowArrayLike) {
+    if (arrayLikeIsIterable) {
       args.unshift(this.hub.addHelper(helperName));
       helperName = "maybeArrayLike";
     }

package/lib/scope/lib/renamer.js

@@ -28,7 +28,7 @@ const renameVisitor = {
 
   Scope(path, state) {
     if (!path.scope.bindingIdentifierEquals(state.oldName, state.binding.identifier)) {
-      path.skip();
+      skipAllButComputedMethodKey(path);
     }
   },
 
@@ -128,4 +128,17 @@ class Renamer {
 
 }
 
-exports.default = Renamer;
+exports.default = Renamer;
+
+function skipAllButComputedMethodKey(path) {
+  if (!path.isMethod() || !path.node.computed) {
+    path.skip();
+    return;
+  }
+
+  const keys = t.VISITOR_KEYS[path.type];
+
+  for (const key of keys) {
+    if (key !== "key") path.skipKey(key);
+  }
+}

package/lib/visitors.js

@@ -65,11 +65,11 @@ function explode(visitor) {
     if (shouldIgnoreKey(nodeType)) continue;
     const fns = visitor[nodeType];
     let aliases = t.FLIPPED_ALIAS_KEYS[nodeType];
-    const deprecratedKey = t.DEPRECATED_KEYS[nodeType];
+    const deprecatedKey = t.DEPRECATED_KEYS[nodeType];
 
-    if (deprecratedKey) {
-      console.trace(`Visitor defined for ${nodeType} but it has been renamed to ${deprecratedKey}`);
-      aliases = [deprecratedKey];
+    if (deprecatedKey) {
+      console.trace(`Visitor defined for ${nodeType} but it has been renamed to ${deprecatedKey}`);
+      aliases = [deprecatedKey];
     }
 
     if (!aliases) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/traverse",
-  "version": "7.12.17",
+  "version": "7.13.0",
   "description": "The Babel Traverse module maintains the overall tree state, and is responsible for replacing, removing, and adding nodes",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babel.dev/docs/en/next/babel-traverse",
@@ -17,11 +17,11 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/code-frame": "^7.12.13",
-    "@babel/generator": "^7.12.17",
+    "@babel/generator": "^7.13.0",
     "@babel/helper-function-name": "^7.12.13",
     "@babel/helper-split-export-declaration": "^7.12.13",
-    "@babel/parser": "^7.12.17",
-    "@babel/types": "^7.12.17",
+    "@babel/parser": "^7.13.0",
+    "@babel/types": "^7.13.0",
     "debug": "^4.1.0",
     "globals": "^11.1.0",
     "lodash": "^4.17.19"