[7.x backport] fix: Properly handle await in finally (#17805)

liuxingbaoyu · web-flow · commit 1c0a08d95ae7 · 2026-02-17T13:59:34.000+01:00
* fix

* update test

* update test
diff --git a/packages/babel-helpers/src/helpers-generated.ts b/packages/babel-helpers/src/helpers-generated.ts
@@ -1576,10 +1576,10 @@ const helpers: Record<string, Helper> = {
       internal: false,
     },
   ),
-  // size: 1166, gzip size: 524
+  // size: 1063, gzip size: 498
   wrapAsyncGenerator: helper(
     "7.0.0-beta.0",
-    'function _wrapAsyncGenerator(e){return function(){return new AsyncGenerator(e.apply(this,arguments))}}function AsyncGenerator(e){var r,t;function resume(r,t){try{var n=e[r](t),o=n.value,u=o instanceof OverloadYield;Promise.resolve(u?o.v:o).then(function(t){if(u){var i="return"===r?"return":"next";if(!o.k||t.done)return resume(i,t);t=e[i](t).value}settle(n.done?"return":"normal",t)},function(e){resume("throw",e)})}catch(e){settle("throw",e)}}function settle(e,n){switch(e){case"return":r.resolve({value:n,done:!0});break;case"throw":r.reject(n);break;default:r.resolve({value:n,done:!1})}(r=r.next)?resume(r.key,r.arg):t=null}this._invoke=function(e,n){return new Promise(function(o,u){var i={key:e,arg:n,resolve:o,reject:u,next:null};t?t=t.next=i:(r=t=i,resume(e,n))})},"function"!=typeof e.return&&(this.return=void 0)}AsyncGenerator.prototype["function"==typeof Symbol&&Symbol.asyncIterator||"@@asyncIterator"]=function(){return this},AsyncGenerator.prototype.next=function(e){return this._invoke("next",e)},AsyncGenerator.prototype.throw=function(e){return this._invoke("throw",e)},AsyncGenerator.prototype.return=function(e){return this._invoke("return",e)};',
+    'function _wrapAsyncGenerator(e){return function(){return new AsyncGenerator(e.apply(this,arguments))}}function AsyncGenerator(e){var t,n;function resume(t,n){try{var r=e[t](n),o=r.value,u=o instanceof OverloadYield;Promise.resolve(u?o.v:o).then(function(n){if(u){var i="return"===t&&o.k?t:"next";if(!o.k||n.done)return resume(i,n);n=e[i](n).value}settle(!!r.done,n)},function(e){resume("throw",e)})}catch(e){settle(2,e)}}function settle(e,r){2===e?t.reject(r):t.resolve({value:r,done:e}),(t=t.next)?resume(t.key,t.arg):n=null}this._invoke=function(e,r){return new Promise(function(o,u){var i={key:e,arg:r,resolve:o,reject:u,next:null};n?n=n.next=i:(t=n=i,resume(e,r))})},"function"!=typeof e.return&&(this.return=void 0)}AsyncGenerator.prototype["function"==typeof Symbol&&Symbol.asyncIterator||"@@asyncIterator"]=function(){return this},AsyncGenerator.prototype.next=function(e){return this._invoke("next",e)},AsyncGenerator.prototype.throw=function(e){return this._invoke("throw",e)},AsyncGenerator.prototype.return=function(e){return this._invoke("return",e)};',
     {
       globals: ["Promise", "Symbol"],
       locals: {
diff --git a/packages/babel-helpers/src/helpers/wrapAsyncGenerator.ts b/packages/babel-helpers/src/helpers/wrapAsyncGenerator.ts
@@ -90,7 +90,10 @@ function AsyncGenerator<T = unknown, TReturn = any, TNext = unknown>(
             //      not visible to the (sync) yield*.
             //      The other part of this implementation is in asyncGeneratorDelegate.
             var nextKey: "return" | "next" =
-              key === "return" ? "return" : "next";
+              key === "return" &&
+              (value as OverloadYield<IteratorReturnResult<T>>).k
+                ? key
+                : "next";
             if (
               !(value as OverloadYield<IteratorReturnResult<T>>).k ||
               arg.done
@@ -104,28 +107,27 @@ function AsyncGenerator<T = unknown, TReturn = any, TNext = unknown>(
             }
           }
 
-          settle(result.done ? "return" : "normal", arg);
+          settle(!!result.done, arg);
         },
         function (err) {
           resume("throw", err);
         },
       );
     } catch (err) {
-      settle("throw", err);
+      settle(2, err);
     }
   }
 
