babel-plugin-transform-object-rest-spread - npm Package Compare versions

Comparing version 6.16.0 to 6.19.0

lib/index.js

@@ -12,3 +12,3 @@ "use strict";
 
-  function hasSpread(node) {
+  function hasRestProperty(node) {
     for (var _iterator = node.properties, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
@@ -26,4 +26,49 @@ var _ref2;
 
-      var prop = _ref2;
+      var property = _ref2;
 
+      if (t.isRestProperty(property)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  function variableDeclarationHasRestProperty(node) {
+    for (var _iterator2 = node.declarations, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+      var _ref3;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref3 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref3 = _i2.value;
+      }
+
+      var declar = _ref3;
+
+      if (t.isObjectPattern(declar.id)) {
+        return hasRestProperty(declar.id);
+      }
+    }
+    return false;
+  }
+
+  function hasSpread(node) {
+    for (var _iterator3 = node.properties, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+      var _ref4;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
+      }
+
+      var prop = _ref4;
+
       if (t.isSpreadProperty(prop)) {
@@ -36,2 +81,44 @@ return true;
 
+  function createObjectSpread(file, props, objRef) {
+    var restProperty = props.pop();
+
+    var keys = [];
+    for (var _iterator4 = props, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+      var _ref5;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref5 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref5 = _i4.value;
+      }
+
+      var prop = _ref5;
+
+      var key = prop.key;
+      if (t.isIdentifier(key) && !prop.computed) {
+        key = t.stringLiteral(prop.key.name);
+      }
+      keys.push(key);
+    }
+
+    return [restProperty.argument, t.callExpression(file.addHelper("objectWithoutProperties"), [objRef, t.arrayExpression(keys)])];
+  }
+
+  function replaceRestProperty(paramsPath, i, numParams) {
+    if (paramsPath.isObjectPattern() && hasRestProperty(paramsPath.node)) {
+      var parentPath = paramsPath.parentPath;
+      var uid = parentPath.scope.generateUidIdentifier("ref");
+
+      var declar = t.variableDeclaration("let", [t.variableDeclarator(paramsPath.node, uid)]);
+      declar._blockHoist = i ? numParams - i : 1;
+
+      parentPath.ensureBlock();
+      parentPath.get("body").unshiftContainer("body", declar);
+      paramsPath.replaceWith(uid);
+    }
+  }
+
   return {
@@ -41,2 +128,123 @@ inherits: require("babel-plugin-syntax-object-rest-spread"),
     visitor: {
+      Function: function Function(path) {
+        var params = path.get("params");
+        for (var i = 0; i < params.length; i++) {
+          replaceRestProperty(params[i], i, params.length);
+        }
+      },
+      VariableDeclarator: function VariableDeclarator(path, file) {
+        if (!path.get("id").isObjectPattern()) {
+          return;
+        }
+        var kind = path.parentPath.node.kind;
+        var nodes = [];
+
+        path.traverse({
+          RestProperty: function RestProperty(path) {
+            var ref = this.originalPath.node.init;
+
+            path.findParent(function (path) {
+              if (path.isObjectProperty()) {
+                ref = t.memberExpression(ref, t.identifier(path.node.key.name));
+              } else if (path.isVariableDeclarator()) {
+                return true;
+              }
+            });
+
+            var _createObjectSpread = createObjectSpread(file, path.parentPath.node.properties, ref),
+                argument = _createObjectSpread[0],
+                callExpression = _createObjectSpread[1];
+
+            nodes.push(t.variableDeclarator(argument, callExpression));
+
+            if (path.parentPath.node.properties.length === 0) {
+              path.findParent(function (path) {
+                return path.isObjectProperty() || path.isVariableDeclaration();
+              }).remove();
+            }
+          }
+        }, {
+          originalPath: path
+        });
+
+        if (nodes.length > 0) {
+          path.parentPath.getSibling(path.parentPath.key + 1).insertBefore(t.variableDeclaration(kind, nodes));
+        }
+      },
+      ExportNamedDeclaration: function ExportNamedDeclaration(path) {
+        var declaration = path.get("declaration");
+        if (!declaration.isVariableDeclaration()) return;
+        if (!variableDeclarationHasRestProperty(declaration.node)) return;
+
+        var specifiers = [];
+
+        for (var name in path.getOuterBindingIdentifiers(path)) {
+          var id = t.identifier(name);
+          specifiers.push(t.exportSpecifier(id, id));
+        }
+
+        path.replaceWith(declaration.node);
+        path.insertAfter(t.exportNamedDeclaration(null, specifiers));
+      },
+      CatchClause: function CatchClause(path) {
+        replaceRestProperty(path.get("param"));
+      },
+      AssignmentExpression: function AssignmentExpression(path, file) {
+        var leftPath = path.get("left");
+        if (leftPath.isObjectPattern() && hasRestProperty(leftPath.node)) {
+          var nodes = [];
+
+          var ref = void 0;
+          if (path.isCompletionRecord() || path.parentPath.isExpressionStatement()) {
+            ref = path.scope.generateUidIdentifierBasedOnNode(path.node.right, "ref");
+
+            nodes.push(t.variableDeclaration("var", [t.variableDeclarator(ref, path.node.right)]));
+          }
+
+          var _createObjectSpread2 = createObjectSpread(file, path.node.left.properties, ref),
+              argument = _createObjectSpread2[0],
+              callExpression = _createObjectSpread2[1];
+
+          var nodeWithoutSpread = t.clone(path.node);
+          nodeWithoutSpread.right = ref;
+          nodes.push(t.expressionStatement(nodeWithoutSpread));
+          nodes.push(t.assignmentExpression("=", argument, callExpression));
+
+          if (ref) {
+            nodes.push(t.expressionStatement(ref));
+          }
+
+          path.replaceWithMultiple(nodes);
+        }
+      },
+      ForXStatement: function ForXStatement(path) {
+        var node = path.node,
+            scope = path.scope;
+
+        var left = node.left;
+
+        if (t.isObjectPattern(left) && hasRestProperty(left)) {
+          var temp = scope.generateUidIdentifier("ref");
+
+          node.left = t.variableDeclaration("var", [t.variableDeclarator(temp)]);
+
+          path.ensureBlock();
+
+          node.body.body.unshift(t.variableDeclaration("var", [t.variableDeclarator(left, temp)]));
+
+          return;
+        }
+
+        if (!t.isVariableDeclaration(left)) return;
+
+        var pattern = left.declarations[0].id;
+        if (!t.isObjectPattern(pattern)) return;
+
+        var key = scope.generateUidIdentifier("ref");
+        node.left = t.variableDeclaration(left.kind, [t.variableDeclarator(key, null)]);
+
+        path.ensureBlock();
+
+        node.body.body.unshift(t.variableDeclaration(node.left.kind, [t.variableDeclarator(pattern, key)]));
+      },
       ObjectExpression: function ObjectExpression(path, file) {
@@ -59,15 +267,15 @@ if (!hasSpread(path.node)) return;
 
-        for (var _iterator2 = path.node.properties, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
-          var _ref3;
+        for (var _iterator5 = path.node.properties, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+          var _ref6;
 
-          if (_isArray2) {
-            if (_i2 >= _iterator2.length) break;
-            _ref3 = _iterator2[_i2++];
+          if (_isArray5) {
+            if (_i5 >= _iterator5.length) break;
+            _ref6 = _iterator5[_i5++];
           } else {
-            _i2 = _iterator2.next();
-            if (_i2.done) break;
-            _ref3 = _i2.value;
+            _i5 = _iterator5.next();
+            if (_i5.done) break;
+            _ref6 = _i5.value;
           }
 
-          var prop = _ref3;
+          var prop = _ref6;
 
@@ -74,0 +282,0 @@ if (t.isSpreadProperty(prop)) {

package.json

 {
   "name": "babel-plugin-transform-object-rest-spread",
-  "version": "6.16.0",
+  "version": "6.19.0",
   "description": "Compile object rest and spread to ES5",
@@ -5,0 +5,0 @@ "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-rest-spread",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

10992

increased by168.03%

Lines of code

233

increased by237.68%

No dependency changes