@babel/traverse 7.9.0 → 7.10.1

package/lib/context.js

@@ -31,7 +31,7 @@ class TraversalContext {
     if (opts.enter || opts.exit) return true;
     if (opts[node.type]) return true;
     const keys = t.VISITOR_KEYS[node.type];
-    if (!keys || !keys.length) return false;
+    if (!(keys == null ? void 0 : keys.length)) return false;
 
     for (const key of keys) {
       if (node[key]) return true;

package/lib/path/context.js

@@ -221,9 +221,11 @@ function setup(parentPath, container, listKey, key) {
 }
 
 function setKey(key) {
+  var _this$node;
+
   this.key = key;
   this.node = this.container[this.key];
-  this.type = this.node && this.node.type;
+  this.type = (_this$node = this.node) == null ? void 0 : _this$node.type;
 }
 
 function requeue(pathToQueue = this) {

package/lib/path/conversion.js

@@ -127,7 +127,7 @@ function hoistFunctionEnvironment(fnPath, specCompliant = false, allowInsertArro
       static: false
     });
   });
-  const inConstructor = thisEnvFn && thisEnvFn.node.kind === "constructor";
+  const inConstructor = (thisEnvFn == null ? void 0 : thisEnvFn.node.kind) === "constructor";
 
   if (thisEnvFn.isClassProperty()) {
     throw fnPath.buildCodeFrameError("Unable to transform arrow inside class property");

package/lib/path/evaluation.js

@@ -132,7 +132,7 @@ function _evaluate(path, state) {
       return deopt(binding.path, state);
     }
 
-    if (binding && binding.hasValue) {
+    if (binding == null ? void 0 : binding.hasValue) {
       return binding.value;
     } else {
       if (node.name === "undefined") {

package/lib/path/inference/index.js

@@ -26,6 +26,8 @@ function getTypeAnnotation() {
 }
 
 function _getTypeAnnotation() {
+  var _inferer;
+
   const node = this.node;
 
   if (!node) {
@@ -59,7 +61,7 @@ function _getTypeAnnotation() {
 
   inferer = inferers[this.parentPath.type];
 
-  if (inferer && inferer.validParent) {
+  if ((_inferer = inferer) == null ? void 0 : _inferer.validParent) {
     return this.parentPath.getTypeAnnotation();
   }
 }

package/lib/path/inference/inferer-reference.js

@@ -50,9 +50,19 @@ function getTypeAnnotationBindingConstantViolations(binding, path, name) {
     }
   }
 
-  if (types.length) {
-    return t.createUnionTypeAnnotation(types);
+  if (!types.length) {
+    return;
+  }
+
+  if (t.isTSTypeAnnotation(types[0]) && t.createTSUnionType) {
+    return t.createTSUnionType(types);
+  }
+
+  if (t.createFlowUnionType) {
+    return t.createFlowUnionType(types);
   }
+
+  return t.createUnionTypeAnnotation(types);
 }
 
 function getConstantViolationsBefore(binding, path, functions) {
@@ -165,6 +175,20 @@ function getConditionalAnnotation(binding, path, name) {
   }
 
   if (types.length) {
+    if (t.isTSTypeAnnotation(types[0]) && t.createTSUnionType) {
+      return {
+        typeAnnotation: t.createTSUnionType(types),
+        ifStatement
+      };
+    }
+
+    if (t.createFlowUnionType) {
+      return {
+        typeAnnotation: t.createFlowUnionType(types),
+        ifStatement
+      };
+    }
+
     return {
       typeAnnotation: t.createUnionTypeAnnotation(types),
       ifStatement

package/lib/path/inference/inferers.js

@@ -44,12 +44,14 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function VariableDeclarator() {
+  var _type;
+
   const id = this.get("id");
   if (!id.isIdentifier()) return;
   const init = this.get("init");
   let type = init.getTypeAnnotation();
 
-  if (type && type.type === "AnyTypeAnnotation") {
+  if (((_type = type) == null ? void 0 : _type.type) === "AnyTypeAnnotation") {
     if (init.isCallExpression() && init.get("callee").isIdentifier({
       name: "Array"
     }) && !init.scope.hasBinding("Array", true)) {
@@ -112,11 +114,31 @@ function BinaryExpression(node) {
 }
 
 function LogicalExpression() {
-  return t.createUnionTypeAnnotation([this.get("left").getTypeAnnotation(), this.get("right").getTypeAnnotation()]);
+  const argumentTypes = [this.get("left").getTypeAnnotation(), this.get("right").getTypeAnnotation()];
+
+  if (t.isTSTypeAnnotation(argumentTypes[0]) && t.createTSUnionType) {
+    return t.createTSUnionType(argumentTypes);
+  }
+
+  if (t.createFlowUnionType) {
+    return t.createFlowUnionType(argumentTypes);
+  }
+
+  return t.createUnionTypeAnnotation(argumentTypes);
 }
 
 function ConditionalExpression() {
-  return t.createUnionTypeAnnotation([this.get("consequent").getTypeAnnotation(), this.get("alternate").getTypeAnnotation()]);
+  const argumentTypes = [this.get("consequent").getTypeAnnotation(), this.get("alternate").getTypeAnnotation()];
+
+  if (t.isTSTypeAnnotation(argumentTypes[0]) && t.createTSUnionType) {
+    return t.createTSUnionType(argumentTypes);
+  }
+
+  if (t.createFlowUnionType) {
+    return t.createFlowUnionType(argumentTypes);
+  }
+
+  return t.createUnionTypeAnnotation(argumentTypes);
 }
 
 function SequenceExpression() {

package/lib/path/removal.js

@@ -15,11 +15,13 @@ var _removalHooks = require("./lib/removal-hooks");
 var _index = require("./index");
 
 function remove() {
+  var _this$opts;
+
   this._assertUnremoved();
 
   this.resync();
 
-  if (!this.opts || !this.opts.noScope) {
+  if (!((_this$opts = this.opts) == null ? void 0 : _this$opts.noScope)) {
     this._removeFromScope();
   }
 

package/lib/path/replacement.js

@@ -172,7 +172,7 @@ function _replaceWith(node) {
     t.validate(this.parent, this.key, node);
   }
 
-  this.debug(`Replace with ${node && node.type}`);
+  this.debug(`Replace with ${node == null ? void 0 : node.type}`);
   this.node = this.container[this.key] = node;
 }
 
@@ -185,7 +185,7 @@ function replaceExpressionWithStatements(nodes) {
   }
 
   const functionParent = this.getFunctionParent();
-  const isParentAsync = functionParent && functionParent.is("async");
+  const isParentAsync = functionParent == null ? void 0 : functionParent.is("async");
   const container = t.arrowFunctionExpression([], t.blockStatement(nodes));
   this.replaceWith(t.callExpression(container, []));
   this.traverse(hoistVariablesVisitor);

package/lib/scope/index.js

@@ -270,6 +270,28 @@ const collectorVisitor = {
         path.scope.getBlockParent().registerDeclaration(bodyPath);
       }
     }
+  },
+
+  CatchClause(path) {
+    path.scope.registerBinding("let", path);
+  },
+
+  Function(path) {
+    if (path.isFunctionExpression() && path.has("id") && !path.get("id").node[t.NOT_LOCAL_BINDING]) {
+      path.scope.registerBinding("local", path.get("id"), path);
+    }
+
+    const params = path.get("params");
+
+    for (const param of params) {
+      path.scope.registerBinding("param", param);
+    }
+  },
+
+  ClassExpression(path) {
+    if (path.has("id") && !path.get("id").node[t.NOT_LOCAL_BINDING]) {
+      path.scope.registerBinding("local", path);
+    }
   }
 
 };
@@ -283,7 +305,7 @@ class Scope {
 
     const cached = _cache.scope.get(node);
 
-    if (cached && cached.path === path) {
+    if ((cached == null ? void 0 : cached.path) === path) {
       return cached;
     }
 
@@ -293,11 +315,12 @@ class Scope {
     this.block = node;
     this.path = path;
     this.labels = new Map();
+    this.inited = false;
   }
 
   get parent() {
     const parent = this.path.findParent(p => p.isScope());
-    return parent && parent.scope;
+    return parent == null ? void 0 : parent.scope;
   }
 
   get parentBlock() {
@@ -441,11 +464,11 @@ class Scope {
     console.log(sep);
   }
 
-  toArray(node, i) {
+  toArray(node, i, allowArrayLike) {
     if (t.isIdentifier(node)) {
       const binding = this.getBinding(node.name);
 
-      if (binding && binding.constant && binding.path.isGenericType("Array")) {
+      if ((binding == null ? void 0 : binding.constant) && binding.path.isGenericType("Array")) {
         return node;
       }
     }
@@ -472,6 +495,11 @@ class Scope {
       helperName = "toArray";
     }
 
+    if (allowArrayLike) {
+      args.unshift(this.hub.addHelper(helperName));
+      helperName = "maybeArrayLike";
+    }
+
     return t.callExpression(this.hub.addHelper(helperName), args);
   }
 
@@ -547,6 +575,8 @@ class Scope {
     const ids = path.getOuterBindingIdentifiers(true);
 
     for (const name of Object.keys(ids)) {
+      parent.references[name] = true;
+
       for (const id of ids[name]) {
         const local = this.getOwnBinding(name);
 
@@ -555,8 +585,6 @@ class Scope {
           this.checkBlockScopedCollisions(local, kind, name, id);
         }
 
-        parent.references[name] = true;
-
         if (local) {
           this.registerConstantViolation(bindingPath);
         } else {
@@ -596,13 +624,7 @@ class Scope {
   }
 
   hasReference(name) {
-    let scope = this;
-
-    do {
-      if (scope.references[name]) return true;
-    } while (scope = scope.parent);
-
-    return false;
+    return !!this.getProgramParent().references[name];
   }
 
   isPure(node, constantsOnly) {
@@ -637,7 +659,7 @@ class Scope {
       }
 
       return true;
-    } else if (t.isClassMethod(node)) {
+    } else if (t.isMethod(node)) {
       if (node.computed && !this.isPure(node.key, constantsOnly)) return false;
       if (node.kind === "get" || node.kind === "set") return false;
       return true;
@@ -682,7 +704,10 @@ class Scope {
   }
 
   init() {
-    if (!this.references) this.crawl();
+    if (!this.inited) {
+      this.inited = true;
+      this.crawl();
+    }
   }
 
   crawl() {
@@ -693,26 +718,11 @@ class Scope {
     this.uids = Object.create(null);
     this.data = Object.create(null);
 
-    if (path.isLoop()) {
-      for (const key of t.FOR_INIT_KEYS) {
-        const node = path.get(key);
-        if (node.isBlockScoped()) this.registerBinding(node.node.kind, node);
-      }
-    }
-
-    if (path.isFunctionExpression() && path.has("id")) {
-      if (!path.get("id").node[t.NOT_LOCAL_BINDING]) {
+    if (path.isFunction()) {
+      if (path.isFunctionExpression() && path.has("id") && !path.get("id").node[t.NOT_LOCAL_BINDING]) {
         this.registerBinding("local", path.get("id"), path);
       }
-    }
 
-    if (path.isClassExpression() && path.has("id")) {
-      if (!path.get("id").node[t.NOT_LOCAL_BINDING]) {
-        this.registerBinding("local", path);
-      }
-    }
-
-    if (path.isFunction()) {
       const params = path.get("params");
 
       for (const param of params) {
@@ -720,12 +730,8 @@ class Scope {
       }
     }
 
-    if (path.isCatchClause()) {
-      this.registerBinding("let", path);
-    }
-
-    const parent = this.getProgramParent();
-    if (parent.crawling) return;
+    const programParent = this.getProgramParent();
+    if (programParent.crawling) return;
     const state = {
       references: [],
       constantViolations: [],
@@ -737,11 +743,9 @@ class Scope {
 
     for (const path of state.assignments) {
       const ids = path.getBindingIdentifiers();
-      let programParent;
 
       for (const name of Object.keys(ids)) {
         if (path.scope.getBinding(name)) continue;
-        programParent = programParent || path.scope.getProgramParent();
         programParent.addGlobal(ids[name]);
       }
 
@@ -754,7 +758,7 @@ class Scope {
       if (binding) {
         binding.reference(ref);
       } else {
-        ref.scope.getProgramParent().addGlobal(ref.node);
+        programParent.addGlobal(ref.node);
       }
     }
 
@@ -890,13 +894,14 @@ class Scope {
   }
 
   getBindingIdentifier(name) {
-    const info = this.getBinding(name);
-    return info && info.identifier;
+    var _this$getBinding;
+
+    return (_this$getBinding = this.getBinding(name)) == null ? void 0 : _this$getBinding.identifier;
   }
 
   getOwnBindingIdentifier(name) {
     const binding = this.bindings[name];
-    return binding && binding.identifier;
+    return binding == null ? void 0 : binding.identifier;
   }
 
   hasOwnBinding(name) {
@@ -914,7 +919,9 @@ class Scope {
   }
 
   parentHasBinding(name, noGlobals) {
-    return this.parent && this.parent.hasBinding(name, noGlobals);
+    var _this$parent;
+
+    return (_this$parent = this.parent) == null ? void 0 : _this$parent.hasBinding(name, noGlobals);
   }
 
   moveBindingTo(name, scope) {
@@ -932,12 +939,9 @@ class Scope {
   }
 
   removeBinding(name) {
-    const info = this.getBinding(name);
-
-    if (info) {
-      info.scope.removeOwnBinding(name);
-    }
+    var _this$getBinding2;
 
+    (_this$getBinding2 = this.getBinding(name)) == null ? void 0 : _this$getBinding2.scope.removeOwnBinding(name);
     let scope = this;
 
     do {

package/lib/scope/lib/renamer.js

@@ -32,7 +32,8 @@ const renameVisitor = {
     }
   },
 
-  "AssignmentExpression|Declaration"(path, state) {
+  "AssignmentExpression|Declaration|VariableDeclarator"(path, state) {
+    if (path.isVariableDeclaration()) return;
     const ids = path.getOuterBindingIdentifiers();
 
     for (const name in ids) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/traverse",
-  "version": "7.9.0",
+  "version": "7.10.1",
   "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://babeljs.io/",
@@ -8,21 +8,25 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-traverse",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/babel/babel.git",
+    "directory": "packages/babel-traverse"
+  },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/code-frame": "^7.8.3",
-    "@babel/generator": "^7.9.0",
-    "@babel/helper-function-name": "^7.8.3",
-    "@babel/helper-split-export-declaration": "^7.8.3",
-    "@babel/parser": "^7.9.0",
-    "@babel/types": "^7.9.0",
+    "@babel/code-frame": "^7.10.1",
+    "@babel/generator": "^7.10.1",
+    "@babel/helper-function-name": "^7.10.1",
+    "@babel/helper-split-export-declaration": "^7.10.1",
+    "@babel/parser": "^7.10.1",
+    "@babel/types": "^7.10.1",
     "debug": "^4.1.0",
     "globals": "^11.1.0",
     "lodash": "^4.17.13"
   },
   "devDependencies": {
-    "@babel/helper-plugin-test-runner": "^7.8.3"
+    "@babel/helper-plugin-test-runner": "^7.10.1"
   },
-  "gitHead": "8d5e422be27251cfaadf8dd2536b31b4a5024b02"
+  "gitHead": "88f57a7ea659d25232bf62de1efceb5d6299b8cf"
 }