Unwrap registerServerReference function

In the same vein as #69190, where we already unwrapped
`createServerReference`, we now also unwrap `registerServerReference`,
which is required for React to select the right call stack frame when
generating source locations for server actions facebook/react#30741.

Whereas unwrapping of `createServerReference` was required for server
actions that are imported into client components, unwrapping
`registerServerReference` is needed for server actions that are passed
from server components to client components.

This does not fully enable the source mapping just yet. For this to work
end-to-end, the next step is to generate proper spans in the SWC
transform, which will be done in the next PR.

Author: unstubbable

crates/next-custom-transforms/src/transforms/server_actions.rs

@@ -1626,7 +1626,6 @@ impl<C: Comments> VisitMut for ServerActions<C> {
         if (self.has_action || self.has_cache) && self.config.is_react_server_layer {
             // Inlined actions are only allowed on the server layer.
             // import { registerServerReference } from 'private-next-rsc-server-reference'
-            // registerServerReference("action_id")
             new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
                 span: DUMMY_SP,
                 specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier {
@@ -1825,21 +1824,22 @@ fn annotate_ident_as_server_reference(
     bound: Vec<Option<ExprOrSpread>>,
     action_id: String,
 ) -> Expr {
-    // Add the proxy wrapper call `registerServerReference($$id, $$bound, myAction,
-    // maybe_orig_action)`.
-
+    // registerServerReference(reference, id, null)
     let proxy_expr = Expr::Call(CallExpr {
         span: DUMMY_SP,
         callee: quote_ident!("registerServerReference").as_callee(),
         args: vec![
-            // $$id
+            ExprOrSpread {
+                spread: None,
+                expr: Box::new(Expr::Ident(ident)),
+            },
             ExprOrSpread {
                 spread: None,
                 expr: Box::new(action_id.clone().into()),
             },
             ExprOrSpread {
                 spread: None,
-                expr: Box::new(Expr::Ident(ident)),
+                expr: Box::new(Expr::Lit(Lit::Null(Null { span: DUMMY_SP }))),
             },
         ],
         ..Default::default()

crates/next-custom-transforms/tests/errors/server-actions/client-graph/1/output.js

@@ -1,5 +1,5 @@
 /* __next_internal_client_entry_do_not_use__ default auto */ /* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ export default function App() {
-    var fn = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
+    var fn = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
     return <div>App</div>;
 }
 export async function $$RSC_SERVER_ACTION_0() {}

crates/next-custom-transforms/tests/errors/server-actions/server-graph/1/output.js

@@ -5,4 +5,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
 ensureServerEntryExports([
     foo
 ]);
-registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo);
+registerServerReference(foo, "ab21efdafbe611287bc25c0462b1e0510d13e48b", null);

crates/next-custom-transforms/tests/errors/server-actions/server-graph/2/output.js

@@ -6,4 +6,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
 ensureServerEntryExports([
     bar
 ]);
-registerServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar);
+registerServerReference(bar, "ac840dcaf5e8197cb02b7f3a43c119b7a770b272", null);

crates/next-custom-transforms/tests/errors/server-actions/server-graph/3/output.js

@@ -5,4 +5,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
 ensureServerEntryExports([
     x
 ]);
-registerServerReference("b78c261f135a7a852508c2920bd7228020ff4bd7", x);
+registerServerReference(x, "b78c261f135a7a852508c2920bd7228020ff4bd7", null);

crates/next-custom-transforms/tests/errors/server-actions/server-graph/6/output.js

@@ -1,6 +1,6 @@
 /* __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 default registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
+export default registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
 export async function $$RSC_SERVER_ACTION_0() {}
 import { ensureServerEntryExports } from "private-next-rsc-action-validate";
 ensureServerEntryExports([]);

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";
-const foo = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
+const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
 export async function $$RSC_SERVER_ACTION_0() {}

crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/output.js

@@ -1,6 +1,6 @@
 /* __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("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
+const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
 export async function $$RSC_SERVER_ACTION_0() {
     'use strict';
 }

crates/next-custom-transforms/tests/fixture/server-actions/server/1/output.js

@@ -2,7 +2,7 @@
 import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
 import deleteFromDb from 'db';
 export function Item({ id1, id2 }) {
-    var deleteItem = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
+    var deleteItem = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
         id1,
         id2
     ]));
@@ -18,7 +18,7 @@ export default function Home() {
         name: 'John',
         test: 'test'
     };
-    const action = registerServerReference("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$RSC_SERVER_ACTION_1).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
+    const action = registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
         info.name,
         info.test
     ]));

crates/next-custom-transforms/tests/fixture/server-actions/server/10/output.js

@@ -5,4 +5,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
 ensureServerEntryExports([
     foo
 ]);
-registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo);
+registerServerReference(foo, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);