@reckona/mreact-router 0.0.151 → 0.0.153

package/dist/render.js

@@ -29,7 +29,7 @@ import { invokeRouterInstrumentation, traceContextFromRequest, } from "./trace.j
 import { mergeRouteMiddlewareControls, middlewareMatches, parseRouteMiddlewareControl, parseStaticMiddlewareConfig, shouldSkipMiddleware, validateRouteMiddlewareControl, } from "./middleware.js";
 import { applyFileConventionMetadata, injectHeadMetadata, mergeRouteMetadata, responseHeadersForMetadata, serializeRobots, serializeSitemap, validateRouteMetadata, } from "./metadata.js";
 import { createSlotRenderContext, markShellBoundary, shellBoundaryId, splitLayoutSlot, warnUnconsumedRouteSlots, } from "./layout-composer.js";
-import { importPolicyCacheKey, memoizedHashText, prebuiltRequestModuleArtifact, prebuiltRouteLoaderModuleArtifact, prebuiltServerComponentModuleCode, prebuiltServerModuleOutputMatches, } from "./route-module-loader.js";
+import { importPolicyCacheKey, memoizedHashText, prebuiltRequestModuleArtifact, prebuiltRouteLoaderModuleArtifact, prebuiltServerComponentModuleCode, prebuiltServerModuleOutputMatches, prebuiltServerModuleOutputOptionsMatch, } from "./route-module-loader.js";
 const nativeEscapeTransform = {
     batchImportName: "escapeHtmlBatch",
     batchImportSource: "@reckona/mreact-router/native-escape",
@@ -134,7 +134,7 @@ async function preloadBuiltPageRouteModules(options) {
             serverAwaitHydration: options.analysis.clientInference.client,
         });
         assertNoFatalServerDiagnostics(options.file, streamOutput.diagnostics);
