Assign proper function names to server actions (#71478)

This PR adjusts the server action transforms to assign proper function names for the generated server reference proxies. - If the original function has a name, this name is used. - If a function expression is assigned to a variable, the variable's name is used. - If an anonymous function expression is assigned to a prop, the prop's name is used. In addition, this PR simplifies the output for exported functions, avoiding unnecessary `registerServerReference` calls. It also fixes the source mapping of default exported server actions. **Before:** <img width="890" alt="before" src="https://github.com/user-attachments/assets/a3d6a5f8-d48e-474d-8f03-b49306fb704f"> **After:** <img width="890" alt="after" src="https://github.com/user-attachments/assets/8f332690-6c26-46f1-9eef-7680f47ea578"> Next up, we will do the same for `'use cache'` functions.
vercel · Oct 18, 2024 · c54b8a3 · c54b8a3
1 parent 1f46214
commit c54b8a3
Show file tree

Hide file tree

Showing 46 changed files with 727 additions and 285 deletions.
diff --git a/crates/next-custom-transforms/src/transforms/server_actions.rs b/crates/next-custom-transforms/src/transforms/server_actions.rs
diff --git a/crates/next-custom-transforms/tests/errors/server-actions/server-graph/6/output.js b/crates/next-custom-transforms/tests/errors/server-actions/server-graph/6/output.js
@@ -1,4 +1,3 @@
-/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
+/* __next_internal_action_entry_do_not_use__ {} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
-export default registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
-export async function $$RSC_SERVER_ACTION_0() {}
+export default (()=>{});
diff --git a/crates/next-custom-transforms/tests/errors/server-actions/server-graph/7/output.js b/crates/next-custom-transforms/tests/errors/server-actions/server-graph/7/output.js
@@ -1,4 +1,4 @@
 /* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
+export const $$RSC_SERVER_ACTION_0 = async function foo() {};
 const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
-export async function $$RSC_SERVER_ACTION_0() {}
diff --git a/crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/output.js b/crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/output.js
@@ -1,9 +1,9 @@
 /* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
-const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
-export async function $$RSC_SERVER_ACTION_0() {
+export const $$RSC_SERVER_ACTION_0 = async function foo() {
     'use strict';
-}
+};
+const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
 const bar = async ()=>{
     const x = 1;
     // prettier-ignore

diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/client/7/input.js b/crates/next-custom-transforms/tests/fixture/server-actions/client/7/input.js
@@ -0,0 +1,3 @@
+'use server'
+
+export default async () => {}
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/client/7/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/client/7/output.js
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/1/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/1/output.js
@@ -1,18 +1,23 @@
 /* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
 import deleteFromDb from 'db';
+export const $$RSC_SERVER_ACTION_0 = async function deleteItem($$ACTION_CLOSURE_BOUND) {
+    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
+    await deleteFromDb($$ACTION_ARG_0);
+    await deleteFromDb($$ACTION_ARG_1);
+};
 export function Item({ id1, id2 }) {
     var deleteItem = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
         id1,
         id2
     ]));
     return <Button action={deleteItem}>Delete</Button>;
 }
-export async function $$RSC_SERVER_ACTION_0($$ACTION_CLOSURE_BOUND) {
-    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
-    await deleteFromDb($$ACTION_ARG_0);
-    await deleteFromDb($$ACTION_ARG_1);
-}
+export const $$RSC_SERVER_ACTION_1 = async function action($$ACTION_CLOSURE_BOUND) {
+    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$ACTION_CLOSURE_BOUND);
+    console.log($$ACTION_ARG_0);
+    console.log($$ACTION_ARG_1);
+};
 export default function Home() {
     const info = {
         name: 'John',
@@ -24,8 +29,3 @@ export default function Home() {
     ]));
     return null;
 }
-export async function $$RSC_SERVER_ACTION_1($$ACTION_CLOSURE_BOUND) {
-    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$ACTION_CLOSURE_BOUND);
-    console.log($$ACTION_ARG_0);
-    console.log($$ACTION_ARG_1);
-}
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/11/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/11/output.js
@@ -1,6 +1,10 @@
 /* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
 export default async function $$RSC_SERVER_ACTION_0() {}
+Object.defineProperty($$RSC_SERVER_ACTION_0, "name", {
+    "value": "default",
+    "writable": false
+});
 import { ensureServerEntryExports } from "private-next-rsc-action-validate";
 ensureServerEntryExports([
     $$RSC_SERVER_ACTION_0

diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/15/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/15/output.js
@@ -1,10 +1,13 @@
-/* __next_internal_action_entry_do_not_use__ {"90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference";
+/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
-export default $$RSC_SERVER_ACTION_0 = registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null);
-var $$RSC_SERVER_ACTION_0;
-export async function $$RSC_SERVER_ACTION_1(a, b) {
+export default $$RSC_SERVER_ACTION_0 = async (a, b)=>{
     console.log(a, b);
-}
+};
+var $$RSC_SERVER_ACTION_0;
+Object.defineProperty($$RSC_SERVER_ACTION_0, "name", {
+    "value": "default",
+    "writable": false
+});
 import { ensureServerEntryExports } from "private-next-rsc-action-validate";
 ensureServerEntryExports([
     $$RSC_SERVER_ACTION_0

diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/16/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/16/output.js
@@ -2,6 +2,12 @@
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
 import deleteFromDb from 'db';
 const v1 = 'v1';
+export const $$RSC_SERVER_ACTION_0 = async function deleteItem($$ACTION_CLOSURE_BOUND) {
+    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
+    await deleteFromDb($$ACTION_ARG_0);
+    await deleteFromDb(v1);
+    await deleteFromDb($$ACTION_ARG_1);
+};
 export function Item({ id1, id2 }) {
     const v2 = id2;
     const deleteItem = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
@@ -10,27 +16,21 @@ export function Item({ id1, id2 }) {
     ]));
     return <Button action={deleteItem}>Delete</Button>;
 }
-export async function $$RSC_SERVER_ACTION_0($$ACTION_CLOSURE_BOUND) {
-    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
-    await deleteFromDb($$ACTION_ARG_0);
-    await deleteFromDb(v1);
-    await deleteFromDb($$ACTION_ARG_1);
-}
+export const $$RSC_SERVER_ACTION_1 = async function g($$ACTION_CLOSURE_BOUND, y, ...z) {
+    var [$$ACTION_ARG_0] = await decryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$ACTION_CLOSURE_BOUND);
+    return $$ACTION_ARG_0 + y + z[0];
+};
 const f = (x)=>{
     var g = registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
         x
     ]));
 };
-export async function $$RSC_SERVER_ACTION_1($$ACTION_CLOSURE_BOUND, y, ...z) {
-    var [$$ACTION_ARG_0] = await decryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$ACTION_CLOSURE_BOUND);
+export const $$RSC_SERVER_ACTION_2 = async function f($$ACTION_CLOSURE_BOUND, y, ...z) {
+    var [$$ACTION_ARG_0] = await decryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", $$ACTION_CLOSURE_BOUND);
     return $$ACTION_ARG_0 + y + z[0];
-}
+};
 const g = (x)=>{
     f = registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null).bind(null, encryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", [
         x
     ]));
 };
-export async function $$RSC_SERVER_ACTION_2($$ACTION_CLOSURE_BOUND, y, ...z) {
-    var [$$ACTION_ARG_0] = await decryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", $$ACTION_CLOSURE_BOUND);
-    return $$ACTION_ARG_0 + y + z[0];
-}
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/17/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/17/output.js
@@ -1,7 +1,6 @@
-/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo","ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { registerServerReference } from "private-next-rsc-server-reference";
+/* __next_internal_action_entry_do_not_use__ {"ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo","ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
-export const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
-export async function $$RSC_SERVER_ACTION_0() {}
+export const foo = async ()=>{};
 const bar = async ()=>{};
 export { bar };
 import { ensureServerEntryExports } from "private-next-rsc-action-validate";

diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/18/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/18/output.js
@@ -1,7 +1,19 @@
-/* __next_internal_action_entry_do_not_use__ {"1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91":"$$RSC_SERVER_ACTION_2","6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
+/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
 import deleteFromDb from 'db';
 const v1 = 'v1';
+export const $$RSC_SERVER_ACTION_0 = async function action($$ACTION_CLOSURE_BOUND) {
+    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
+    await deleteFromDb($$ACTION_ARG_0);
+    await deleteFromDb(v1);
+    await deleteFromDb($$ACTION_ARG_1);
+};
+export const $$RSC_SERVER_ACTION_1 = async function action($$ACTION_CLOSURE_BOUND) {
+    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$ACTION_CLOSURE_BOUND);
+    await deleteFromDb($$ACTION_ARG_0);
+    await deleteFromDb(v1);
+    await deleteFromDb($$ACTION_ARG_1);
+};
 export function Item({ id1, id2 }) {
     const v2 = id2;
     return <>
@@ -11,23 +23,11 @@ export function Item({ id1, id2 }) {
     ]))}>
         Delete
       </Button>
-      <Button action={registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null).bind(null, encryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", [
+      <Button action={registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
         id1,
         v2
     ]))}>
         Delete
       </Button>
     </>;
 }
-export async function $$RSC_SERVER_ACTION_0($$ACTION_CLOSURE_BOUND) {
-    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
-    await deleteFromDb($$ACTION_ARG_0);
-    await deleteFromDb(v1);
-    await deleteFromDb($$ACTION_ARG_1);
-}
-export async function $$RSC_SERVER_ACTION_2($$ACTION_CLOSURE_BOUND) {
-    var [$$ACTION_ARG_0, $$ACTION_ARG_1] = await decryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", $$ACTION_CLOSURE_BOUND);
-    await deleteFromDb($$ACTION_ARG_0);
-    await deleteFromDb(v1);
-    await deleteFromDb($$ACTION_ARG_1);
-}
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/19/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/19/output.js
@@ -1,5 +1,9 @@
 /* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
+export const $$RSC_SERVER_ACTION_0 = async function action($$ACTION_CLOSURE_BOUND, value2) {
+    var [$$ACTION_ARG_0] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
+    return $$ACTION_ARG_0 * value2;
+};
 export function Item({ value }) {
     return <>
       <Button action={registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
@@ -9,7 +13,3 @@ export function Item({ value }) {
       </Button>
     </>;
 }
-export async function $$RSC_SERVER_ACTION_0($$ACTION_CLOSURE_BOUND, value2) {
-    var [$$ACTION_ARG_0] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
-    return $$ACTION_ARG_0 * value2;
-}
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/2/input.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/2/input.js
@@ -7,6 +7,7 @@ export default function Page() {
   return <Button action={myAction}>Delete</Button>
 }
 
+// TODO: should use `action` as function name?
 export const action = withValidate(async () => {
   'use server'
 })
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/2/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/2/output.js
@@ -1,11 +1,12 @@
 /* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
-var myAction = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
-export async function $$RSC_SERVER_ACTION_0(a, b, c) {
+export const $$RSC_SERVER_ACTION_0 = async function myAction(a, b, c) {
     console.log('a');
-}
+};
+var myAction = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
 export default function Page() {
     return <Button action={myAction}>Delete</Button>;
 }
+export const $$RSC_SERVER_ACTION_1 = async function() {};
+// TODO: should use `action` as function name?
 export const action = withValidate(registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null));
-export async function $$RSC_SERVER_ACTION_1() {}
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/21/input.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/21/input.js
@@ -6,6 +6,7 @@ export default function Page() {
   const y = 1
   return (
     <Foo
+      // TODO: should use `action` as function name?
       action={validator(async function (z) {
         'use server'
         return x + y + z

diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/21/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/21/output.js
@@ -1,18 +1,19 @@
-/* __next_internal_action_entry_do_not_use__ {"1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91":"$$RSC_SERVER_ACTION_2","90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1","9ed0cc47abc4e1c64320cf42b74ae60b58c40f00":"$$RSC_SERVER_ACTION_3"} */ import { registerServerReference } from "private-next-rsc-server-reference";
+/* __next_internal_action_entry_do_not_use__ {"1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91":"$$RSC_SERVER_ACTION_2","6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
 import { validator, another } from 'auth';
 const x = 1;
+export const $$RSC_SERVER_ACTION_0 = async function($$ACTION_CLOSURE_BOUND, z) {
+    var [$$ACTION_ARG_0] = await decryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$ACTION_CLOSURE_BOUND);
+    return x + $$ACTION_ARG_0 + z;
+};
 export default function Page() {
     const y = 1;
-    return <Foo action={validator(registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
+    return <Foo // TODO: should use `action` as function name?
+    action={validator(registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
         y
     ])))}/>;
 }
-export async function $$RSC_SERVER_ACTION_1($$ACTION_CLOSURE_BOUND, z) {
-    var [$$ACTION_ARG_0] = await decryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$ACTION_CLOSURE_BOUND);
-    return x + $$ACTION_ARG_0 + z;
-}
-validator(registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null));
-export async function $$RSC_SERVER_ACTION_2() {}
-another(validator(registerServerReference($$RSC_SERVER_ACTION_3, "9ed0cc47abc4e1c64320cf42b74ae60b58c40f00", null)));
-export async function $$RSC_SERVER_ACTION_3() {}
+export const $$RSC_SERVER_ACTION_1 = async function() {};
+validator(registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null));
+export const $$RSC_SERVER_ACTION_2 = async function() {};
+another(validator(registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null)));
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/server/22/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/server/22/output.js
@@ -1,15 +1,17 @@
-/* __next_internal_action_entry_do_not_use__ {"1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91":"$$RSC_SERVER_ACTION_2","6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default","f14702b5a021dd117f7ec7a3c838f397c2046d3b":"action"} */ import { registerServerReference } from "private-next-rsc-server-reference";
+/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default","f14702b5a021dd117f7ec7a3c838f397c2046d3b":"action"} */ import { registerServerReference } from "private-next-rsc-server-reference";
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
 import { validator } from 'auth';
-export const action = validator(registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null));
-export async function $$RSC_SERVER_ACTION_0() {}
-export default $$RSC_SERVER_ACTION_1 = validator(registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null));
-var $$RSC_SERVER_ACTION_1;
-export async function $$RSC_SERVER_ACTION_2() {}
+export const action = validator(async ()=>{});
+export default $$RSC_SERVER_ACTION_0 = validator(async ()=>{});
+var $$RSC_SERVER_ACTION_0;
+Object.defineProperty($$RSC_SERVER_ACTION_0, "name", {
+    "value": "default",
+    "writable": false
+});
 import { ensureServerEntryExports } from "private-next-rsc-action-validate";
 ensureServerEntryExports([
     action,
-    $$RSC_SERVER_ACTION_1
+    $$RSC_SERVER_ACTION_0
 ]);
 registerServerReference(action, "f14702b5a021dd117f7ec7a3c838f397c2046d3b", null);
-registerServerReference($$RSC_SERVER_ACTION_1, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);
+registerServerReference($$RSC_SERVER_ACTION_0, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);