Merge pull request #5469 from yavorsky/fix-commonjs-destructuring

Fix commonjs exports with destructuring.

packages/babel-plugin-transform-es2015-modules-commonjs/package.json

@@ -15,6 +15,7 @@
     "babel-plugin"
   ],
   "devDependencies": {
-    "babel-helper-plugin-test-runner": "^6.24.0"
+    "babel-helper-plugin-test-runner": "^6.24.0",
+    "babel-plugin-syntax-object-rest-spread": "^6.13.0"
   }
 }

packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js

@@ -1,5 +1,7 @@
 import { basename, extname } from "path";
 import template from "babel-template";
+import babelPluginTransformStrictMode from "babel-plugin-transform-strict-mode";
+
 import * as t from "babel-types";
 
 const buildRequire = template(`
@@ -127,7 +129,7 @@ export default function () {
   };
 
   return {
-    inherits: require("babel-plugin-transform-strict-mode"),
+    inherits: babelPluginTransformStrictMode,
 
     visitor: {
       ThisExpression(path, state) {
@@ -300,15 +302,42 @@ export default function () {
                     const id = decl.get("id");
 
                     const init = decl.get("init");
+                    const exportsToInsert = [];
                     if (!init.node) init.replaceWith(t.identifier("undefined"));
 
                     if (id.isIdentifier()) {
                       addTo(exports, id.node.name, id.node);
                       init.replaceWith(buildExportsAssignment(id.node, init.node).expression);
                       nonHoistedExportNames[id.node.name] = true;
-                    } else {
-                      // todo
+                    } else if (id.isObjectPattern()) {
+                      for (let i = 0; i < id.node.properties.length; i++) {
+                        const prop = id.node.properties[i];
+                        let propValue = prop.value;
+                        if (t.isAssignmentPattern(propValue)) {
+                          propValue = propValue.left;
+                        } else if (t.isRestProperty(prop)) {
+                          propValue = prop.argument;
+                        }
+                        addTo(exports, propValue.name, propValue);
+                        exportsToInsert.push(buildExportsAssignment(propValue, propValue));
+                        nonHoistedExportNames[propValue.name] = true;
+                      }
+                    } else if (id.isArrayPattern() && id.node.elements) {
+                      for (let i = 0; i < id.node.elements.length; i++) {
+                        let elem = id.node.elements[i];
+                        if (!elem) continue;
+                        if (t.isAssignmentPattern(elem)) {
+                          elem = elem.left;
+                        } else if (t.isRestElement(elem)) {
+                          elem = elem.argument;
+                        }
+                        const name = elem.name;
+                        addTo(exports, name, elem);
+                        exportsToInsert.push(buildExportsAssignment(elem, elem));
+                        nonHoistedExportNames[name] = true;
+                      }
                     }
+                    path.insertAfter(exportsToInsert);
                   }
                   path.replaceWith(declaration.node);
                 }

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/actual.js

@@ -0,0 +1 @@
+export const [foo, bar = 2] = [];

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+const [foo, bar = 2] = [];
+exports.foo = foo;
+exports.bar = bar;

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/actual.js

@@ -0,0 +1 @@
+export const [foo, bar, ...baz] = [];

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/expected.js

@@ -0,0 +1,6 @@
+"use strict";
+
+const [foo, bar, ...baz] = [];
+exports.foo = foo;
+exports.bar = bar;
+exports.baz = baz;

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/actual.js

@@ -0,0 +1 @@
+export const [foo, bar] = [];

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+const [foo, bar] = [];
+exports.foo = foo;
+exports.bar = bar;

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/actual.js

@@ -0,0 +1 @@
+export const { foo, bar = 1 } = {};

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+const { foo, bar = 1 } = {};
+exports.foo = foo;
+exports.bar = bar;

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/actual.js

@@ -0,0 +1 @@
+export const { foo, ...bar } = {};

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+const { foo, ...bar } = {};
+exports.foo = foo;
+exports.bar = bar;

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object/actual.js

@@ -0,0 +1 @@
+export const { foo: bar, baz } = {};

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+const { foo: bar, baz } = {};
+exports.bar = bar;
+exports.baz = baz;

packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/options.json

@@ -1,3 +1,6 @@
 {
-  "plugins": ["external-helpers", ["transform-es2015-modules-commonjs", { "strict": true }]]
+  "plugins": [
+    "external-helpers",
+    "syntax-object-rest-spread",
+    ["transform-es2015-modules-commonjs", { "strict": true }]]
 }