[babel 8] Don't pass the second parameter to asyncGeneratorDelegate

babel · Aug 25, 2022 · 5a5fd7f · 5a5fd7f
1 parent 4165bd3
commit 5a5fd7f
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 7 deletions.
diff --git a/packages/babel-plugin-proposal-async-generator-functions/src/index.ts b/packages/babel-plugin-proposal-async-generator-functions/src/index.ts
@@ -17,11 +17,15 @@ export default declare(api => {
 
       YieldExpression({ node }, state) {
         if (!node.delegate) return;
-        const callee = state.addHelper("asyncGeneratorDelegate");
-        node.argument = t.callExpression(callee, [
-          t.callExpression(state.addHelper("asyncIterator"), [node.argument]),
-          state.addHelper("awaitAsyncGenerator"),
+        const asyncIter = t.callExpression(state.addHelper("asyncIterator"), [
+          node.argument,
         ]);
+        node.argument = t.callExpression(
+          state.addHelper("asyncGeneratorDelegate"),
+          process.env.BABEL_8_BREAKING
+            ? [asyncIter]
+            : [asyncIter, state.addHelper("awaitAsyncGenerator")],
+        );
       },
     },
     environmentVisitor,

diff --git a/...osal-async-generator-functions/test/fixtures/async-generators/yield-star-babel-7/input.js b/...osal-async-generator-functions/test/fixtures/async-generators/yield-star-babel-7/input.js
@@ -0,0 +1,4 @@
+async function* g() {
+  yield* [1, 2, 3];
+  yield* iterable;
+}
diff --git a/...-async-generator-functions/test/fixtures/async-generators/yield-star-babel-7/options.json b/...-async-generator-functions/test/fixtures/async-generators/yield-star-babel-7/options.json
@@ -0,0 +1,3 @@
+{
+  "BABEL_8_BREAKING": false
+}
diff --git a/...sal-async-generator-functions/test/fixtures/async-generators/yield-star-babel-7/output.js b/...sal-async-generator-functions/test/fixtures/async-generators/yield-star-babel-7/output.js
@@ -0,0 +1,11 @@
+function g() {
+  return _g.apply(this, arguments);
+}
+
+function _g() {
+  _g = babelHelpers.wrapAsyncGenerator(function* () {
+    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator([1, 2, 3]), babelHelpers.awaitAsyncGenerator);
+    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator(iterable), babelHelpers.awaitAsyncGenerator);
+  });
+  return _g.apply(this, arguments);
+}
diff --git a/...proposal-async-generator-functions/test/fixtures/async-generators/yield-star/options.json b/...proposal-async-generator-functions/test/fixtures/async-generators/yield-star/options.json
@@ -0,0 +1,3 @@
+{
+  "BABEL_8_BREAKING": true
+}
diff --git a/...in-proposal-async-generator-functions/test/fixtures/async-generators/yield-star/output.js b/...in-proposal-async-generator-functions/test/fixtures/async-generators/yield-star/output.js
@@ -4,8 +4,8 @@ function g() {
 
 function _g() {
   _g = babelHelpers.wrapAsyncGenerator(function* () {
-    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator([1, 2, 3]), babelHelpers.awaitAsyncGenerator);
-    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator(iterable), babelHelpers.awaitAsyncGenerator);
+    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator([1, 2, 3]));
+    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator(iterable));
   });
   return _g.apply(this, arguments);
 }
diff --git a/...erator-functions/test/fixtures/yield-star/create-async-from-sync-iterator-babel-7/exec.js b/...erator-functions/test/fixtures/yield-star/create-async-from-sync-iterator-babel-7/exec.js
@@ -0,0 +1,7 @@
+async function* fn() {
+  yield* [Promise.resolve("ok")] // CreateAsyncFromSyncIterator
+}
+
+return fn().next().then(result => {
+  expect(result).toEqual({ value: "ok", done: false });
+});
diff --git a/...rator-functions/test/fixtures/yield-star/create-async-from-sync-iterator-babel-7/input.js b/...rator-functions/test/fixtures/yield-star/create-async-from-sync-iterator-babel-7/input.js
@@ -0,0 +1,3 @@
+async function* fn() {
+  yield* [Promise.resolve("ok")] // CreateAsyncFromSyncIterator
+}
diff --git a/...r-functions/test/fixtures/yield-star/create-async-from-sync-iterator-babel-7/options.json b/...r-functions/test/fixtures/yield-star/create-async-from-sync-iterator-babel-7/options.json
@@ -0,0 +1,7 @@
+{
+  "BABEL_8_BREAKING": false,
+  "plugins": ["proposal-async-generator-functions"],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/...ator-functions/test/fixtures/yield-star/create-async-from-sync-iterator-babel-7/output.js b/...ator-functions/test/fixtures/yield-star/create-async-from-sync-iterator-babel-7/output.js
@@ -0,0 +1,10 @@
+function fn() {
+  return _fn.apply(this, arguments);
+}
+
+function _fn() {
+  _fn = babelHelpers.wrapAsyncGenerator(function* () {
+    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator([Promise.resolve("ok")]), babelHelpers.awaitAsyncGenerator); // CreateAsyncFromSyncIterator
+  });
+  return _fn.apply(this, arguments);
+}
diff --git a/...generator-functions/test/fixtures/yield-star/create-async-from-sync-iterator/options.json b/...generator-functions/test/fixtures/yield-star/create-async-from-sync-iterator/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": true,
   "plugins": ["proposal-async-generator-functions"],
   "parserOpts": {
     "allowReturnOutsideFunction": true

diff --git a/...nc-generator-functions/test/fixtures/yield-star/create-async-from-sync-iterator/output.js b/...nc-generator-functions/test/fixtures/yield-star/create-async-from-sync-iterator/output.js
@@ -4,7 +4,7 @@ function fn() {
 
 function _fn() {
   _fn = babelHelpers.wrapAsyncGenerator(function* () {
-    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator([Promise.resolve("ok")]), babelHelpers.awaitAsyncGenerator); // CreateAsyncFromSyncIterator
+    yield* babelHelpers.asyncGeneratorDelegate(babelHelpers.asyncIterator([Promise.resolve("ok")])); // CreateAsyncFromSyncIterator
   });
   return _fn.apply(this, arguments);
 }