@reckona/mreact-router 0.0.73 → 0.0.75

package/src/client.ts

@@ -29,7 +29,7 @@ import {
 } from "./bundle-pipeline.js";
 import type { AppRoute } from "./routes.js";
 import { existingRouteShellCandidates } from "./route-shells.js";
-import { stripRouteClientOnlyExports } from "./route-source.js";
+import { stripRouteClientSource } from "./route-source.js";
 import { hasJsxSyntax } from "./source-jsx.js";
 import { sourceModuleCandidates } from "./source-modules.js";
 import { escapeHtmlQuotedAttribute as escapeHtmlAttribute } from "@reckona/mreact-shared/html-escape";
@@ -147,7 +147,7 @@ export async function routeToClientManifestEntry(
 
   const code = await readFile(route.file, "utf8");
   const inference = await inferClientRouteModule({
-    code: stripRouteClientOnlyExports(code),
+    code: stripRouteClientSource({ code, filename: route.file }),
     filename: route.file,
     routePath: route.path,
   });
@@ -311,9 +311,10 @@ export async function collectClientRouteReferences(options: {
     });
 
     for (const referenceFile of inference.clientReferenceSourceFiles) {
-      const code = stripRouteClientOnlyExports(
-        await readClientRouteSource({ cache, filename: referenceFile, sourceTransform }),
-      );
+      const code = stripRouteClientSource({
+        code: await readClientRouteSource({ cache, filename: referenceFile, sourceTransform }),
+        filename: referenceFile,
+      });
       await addSource({ code, filename: referenceFile });
     }
   };
