fix(rsc): expose wrapped directive hoists

Author: james-elicx

packages/plugin-rsc/src/plugins/server-function-directives.test.ts

@@ -109,14 +109,15 @@ export async function getData() {
     expect(result?.code).toMatchInlineSnapshot(`
       "/* __vite_rsc_server_function_directives__ */
       import * as $$ReactServer from "/rsc-runtime.js";
+      export const $$hoist_e9c2205b6101_0_getData = /* #__PURE__ */ $$ReactServer.registerServerReference(cache($$hoist_e9c2205b6101_0_getData$$impl, "use cache", "inline"), "53eb073e2100", "$$hoist_e9c2205b6101_0_getData");
 
-      export const getData = /* #__PURE__ */ $$ReactServer.registerServerReference(cache($$hoist_e9c2205b6101_0_getData, "use cache", "inline"), "53eb073e2100", "$$hoist_e9c2205b6101_0_getData");
+      export const getData = $$hoist_e9c2205b6101_0_getData;
 
-      ;export async function $$hoist_e9c2205b6101_0_getData() {
+      ;async function $$hoist_e9c2205b6101_0_getData$$impl() {
         "use cache";
         return 1;
       };
-      /* #__PURE__ */ Object.defineProperty($$hoist_e9c2205b6101_0_getData, "name", { value: "getData" });
+      /* #__PURE__ */ Object.defineProperty($$hoist_e9c2205b6101_0_getData$$impl, "name", { value: "getData" });
       "
     `)
     expect(
@@ -147,16 +148,17 @@ export async function outer(value) {
       "/* __vite_rsc_server_function_directives__ */
       import * as $$ReactServer from "/rsc-runtime.js";
       import * as __vite_rsc_encryption_runtime from "/encryption-runtime.js";
+      export const $$hoist_ab3ae7af371a_0_cached = /* #__PURE__ */ $$ReactServer.registerServerReference((($$wrapped) => async ($$encoded, ...$$args) => $$wrapped(...await __vite_rsc_encryption_runtime.decryptActionBoundArgs($$encoded), ...$$args))(cache($$hoist_ab3ae7af371a_0_cached$$impl)), "53eb073e2100", "$$hoist_ab3ae7af371a_0_cached");
 
       export async function outer(value) {
-        return /* #__PURE__ */ $$ReactServer.registerServerReference((($$wrapped) => async ($$encoded, ...$$args) => $$wrapped(...await __vite_rsc_encryption_runtime.decryptActionBoundArgs($$encoded), ...$$args))(cache($$hoist_ab3ae7af371a_0_cached)), "53eb073e2100", "$$hoist_ab3ae7af371a_0_cached").bind(null, __vite_rsc_encryption_runtime.encryptActionBoundArgs([value]));
+        return $$hoist_ab3ae7af371a_0_cached.bind(null, __vite_rsc_encryption_runtime.encryptActionBoundArgs([value]));
       }
 
-      ;export async function $$hoist_ab3ae7af371a_0_cached(value) {
+      ;async function $$hoist_ab3ae7af371a_0_cached$$impl(value) {
           "use cache";
           return value;
         };
-      /* #__PURE__ */ Object.defineProperty($$hoist_ab3ae7af371a_0_cached, "name", { value: "cached" });
+      /* #__PURE__ */ Object.defineProperty($$hoist_ab3ae7af371a_0_cached$$impl, "name", { value: "cached" });
       "
     `)
     expect(wrap).toHaveBeenCalledWith(

packages/plugin-rsc/src/plugins/server-function-directives.ts

@@ -347,6 +347,7 @@ export function vitePluginServerFunctionDirectives(options: Options): Plugin {
               return `__vite_rsc_encryption_runtime.encryptActionBoundArgs(${value})`
             },
             stableName: true,
+            exportWrappedHoist: !useServerBoundary,
             detectUseServerModule: false,
             rejectForbiddenExpressions: true,
           })

packages/plugin-rsc/src/transforms/hoist.ts

@@ -35,6 +35,7 @@ export function transformHoistInlineDirective(
     encode?: (value: string) => string
     decode?: (value: string) => string
     noExport?: boolean
+    exportWrappedHoist?: boolean
     stableName?: boolean
     rejectForbiddenExpressions?: boolean
   },
@@ -163,32 +164,44 @@ export function transformHoistInlineDirective(
         const newName =
           `$$hoist_${nameKey}` + (originalName ? `_${originalName}` : '')
         names.push(newName)
+        const implementationName = options.exportWrappedHoist
+          ? `${newName}$$impl`
+          : newName
         output.update(
           node.start,
           node.body.start,
-          `\n;${options.noExport ? '' : 'export '}${
+          `\n;${options.noExport || options.exportWrappedHoist ? '' : 'export '}${
             node.async ? 'async ' : ''
-          }function${node.generator ? '*' : ''} ${newName}(${newParams}) `,
+          }function${node.generator ? '*' : ''} ${implementationName}(${newParams}) `,
         )
         output.appendLeft(
           node.end,
-          `;\n/* #__PURE__ */ Object.defineProperty(${newName}, "name", { value: ${JSON.stringify(
+          `;\n/* #__PURE__ */ Object.defineProperty(${implementationName}, "name", { value: ${JSON.stringify(
             originalName,
           )} });\n`,
         )
         output.move(node.start, node.end, input.length)
 
         // replace original declartion with action register + bind
-        let newCode = `/* #__PURE__ */ ${runtime(newName, newName, {
-          directiveMatch: match,
-          hasBoundArgs: bindVars.length > 0,
-          parameters: {
-            count: node.params.length,
-            hasRest: node.params.some(
-              (parameter) => parameter.type === 'RestElement',
-            ),
+        let wrappedCode = `/* #__PURE__ */ ${runtime(
+          implementationName,
+          newName,
+          {
+            directiveMatch: match,
+            hasBoundArgs: bindVars.length > 0,
+            parameters: {
+              count: node.params.length,
+              hasRest: node.params.some(
+                (parameter) => parameter.type === 'RestElement',
+              ),
+            },
           },
-        })}`
+        )}`
+        let newCode = wrappedCode
+        if (options.exportWrappedHoist) {
+          output.prepend(`export const ${newName} = ${wrappedCode};\n`)
+          newCode = newName
+        }
         if (bindVars.length > 0) {
           const bindArgs = options.encode
             ? options.encode('[' + bindVars.map((b) => b.expr).join(', ') + ']')

packages/plugin-rsc/src/transforms/server-action.ts

@@ -26,6 +26,7 @@ export function transformServerActionServer(
     encode?: (value: string) => string
     decode?: (value: string) => string
     stableName?: boolean
+    exportWrappedHoist?: boolean
     preserveModuleDirective?: boolean
     detectUseServerModule?: boolean
     rejectForbiddenExpressions?: boolean
@@ -80,6 +81,7 @@ export function transformServerActionServer(
     encode: options.encode,
     decode: options.decode,
     stableName: options.stableName,
+    exportWrappedHoist: options.exportWrappedHoist,
     rejectForbiddenExpressions: options.rejectForbiddenExpressions,
   })
 }