@reckona/mreact-router 0.0.29 → 0.0.31

package/dist/render.js

@@ -12,7 +12,7 @@ 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";
@@ -239,6 +239,31 @@ function addRenderTimingPhaseDuration(timing, startedAt, phaseName) {
     }
     timing.phases[phaseName] = (timing.phases[phaseName] ?? 0) + logDurationMs(startedAt);
 }
+async function waitForRenderPreload(options, timing) {
+    if (options.preload?.wait !== "before-render") {
+        return;
+    }
+    const phaseStartedAt = renderTimingPhaseStartedAt(timing);
+    try {
+        await options.preload.promise;
+    }
+    finally {
+        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;
@@ -501,6 +526,8 @@ async function renderAppRequestInternal(options) {
                     emitRenderTiming(options, timing, data.status);
                     return data;
                 }
+                await waitForRenderPreload(options, timing);
+                await loadServerRenderArtifacts(options, matched.route.file, timing);
                 phaseStartedAt = renderTimingPhaseStartedAt(timing);
                 const stringOutput = transformServerModule({
                     code: routeCode,
@@ -598,6 +625,8 @@ async function renderAppRequestInternal(options) {
                     return streamData;
                 }
             }
+            await waitForRenderPreload(options, timing);
+            await loadServerRenderArtifacts(options, matched.route.file, timing);
             phaseStartedAt = renderTimingPhaseStartedAt(timing);
             const output = transformServerModule({
                 code: routeCode,
@@ -683,6 +712,8 @@ async function renderAppRequestInternal(options) {
             emitRenderTiming(options, timing, data.status);
             return data;
         }
+        await waitForRenderPreload(options, timing);
+        await loadServerRenderArtifacts(options, matched.route.file, timing);
         phaseStartedAt = renderTimingPhaseStartedAt(timing);
         const output = transformServerModule({
             code: routeCode,
@@ -1073,6 +1104,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);
@@ -1239,7 +1277,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) {
@@ -1272,7 +1310,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,
@@ -1460,7 +1505,17 @@ async function runServerModuleWithSlots(code, props, sourcefile, serverModules,
 async function loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion) {
     const artifact = serverModules?.get(sourcefile)?.string;
     const codeHash = memoizedHashText(code);
-    const moduleCode = artifact !== undefined && artifact.sourceHash === codeHash ? artifact.code : 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
         : `server-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}`;
@@ -1468,15 +1523,41 @@ async function loadServerModule(code, sourcefile, serverModules, serverModuleCac
         cacheKey,
         code: moduleCode,
         label: `server-component:${sourcefile}`,
-        resolveDir: dirname(sourcefile),
-        serverSourceTransform: {
-            dev: serverModuleCacheVersion === undefined,
-            serverModules,
-            serverOutput: "string",
-        },
+        ...(prebuiltCode === undefined
+            ? {
+                resolveDir: dirname(sourcefile),
+                serverSourceTransform: {
+                    dev: serverModuleCacheVersion === undefined,
+                    serverModules,
+                    serverOutput: "string",
+                },
+            }
+            : {}),
         sourcefile,
     });
 }
+function prebuiltServerComponentModuleCode(artifact, code, codeHash) {
+    if (artifact === undefined) {
+        return undefined;
+    }
+    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);
@@ -1740,7 +1821,17 @@ function hasRouteSlotsExport(code) {
 async function loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion) {
     const artifactCode = serverModules?.get(sourcefile)?.stream;
     const codeHash = memoizedHashText(code);
-    const moduleCode = artifactCode !== undefined && artifactCode.sourceHash === codeHash ? artifactCode.code : 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
         : `server-stream-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}`;
@@ -1748,12 +1839,16 @@ async function loadServerStreamModule(code, sourcefile, serverModules, serverMod
         cacheKey,
         code: moduleCode,
         label: `server-stream-component:${sourcefile}`,
-        resolveDir: dirname(sourcefile),
-        serverSourceTransform: {
-            dev: serverModuleCacheVersion === undefined,
-            serverModules,
-            serverOutput: "stream",
-        },
+        ...(prebuiltCode === undefined
+            ? {
+                resolveDir: dirname(sourcefile),
+                serverSourceTransform: {
+                    dev: serverModuleCacheVersion === undefined,
+                    serverModules,
+                    serverOutput: "stream",
+                },
+            }
+            : {}),
         sourcefile,
     });
 }
@@ -2204,7 +2299,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);
@@ -2236,7 +2331,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,
@@ -2253,17 +2355,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) {
@@ -2279,8 +2381,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
             ? {}