@@ -327,9 +328,10 @@ export async function collectClientRouteReferences(options: {
 
   if (options.appDir !== undefined) {
     for (const shell of await clientShellFilesForPage(options.appDir, options.filename)) {
-      const code = stripRouteClientOnlyExports(
-        await readClientRouteSource({ cache, filename: shell, sourceTransform }),
-      );
+      const code = stripRouteClientSource({
+        code: await readClientRouteSource({ cache, filename: shell, sourceTransform }),
+        filename: shell,
+      });
       const moduleContext = await compilerModuleContextForSource({
         cache,
         code,
@@ -419,13 +421,14 @@ async function inferClientRouteShellModules(options: {
 }): Promise<ClientRouteInferenceResult[]> {
   return Promise.all(
     (await clientShellFilesForPage(options.appDir, options.filename)).map(async (shell) => {
-      const code = stripRouteClientOnlyExports(
-        await readClientRouteSource({
+      const code = stripRouteClientSource({
+        code: await readClientRouteSource({
           cache: options.cache,
           filename: shell,
           sourceTransform: options.sourceTransform,
         }),
-      );
+        filename: shell,
+      });
       return await inferClientRouteModuleSource({
         cache: options.cache,
         code,

package/src/index.ts

@@ -157,6 +157,7 @@ export {
 export type {
   AppRouterAllowedServerAction,
   AppRouterServerActionOptions,
+  PreparedFormActionReference,
 } from "./actions.js";
 /**
  * @deprecated Import session helpers and types from `@reckona/mreact-auth` instead.

package/src/render.ts

@@ -45,6 +45,7 @@ import type { AppRoute, RouteMatcher } from "./routes.js";
 import { appFileConventionContentType, type AppFileConvention } from "./file-conventions.js";
 import {
   type AppRouterServerActionOptions,
+  type PreparedFormActionReference,
   dispatchServerActionRequest,
   prepareRouteServerActions,
 } from "./actions.js";
@@ -148,6 +149,10 @@ export interface RenderAppRequestOptions {
   serverModuleCacheVersion?: string | undefined;
   serverSourceFiles?: ReadonlyMap<string, string> | undefined;
   serverActions?: AppRouterServerActionOptions | undefined;
+  serverActionReferencesByFile?: ReadonlyMap<
+    string,
+    readonly PreparedFormActionReference[]
+  > | undefined;
   skipMiddleware?: boolean | undefined;
   preload?: AppRouterRenderPreload | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -904,9 +909,13 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
     const preparedActions = await prepareRouteServerActions({
       appDir: options.appDir,
       code: originalCode,
+      formActionReferences: options.serverActionReferencesByFile?.get(matched.route.file),
       pageFile: matched.route.file,
       request: options.request,
     });
+    for (const diagnostic of preparedActions.diagnostics ?? []) {
+      console.warn(`${diagnostic.code}: ${diagnostic.message}`);
+    }
     finishRenderTimingPhase(timing, phaseStartedAt, "serverActionsMs");
     const code = preparedActions.code;
     phaseStartedAt = renderTimingPhaseStartedAt(timing);

package/src/route-source.ts

@@ -1,5 +1,6 @@
 import { dirname, isAbsolute, join } from "node:path";
 import {
+  collectFormActionExpressionReferences,
   collectTopLevelValueExportNames,
   collectJsxComponentRootNames,
   collectStaticImportReferences,
@@ -49,6 +50,30 @@ export function stripRouteClientOnlyExports(code: string): string {
   }));
 }
 
+export function stripRouteClientSource(input: {
+  code: string;
+  filename?: string | undefined;
+}): string {
+  return stripRouteClientFormActionExpressions({
+    code: stripRouteClientOnlyExports(input.code),
+    filename: input.filename,
+  });
+}
+
+export function stripRouteClientFormActionExpressions(input: {
+  code: string;
+  filename?: string | undefined;
+}): string {
+  const references = collectFormActionExpressionReferences(input);
+  let code = input.code;
+
+  for (const reference of [...references].reverse()) {
+    code = `${code.slice(0, reference.expressionStart)}undefined${code.slice(reference.expressionEnd)}`;
+  }
+
+  return code;
+}
+
 export function stripRouteBuildExports(code: string): string {
   return stripRouteClientOnlyExports(code);
 }

package/src/serve.ts

@@ -50,6 +50,20 @@ interface BuiltRuntime {
   prerenderedRoutes: Map<string, BuiltPrerenderedRoute>;
   routeMatcher: RouteMatcher;
   routes: readonly AppRoute[];
+  serverActionReferencesByFile: ReadonlyMap<
+    string,
+    readonly {
+      end: number;
+      expression: string;
+      expressionEnd: number;
+      expressionStart: number;
+      moduleId: string;
+      exportName: string;
+      inferred: boolean;
+      sourceHash: string;
+      start: number;
+    }[]
+  >;
   serverActionManifest?: readonly { moduleId: string; exportName: string; inferred?: boolean }[] | undefined;
   serverModuleArtifactLoads: Map<string, Promise<void>>;
   serverModuleFiles: ReadonlyMap<string, string>;
@@ -701,6 +715,12 @@ async function materializeBuiltRuntime(options: {
   const serverSourceFiles = new Map(
     Object.entries(serverManifest.files).map(([file, source]) => [join(appDir, file), source]),
   );
+  const serverActionReferencesByFile = new Map(
+    Object.entries(serverManifest.routeServerActionReferences ?? {}).map(([file, references]) => [
+      join(appDir, file),
+      references,
+    ]),
+  );
   const routeMatcher = createRouteMatcher(routes);
   const clientScripts = new Map(
     clientManifest.routes.flatMap((route) =>
@@ -752,6 +772,7 @@ async function materializeBuiltRuntime(options: {
     prerenderedRoutes,
     routeMatcher,
     routes,
+    serverActionReferencesByFile,
     ...(serverManifest.serverActionManifest === undefined
       ? {}
       : { serverActionManifest: serverManifest.serverActionManifest }),
@@ -1070,6 +1091,7 @@ function builtRenderAppRequestOptions(
     serverModules: options.runtime.serverModules,
     serverModuleCacheVersion: options.runtime.serverModuleCacheVersion,
     serverSourceFiles: options.runtime.serverSourceFiles,
+    serverActionReferencesByFile: options.runtime.serverActionReferencesByFile,
     serverActions: mergeBuiltServerActionOptions(
       options.serverActions,
       options.runtime.serverActionManifest,