diff --git a/packages/babel-plugin-transform-object-rest-spread/src/index.js b/packages/babel-plugin-transform-object-rest-spread/src/index.js index c96358fed1..a33cff0217 100644 --- a/packages/babel-plugin-transform-object-rest-spread/src/index.js +++ b/packages/babel-plugin-transform-object-rest-spread/src/index.js @@ -65,9 +65,11 @@ export default function({ types: t }) { //expects path to an object pattern function createObjectSpread(path, file, objRef) { - const last = path.get("properties").pop(); // note: popping does not mean removal from path + const props = path.get("properties"); + const last = props[props.length - 1]; + t.assertRestElement(last.node); const restElement = t.clone(last.node); - last.remove(); // remove restElement + last.remove(); const impureComputedPropertyDeclarators = replaceImpureComputedKeys(path); const { keys, allLiteral } = extractNormalizedKeys(path); @@ -144,6 +146,13 @@ export default function({ types: t }) { path.get("id").traverse( { RestElement(path) { + if (!path.parentPath.isObjectPattern()) { + // Return early if the parent is not an ObjectPattern, but + // (for example) an ArrayPattern or Function, because that + // means this RestElement is an not an object property. + return; + } + if ( // skip single-property case, e.g. // const { ...x } = foo(); @@ -197,6 +206,8 @@ export default function({ types: t }) { callExpression, ] = createObjectSpread(objectPatternPath, file, ref); + t.assertIdentifier(argument); + insertionPath.insertBefore(impureComputedPropertyDeclarators); insertionPath.insertAfter( @@ -205,8 +216,8 @@ export default function({ types: t }) { insertionPath = insertionPath.getSibling(insertionPath.key + 1); - if (path.parentPath.node.properties.length === 0) { - path + if (objectPatternPath.node.properties.length === 0) { + objectPatternPath .findParent( path => path.isObjectProperty() || path.isVariableDeclarator(), diff --git a/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/actual.js b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/actual.js new file mode 100644 index 0000000000..acbe7b35fb --- /dev/null +++ b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/actual.js @@ -0,0 +1,8 @@ +let { + a: [b, ...arrayRest], + c = function(...functionRest){}, + ...objectRest +} = { + a: [1, 2, 3, 4], + d: "oyez" +}; diff --git a/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/expected.js b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/expected.js new file mode 100644 index 0000000000..743129f1bb --- /dev/null +++ b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/expected.js @@ -0,0 +1,9 @@ +let _a$d = { + a: [1, 2, 3, 4], + d: "oyez" +}, + { + a: [b, ...arrayRest], + c = function (...functionRest) {} +} = _a$d, + objectRest = babelHelpers.objectWithoutProperties(_a$d, ["a", "c"]);