fix regenerator transformer order - fixes #617

lib/6to5/transformation/transformers/es6/parameters.rest.js

@@ -58,15 +58,15 @@ exports.Function = function (node, parent, scope) {
     node.body.body.unshift(restDeclar);
   }
 
-  node.body.body.unshift(
-    util.template("rest", {
-      ARGUMENTS: argsId,
-      ARRAY_KEY: arrKey,
-      ARRAY_LEN: arrLen,
-      START: start,
-      ARRAY: rest,
-      KEY: key,
-      LEN: len,
-    })
-  );
+  var loop = util.template("rest", {
+    ARGUMENTS: argsId,
+    ARRAY_KEY: arrKey,
+    ARRAY_LEN: arrLen,
+    START: start,
+    ARRAY: rest,
+    KEY: key,
+    LEN: len,
+  });
+  loop._blockHoist = node.params.length + 1;
+  node.body.body.unshift(loop);
 };

lib/6to5/transformation/transformers/index.js

@@ -52,14 +52,13 @@ module.exports = {
   // needs to be after `es6.blockScoping` due to needing `letReferences` set on blocks
   "es6.blockScopingTDZ":                   require("./es6/block-scoping-tdz"),
 
-  // needs to be after block scoping since regenerator doesn't support it
-  regenerator:                             require("./other/regenerator"),
-
   "es6.parameters.default":                require("./es6/parameters.default"),
   "es6.parameters.rest":                   require("./es6/parameters.rest"),
 
   "es6.destructuring":                     require("./es6/destructuring"),
 
+  regenerator:                             require("./other/regenerator"),
+
   // needs to be after `regenerator` due to needing `regeneratorRuntime` references
   // needs to be after `es6.forOf` due to needing `Symbol.iterator` references
   // needs to be before `es6.modules` due to dynamic imports

package.json

@@ -48,7 +48,7 @@
     "lodash": "3.0.0",
     "output-file-sync": "1.1.0",
     "private": "0.1.6",
-    "regenerator-6to5": "0.8.9-7",
+    "regenerator-6to5": "0.8.9-8",
     "regexpu": "1.1.0",
     "roadrunner": "1.0.4",
     "source-map": "0.1.43",

test/fixtures/transformation/regenerator/destructuring-parameters/exec.js

@@ -0,0 +1,5 @@
+function* foo({ bar }) {
+  return bar;
+}
+
+assert(foo({ bar: "bar" }).next().value, "bar");

test/fixtures/transformation/regenerator/destructuring/exec.js

@@ -1,5 +1,6 @@
-function* foo({ bar }) {
+function* foo() {
+  var { bar } = { bar: "bar" };
   return bar;
 }
 
-assert(foo({ bar: "bar" }).next().value, "bar");
+assert.deepEqual(foo().next().value, "bar");