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

package/lib/scope/lib/renamer.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _binding = _interopRequireDefault(require("../binding"));
 
 function _helperSplitExportDeclaration() {
-  var data = _interopRequireDefault(require("@babel/helper-split-export-declaration"));
+  const data = _interopRequireDefault(require("@babel/helper-split-export-declaration"));
 
   _helperSplitExportDeclaration = function _helperSplitExportDeclaration() {
     return data;
@@ -18,7 +18,7 @@ function _helperSplitExportDeclaration() {
 }
 
 function t() {
-  var data = _interopRequireWildcard(require("@babel/types"));
+  const data = _interopRequireWildcard(require("@babel/types"));
 
   t = function t() {
     return data;
@@ -31,39 +31,40 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var renameVisitor = {
-  ReferencedIdentifier: function ReferencedIdentifier(_ref, state) {
-    var node = _ref.node;
-
+const renameVisitor = {
+  ReferencedIdentifier({
+    node
+  }, state) {
     if (node.name === state.oldName) {
       node.name = state.newName;
     }
   },
-  Scope: function Scope(path, state) {
+
+  Scope(path, state) {
     if (!path.scope.bindingIdentifierEquals(state.oldName, state.binding.identifier)) {
       path.skip();
     }
   },
-  "AssignmentExpression|Declaration": function AssignmentExpressionDeclaration(path, state) {
-    var ids = path.getOuterBindingIdentifiers();
 
-    for (var name in ids) {
+  "AssignmentExpression|Declaration"(path, state) {
+    const ids = path.getOuterBindingIdentifiers();
+
+    for (const name in ids) {
       if (name === state.oldName) ids[name].name = state.newName;
     }
   }
+
 };
 
-var Renamer = function () {
-  function Renamer(binding, oldName, newName) {
+class Renamer {
+  constructor(binding, oldName, newName) {
     this.newName = newName;
     this.oldName = oldName;
     this.binding = binding;
   }
 
-  var _proto = Renamer.prototype;
-
-  _proto.maybeConvertFromExportDeclaration = function maybeConvertFromExportDeclaration(parentDeclar) {
-    var maybeExportDeclar = parentDeclar.parentPath;
+  maybeConvertFromExportDeclaration(parentDeclar) {
+    const maybeExportDeclar = parentDeclar.parentPath;
 
     if (!maybeExportDeclar.isExportDeclaration()) {
       return;
@@ -74,18 +75,18 @@ var Renamer = function () {
     }
 
     (0, _helperSplitExportDeclaration().default)(maybeExportDeclar);
-  };
+  }
 
-  _proto.maybeConvertFromClassFunctionDeclaration = function maybeConvertFromClassFunctionDeclaration(path) {
+  maybeConvertFromClassFunctionDeclaration(path) {
     return;
     if (!path.isFunctionDeclaration() && !path.isClassDeclaration()) return;
     if (this.binding.kind !== "hoisted") return;
     path.node.id = t().identifier(this.oldName);
     path.node._blockHoist = 3;
     path.replaceWith(t().variableDeclaration("let", [t().variableDeclarator(t().identifier(this.newName), t().toExpression(path.node))]));
-  };
+  }
 
-  _proto.maybeConvertFromClassFunctionExpression = function maybeConvertFromClassFunctionExpression(path) {
+  maybeConvertFromClassFunctionExpression(path) {
     return;
     if (!path.isFunctionExpression() && !path.isClassExpression()) return;
     if (this.binding.kind !== "local") return;
@@ -94,17 +95,15 @@ var Renamer = function () {
       id: t().identifier(this.newName)
     });
     path.replaceWith(t().assignmentExpression("=", t().identifier(this.newName), path.node));
-  };
+  }
 
-  _proto.rename = function rename(block) {
-    var binding = this.binding,
-        oldName = this.oldName,
-        newName = this.newName;
-    var scope = binding.scope,
-        path = binding.path;
-    var parentDeclar = path.find(function (path) {
-      return path.isDeclaration() || path.isFunctionExpression() || path.isClassExpression();
-    });
+  rename(block) {
+    const binding = this.binding,
+          oldName = this.oldName,
+          newName = this.newName;
+    const scope = binding.scope,
+          path = binding.path;
+    const parentDeclar = path.find(path => path.isDeclaration() || path.isFunctionExpression() || path.isClassExpression());
 
     if (parentDeclar) {
       this.maybeConvertFromExportDeclaration(parentDeclar);
@@ -124,9 +123,8 @@ var Renamer = function () {
       this.maybeConvertFromClassFunctionDeclaration(parentDeclar);
       this.maybeConvertFromClassFunctionExpression(parentDeclar);
     }
-  };
+  }
 
-  return Renamer;
-}();
+}
 
 exports.default = Renamer;

package/lib/visitors.js

@@ -10,7 +10,7 @@ exports.merge = merge;
 var virtualTypes = _interopRequireWildcard(require("./path/lib/virtual-types"));
 
 function t() {
-  var data = _interopRequireWildcard(require("@babel/types"));
+  const data = _interopRequireWildcard(require("@babel/types"));
 
   t = function t() {
     return data;
@@ -20,7 +20,7 @@ function t() {
 }
 
 function _clone() {
-  var data = _interopRequireDefault(require("lodash/clone"));
+  const data = _interopRequireDefault(require("lodash/clone"));
 
   _clone = function _clone() {
     return data;
@@ -37,11 +37,11 @@ function explode(visitor) {
   if (visitor._exploded) return visitor;
   visitor._exploded = true;
 
-  for (var nodeType in visitor) {
+  for (const nodeType in visitor) {
     if (shouldIgnoreKey(nodeType)) continue;
-    var parts = nodeType.split("|");
+    const parts = nodeType.split("|");
     if (parts.length === 1) continue;
-    var fns = visitor[nodeType];
+    const fns = visitor[nodeType];
     delete visitor[nodeType];
 
     for (var _iterator = parts, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
@@ -56,7 +56,7 @@ function explode(visitor) {
         _ref = _i.value;
       }
 
-      var part = _ref;
+      const part = _ref;
       visitor[part] = fns;
     }
   }
@@ -69,50 +69,48 @@ function explode(visitor) {
   var _arr = Object.keys(visitor);
 
   for (var _i2 = 0; _i2 < _arr.length; _i2++) {
-    var _nodeType3 = _arr[_i2];
-    if (shouldIgnoreKey(_nodeType3)) continue;
-    var wrapper = virtualTypes[_nodeType3];
+    const nodeType = _arr[_i2];
+    if (shouldIgnoreKey(nodeType)) continue;
+    const wrapper = virtualTypes[nodeType];
     if (!wrapper) continue;
-    var _fns2 = visitor[_nodeType3];
+    const fns = visitor[nodeType];
 
-    for (var type in _fns2) {
-      _fns2[type] = wrapCheck(wrapper, _fns2[type]);
+    for (const type in fns) {
+      fns[type] = wrapCheck(wrapper, fns[type]);
     }
 
-    delete visitor[_nodeType3];
+    delete visitor[nodeType];
 
     if (wrapper.types) {
       var _arr2 = wrapper.types;
 
       for (var _i4 = 0; _i4 < _arr2.length; _i4++) {
-        var _type = _arr2[_i4];
+        const type = _arr2[_i4];
 
-        if (visitor[_type]) {
-          mergePair(visitor[_type], _fns2);
+        if (visitor[type]) {
+          mergePair(visitor[type], fns);
         } else {
-          visitor[_type] = _fns2;
+          visitor[type] = fns;
         }
       }
     } else {
-      mergePair(visitor, _fns2);
+      mergePair(visitor, fns);
     }
   }
 
-  for (var _nodeType in visitor) {
-    if (shouldIgnoreKey(_nodeType)) continue;
-    var _fns = visitor[_nodeType];
-
-    var aliases = t().FLIPPED_ALIAS_KEYS[_nodeType];
-
-    var deprecratedKey = t().DEPRECATED_KEYS[_nodeType];
+  for (const nodeType in visitor) {
+    if (shouldIgnoreKey(nodeType)) continue;
+    const fns = visitor[nodeType];
+    let aliases = t().FLIPPED_ALIAS_KEYS[nodeType];
+    const deprecratedKey = t().DEPRECATED_KEYS[nodeType];
 
     if (deprecratedKey) {
-      console.trace("Visitor defined for " + _nodeType + " but it has been renamed to " + deprecratedKey);
+      console.trace(`Visitor defined for ${nodeType} but it has been renamed to ${deprecratedKey}`);
       aliases = [deprecratedKey];
     }
 
     if (!aliases) continue;
-    delete visitor[_nodeType];
+    delete visitor[nodeType];
 
     for (var _iterator2 = aliases, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
       var _ref2;
@@ -126,20 +124,20 @@ function explode(visitor) {
         _ref2 = _i3.value;
       }
 
-      var alias = _ref2;
-      var existing = visitor[alias];
+      const alias = _ref2;
+      const existing = visitor[alias];
 
       if (existing) {
-        mergePair(existing, _fns);
+        mergePair(existing, fns);
       } else {
-        visitor[alias] = (0, _clone().default)(_fns);
+        visitor[alias] = (0, _clone().default)(fns);
       }
     }
   }
 
-  for (var _nodeType2 in visitor) {
-    if (shouldIgnoreKey(_nodeType2)) continue;
-    ensureCallbackArrays(visitor[_nodeType2]);
+  for (const nodeType in visitor) {
+    if (shouldIgnoreKey(nodeType)) continue;
+    ensureCallbackArrays(visitor[nodeType]);
   }
 
   return visitor;
@@ -152,7 +150,7 @@ function verify(visitor) {
     throw new Error("You passed `traverse()` a function when it expected a visitor object, " + "are you sure you didn't mean `{ enter: Function }`?");
   }
 
-  for (var nodeType in visitor) {
+  for (const nodeType in visitor) {
     if (nodeType === "enter" || nodeType === "exit") {
       validateVisitorMethods(nodeType, visitor[nodeType]);
     }
@@ -160,17 +158,17 @@ function verify(visitor) {
     if (shouldIgnoreKey(nodeType)) continue;
 
     if (t().TYPES.indexOf(nodeType) < 0) {
-      throw new Error("You gave us a visitor for the node type " + nodeType + " but it's not a valid type");
+      throw new Error(`You gave us a visitor for the node type ${nodeType} but it's not a valid type`);
     }
 
-    var visitors = visitor[nodeType];
+    const visitors = visitor[nodeType];
 
     if (typeof visitors === "object") {
-      for (var visitorKey in visitors) {
+      for (const visitorKey in visitors) {
         if (visitorKey === "enter" || visitorKey === "exit") {
-          validateVisitorMethods(nodeType + "." + visitorKey, visitors[visitorKey]);
+          validateVisitorMethods(`${nodeType}.${visitorKey}`, visitors[visitorKey]);
         } else {
-          throw new Error("You passed `traverse()` a visitor object with the property " + (nodeType + " that has the invalid property " + visitorKey));
+          throw new Error("You passed `traverse()` a visitor object with the property " + `${nodeType} that has the invalid property ${visitorKey}`);
         }
       }
     }
@@ -180,7 +178,7 @@ function verify(visitor) {
 }
 
 function validateVisitorMethods(path, val) {
-  var fns = [].concat(val);
+  const fns = [].concat(val);
 
   for (var _iterator3 = fns, _isArray3 = Array.isArray(_iterator3), _i5 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
     var _ref3;
@@ -194,34 +192,30 @@ function validateVisitorMethods(path, val) {
       _ref3 = _i5.value;
     }
 
-    var fn = _ref3;
+    const fn = _ref3;
 
     if (typeof fn !== "function") {
-      throw new TypeError("Non-function found defined in " + path + " with type " + typeof fn);
+      throw new TypeError(`Non-function found defined in ${path} with type ${typeof fn}`);
     }
   }
 }
 
-function merge(visitors, states, wrapper) {
-  if (states === void 0) {
-    states = [];
-  }
-
-  var rootVisitor = {};
+function merge(visitors, states = [], wrapper) {
+  const rootVisitor = {};
 
-  for (var i = 0; i < visitors.length; i++) {
-    var visitor = visitors[i];
-    var state = states[i];
+  for (let i = 0; i < visitors.length; i++) {
+    const visitor = visitors[i];
+    const state = states[i];
     explode(visitor);
 
-    for (var type in visitor) {
-      var visitorType = visitor[type];
+    for (const type in visitor) {
+      let visitorType = visitor[type];
 
       if (state || wrapper) {
         visitorType = wrapWithStateOrWrapper(visitorType, state, wrapper);
       }
 
-      var nodeVisitor = rootVisitor[type] = rootVisitor[type] || {};
+      const nodeVisitor = rootVisitor[type] = rootVisitor[type] || {};
       mergePair(nodeVisitor, visitorType);
     }
   }
@@ -230,13 +224,13 @@ function merge(visitors, states, wrapper) {
 }
 
 function wrapWithStateOrWrapper(oldVisitor, state, wrapper) {
-  var newVisitor = {};
+  const newVisitor = {};
 
-  var _loop = function _loop(key) {
-    var fns = oldVisitor[key];
-    if (!Array.isArray(fns)) return "continue";
+  for (const key in oldVisitor) {
+    let fns = oldVisitor[key];
+    if (!Array.isArray(fns)) continue;
     fns = fns.map(function (fn) {
-      var newFn = fn;
+      let newFn = fn;
 
       if (state) {
         newFn = function newFn(path) {
@@ -251,21 +245,15 @@ function wrapWithStateOrWrapper(oldVisitor, state, wrapper) {
       return newFn;
     });
     newVisitor[key] = fns;
-  };
-
-  for (var key in oldVisitor) {
-    var _ret = _loop(key);
-
-    if (_ret === "continue") continue;
   }
 
   return newVisitor;
 }
 
 function ensureEntranceObjects(obj) {
-  for (var key in obj) {
+  for (const key in obj) {
     if (shouldIgnoreKey(key)) continue;
-    var fns = obj[key];
+    const fns = obj[key];
 
     if (typeof fns === "function") {
       obj[key] = {
@@ -281,15 +269,13 @@ function ensureCallbackArrays(obj) {
 }
 
 function wrapCheck(wrapper, fn) {
-  var newFn = function newFn(path) {
+  const newFn = function newFn(path) {
     if (wrapper.checkPath(path)) {
       return fn.apply(this, arguments);
     }
   };
 
-  newFn.toString = function () {
-    return fn.toString();
-  };
+  newFn.toString = () => fn.toString();
 
   return newFn;
 }
@@ -306,7 +292,7 @@ function shouldIgnoreKey(key) {
 }
 
 function mergePair(dest, src) {
-  for (var key in src) {
+  for (const key in src) {
     dest[key] = [].concat(dest[key] || [], src[key]);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/traverse",
-  "version": "7.0.0-beta.46",
+  "version": "7.0.0-beta.47",
   "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,18 +8,18 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-traverse",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/code-frame": "7.0.0-beta.46",
-    "@babel/generator": "7.0.0-beta.46",
-    "@babel/helper-function-name": "7.0.0-beta.46",
-    "@babel/helper-split-export-declaration": "7.0.0-beta.46",
-    "@babel/types": "7.0.0-beta.46",
-    "babylon": "7.0.0-beta.46",
+    "@babel/code-frame": "7.0.0-beta.47",
+    "@babel/generator": "7.0.0-beta.47",
+    "@babel/helper-function-name": "7.0.0-beta.47",
+    "@babel/helper-split-export-declaration": "7.0.0-beta.47",
+    "@babel/types": "7.0.0-beta.47",
+    "babylon": "7.0.0-beta.47",
     "debug": "^3.1.0",
     "globals": "^11.1.0",
     "invariant": "^2.2.0",
-    "lodash": "^4.2.0"
+    "lodash": "^4.17.5"
   },
   "devDependencies": {
-    "@babel/helper-plugin-test-runner": "7.0.0-beta.46"
+    "@babel/helper-plugin-test-runner": "7.0.0-beta.47"
   }
 }