-        await loadServerStreamModule(streamOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins);
+        await loadServerStreamModule(streamOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, undefined, { serverAwaitHydration: options.analysis.clientInference.client });
     }
     await preloadShellModulesForPage({
         appDir: options.appDir,
@@ -193,6 +193,7 @@ function assertNoFatalServerDiagnostics(filename, diagnostics) {
 }
 const serverTransformCache = new Map();
 const serverTransformCacheCounters = createRouterRuntimeCacheCounters();
+let productionDynamicServerTransformWarned = false;
 const serverSourceFileCache = new Map();
 const serverSourceFileCacheCounters = createRouterRuntimeCacheCounters();
 const routeSourceAnalysisCache = new Map();
@@ -275,12 +276,25 @@ function finishRenderTimingPhase(timing, startedAt, phaseName) {
     }
     timing.phases[phaseName] = logDurationMs(startedAt);
 }
+async function readSettledPromiseAtNextTask(promise) {
+    return await Promise.race([
+        promise.then((value) => ({ settled: true, value })),
+        new Promise((resolve) => {
+            setTimeout(() => resolve({ settled: false }), 0);
+        }),
+    ]);
+}
 function addRenderTimingPhaseDuration(timing, startedAt, phaseName) {
     if (timing === undefined || startedAt === undefined) {
         return;
     }
     timing.phases[phaseName] = (timing.phases[phaseName] ?? 0) + logDurationMs(startedAt);
 }
+function routeLoaderMayReturnControlResponse(code) {
+    return /\b(?:redirect|redirectExternal|rewrite|notFound|throwNotFound)\s*\(/.test(code) ||
+        /\bnew\s+Response\s*\(/.test(code) ||
+        /\bResponse\.(?:redirect|json)\s*\(/.test(code);
+}
 async function waitForRenderPreload(options, timing) {
     if (options.preload?.wait !== "before-render") {
         return;
@@ -413,6 +427,7 @@ async function renderAppRequestInternal(options) {
             appDir: options.appDir,
             filename: "not-found.mreact.tsx",
             pathname: url.pathname,
+            serverSourceFiles: options.serverSourceFiles,
         });
         const response = await renderSpecialRoute({
             appDir: options.appDir,
@@ -735,8 +750,9 @@ async function renderAppRequestInternal(options) {
                 return response;
             }
             let streamData;
-            if (loadingFile === undefined) {
-                phaseStartedAt = renderTimingPhaseStartedAt(timing);
+            let streamDataPromise = dataPromise ?? Promise.resolve(undefined);
+            phaseStartedAt = renderTimingPhaseStartedAt(timing);
+            if (loadingFile === undefined || routeLoaderMayReturnControlResponse(code)) {
                 try {
                     streamData = dataPromise === undefined ? undefined : await dataPromise;
                 }
@@ -747,6 +763,22 @@ async function renderAppRequestInternal(options) {
                     emitRenderTiming(options, timing, streamData.status);
                     return streamData;
                 }
+                streamDataPromise = Promise.resolve(streamData);
+            }
+            else {
+                try {
+                    const settledData = await readSettledPromiseAtNextTask(streamDataPromise);
+                    if (settledData.settled) {
+                        if (settledData.value instanceof Response) {
+                            emitRenderTiming(options, timing, settledData.value.status);
+                            return settledData.value;
+                        }
+                        streamDataPromise = Promise.resolve(settledData.value);
+                    }
+                }
+                finally {
+                    finishRenderTimingPhase(timing, phaseStartedAt, "loaderWaitMs");
+                }
             }
             await waitForRenderPreload(options, timing);
             await loadServerRenderArtifacts(options, matched.route.file, timing);
@@ -774,7 +806,7 @@ async function renderAppRequestInternal(options) {
                     appDir: options.appDir,
                     assetBaseUrl: options.assetBaseUrl,
                     clientRoute,
-                    data: dataPromise ?? Promise.resolve(undefined),
+                    data: streamDataPromise,
                     define: options.define,
                     loadingFile,
                     pageFile: matched.route.file,
@@ -1149,17 +1181,24 @@ async function nearestBoundaryFileForPath(options) {
     const parts = options.pathname
         .replace(/^\/+|\/+$/g, "")
         .split("/")
-        .filter((part) => part.length > 0);
-    return nearestBoundaryFileFromParts({
+        .filter((part) => part.length > 0 && part !== "." && part !== "..");
+    return await nearestBoundaryFileFromParts({
         appDir: options.appDir,
         filename: options.filename,
         parts,
+        serverSourceFiles: options.serverSourceFiles,
     });
 }
 async function nearestBoundaryFileFromParts(options) {
     for (let count = options.parts.length; count >= 0; count -= 1) {
         for (const filename of boundaryFilenameCandidates(options.filename)) {
             const candidate = join(options.appDir, ...options.parts.slice(0, count), filename);
+            if (options.serverSourceFiles !== undefined) {
+                if (options.serverSourceFiles.has(candidate)) {
+                    return candidate;
+                }
+                continue;
+            }
             try {
                 await access(candidate);
                 return candidate;
@@ -1200,11 +1239,18 @@ function boundaryFilenameCandidates(filename) {
     return [standardFilename, filename];
 }
 async function renderSpecialRoute(options) {
-    try {
-        await access(options.routeFile);
+    if (options.serverSourceFiles !== undefined) {
+        if (!options.serverSourceFiles.has(options.routeFile)) {
+            return new Response(options.textFallback, { status: options.status });
+        }
     }
-    catch {
-        return new Response(options.textFallback, { status: options.status });
+    else {
+        try {
+            await access(options.routeFile);
+        }
+        catch {
+            return new Response(options.textFallback, { status: options.status });
+        }
     }
     const props = {
         data: undefined,
@@ -1286,7 +1332,10 @@ async function dispatchServerRoute(options) {
     const module = await loadServerRouteModule(options);
     const handler = module[options.request.method] ?? module.ALL ?? module.default;
     if (typeof handler !== "function") {
-        return new Response("Method Not Allowed", { status: 405 });
+        return new Response("Method Not Allowed", {
+            headers: { allow: allowedServerRouteMethods(module).join(", ") },
+            status: 405,
+        });
     }
     let response;
     try {
@@ -1307,6 +1356,9 @@ async function dispatchServerRoute(options) {
         ? response
         : new Response("Invalid route response", { status: 500 });
 }
+function allowedServerRouteMethods(module) {
+    return ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"].filter((method) => typeof module[method] === "function");
+}
 async function dispatchConventionAssetRoute(options) {
     if (options.request.method !== "GET" && options.request.method !== "HEAD") {
         return new Response("Method Not Allowed", {
@@ -1664,7 +1716,7 @@ function transformServerModule(options) {
     const artifact = options.serverModules?.get(options.filename)?.[options.serverOutput];
     if (artifact !== undefined &&
         artifact.sourceHash === sourceHash &&
-        options.serverAwaitHydration !== true) {
+        prebuiltServerModuleOutputOptionsMatch(artifact, options.serverAwaitHydration === true ? { serverAwaitHydration: true } : {})) {
         return {
             code: artifact.code,
             diagnostics: [],
@@ -1690,6 +1742,7 @@ function transformServerModule(options) {
     if (cached !== undefined) {
         return cached;
     }
+    warnProductionDynamicServerTransform();
     const output = transform({
         code: options.code,
         ...(options.clientBoundaryImports === undefined
@@ -1708,6 +1761,14 @@ function transformServerModule(options) {
     setBoundedCacheEntry(serverTransformCache, key, output, maxServerTransformCacheEntries, serverTransformCacheCounters);
     return output;
 }
+export const __transformServerModuleForTesting = transformServerModule;
+function warnProductionDynamicServerTransform() {
+    if (process.env.NODE_ENV !== "production" || productionDynamicServerTransformWarned) {
+        return;
+    }
+    productionDynamicServerTransformWarned = true;
+    console.warn("mreact router: dynamic server transform path ran in production. Production deployments should provide prebuilt serverModules; otherwise request-time transforms use development compiler settings.");
+}
 async function analyzeRouteSource(options) {
     const sourceHash = memoizedHashText(options.code);
     if (options.artifact !== undefined &&
@@ -2123,11 +2184,12 @@ async function renderServerStreamSlots(code, options) {
 function hasRouteSlotsExport(code) {
     return /^\s*export\s+const\s+slots\s*=/m.test(code);
 }
-async function loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy) {
+async function loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy, outputOptions = {}) {
     const artifactCode = serverModules?.get(sourcefile)?.stream;
     const codeHash = memoizedHashText(code);
-    const prebuiltCode = prebuiltServerComponentModuleCode(artifactCode, code, codeHash);
+    const prebuiltCode = prebuiltServerComponentModuleCode(artifactCode, code, codeHash, outputOptions);
     if (artifactCode !== undefined &&
+        prebuiltServerModuleOutputOptionsMatch(artifactCode, outputOptions) &&
         prebuiltServerModuleOutputMatches(artifactCode, code, codeHash) &&
         artifactCode.moduleFile !== undefined) {
         return await importBuiltServerModuleFile({
@@ -2806,9 +2868,7 @@ async function bundleRouteMetadataModuleCode(options) {
     return code;
 }
 async function loadComposedRouteMetadata(options) {
-    const cacheKey = options.serverModuleCacheVersion === undefined
-        ? undefined
-        : `${options.appDir}\0${options.filename}\0${options.serverModuleCacheVersion}\0${memoizedHashText(options.code)}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
+    const cacheKey = composedRouteMetadataCacheKey(options);
     if (cacheKey !== undefined) {
         const cached = readRouterRuntimeCacheEntry(composedRouteMetadataCache, cacheKey, composedRouteMetadataCacheCounters);
         if (cached !== undefined) {
@@ -2829,6 +2889,12 @@ async function loadComposedRouteMetadata(options) {
         throw error;
     }
 }
+function composedRouteMetadataCacheKey(options) {
+    return options.serverModuleCacheVersion === undefined
+        ? undefined
+        : `${options.appDir}\0${options.filename}\0${options.serverModuleCacheVersion}\0${memoizedHashText(options.code)}\0${importPolicyCacheKey(options.importPolicy)}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
+}
+export const __composedRouteMetadataCacheKeyForTesting = composedRouteMetadataCacheKey;
 async function loadComposedRouteMetadataUncached(options) {
     const layoutFiles = await shellFilesForPage(options.appDir, options.filename, options.serverModuleCacheVersion);
     const metadata = [];
@@ -2951,21 +3017,47 @@ function cspDirectiveNonces(csp, directive) {
 }
 function inlineCspTags(html) {
     const tags = [];
-    const pattern = /<(script|style)\b([^>]*)>([\s\S]*?)<\/\1>/gi;
-    let match;
-    while ((match = pattern.exec(html)) !== null) {
-        const name = match[1]?.toLowerCase();
-        if (name !== "script" && name !== "style") {
+    const lowerHtml = html.toLowerCase();
+    let position = 0;
+    while (position < html.length) {
+        const scriptIndex = lowerHtml.indexOf("<script", position);
+        const styleIndex = lowerHtml.indexOf("<style", position);
+        const openerIndex = scriptIndex === -1
+            ? styleIndex
+            : styleIndex === -1
+                ? scriptIndex
+                : Math.min(scriptIndex, styleIndex);
+        if (openerIndex === -1) {
+            break;
+        }
+        const name = lowerHtml.startsWith("<script", openerIndex) ? "script" : "style";
+        const tagEnd = html.indexOf(">", openerIndex + 1);
+        if (tagEnd === -1) {
+            break;
+        }
+        const closeToken = `</${name}>`;
+        const closeIndex = lowerHtml.indexOf(closeToken, tagEnd + 1);
+        const nextScriptIndex = lowerHtml.indexOf("<script", tagEnd + 1);
+        const nextStyleIndex = lowerHtml.indexOf("<style", tagEnd + 1);
+        const nextOpenerIndex = nextScriptIndex === -1
+            ? nextStyleIndex
+            : nextStyleIndex === -1
+                ? nextScriptIndex
+                : Math.min(nextScriptIndex, nextStyleIndex);
+        if (closeIndex === -1 || (nextOpenerIndex !== -1 && nextOpenerIndex < closeIndex)) {
+            position = tagEnd + 1;
             continue;
         }
         tags.push({
-            attributes: parseTagAttributes(match[2] ?? ""),
-            content: match[3] ?? "",
+            attributes: parseTagAttributes(html.slice(openerIndex + name.length + 1, tagEnd)),
+            content: html.slice(tagEnd + 1, closeIndex),
             name,
         });
+        position = closeIndex + closeToken.length;
     }
     return tags;
 }
+export const __inlineCspTagsForTesting = inlineCspTags;
 function parseTagAttributes(source) {
     const attributes = new Map();
     const pattern = /([^\s=/>]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+)))?/g;
@@ -2996,7 +3088,7 @@ function injectQueryState(html, state) {
     }
     const script = `<script type="application/json" id="${__MREACT_QUERY_STATE_SCRIPT_ID}">${escapeJsonForHtml(JSON.stringify(state))}</script>`;
     return /<\/body>/i.test(html)
-        ? html.replace(/<\/body>/i, () => `${script}</body>`)
+        ? replaceFinalBodyCloseTag(html, script)
         : `${html}${script}`;
 }
 function injectAuthSessionClaims(html, claims) {
@@ -3005,9 +3097,17 @@ function injectAuthSessionClaims(html, claims) {
     }
     const script = `<script type="application/json" id="${authSessionScriptId}">${escapeJsonForHtml(JSON.stringify(claims))}</script>`;
     return /<\/body>/i.test(html)
-        ? html.replace(/<\/body>/i, () => `${script}</body>`)
+        ? replaceFinalBodyCloseTag(html, script)
         : `${html}${script}`;
 }
+function replaceFinalBodyCloseTag(html, insertion) {
+    const matches = [...html.matchAll(/<\/body>/gi)];
+    const last = matches.at(-1);
+    if (last?.index === undefined) {
+        return `${html}${insertion}`;
+    }
+    return `${html.slice(0, last.index)}${insertion}${html.slice(last.index)}`;
+}
 function authIncludesClaims(code) {
     return /\bexport\s+const\s+auth\s*=\s*["']include-claims["']\s*;?/.test(code);
 }