fix

babel · Sep 22, 2023 · 39776f4 · 39776f4
1 parent 306769e
commit 39776f4
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 45 deletions.
diff --git a/packages/babel-helper-remap-async-to-generator/src/index.ts b/packages/babel-helper-remap-async-to-generator/src/index.ts
@@ -11,7 +11,9 @@ const {
   yieldExpression,
 } = t;
 
-const awaitVisitor = traverse.visitors.merge<{ wrapAwait: t.Expression }>([
+const awaitVisitor = traverse.visitors.merge<{
+  wrapAwait: t.Expression | string;
+}>([
   {
     ArrowFunctionExpression(path) {
       path.skip();
@@ -23,7 +25,12 @@ const awaitVisitor = traverse.visitors.merge<{ wrapAwait: t.Expression }>([
       path.replaceWith(
         yieldExpression(
           wrapAwait
-            ? callExpression(cloneNode(wrapAwait), [argument.node])
+            ? callExpression(
+                typeof wrapAwait === "string"
+                  ? path.hub.addHelper(wrapAwait)
+                  : cloneNode(wrapAwait),
+                [argument.node],
+              )
             : argument.node,
         ),
       );
@@ -35,9 +42,9 @@ const awaitVisitor = traverse.visitors.merge<{ wrapAwait: t.Expression }>([
 export default function (
   path: NodePath<t.Function>,
   helpers: {
-    wrapAsync: t.Identifier | string;
-    wrapAwait?: t.Identifier;
-    callAsync?: t.Identifier;
+    wrapAsync: t.Expression | string;
+    wrapAwait?: t.Expression | string;
+    callAsync?: string;
   },
   noNewArrows?: boolean,
   ignoreFunctionLength?: boolean,

diff --git a/packages/babel-helper-wrap-function/src/index.ts b/packages/babel-helper-wrap-function/src/index.ts
@@ -201,7 +201,7 @@ export default function wrapFunction(
   // TODO(Babel 8): Consider defaulting to false for spec compliance
   noNewArrows: boolean = true,
   ignoreFunctionLength: boolean = false,
-  callAsync?: t.Expression,
+  callAsync?: string,
 ) {
   if (callAsync) {
     if (path.isMethod()) {
@@ -214,7 +214,11 @@ export default function wrapFunction(
         blockStatement(body.body),
         true,
       );
-      body.body = [returnStatement(callExpression(callAsync, [container]))];
+      body.body = [
+        returnStatement(
+          callExpression(path.hub.addHelper(callAsync), [container]),
+        ),
+      ];
 
       // Regardless of whether or not the wrapped function is a an async method
       // or generator the outer function should not be
@@ -246,15 +250,14 @@ export default function wrapFunction(
       } else {
         node = path.node as t.FunctionDeclaration | t.FunctionExpression;
       }
-
-      const isDeclaration = isFunctionDeclaration(node);
+      const isDeclaration = path.isFunctionDeclaration();
 
       let built = node;
       if (!isCallExpression(node)) {
         functionId = node.id;
         node.id = null;
         node.type = "FunctionExpression";
-        built = callExpression(callAsync, [
+        built = callExpression(path.hub.addHelper(callAsync), [
           node as t.FunctionExpression,
           identifier("this"),
           identifier("arguments"),
@@ -289,8 +292,11 @@ export default function wrapFunction(
         wrapper.id ||
         (!ignoreFunctionLength && params.length)
       ) {
+        // Because we previously mutated some `FunctionDeclaration` nodes to `FunctionExpression`.
+        path.type = isDeclaration
+          ? "FunctionDeclaration"
+          : "FunctionExpression";
         path.replaceWith(wrapper);
-
         markCallWrapped(path);
       } else {
         // we can omit this wrapper as the conditions it protects for do not apply
@@ -305,11 +311,11 @@ export default function wrapFunction(
   }
 
   if (path.isMethod()) {
-    classOrObjectMethod(path, callId as t.Identifier);
+    classOrObjectMethod(path, callId as t.Expression);
   } else {
     plainFunction(
       path as NodePath<Exclude<t.Function, t.Method>>,
-      callId as t.Identifier,
+      callId as t.Expression,
       noNewArrows,
       ignoreFunctionLength,
     );

diff --git a/packages/babel-plugin-proposal-function-sent/src/index.ts b/packages/babel-plugin-proposal-function-sent/src/index.ts
@@ -67,15 +67,20 @@ export default declare(api => {
           ]),
         );
 
-        wrapFunction.default(
-          fnPath,
-          "skipFirstGeneratorNext",
-          undefined,
-          undefined,
-          state.availableHelper("callSkipFirstGeneratorNext")
-            ? state.addHelper("callSkipFirstGeneratorNext")
-            : undefined,
-        );
+        if (state.availableHelper("callSkipFirstGeneratorNext")) {
+          wrapFunction.default(
+            fnPath,
+            "skipFirstGeneratorNext",
+            undefined,
+            undefined,
+            "callSkipFirstGeneratorNext",
+          );
+        } else {
+          wrapFunction.default(
+            fnPath,
+            state.addHelper("skipFirstGeneratorNext"),
+          );
+        }
       },
     },
   };

diff --git a/packages/babel-plugin-transform-async-generator-functions/src/index.ts b/packages/babel-plugin-transform-async-generator-functions/src/index.ts
@@ -85,13 +85,18 @@ export default declare(api => {
 
       // We don't need to pass the noNewArrows assumption, since
       // async generators are never arrow functions.
-      remapAsyncToGenerator.default(path, {
-        wrapAsync: state.addHelper("wrapAsyncGenerator"),
-        wrapAwait: state.addHelper("awaitAsyncGenerator"),
-        callAsync: state.availableHelper("callAsyncGenerator")
-          ? state.addHelper("callAsyncGenerator")
-          : undefined,
-      });
+      if (state.availableHelper("callAsyncGenerator")) {
+        remapAsyncToGenerator.default(path, {
+          wrapAsync: "wrapAsyncGenerator",
+          wrapAwait: "awaitAsyncGenerator",
+          callAsync: "callAsyncGenerator",
+        });
+      } else {
+        remapAsyncToGenerator.default(path, {
+          wrapAsync: state.addHelper("wrapAsyncGenerator"),
+          wrapAwait: state.addHelper("awaitAsyncGenerator"),
+        });
+      }
     },
   };
 

diff --git a/packages/babel-plugin-transform-async-to-generator/src/index.ts b/packages/babel-plugin-transform-async-to-generator/src/index.ts
@@ -9,7 +9,7 @@ export interface Options {
 }
 
 type State = {
-  methodWrapper?: t.Identifier;
+  methodWrapper?: t.Expression;
 };
 
 export default declare<State>((api, options: Options) => {
@@ -60,19 +60,29 @@ export default declare<State>((api, options: Options) => {
       Function(path, state) {
         if (!path.node.async || path.node.generator) return;
 
-        remapAsyncToGenerator.default(
-          path,
-          {
-            wrapAsync: state.availableHelper("asyncToGenerator2")
-              ? "asyncToGenerator2"
-              : "asyncToGenerator",
-            callAsync: state.availableHelper("callAsync")
-              ? state.addHelper("callAsync")
-              : undefined,
-          },
-          noNewArrows,
-          ignoreFunctionLength,
-        );
+        if (
+          state.availableHelper("callAsync") &&
+          state.availableHelper("asyncToGenerator2")
+        ) {
+          remapAsyncToGenerator.default(
+            path,
+            {
+              wrapAsync: "asyncToGenerator2",
+              callAsync: "callAsync",
+            },
+            noNewArrows,
+            ignoreFunctionLength,
+          );
+        } else {
+          remapAsyncToGenerator.default(
+            path,
+            {
+              wrapAsync: state.addHelper("asyncToGenerator"),
+            },
+            noNewArrows,
+            ignoreFunctionLength,
+          );
+        }
       },
     },
   };

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