-  function settle(type: AsyncIteratorMethod | "normal", value: any) {
-    switch (type) {
-      case "return":
-        front!.resolve({ value: value, done: true });
-        break;
-      case "throw":
-        front!.reject(value);
-        break;
-      default:
-        front!.resolve({ value: value, done: false });
-        break;
+  /**
+   * type == true -> return
+   * type == false -> normal
+   * type == 2 -> throw
+   */
+  function settle(type: true | false | 2, value: any) {
+    if (type === 2) {
+      front!.reject(value);
+    } else {
+      front!.resolve({ value: value, done: type });
     }
 
     front = front!.next;
diff --git a/packages/babel-plugin-transform-async-generator-functions/test/fixtures/async-generators/await-in-finally/exec.js b/packages/babel-plugin-transform-async-generator-functions/test/fixtures/async-generators/await-in-finally/exec.js
@@ -0,0 +1,22 @@
+
+
+async function* createAsyncGenerator() {
+  try {
+    yield 1;
+  } finally {
+    await Promise.resolve(2);
+    await Promise.resolve(3);
+    yield 4;
+  }
+  return 5;
+}
+
+async function test() {
+  const withReturnCall = createAsyncGenerator();
+
+  expect(await withReturnCall.next()).toEqual({ value: 1, done: false });
+  expect(await withReturnCall.return(10)).toEqual({ value: 4, done: false });
+  expect(await withReturnCall.next()).toEqual({ value: 10, done: true });
+}
+
+return test();
diff --git a/packages/babel-plugin-transform-async-generator-functions/test/fixtures/async-generators/await-in-finally/options.json b/packages/babel-plugin-transform-async-generator-functions/test/fixtures/async-generators/await-in-finally/options.json
@@ -0,0 +1,9 @@
+{
+  "plugins": [
+    "transform-async-generator-functions"
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  },
+  "minNodeVersion": "8.0.0"
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2-babel-7/usage-shippedProposals/output.js b/packages/babel-preset-env/test/fixtures/corejs2-babel-7/usage-shippedProposals/output.js
diff --git a/packages/babel-runtime-corejs3/helpers/esm/wrapAsyncGenerator.js b/packages/babel-runtime-corejs3/helpers/esm/wrapAsyncGenerator.js
@@ -8,55 +8,42 @@ function _wrapAsyncGenerator(e) {
   };
 }
 function AsyncGenerator(e) {
-  var r, t;
-  function resume(r, t) {
+  var t, n;
+  function resume(t, n) {
     try {
-      var n = e[r](t),
-        o = n.value,
+      var r = e[t](n),
+        o = r.value,
         u = o instanceof OverloadYield;
-      _Promise.resolve(u ? o.v : o).then(function (t) {
+      _Promise.resolve(u ? o.v : o).then(function (n) {
         if (u) {
-          var i = "return" === r ? "return" : "next";
-          if (!o.k || t.done) return resume(i, t);
-          t = e[i](t).value;
+          var i = "return" === t && o.k ? t : "next";
+          if (!o.k || n.done) return resume(i, n);
+          n = e[i](n).value;
         }
-        settle(n.done ? "return" : "normal", t);
+        settle(!!r.done, n);
       }, function (e) {
         resume("throw", e);
       });
     } catch (e) {
-      settle("throw", e);
+      settle(2, e);
     }
   }
-  function settle(e, n) {
-    switch (e) {
-      case "return":
-        r.resolve({
-          value: n,
-          done: !0
-        });
-        break;
-      case "throw":
-        r.reject(n);
-        break;
-      default:
-        r.resolve({
-          value: n,
-          done: !1
-        });
-    }
-    (r = r.next) ? resume(r.key, r.arg) : t = null;
+  function settle(e, r) {
+    2 === e ? t.reject(r) : t.resolve({
+      value: r,
+      done: e
+    }), (t = t.next) ? resume(t.key, t.arg) : n = null;
   }
-  this._invoke = function (e, n) {
+  this._invoke = function (e, r) {
     return new _Promise(function (o, u) {
       var i = {
         key: e,
-        arg: n,
+        arg: r,
         resolve: o,
         reject: u,
         next: null
       };
-      t ? t = t.next = i : (r = t = i, resume(e, n));
+      n ? n = n.next = i : (t = n = i, resume(e, r));
     });
   }, "function" != typeof e["return"] && (this["return"] = void 0);
 }
