@reckona/mreact-router 0.0.30 → 0.0.32

package/dist/render.js

@@ -5,19 +5,20 @@ import { dirname, join, relative, sep } from "node:path";
 import { transform, } from "@reckona/mreact-compiler";
 import { createQueryClient, dehydrate, __MREACT_QUERY_STATE_SCRIPT_ID, runWithQueryClient, } from "@reckona/mreact-query";
 import { createStringSink, renderAsyncBoundary, renderOutOfOrderReorderScript, renderToReadableStream, } from "@reckona/mreact-server";
-import { hydrationMarkerParts, inferClientRouteModule, routeIdForPath, withHydrationMarkers, withRouteMarkers, } from "./client.js";
+import { createClientRouteInferenceCache, hydrationMarkerParts, formatClientRouteInferenceDiagnostic, inferClientRouteModule, routeIdForPath, withHydrationMarkers, withRouteMarkers, } from "./client.js";
 import { assetPath } from "./assets.js";
 import { escapeHtmlAttribute, escapeHtmlText as escapeHtml, } from "@reckona/mreact-shared/html-escape";
 import { matchRoute, scanAppRoutes } from "./routes.js";
 import { dispatchServerActionRequest, prepareRouteServerActions, serverActionCookie, } from "./actions.js";
 import { beginRouteCacheContext, cachedRouteResponse, cacheRouteResponse, routeCacheKey, routeCachePolicyFromSource, } from "./cache.js";
 import { resolveRouterCacheLimit } from "./cache-config.js";
-import { importAppRouterFileModule, importAppRouterSourceModule } from "./module-runner.js";
+import { importAppRouterBuiltFileModule, importAppRouterFileModule, importAppRouterSourceModule, } from "./module-runner.js";
 import { contentSecurityPolicy } from "./csp.js";
 import { htmlResponse } from "./http.js";
 import { isNotFoundError, isRedirectError, rewriteLocation } from "./navigation.js";
 import { createAppRouterImportPolicyPlugin } from "./import-policy.js";
-import { hasLoaderExport, isStreamRouteSource, stripRouteLoaderOnlyExports, stripRouteMetadataOnlyExports, stripRouteModuleExports, } from "./route-source.js";
+import { existingRouteShellCandidates } from "./route-shells.js";
+import { hasLoaderExport, isStreamRouteSource, stripRouteClientOnlyExports, stripRouteLoaderOnlyExports, stripRouteMetadataOnlyExports, stripRouteModuleExports, } from "./route-source.js";
 import { emitRouterLog, logDurationMs, logNow } from "./logger.js";
 import { createRouterRuntimeCacheCounters, readRouterRuntimeCacheEntry, routerRuntimeCacheStat, } from "./cache-stats.js";
 import { bundleRouterModule } from "./bundle-pipeline.js";
