@reckona/mreact-router 0.0.73 → 0.0.74

package/dist/build.js

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 import { copyFile, cp, mkdir, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { builtinModules } from "node:module";
 import { dirname, join, relative, sep } from "node:path";
-import { collectFormActionReferenceNames, collectStaticImportReferences, collectTopLevelValueExportNames, formatDiagnostic, hasModuleDirective, transform, } from "@reckona/mreact-compiler";
+import { collectStaticImportReferences, collectTopLevelValueExportNames, formatDiagnostic, hasModuleDirective, transform, } from "@reckona/mreact-compiler";
 import { transformCompilerModuleContext } from "@reckona/mreact-compiler/internal";
 import { buildClientRouteBatchOutput, buildNavigationRuntimeBundle, clientScriptForPath, compilerModuleContextForSource, collectClientRouteReferences, createClientRouteInferenceCache, detectClientNavigationHint, detectNavigationRuntimeHint, formatClientRouteInferenceDiagnostic, inferClientRouteModule, routeIdForPath, } from "./client.js";
 import { bundleAppRouterSourceModule, importAppRouterSourceModule } from "./module-runner.js";
@@ -12,11 +12,12 @@ import { resolveAppRouterProjectOptions, resolveBuildTargets, } from "./config.j
 import { routeCachePolicyFromSource } from "./cache.js";
 import { bundleMiddlewareModuleCode, renderAppRequest } from "./render.js";
 import { createAppRouterImportPolicyPlugin } from "./import-policy.js";
-import { hasGenerateStaticParamsExport, hasLoaderExport, hasPrerenderExport, isStreamRouteSource, routeClosureMayUseAwaitBoundary, stripRouteBuildExports, stripRouteClientOnlyExports, stripRouteLoaderOnlyExports, stripRouteMetadataOnlyExports, stripRouteRequestOnlyExports, } from "./route-source.js";
+import { hasGenerateStaticParamsExport, hasLoaderExport, hasPrerenderExport, isStreamRouteSource, routeClosureMayUseAwaitBoundary, stripRouteBuildExports, stripRouteClientOnlyExports, stripRouteClientSource, stripRouteLoaderOnlyExports, stripRouteMetadataOnlyExports, stripRouteRequestOnlyExports, } from "./route-source.js";
 import { bundleRouterModule, } from "./bundle-pipeline.js";
 import { collectRouteCssFiles } from "./route-styles.js";
 import { existingRouteShellCandidates } from "./route-shells.js";
 import { sourceModuleCandidates } from "./source-modules.js";
+import { collectBuildInferredServerActions } from "./server-action-inference.js";
 import { workspacePackageFile } from "./workspace-packages.js";
 const nativeEscapeTransform = {
     batchImportName: "escapeHtmlBatch",
@@ -48,7 +49,7 @@ export async function buildApp(options) {
     const publicAssets = [
         ...new Set([...(await collectPublicAssetPaths(project.publicDir)), ...appConventionPublicAssets]),
     ].sort();
-    const serverActionManifest = collectBuildServerActionManifest({
+    const serverActionManifest = await collectBuildServerActionManifest({
         files,
         projectRoot: project.projectRoot,
         routes,
@@ -116,6 +117,7 @@ export async function buildApp(options) {
             vitePlugins,
         });
     }
+    const routeServerActionReferences = Object.fromEntries([...serverActionManifest.routeReferences.entries()].sort(([left], [right]) => left.localeCompare(right)));
     const serverManifest = {
         allowedSourceDirs: project.allowedSourceDirs.map((directory) => relative(project.projectRoot, directory)),
         ...(project.assetBaseUrl === undefined ? {} : { assetBaseUrl: project.assetBaseUrl }),
@@ -127,7 +129,12 @@ export async function buildApp(options) {
         ...(project.publicAssetBaseUrl === undefined
             ? {}
             : { publicAssetBaseUrl: project.publicAssetBaseUrl }),
-        ...(serverActionManifest.length === 0 ? {} : { serverActionManifest }),
+        ...(Object.keys(routeServerActionReferences).length === 0
+            ? {}
+            : { routeServerActionReferences }),
+        ...(serverActionManifest.allowedActions.length === 0
+            ? {}
+            : { serverActionManifest: serverActionManifest.allowedActions }),
         ...(Object.keys(serverModuleArtifacts.files).length === 0
             ? {}
             : { serverModuleFiles: serverModuleArtifacts.files }),
@@ -343,8 +350,9 @@ function runtimePackageNameForSpecifier(specifier) {
     const [scope, name] = specifier.split("/");
     return scope !== undefined && name !== undefined ? `${scope}/${name}` : specifier;
 }
-function collectBuildServerActionManifest(options) {
+async function collectBuildServerActionManifest(options) {
     const entries = new Map();
+    const routeReferences = new Map();
     const relativeRoutesDir = relative(options.projectRoot, options.routesDir);
     const routeSourceFiles = new Set(options.routes
         .filter((route) => route.kind === "page")
@@ -360,56 +368,46 @@ function collectBuildServerActionManifest(options) {
             }
         }
         if (routeSourceFiles.has(file)) {
-            for (const reference of collectBuildInferredServerActionReferences({
+            const inference = await collectBuildInferredServerActionReferences({
                 file,
                 files: options.files,
                 relativeRoutesDir,
                 source: code,
-            })) {
+            });
+            for (const diagnostic of inference.diagnostics) {
+                console.warn(formatServerActionInferenceDiagnostic(diagnostic));
+            }
+            routeReferences.set(file, inference.references);
+            for (const reference of inference.references) {
                 const key = `${reference.moduleId}#${reference.exportName}`;
                 if (!entries.has(key)) {
-                    entries.set(key, reference);
+                    entries.set(key, {
+                        exportName: reference.exportName,
+                        inferred: reference.inferred,
+                        moduleId: reference.moduleId,
+                    });
                 }
             }
         }
     }
-    return [...entries.values()].sort((left, right) => left.moduleId === right.moduleId
-        ? left.exportName.localeCompare(right.exportName)
-        : left.moduleId.localeCompare(right.moduleId));
+    return {
+        allowedActions: [...entries.values()].sort((left, right) => left.moduleId === right.moduleId
+            ? left.exportName.localeCompare(right.exportName)
+            : left.moduleId.localeCompare(right.moduleId)),
+        routeReferences,
+    };
 }
 function collectBuildInferredServerActionReferences(options) {
-    const actionNames = collectFormActionNames(options.source);
-    if (actionNames.size === 0) {
-        return [];
-    }
-    const references = [];
-    for (const match of options.source.matchAll(/^import\s+\{\s*(?<specifiers>[^}]+)\s*\}\s+from\s+["'](?<source>[^"']+)["'];?/gm)) {
-        const source = match.groups?.source;
-        const specifiers = match.groups?.specifiers;
-        if (source === undefined || specifiers === undefined || !source.startsWith(".")) {
-            continue;
-        }
-        const localFile = resolveBuildLocalSourceImport(options.files, options.file, source);
-        if (localFile === undefined) {
-            continue;
-        }
-        const moduleId = moduleIdForBuildFile(localFile, options.relativeRoutesDir);
-        for (const specifier of specifiers.split(",")) {
-            const [exportName, localName] = specifier.trim().split(/\s+as\s+/);
-            const imported = exportName?.trim();
-            const local = localName?.trim() ?? imported;
-            if (imported !== undefined &&
-                imported.length > 0 &&
-                local !== undefined &&
-                actionNames.has(local)) {
-                references.push({ moduleId, exportName: imported, inferred: true });
-            }
-        }
-    }
-    return references;
+    return collectBuildInferredServerActions({
+        file: options.file,
+        files: options.files,
+        relativeRoutesDir: options.relativeRoutesDir,
+        resolveSourceImport: (importer, source) => resolveBuildLocalSourceImport(options.files, importer, source),
+        source: options.source,
+    });
 }
-function collectFormActionNames(code) {
-    return new Set(collectFormActionReferenceNames({ code }));
+function formatServerActionInferenceDiagnostic(diagnostic) {
+    return `${diagnostic.code}: ${diagnostic.message}`;
 }
 function isSourceModuleFile(file) {
     return /\.(?:mreact\.tsx|tsx?|jsx?|mjs|mts|cjs|cts)$/.test(file);
@@ -667,7 +665,9 @@ async function buildServerModuleArtifacts(options) {
         const clientInference = await inferClientRouteModule({
             ...(route === undefined ? {} : { appDir: options.project.routesDir }),
             cache: options.clientRouteInferenceCache,
-            code: stripRouteClientOnlyExports(source),
+            code: route === undefined
+                ? stripRouteClientOnlyExports(source)
+                : stripRouteClientSource({ code: source, filename: route.file }),
             filename: join(options.projectRoot, file),
             ...(route === undefined ? {} : { routePath: route.path }),
             vitePlugins: options.vitePlugins,
@@ -1781,7 +1781,7 @@ async function writeClientRouteBundles(options) {
             vitePlugins: options.vitePlugins,
         });
         const source = await readFile(route.file, "utf8");
-        const clientSource = stripRouteClientOnlyExports(source);
+        const clientSource = stripRouteClientSource({ code: source, filename: route.file });
         const navigation = detectNavigationRuntimeHint(source);
         const references = await collectClientRouteReferences({
             appDir: options.appDir,