cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add failing test case for object rest after array rest, and fix it. (#6213)

Browse Source 
* Add failing test case for object rest after array rest.

Discovered while upgrading https://github.com/meteor/babel to Babel 7.

The error is:

  1) babel-plugin-transform-object-rest-spread/object rest with array rest:
     TypeError: /Users/ben/dev/babel/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/actual.js: Property id of VariableDeclarator expected node to be of a type ["LVal"] but instead got null
      at Object.validate (packages/babel-types/lib/definitions/index.js:73:13)
      at validate (packages/babel-types/lib/index.js:460:9)
      at Object.builder (packages/babel-types/lib/index.js:428:7)
      at Object.RestElement (packages/babel-plugin-transform-object-rest-spread/lib/index.js:157:41)
      at NodePath._call (packages/babel-traverse/lib/path/context.js:53:20)
      at NodePath.call (packages/babel-traverse/lib/path/context.js:40:17)
      at NodePath.visit (packages/babel-traverse/lib/path/context.js:84:12)
      ...

* Fix object rest following array rest. (#6213)

* Avoid treating array ...rest elements as object ...rest properties.

* Also avoid treating ...rest parameters as object ...rest properties.

Returning early if the parent was an ArrayPattern was not quite enough,
since a RestElement can appear as a parameter in a Function as well.

* Move RestElement parent check earlier in visitor method.
This commit is contained in:
Ben Newman 2017-09-11 11:16:14 -04:00 committed by Henry Zhu
parent 1341e4163b
commit c4f6a7a06f
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/babel-plugin-transform-object-rest-spread/src/index.js
View File

@ -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(),

8
packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/actual.js vendored Normal file
View File

@ -0,0 +1,8 @@
let {
a: [b, ...arrayRest],
c = function(...functionRest){},
...objectRest
} = {
a: [1, 2, 3, 4],
d: "oyez"
};

9
packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/with-array-rest/expected.js vendored Normal file
View File

@ -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"]);