@@ -29,6 +30,7 @@ const nativeEscapeTransform = {
 const authRuntimeStateKey = "__mreactAuthRuntimeState";
 const authSessionScriptId = "__mreact_auth_session";
 export async function preloadBuiltRequestModules(options) {
+    const clientRouteInferenceCache = createClientRouteInferenceCache();
     const middlewareFiles = [
         join(options.appDir, "middleware.ts"),
         join(options.appDir, "middleware.mreact.ts"),
@@ -58,10 +60,12 @@ export async function preloadBuiltRequestModules(options) {
         }
         if (options.includeRenderModules !== false) {
             const analysis = await analyzeRouteSource({
+                appDir: options.appDir,
                 artifact: options.serverModules?.get(route.file)?.analysis,
                 code,
                 filename: route.file,
                 routePath: route.path,
+                clientRouteInferenceCache,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
             });
             await preloadBuiltPageRouteModules({
@@ -251,6 +255,19 @@ async function waitForRenderPreload(options, timing) {
         finishRenderTimingPhase(timing, phaseStartedAt, "preloadWaitMs");
     }
 }
+async function loadServerRenderArtifacts(options, routeFile, timing) {
+    const loader = options.__mreactLoadServerRenderArtifacts;
+    if (loader === undefined) {
+        return;
+    }
+    const phaseStartedAt = renderTimingPhaseStartedAt(timing);
+    try {
+        await loader(routeFile);
+    }
+    finally {
+        finishRenderTimingPhase(timing, phaseStartedAt, "renderArtifactLoadMs");
+    }
+}
 function emitRenderTiming(options, timing, status) {
     if (timing === undefined) {
         return;
@@ -279,6 +296,7 @@ export async function resolveAppRouterMiddleware(options) {
 }
 async function renderAppRequestInternal(options) {
     const timing = createRenderTiming(options.logger);
+    const clientRouteInferenceCache = createClientRouteInferenceCache();
     let phaseStartedAt = renderTimingPhaseStartedAt(timing);
     const routes = options.routes ?? (await scanAppRoutes({ appDir: options.appDir }));
     finishRenderTimingPhase(timing, phaseStartedAt, "routeScanMs");
@@ -400,10 +418,12 @@ async function renderAppRequestInternal(options) {
         finishRenderTimingPhase(timing, phaseStartedAt, "readSourceMs");
         phaseStartedAt = renderTimingPhaseStartedAt(timing);
         const originalAnalysis = await analyzeRouteSource({
+            appDir: options.appDir,
             artifact: options.serverModules?.get(matched.route.file)?.analysis,
             code: originalCode,
             filename: matched.route.file,
             routePath: matched.route.path,
+            clientRouteInferenceCache,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             timing,
         });
@@ -438,9 +458,11 @@ async function renderAppRequestInternal(options) {
         const routeAnalysis = code === originalCode
             ? originalAnalysis
             : await analyzeRouteSource({
+                appDir: options.appDir,
                 code,
                 filename: matched.route.file,
                 routePath: matched.route.path,
+                clientRouteInferenceCache,
                 serverModuleCacheVersion: undefined,
             });
         finishRenderTimingPhase(timing, phaseStartedAt, "routeCodeAnalysisMs");
@@ -514,6 +536,7 @@ async function renderAppRequestInternal(options) {
                     return data;
                 }
                 await waitForRenderPreload(options, timing);
+                await loadServerRenderArtifacts(options, matched.route.file, timing);
                 phaseStartedAt = renderTimingPhaseStartedAt(timing);
                 const stringOutput = transformServerModule({
                     code: routeCode,
@@ -570,6 +593,7 @@ async function renderAppRequestInternal(options) {
                     serverModules: options.serverModules,
                     serverModuleCacheVersion: options.serverModuleCacheVersion,
                     serverSourceFiles: options.serverSourceFiles,
+                    clientRouteInferenceCache,
                     timing,
                 }));
                 const metadata = await loadComposedRouteMetadata({
@@ -612,6 +636,7 @@ async function renderAppRequestInternal(options) {
                 }
             }
             await waitForRenderPreload(options, timing);
+            await loadServerRenderArtifacts(options, matched.route.file, timing);
             phaseStartedAt = renderTimingPhaseStartedAt(timing);
             const output = transformServerModule({
                 code: routeCode,
@@ -646,6 +671,7 @@ async function renderAppRequestInternal(options) {
                     serverModules: options.serverModules,
                     serverModuleCacheVersion: options.serverModuleCacheVersion,
                     serverSourceFiles: options.serverSourceFiles,
+                    clientRouteInferenceCache,
                     script: clientScript,
                     clientReferenceManifest: output.metadata.clientReferenceManifest,
                 });
@@ -674,6 +700,7 @@ async function renderAppRequestInternal(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                clientRouteInferenceCache,
                 clientRoute,
                 script: clientScript,
                 clientReferenceManifest: output.metadata.clientReferenceManifest,
@@ -698,6 +725,7 @@ async function renderAppRequestInternal(options) {
             return data;
         }
         await waitForRenderPreload(options, timing);
+        await loadServerRenderArtifacts(options, matched.route.file, timing);
         phaseStartedAt = renderTimingPhaseStartedAt(timing);
         const output = transformServerModule({
             code: routeCode,
@@ -762,6 +790,7 @@ async function renderAppRequestInternal(options) {
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             serverSourceFiles: options.serverSourceFiles,
+            clientRouteInferenceCache,
             timing,
         }));
         finishRenderTimingPhase(timing, phaseStartedAt, "layoutRenderMs");
@@ -1088,6 +1117,13 @@ async function loadServerRouteModule(options) {
     const code = await readServerSourceFile(options.file, options.serverModuleCacheVersion, options.serverSourceFiles);
     const artifactCode = options.serverModules?.get(options.file)?.request;
     const codeHash = memoizedHashText(code);
+    if (artifactCode !== undefined && artifactCode.sourceHash === codeHash && artifactCode.moduleFile !== undefined) {
+        return await importBuiltServerModuleFile({
+            file: artifactCode.moduleFile,
+            label: `server-route:${options.file}`,
+            serverModuleCacheVersion: options.serverModuleCacheVersion,
+        });
+    }
     const moduleCode = artifactCode !== undefined && artifactCode.sourceHash === codeHash ? artifactCode.code : code;
     const cacheKey = `server-route\0${options.file}\0${options.serverModuleCacheVersion}\0${codeHash}\0${memoizedHashText(moduleCode)}`;
     const cached = readRouterRuntimeCacheEntry(serverRouteModuleCache, cacheKey, serverRouteModuleCacheCounters);
@@ -1254,7 +1290,7 @@ async function loadMiddlewareModule(options) {
         code,
         file: options.file,
         importPolicy: options.importPolicy,
-        prebuiltCode: prebuiltRequestModuleCode(options.serverModules, options.file, code),
+        prebuiltArtifact: prebuiltRequestModuleArtifact(options.serverModules, options.file, code),
         serverModuleCacheVersion: options.serverModuleCacheVersion,
     }).catch((error) => {
         if (cacheKey !== undefined) {
@@ -1287,7 +1323,14 @@ export async function bundleMiddlewareModuleCode(options) {
     return compiled;
 }
 async function loadBundledMiddlewareModule(options) {
-    const compiled = options.prebuiltCode ??
+    if (options.prebuiltArtifact?.moduleFile !== undefined) {
+        return await importBuiltServerModuleFile({
+            file: options.prebuiltArtifact.moduleFile,
+            label: `middleware:${options.file}`,
+            serverModuleCacheVersion: options.serverModuleCacheVersion,
+        });
+    }
+    const compiled = options.prebuiltArtifact?.code ??
         (await bundleMiddlewareModuleCode({
             appDir: options.appDir,
             code: options.code,
@@ -1416,6 +1459,8 @@ function routeSourceAnalysisFromArtifact(artifact) {
 async function analyzeRouteSourceUncached(options) {
     const routeCode = stripRouteModuleExports(options.code);
     const clientInference = await inferClientRouteModule({
+        appDir: options.appDir,
+        cache: options.clientRouteInferenceCache,
         code: routeCode,
         filename: options.filename,
         routePath: options.routePath,
@@ -1476,6 +1521,15 @@ async function loadServerModule(code, sourcefile, serverModules, serverModuleCac
     const artifact = serverModules?.get(sourcefile)?.string;
     const codeHash = memoizedHashText(code);
     const prebuiltCode = prebuiltServerComponentModuleCode(artifact, code, codeHash);
+    if (artifact !== undefined &&
+        prebuiltServerModuleOutputMatches(artifact, code, codeHash) &&
+        artifact.moduleFile !== undefined) {
+        return await importBuiltServerModuleFile({
+            file: artifact.moduleFile,
+            label: `server-component:${sourcefile}`,
+            serverModuleCacheVersion,
+        });
+    }
     const moduleCode = prebuiltCode ?? code;
     const cacheKey = serverModuleCacheVersion === undefined
         ? undefined
@@ -1501,11 +1555,24 @@ function prebuiltServerComponentModuleCode(artifact, code, codeHash) {
     if (artifact === undefined) {
         return undefined;
     }
-    if (artifact.sourceHash !== codeHash && artifact.code !== code) {
+    if (!prebuiltServerModuleOutputMatches(artifact, code, codeHash)) {
         return undefined;
     }
     return artifact.bundleCode;
 }
+function prebuiltServerModuleOutputMatches(artifact, code, codeHash) {
+    return artifact.sourceHash === codeHash || artifact.code === code;
+}
+async function importBuiltServerModuleFile(options) {
+    return await importAppRouterBuiltFileModule({
+        ...(options.serverModuleCacheVersion === undefined
+            ? {}
+            : {
+                cacheKey: `${options.label}:${options.serverModuleCacheVersion}:${options.file}`,
+            }),
+        file: options.file,
+    });
+}
 async function loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion) {
     const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion);
     return selectServerComponent(module);
@@ -1535,7 +1602,7 @@ function runServerStreamModule(code, options) {
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
         });
-        const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, options.props, slots, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles);
+        const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, options.props, slots, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache);
         const marker = options.clientRoute
             ? hydrationMarkerParts({
                 assetBaseUrl: options.assetBaseUrl,
@@ -1668,7 +1735,7 @@ async function runServerStreamModuleWithLoading(code, options) {
         queryClient: options.queryClient,
         request: options.request,
     };
-    const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, loadingProps, {}, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles);
+    const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, loadingProps, {}, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache);
     const loadingHtml = await renderServerFileToHtml(options.loadingFile, loadingProps, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles);
     const marker = options.clientRoute
         ? hydrationMarkerParts({
@@ -1770,6 +1837,15 @@ async function loadServerStreamModule(code, sourcefile, serverModules, serverMod
     const artifactCode = serverModules?.get(sourcefile)?.stream;
     const codeHash = memoizedHashText(code);
     const prebuiltCode = prebuiltServerComponentModuleCode(artifactCode, code, codeHash);
+    if (artifactCode !== undefined &&
+        prebuiltServerModuleOutputMatches(artifactCode, code, codeHash) &&
+        artifactCode.moduleFile !== undefined) {
+        return await importBuiltServerModuleFile({
+            file: artifactCode.moduleFile,
+            label: `server-stream-component:${sourcefile}`,
+            serverModuleCacheVersion,
+        });
+    }
     const moduleCode = prebuiltCode ?? code;
     const cacheKey = serverModuleCacheVersion === undefined
         ? undefined
@@ -1803,7 +1879,7 @@ async function applyLayouts(options) {
     let html = options.html;
     const slotContext = createSlotRenderContext(options.slots);
     for (const shell of layoutFiles.reverse()) {
-        const rendered = await renderShellPrefixSuffix(options.appDir, shell, options.props, slotContext, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.timing);
+        const rendered = await renderShellPrefixSuffix(options.appDir, shell, options.props, slotContext, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.timing);
         html = `${rendered.prefix}${html}${rendered.suffix}`;
     }
     warnUnconsumedRouteSlots({
@@ -1814,12 +1890,12 @@ async function applyLayouts(options) {
     });
     return html;
 }
-async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules, serverModuleCacheVersion, serverSourceFiles) {
+async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache) {
     const layoutFiles = await shellFilesForPage(appDir, pageFile, serverModuleCacheVersion);
     const shells = [];
     const slotContext = createSlotRenderContext(slots);
     for (const shell of layoutFiles) {
-        shells.push(await renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles));
+        shells.push(await renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache));
     }
     warnUnconsumedRouteSlots({
         appDir,
@@ -1829,7 +1905,7 @@ async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules
     });
     return shells;
 }
-async function renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, timing) {
+async function renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, timing) {
     const hasNamedSlots = Object.keys(slotContext.namedSlots).length > 0;
     const cacheKey = serverModuleCacheVersion === undefined || hasNamedSlots || shell.kind === "template"
         ? undefined
@@ -1844,8 +1920,20 @@ async function renderShellPrefixSuffix(appDir, shell, props, slotContext, server
     const code = await readServerSourceFile(shell.file, serverModuleCacheVersion, serverSourceFiles);
     addRenderTimingPhaseDuration(timing, phaseStartedAt, "layoutSourceReadMs");
     phaseStartedAt = renderTimingPhaseStartedAt(timing);
+    const artifact = serverModules?.get(shell.file)?.string;
+    const clientInference = artifact !== undefined && artifact.sourceHash === memoizedHashText(code)
+        ? { client: false, clientBoundaryImports: [], diagnostics: [] }
+        : await inferClientRouteModule({
+            cache: clientRouteInferenceCache,
+            code: stripRouteClientOnlyExports(code),
+            filename: shell.file,
+        });
+    for (const diagnostic of clientInference.diagnostics) {
+        console.warn(formatClientRouteInferenceDiagnostic(diagnostic));
+    }
     const output = transformServerModule({
         code,
+        clientBoundaryImports: clientInference.clientBoundaryImports,
         filename: shell.file,
         serverModules,
         serverOutput: "string",
@@ -1930,31 +2018,20 @@ async function shellFilesForPage(appDir, pageFile, serverModuleCacheVersion) {
             return cached;
         }
     }
-    const relativeDir = relative(appDir, dirname(pageFile));
-    const parts = relativeDir === "" ? [] : relativeDir.split("/");
-    const directories = [appDir];
-    for (let index = 0; index < parts.length; index += 1) {
-        directories.push(join(appDir, ...parts.slice(0, index + 1)));
-    }
-    const files = [];
-    for (const directory of directories) {
-        const shellId = shellBoundaryId(appDir, directory);
-        for (const [filename, kind] of [
-            ["layout.tsx", "layout"],
-            ["layout.mreact.tsx", "layout"],
-            ["template.tsx", "template"],
-            ["template.mreact.tsx", "template"],
-        ]) {
-            const candidate = join(directory, filename);
-            try {
-                await access(candidate);
-                files.push({ file: candidate, id: shellId, kind });
-            }
-            catch {
-                // Missing shell files are allowed.
-            }
+    const shells = await existingRouteShellCandidates(appDir, pageFile, async (file) => {
+        try {
+            await access(file);
+            return true;
         }
-    }
+        catch {
+            return false;
+        }
+    });
+    const files = shells.map((shell) => ({
+        file: shell.file,
+        id: shellBoundaryId(appDir, shell.directory),
+        kind: shell.kind,
+    }));
     if (cacheKey !== undefined) {
         if (shellFilesCache.size >= MAX_SHELL_FILES_CACHE_ENTRIES) {
             const oldestKey = shellFilesCache.keys().next().value;
@@ -2238,7 +2315,7 @@ async function loadRouteLoaderModule(options) {
     }
     const loaded = loadBundledRouteLoaderModule({
         ...options,
-        prebuiltCode: prebuiltRouteLoaderModuleCode(options.serverModules, options.filename, options.code),
+        prebuiltArtifact: prebuiltRouteLoaderModuleArtifact(options.serverModules, options.filename, options.code),
     }).catch((error) => {
         if (cacheKey !== undefined) {
             routeLoaderModuleCache.delete(cacheKey);
@@ -2270,7 +2347,14 @@ export async function bundleRouteLoaderModuleCode(options) {
     return code;
 }
 async function loadBundledRouteLoaderModule(options) {
-    const code = options.prebuiltCode ??
+    if (options.prebuiltArtifact?.moduleFile !== undefined) {
+        return await importBuiltServerModuleFile({
+            file: options.prebuiltArtifact.moduleFile,
+            label: `loader:${options.filename}`,
+            serverModuleCacheVersion: options.serverModuleCacheVersion,
+        });
+    }
+    const code = options.prebuiltArtifact?.code ??
         (await bundleRouteLoaderModuleCode({
             appDir: options.appDir,
             code: options.code,
@@ -2287,17 +2371,17 @@ async function loadBundledRouteLoaderModule(options) {
         label: `loader:${options.filename}`,
     });
 }
-function prebuiltRequestModuleCode(serverModules, file, source, kind = "request") {
+function prebuiltRequestModuleArtifact(serverModules, file, source, kind = "request") {
     const artifact = serverModules?.get(file)?.[kind];
     return artifact !== undefined && artifact.sourceHash === memoizedHashText(source)
-        ? artifact.code
+        ? artifact
         : undefined;
 }
-function prebuiltRouteLoaderModuleCode(serverModules, file, source) {
+function prebuiltRouteLoaderModuleArtifact(serverModules, file, source) {
     const artifact = serverModules?.get(file)?.loader;
     return artifact !== undefined && artifact.sourceHash === memoizedHashText(source)
-        ? artifact.code
-        : prebuiltRequestModuleCode(serverModules, file, source);
+        ? artifact
+        : prebuiltRequestModuleArtifact(serverModules, file, source);
 }
 function importPolicyCacheKey(policy) {
     if (policy === undefined) {
@@ -2313,8 +2397,16 @@ async function loadRouteMetadata(options) {
     if (!hasMetadataExport(options.code)) {
         return undefined;
     }
-    const prebuiltCode = prebuiltRequestModuleCode(options.serverModules, options.filename, options.code, "routeMetadata");
-    const code = prebuiltCode ?? await bundleRouteMetadataModuleCode(options);
+    const prebuiltArtifact = prebuiltRequestModuleArtifact(options.serverModules, options.filename, options.code, "routeMetadata");
+    if (prebuiltArtifact?.moduleFile !== undefined) {
+        const module = await importBuiltServerModuleFile({
+            file: prebuiltArtifact.moduleFile,
+            label: `metadata:${options.filename}`,
+            serverModuleCacheVersion: options.serverModuleCacheVersion,
+        });
+        return module.metadata;
+    }
+    const code = prebuiltArtifact?.code ?? await bundleRouteMetadataModuleCode(options);
     const module = await importAppRouterSourceModule({
         ...(options.serverModuleCacheVersion === undefined
             ? {}