@babel/traverse 7.0.0-beta.46 → 7.0.0-beta.47

package/lib/path/lib/virtual-types.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ForAwaitStatement = exports.NumericLiteralTypeAnnotation = exports.ExistentialTypeParam = exports.SpreadProperty = exports.RestProperty = exports.Flow = exports.Pure = exports.Generated = exports.User = exports.Var = exports.BlockScoped = exports.Referenced = exports.Scope = exports.Expression = exports.Statement = exports.BindingIdentifier = exports.ReferencedMemberExpression = exports.ReferencedIdentifier = void 0;
 
 function t() {
-  var data = _interopRequireWildcard(require("@babel/types"));
+  const data = _interopRequireWildcard(require("@babel/types"));
 
   t = function t() {
     return data;
@@ -17,12 +17,13 @@ function t() {
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
 
-var ReferencedIdentifier = {
+const ReferencedIdentifier = {
   types: ["Identifier", "JSXIdentifier"],
-  checkPath: function checkPath(_ref, opts) {
-    var node = _ref.node,
-        parent = _ref.parent;
 
+  checkPath({
+    node,
+    parent
+  }, opts) {
     if (!t().isIdentifier(node, opts) && !t().isJSXMemberExpression(parent, opts)) {
       if (t().isJSXIdentifier(node, opts)) {
         if (t().react.isCompatTag(node.name)) return false;
@@ -33,32 +34,40 @@ var ReferencedIdentifier = {
 
     return t().isReferenced(node, parent);
   }
+
 };
 exports.ReferencedIdentifier = ReferencedIdentifier;
-var ReferencedMemberExpression = {
+const ReferencedMemberExpression = {
   types: ["MemberExpression"],
-  checkPath: function checkPath(_ref2) {
-    var node = _ref2.node,
-        parent = _ref2.parent;
+
+  checkPath({
+    node,
+    parent
+  }) {
     return t().isMemberExpression(node) && t().isReferenced(node, parent);
   }
+
 };
 exports.ReferencedMemberExpression = ReferencedMemberExpression;
-var BindingIdentifier = {
+const BindingIdentifier = {
   types: ["Identifier"],
-  checkPath: function checkPath(_ref3) {
-    var node = _ref3.node,
-        parent = _ref3.parent;
+
+  checkPath({
+    node,
+    parent
+  }) {
     return t().isIdentifier(node) && t().isBinding(node, parent);
   }
+
 };
 exports.BindingIdentifier = BindingIdentifier;
-var Statement = {
+const Statement = {
   types: ["Statement"],
-  checkPath: function checkPath(_ref4) {
-    var node = _ref4.node,
-        parent = _ref4.parent;
 
+  checkPath({
+    node,
+    parent
+  }) {
     if (t().isStatement(node)) {
       if (t().isVariableDeclaration(node)) {
         if (t().isForXStatement(parent, {
@@ -74,68 +83,81 @@ var Statement = {
       return false;
     }
   }
+
 };
 exports.Statement = Statement;
-var Expression = {
+const Expression = {
   types: ["Expression"],
-  checkPath: function checkPath(path) {
+
+  checkPath(path) {
     if (path.isIdentifier()) {
       return path.isReferencedIdentifier();
     } else {
       return t().isExpression(path.node);
     }
   }
+
 };
 exports.Expression = Expression;
-var Scope = {
+const Scope = {
   types: ["Scopable"],
-  checkPath: function checkPath(path) {
+
+  checkPath(path) {
     return t().isScope(path.node, path.parent);
   }
+
 };
 exports.Scope = Scope;
-var Referenced = {
-  checkPath: function checkPath(path) {
+const Referenced = {
+  checkPath(path) {
     return t().isReferenced(path.node, path.parent);
   }
+
 };
 exports.Referenced = Referenced;
-var BlockScoped = {
-  checkPath: function checkPath(path) {
+const BlockScoped = {
+  checkPath(path) {
     return t().isBlockScoped(path.node);
   }
+
 };
 exports.BlockScoped = BlockScoped;
-var Var = {
+const Var = {
   types: ["VariableDeclaration"],
-  checkPath: function checkPath(path) {
+
+  checkPath(path) {
     return t().isVar(path.node);
   }
+
 };
 exports.Var = Var;
-var User = {
-  checkPath: function checkPath(path) {
+const User = {
+  checkPath(path) {
     return path.node && !!path.node.loc;
   }
+
 };
 exports.User = User;
-var Generated = {
-  checkPath: function checkPath(path) {
+const Generated = {
+  checkPath(path) {
     return !path.isUser();
   }
+
 };
 exports.Generated = Generated;
-var Pure = {
-  checkPath: function checkPath(path, opts) {
+const Pure = {
+  checkPath(path, opts) {
     return path.scope.isPure(path.node, opts);
   }
+
 };
 exports.Pure = Pure;
-var Flow = {
+const Flow = {
   types: ["Flow", "ImportDeclaration", "ExportDeclaration", "ImportSpecifier"],
-  checkPath: function checkPath(_ref5) {
-    var node = _ref5.node;
 
+  checkPath({
+    node
+  }) {
     if (t().isFlow(node)) {
       return true;
     } else if (t().isImportDeclaration(node)) {
@@ -148,35 +170,43 @@ var Flow = {
       return false;
     }
   }
+
 };
 exports.Flow = Flow;
-var RestProperty = {
+const RestProperty = {
   types: ["RestElement"],
-  checkPath: function checkPath(path) {
+
+  checkPath(path) {
     return path.parentPath && path.parentPath.isObjectPattern();
   }
+
 };
 exports.RestProperty = RestProperty;
-var SpreadProperty = {
+const SpreadProperty = {
   types: ["RestElement"],
-  checkPath: function checkPath(path) {
+
+  checkPath(path) {
     return path.parentPath && path.parentPath.isObjectExpression();
   }
+
 };
 exports.SpreadProperty = SpreadProperty;
-var ExistentialTypeParam = {
+const ExistentialTypeParam = {
   types: ["ExistsTypeAnnotation"]
 };
 exports.ExistentialTypeParam = ExistentialTypeParam;
-var NumericLiteralTypeAnnotation = {
+const NumericLiteralTypeAnnotation = {
   types: ["NumberLiteralTypeAnnotation"]
 };
 exports.NumericLiteralTypeAnnotation = NumericLiteralTypeAnnotation;
-var ForAwaitStatement = {
+const ForAwaitStatement = {
   types: ["ForOfStatement"],
-  checkPath: function checkPath(_ref6) {
-    var node = _ref6.node;
+
+  checkPath({
+    node
+  }) {
     return node.await === true;
   }
+
 };
 exports.ForAwaitStatement = ForAwaitStatement;

package/lib/path/modification.js

@@ -21,7 +21,7 @@ var _hoister = _interopRequireDefault(require("./lib/hoister"));
 var _index = _interopRequireDefault(require("./index"));
 
 function t() {
-  var data = _interopRequireWildcard(require("@babel/types"));
+  const data = _interopRequireWildcard(require("@babel/types"));
 
   t = function t() {
     return data;
@@ -38,7 +38,7 @@ function insertBefore(nodes) {
   this._assertUnremoved();
 
   nodes = this._verifyNodeList(nodes);
-  var parentPath = this.parentPath;
+  const parentPath = this.parentPath;
 
   if (parentPath.isExpressionStatement() || parentPath.isLabeledStatement() || parentPath.isExportNamedDeclaration() || parentPath.isExportDefaultDeclaration() && this.isDeclaration()) {
     return parentPath.insertBefore(nodes);
@@ -48,7 +48,7 @@ function insertBefore(nodes) {
   } else if (Array.isArray(this.container)) {
     return this._containerInsertBefore(nodes);
   } else if (this.isStatementOrBlock()) {
-    var shouldInsertCurrentNode = this.node && (!this.isExpressionStatement() || this.node.expression != null);
+    const shouldInsertCurrentNode = this.node && (!this.isExpressionStatement() || this.node.expression != null);
     this.replaceWith(t().blockStatement(shouldInsertCurrentNode ? [this.node] : []));
     return this.unshiftContainer("body", nodes);
   } else {
@@ -57,16 +57,13 @@ function insertBefore(nodes) {
 }
 
 function _containerInsert(from, nodes) {
-  var _container;
-
   this.updateSiblingKeys(from, nodes.length);
-  var paths = [];
-
-  (_container = this.container).splice.apply(_container, [from, 0].concat(nodes));
+  const paths = [];
+  this.container.splice(from, 0, ...nodes);
 
-  for (var i = 0; i < nodes.length; i++) {
-    var to = from + i;
-    var path = this.getSibling(to);
+  for (let i = 0; i < nodes.length; i++) {
+    const to = from + i;
+    const path = this.getSibling(to);
     paths.push(path);
 
     if (this.context && this.context.queue) {
@@ -74,14 +71,12 @@ function _containerInsert(from, nodes) {
     }
   }
 
-  var contexts = this._getQueueContexts();
+  const contexts = this._getQueueContexts();
 
   for (var _i = 0; _i < paths.length; _i++) {
-    var _path = paths[_i];
-
-    _path.setScope();
-
-    _path.debug("Inserted.");
+    const path = paths[_i];
+    path.setScope();
+    path.debug("Inserted.");
 
     for (var _iterator = contexts, _isArray = Array.isArray(_iterator), _i2 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
       var _ref;
@@ -95,8 +90,8 @@ function _containerInsert(from, nodes) {
         _ref = _i2.value;
       }
 
-      var context = _ref;
-      context.maybeQueue(_path, true);
+      const context = _ref;
+      context.maybeQueue(path, true);
     }
   }
 
@@ -115,13 +110,13 @@ function insertAfter(nodes) {
   this._assertUnremoved();
 
   nodes = this._verifyNodeList(nodes);
-  var parentPath = this.parentPath;
+  const parentPath = this.parentPath;
 
   if (parentPath.isExpressionStatement() || parentPath.isLabeledStatement() || parentPath.isExportNamedDeclaration() || parentPath.isExportDefaultDeclaration() && this.isDeclaration()) {
     return parentPath.insertAfter(nodes);
   } else if (this.isNodeType("Expression") || parentPath.isForStatement() && this.key === "init") {
     if (this.node) {
-      var scope = this.scope;
+      let scope = this.scope;
 
       if (parentPath.isMethod({
         computed: true,
@@ -130,7 +125,7 @@ function insertAfter(nodes) {
         scope = scope.parent;
       }
 
-      var temp = scope.generateDeclaredUidIdentifier();
+      const temp = scope.generateDeclaredUidIdentifier();
       nodes.unshift(t().expressionStatement(t().assignmentExpression("=", t().cloneNode(temp), this.node)));
       nodes.push(t().expressionStatement(t().cloneNode(temp)));
     }
@@ -139,7 +134,7 @@ function insertAfter(nodes) {
   } else if (Array.isArray(this.container)) {
     return this._containerInsertAfter(nodes);
   } else if (this.isStatementOrBlock()) {
-    var shouldInsertCurrentNode = this.node && (!this.isExpressionStatement() || this.node.expression != null);
+    const shouldInsertCurrentNode = this.node && (!this.isExpressionStatement() || this.node.expression != null);
     this.replaceWith(t().blockStatement(shouldInsertCurrentNode ? [this.node] : []));
     return this.pushContainer("body", nodes);
   } else {
@@ -150,10 +145,10 @@ function insertAfter(nodes) {
 function updateSiblingKeys(fromIndex, incrementBy) {
   if (!this.parent) return;
 
-  var paths = _cache.path.get(this.parent);
+  const paths = _cache.path.get(this.parent);
 
-  for (var i = 0; i < paths.length; i++) {
-    var path = paths[i];
+  for (let i = 0; i < paths.length; i++) {
+    const path = paths[i];
 
     if (path.key >= fromIndex) {
       path.key += incrementBy;
@@ -170,9 +165,9 @@ function _verifyNodeList(nodes) {
     nodes = [nodes];
   }
 
-  for (var i = 0; i < nodes.length; i++) {
-    var node = nodes[i];
-    var msg = void 0;
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    let msg;
 
     if (!node) {
       msg = "has falsy node";
@@ -185,8 +180,8 @@ function _verifyNodeList(nodes) {
     }
 
     if (msg) {
-      var type = Array.isArray(node) ? "array" : typeof node;
-      throw new Error("Node list " + msg + " with the index of " + i + " and type of " + type);
+      const type = Array.isArray(node) ? "array" : typeof node;
+      throw new Error(`Node list ${msg} with the index of ${i} and type of ${type}`);
     }
   }
 
@@ -198,11 +193,11 @@ function unshiftContainer(listKey, nodes) {
 
   nodes = this._verifyNodeList(nodes);
 
-  var path = _index.default.get({
+  const path = _index.default.get({
     parentPath: this,
     parent: this.node,
     container: this.node[listKey],
-    listKey: listKey,
+    listKey,
     key: 0
   });
 
@@ -213,24 +208,20 @@ function pushContainer(listKey, nodes) {
   this._assertUnremoved();
 
   nodes = this._verifyNodeList(nodes);
-  var container = this.node[listKey];
+  const container = this.node[listKey];
 
-  var path = _index.default.get({
+  const path = _index.default.get({
     parentPath: this,
     parent: this.node,
     container: container,
-    listKey: listKey,
+    listKey,
     key: container.length
   });
 
   return path.replaceWithMultiple(nodes);
 }
 
-function hoist(scope) {
-  if (scope === void 0) {
-    scope = this.scope;
-  }
-
-  var hoister = new _hoister.default(this, scope);
+function hoist(scope = this.scope) {
+  const hoister = new _hoister.default(this, scope);
   return hoister.run();
 }

package/lib/path/removal.js

@@ -33,19 +33,15 @@ function remove() {
 }
 
 function _removeFromScope() {
-  var _this = this;
-
-  var bindings = this.getBindingIdentifiers();
-  Object.keys(bindings).forEach(function (name) {
-    return _this.scope.removeBinding(name);
-  });
+  const bindings = this.getBindingIdentifiers();
+  Object.keys(bindings).forEach(name => this.scope.removeBinding(name));
 }
 
 function _callRemovalHooks() {
   var _arr = _removalHooks.hooks;
 
   for (var _i = 0; _i < _arr.length; _i++) {
-    var fn = _arr[_i];
+    const fn = _arr[_i];
     if (fn(this, this.parentPath)) return true;
   }
 }

package/lib/path/replacement.js

@@ -11,7 +11,7 @@ exports.replaceExpressionWithStatements = replaceExpressionWithStatements;
 exports.replaceInline = replaceInline;
 
 function _codeFrame() {
-  var data = require("@babel/code-frame");
+  const data = require("@babel/code-frame");
 
   _codeFrame = function _codeFrame() {
     return data;
@@ -25,7 +25,7 @@ var _index = _interopRequireDefault(require("../index"));
 var _index2 = _interopRequireDefault(require("./index"));
 
 function _babylon() {
-  var data = require("babylon");
+  const data = require("babylon");
 
   _babylon = function _babylon() {
     return data;
@@ -35,7 +35,7 @@ function _babylon() {
 }
 
 function t() {
-  var data = _interopRequireWildcard(require("@babel/types"));
+  const data = _interopRequireWildcard(require("@babel/types"));
 
   t = function t() {
     return data;
@@ -48,25 +48,26 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var hoistVariablesVisitor = {
-  Function: function Function(path) {
+const hoistVariablesVisitor = {
+  Function(path) {
     path.skip();
   },
-  VariableDeclaration: function VariableDeclaration(path) {
+
+  VariableDeclaration(path) {
     if (path.node.kind !== "var") return;
-    var bindings = path.getBindingIdentifiers();
+    const bindings = path.getBindingIdentifiers();
 
-    for (var key in bindings) {
+    for (const key in bindings) {
       path.scope.push({
         id: bindings[key]
       });
     }
 
-    var exprs = [];
+    const exprs = [];
     var _arr = path.node.declarations;
 
     for (var _i = 0; _i < _arr.length; _i++) {
-      var declar = _arr[_i];
+      const declar = _arr[_i];
 
       if (declar.init) {
         exprs.push(t().expressionStatement(t().assignmentExpression("=", declar.id, declar.init)));
@@ -75,6 +76,7 @@ var hoistVariablesVisitor = {
 
     path.replaceWithMultiple(exprs);
   }
+
 };
 
 function replaceWithMultiple(nodes) {
@@ -83,7 +85,7 @@ function replaceWithMultiple(nodes) {
   t().inheritLeadingComments(nodes[0], this.node);
   t().inheritTrailingComments(nodes[nodes.length - 1], this.node);
   this.node = this.container[this.key] = null;
-  var paths = this.insertAfter(nodes);
+  const paths = this.insertAfter(nodes);
 
   if (this.node) {
     this.requeue();
@@ -98,10 +100,10 @@ function replaceWithSourceString(replacement) {
   this.resync();
 
   try {
-    replacement = "(" + replacement + ")";
+    replacement = `(${replacement})`;
     replacement = (0, _babylon().parse)(replacement);
   } catch (err) {
-    var loc = err.loc;
+    const loc = err.loc;
 
     if (loc) {
       err.message += " - make sure this is an expression.\n" + (0, _codeFrame().codeFrameColumns)(replacement, {
@@ -154,7 +156,7 @@ function replaceWith(replacement) {
     throw new Error("Don't use `path.replaceWith()` with a source string, use `path.replaceWithSourceString()`");
   }
 
-  var nodePath = "";
+  let nodePath = "";
 
   if (this.isNodeType("Statement") && t().isExpression(replacement)) {
     if (!this.canHaveVariableDeclarationOrExpression() && !this.canSwapBetweenExpressionAndStatement(replacement) && !this.parentPath.isExportDefaultDeclaration()) {
@@ -169,7 +171,7 @@ function replaceWith(replacement) {
     }
   }
 
-  var oldNode = this.node;
+  const oldNode = this.node;
 
   if (oldNode) {
     t().inheritsComments(replacement, oldNode);
@@ -195,22 +197,22 @@ function _replaceWith(node) {
     t().validate(this.parent, this.key, node);
   }
 
-  this.debug("Replace with " + (node && node.type));
+  this.debug(`Replace with ${node && node.type}`);
   this.node = this.container[this.key] = node;
 }
 
 function replaceExpressionWithStatements(nodes) {
   this.resync();
-  var toSequenceExpression = t().toSequenceExpression(nodes, this.scope);
+  const toSequenceExpression = t().toSequenceExpression(nodes, this.scope);
 
   if (toSequenceExpression) {
     return this.replaceWith(toSequenceExpression)[0].get("expressions");
   }
 
-  var container = t().arrowFunctionExpression([], t().blockStatement(nodes));
+  const container = t().arrowFunctionExpression([], t().blockStatement(nodes));
   this.replaceWith(t().callExpression(container, []));
   this.traverse(hoistVariablesVisitor);
-  var completionRecords = this.get("callee").getCompletionRecords();
+  const completionRecords = this.get("callee").getCompletionRecords();
 
   for (var _iterator = completionRecords, _isArray = Array.isArray(_iterator), _i2 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
     var _ref;
@@ -224,22 +226,17 @@ function replaceExpressionWithStatements(nodes) {
       _ref = _i2.value;
     }
 
-    var path = _ref;
+    const path = _ref;
     if (!path.isExpressionStatement()) continue;
-    var loop = path.findParent(function (path) {
-      return path.isLoop();
-    });
+    const loop = path.findParent(path => path.isLoop());
 
     if (loop) {
-      var uid = loop.getData("expressionReplacementReturnUid");
+      let uid = loop.getData("expressionReplacementReturnUid");
 
       if (!uid) {
-        var _callee = this.get("callee");
-
-        uid = _callee.scope.generateDeclaredUidIdentifier("ret");
-
-        _callee.get("body").pushContainer("body", t().returnStatement(t().cloneNode(uid)));
-
+        const callee = this.get("callee");
+        uid = callee.scope.generateDeclaredUidIdentifier("ret");
+        callee.get("body").pushContainer("body", t().returnStatement(t().cloneNode(uid)));
         loop.setData("expressionReplacementReturnUid", uid);
       } else {
         uid = t().identifier(uid.name);
@@ -251,7 +248,7 @@ function replaceExpressionWithStatements(nodes) {
     }
   }
 
-  var callee = this.get("callee");
+  const callee = this.get("callee");
   callee.arrowFunctionToExpression();
   return callee.get("body.body");
 }
@@ -263,7 +260,7 @@ function replaceInline(nodes) {
     if (Array.isArray(this.container)) {
       nodes = this._verifyNodeList(nodes);
 
-      var paths = this._containerInsertAfter(nodes);
+      const paths = this._containerInsertAfter(nodes);
 
       this.remove();
       return paths;