veryfront 0.1.812 → 0.1.813

package/esm/src/rendering/orchestrator/pipeline.js

@@ -21,6 +21,7 @@ import { SpanNames } from "../../observability/tracing/span-names.js";
 import { VeryfrontError } from "../../errors/index.js";
 import { FILE_NOT_FOUND, RENDER_ERROR } from "../../errors/error-registry.js";
 import { buildQueryAwareCacheKey } from "../../cache/keys.js";
+import { requestHasCacheSensitiveState } from "../../cache/request-cacheability.js";
 import { extractRelativePath as extractRelativePathShared, extractRouteParams as extractRouteParamsShared, } from "../../utils/route-path-utils.js";
 import { extractRenderedCssHash, hasRenderedReleaseAssetCss, serializeLayoutProps, serializeLayouts, } from "./pipeline-helpers.js";
 import { join } from "../../platform/compat/path/index.js";
@@ -31,6 +32,7 @@ import { setupSSRGlobals } from "../ssr-globals.js";
 import { LAYOUT_EXTENSIONS } from "../layouts/types.js";
 import { withTimeout, withTimeoutThrow } from "../utils/stream-utils.js";
 import { extractCandidates, generateTailwindCSS } from "../../html/styles-builder/index.js";
+import { buildReleaseAssetModules } from "../../release-assets/client-module-map.js";
 import { getCSSByHashAsync, regenerateCSSByHash, } from "../../html/styles-builder/tailwind-compiler.js";
 import { getReadyManifestForRender } from "../../release-assets/manifest-cache.js";
 import { createEsmCache, createModuleCache, loadModule } from "./module-loader/index.js";
@@ -233,7 +235,7 @@ export class RenderPipeline {
         const projectId = options?.projectId ?? this.config.projectDir;
         const cacheKey = this.buildCacheKey(slug, options);
         let cacheResult = null;
-        const shouldCache = !!cacheKey && options?.delivery !== "stream";
+        const shouldCache = cacheKey !== null && options?.delivery !== "stream";
         if (shouldCache && !options?.skipCacheCheck) {
             const cacheCheckStart = performance.now();
             cacheResult = await this.config.cacheCoordinator.checkCache(slug, cacheKey);
@@ -423,6 +425,7 @@ export class RenderPipeline {
             layoutProps,
             buildVersion: createBuildVersion(projectUpdatedAt),
             appPath,
+            releaseAssetModules: buildReleaseAssetModules(options?.releaseAssetManifest),
             headings,
             css,
             cssAction,
@@ -535,7 +538,9 @@ export class RenderPipeline {
     hasReadyReleaseCss(options) {
         if (options?.environment !== "production")
             return false;
-        const releaseManifest = getReadyManifestForRender(options?.releaseId);
+        const releaseManifest = options.releaseAssetManifest !== undefined
+            ? options.releaseAssetManifest
+            : getReadyManifestForRender(options?.releaseId);
         return (releaseManifest?.css?.length ?? 0) > 0;
     }
     async generatePageCssFromHtml(slug, html, options) {
@@ -562,15 +567,9 @@ export class RenderPipeline {
             return options.cacheKey;
         const req = options?.request;
         if (req) {
-            const hasAuth = req.headers.has("authorization") ||
-                req.headers.has("cookie") ||
-                req.headers.has("x-api-key");
-            if (hasAuth)
+            if (requestHasCacheSensitiveState(req))
                 return null;
         }
-        const url = options?.url;
-        if (!url)
-            return slug;
-        return buildQueryAwareCacheKey(slug, url, this.config.queryParamOptions);
+        return buildQueryAwareCacheKey(slug, options?.url, this.config.queryParamOptions);
     }
 }

package/esm/src/rendering/orchestrator/types.d.ts

@@ -81,6 +81,8 @@ export interface PageDataResponse {
     layoutProps: Record<string, Record<string, unknown>>;
     buildVersion: BuildVersion;
     appPath?: string;
+    /** Production release asset URLs keyed by logical source path. */
+    releaseAssetModules?: Record<string, string>;
     /** Headings extracted from MDX for sidebar/TOC navigation */
     headings?: Array<{
         id: string;

package/esm/src/rendering/orchestrator/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/types.ts"],"names":[],"mappings":"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"}

package/esm/src/rendering/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/renderer.ts"],"names":[],"mappings":"AA6CA,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAC/B,KAAK,0BAA0B,EAC/B,KAAK,aAAa,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,iCAAiC,CAAC;AAgBzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAwBxD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,8BAA8B;IAC9B,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B,oBAAoB;IACpB,KAAK,CAAC,EAAE,wBAAwB,CAAC;CAClC;AAeD;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,oBAAoB,CAAgC;IAC5D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,qBAAqB,CAA8B;IAE3D;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAwC;gBAEhD,OAAO,GAAE,eAAoB;IAInC,UAAU,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBhE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;YAwF9E,2BAA2B;IAWzC,OAAO,CAAC,uBAAuB;IAiB/B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAQ1B;;;;;;;;;OASG;IACH,OAAO,CAAC,aAAa;YAwBP,YAAY;IAoF1B,eAAe,CACb,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,aAAa,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAkB5B,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAU5C,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5D,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B,OAAO,CAAC,wBAAwB;CA4FjC;AAED,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAC/B,KAAK,0BAA0B,EAC/B,KAAK,aAAa,GACnB,CAAC;AAMF,wBAAgB,WAAW,IAAI,QAAQ,CAOtC;AAED,wBAAsB,kBAAkB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsBrF;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAE/C;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAQrD;AAED,wBAAsB,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYnF;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,cAAc,EAC1B,OAAO,CAAC,EAAE,aAAa,EACvB,cAAc,CAAC,EAAE,0BAA0B,GAC1C,OAAO,CAAC,YAAY,CAAC,CAIvB"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/renderer.ts"],"names":[],"mappings":"AA8CA,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAC/B,KAAK,0BAA0B,EAC/B,KAAK,aAAa,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,iCAAiC,CAAC;AAgBzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAwBxD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,8BAA8B;IAC9B,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B,oBAAoB;IACpB,KAAK,CAAC,EAAE,wBAAwB,CAAC;CAClC;AAeD;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,oBAAoB,CAAgC;IAC5D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,qBAAqB,CAA8B;IAE3D;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAwC;gBAEhD,OAAO,GAAE,eAAoB;IAInC,UAAU,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBhE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;YAwF9E,2BAA2B;IAWzC,OAAO,CAAC,uBAAuB;IAiB/B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAQ1B;;;;;;;;;OASG;IACH,OAAO,CAAC,aAAa;YAkBP,YAAY;IAoF1B,eAAe,CACb,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,aAAa,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC;IA4B5B,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAU5C,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5D,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B,OAAO,CAAC,wBAAwB;CA4FjC;AAED,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAC/B,KAAK,0BAA0B,EAC/B,KAAK,aAAa,GACnB,CAAC;AAMF,wBAAgB,WAAW,IAAI,QAAQ,CAOtC;AAED,wBAAsB,kBAAkB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsBrF;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAE/C;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAQrD;AAED,wBAAsB,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYnF;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,cAAc,EAC1B,OAAO,CAAC,EAAE,aAAa,EACvB,cAAc,CAAC,EAAE,0BAA0B,GAC1C,OAAO,CAAC,YAAY,CAAC,CAIvB"}

package/esm/src/rendering/renderer.js

@@ -35,6 +35,7 @@ import { MDXCacheAdapter } from "../transforms/mdx/index.js";
 import { INITIALIZATION_ERROR, SERVICE_OVERLOADED } from "../errors/error-registry.js";
 import { withSpan } from "../observability/tracing/otlp-setup.js";
 import { buildQueryAwareCacheKey, buildRenderCachePrefix, } from "../cache/keys.js";
+import { requestHasCacheSensitiveState } from "../cache/request-cacheability.js";
 import { getEnvNumber } from "../platform/compat/process.js";
 import { getReadyManifestForRenderAsync } from "../release-assets/manifest-cache.js";
 import { createRenderContext, createRenderContextFromEnriched, } from "./context/render-context.js";
@@ -128,7 +129,7 @@ export class Renderer {
                 releaseAssetManifest: releaseManifest,
             };
             const cacheKey = this.buildCacheKey(slug, effectiveCtx, effectiveOptions);
-            const cacheResult = cacheKey
+            const cacheResult = cacheKey !== null
                 ? await this.cache.checkCache(slug, effectiveCtx, effectiveOptions?.colorScheme, cacheKey)
                 : { hit: false, cacheKey: "", status: "miss", lookupDurationMs: 0 };
             if (cacheResult.hit && cacheResult.cachedResult) {
@@ -224,23 +225,17 @@ export class Renderer {
             return options.cacheKey;
         const req = options?.request;
         if (req) {
-            const hasAuth = req.headers.has("authorization") ||
-                req.headers.has("cookie") ||
-                req.headers.has("x-api-key");
-            if (hasAuth)
+            if (requestHasCacheSensitiveState(req))
                 return null;
         }
-        const url = options?.url;
-        if (!url)
-            return slug;
         // Get query param handling options from config
         const queryParamOptions = ctx.config?.cache?.queryParams;
-        return buildQueryAwareCacheKey(slug, url, queryParamOptions);
+        return buildQueryAwareCacheKey(slug, options?.url, queryParamOptions);
     }
     async doRenderPage(slug, ctx, options, startTime, cacheKey) {
         const effectiveKey = cacheKey ?? dntShim.crypto.randomUUID();
         const flightKey = this.getSingleflightKey(effectiveKey, ctx, options?.colorScheme);
-        const isFollower = cacheKey ? this.renderFlight.has(flightKey) : false;
+        const isFollower = cacheKey !== null ? this.renderFlight.has(flightKey) : false;
         const runRender = async () => {
             const services = this.createServicesForContext(ctx, options?.colorScheme);
             let result;
@@ -266,7 +261,7 @@ export class Renderer {
                 }
                 throw error;
             }
-            if (cacheKey) {
+            if (cacheKey !== null) {
                 await this.cache.persistResult(result, slug, ctx, options?.colorScheme, cacheKey);
             }
             logger.debug("Render complete (leader)", {
@@ -283,7 +278,7 @@ export class Renderer {
                 pageModule: result.pageModule,
             };
         };
-        const cachedData = cacheKey
+        const cachedData = cacheKey !== null
             ? await this.renderFlight.do(flightKey, runRender)
             : await runRender();
         if (isFollower) {
@@ -309,13 +304,23 @@ export class Renderer {
                 detail: "Renderer not initialized. Call initialize() first.",
             });
         }
-        const services = this.createServicesForContext(ctx);
-        return services.pipeline.resolvePageData(slug, {
-            ...options,
-            projectId: ctx.projectId,
-            projectSlug: ctx.projectSlug,
-            environment: ctx.environment,
-            contentSourceId: ctx.contentSourceId,
+        return withSpan("renderer.resolvePageData", async () => {
+            const releaseManifest = await this.resolveReleaseAssetManifest(ctx, options);
+            const effectiveCtx = this.withManifestCachePrefix(ctx, releaseManifest);
+            const services = this.createServicesForContext(effectiveCtx);
+            return services.pipeline.resolvePageData(slug, {
+                ...options,
+                projectId: effectiveCtx.projectId,
+                projectSlug: effectiveCtx.projectSlug,
+                environment: effectiveCtx.environment,
+                contentSourceId: effectiveCtx.contentSourceId,
+                releaseId: effectiveCtx.releaseId,
+                releaseAssetManifest: releaseManifest,
+            });
+        }, {
+            "renderer.slug": slug,
+            "renderer.projectId": ctx.projectId,
+            "renderer.environment": ctx.environment,
         });
     }
     getAllPages(ctx) {

package/esm/src/server/handlers/request/module/page-data-endpoint-handler.d.ts

@@ -1,4 +1,5 @@
 import type { HandlerContext, HandlerResult } from "../../types.js";
 import { ResponseBuilder } from "../../../../security/index.js";
+export declare function __clearPageDataEndpointCacheForTests(): void;
 export declare function handlePageDataEndpoint(req: Request, pathname: string, ctx: HandlerContext, createResponseBuilder: (ctx: HandlerContext) => ResponseBuilder, respond: (response: Response) => HandlerResult, getErrorMessage: (error: unknown) => string): Promise<HandlerResult>;
 //# sourceMappingURL=page-data-endpoint-handler.d.ts.map

package/esm/src/server/handlers/request/module/page-data-endpoint-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page-data-endpoint-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/request/module/page-data-endpoint-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAShE,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,cAAc,EACnB,qBAAqB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,eAAe,EAC/D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,aAAa,EAC9C,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAC1C,OAAO,CAAC,aAAa,CAAC,CAyFxB"}
+{"version":3,"file":"page-data-endpoint-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/request/module/page-data-endpoint-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAwBhE,wBAAgB,oCAAoC,IAAI,IAAI,CAE3D;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,cAAc,EACnB,qBAAqB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,eAAe,EAC/D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,aAAa,EAC9C,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAC1C,OAAO,CAAC,aAAa,CAAC,CAoGxB"}

package/esm/src/server/handlers/request/module/page-data-endpoint-handler.js

@@ -3,9 +3,19 @@ import { ResponseBuilder } from "../../../../security/index.js";
 import { getRendererForProject } from "../../../shared/renderer-factory.js";
 import { TimeoutError, withTimeoutThrow } from "../../../../rendering/utils/stream-utils.js";
 import { withSpan } from "../../../../observability/tracing/otlp-setup.js";
+import { markRequestProfilePhase } from "../../../../observability/request-profiler.js";
 import { HTTP_GATEWAY_TIMEOUT } from "../../../../utils/constants/http.js";
 import { serverLogger } from "../../../../utils/index.js";
+import { Singleflight } from "../../../../utils/singleflight.js";
+import { requestHasCacheSensitiveState } from "../../../../cache/request-cacheability.js";
 const PAGE_DATA_TIMEOUT_MS = 25_000;
+const PAGE_DATA_CACHE_TTL_MS = 60_000;
+const PAGE_DATA_CACHE_MAX_ENTRIES = 500;
+const pageDataCache = new Map();
+const pageDataFlight = new Singleflight();
+export function __clearPageDataEndpointCacheForTests() {
+    pageDataCache.clear();
+}
 export function handlePageDataEndpoint(req, pathname, ctx, createResponseBuilder, respond, getErrorMessage) {
     return withSpan("module.pageData.handle", async () => {
         try {
@@ -14,18 +24,23 @@ export function handlePageDataEndpoint(req, pathname, ctx, createResponseBuilder
                 .replace(/\.json$/, "") || "";
             const url = new URL(req.url);
             const renderer = await getRendererForProject(ctx);
-            const pageData = await withTimeoutThrow(renderer.resolvePageData(slug, { request: req, url }), PAGE_DATA_TIMEOUT_MS, `resolvePageData for ${slug}`);
-            const body = JSON.stringify(pageData);
-            const etag = computeEtag(body);
+            const cacheKey = requestHasCacheSensitiveState(req)
+                ? null
+                : buildPageDataCacheKey(ctx, slug, url);
+            const payload = cacheKey
+                ? await resolveCachedPageData(cacheKey, () => withTimeoutThrow(renderer.resolvePageData(slug, { request: req, url }), PAGE_DATA_TIMEOUT_MS, `resolvePageData for ${slug}`))
+                : await resolveUncachedPageData(() => withTimeoutThrow(renderer.resolvePageData(slug, { request: req, url }), PAGE_DATA_TIMEOUT_MS, `resolvePageData for ${slug}`));
+            const cacheStrategy = cacheKey ? { maxAge: 60, public: true } : "no-cache";
             const builder = createResponseBuilder(ctx).withCORS(req, ctx.securityConfig?.cors);
-            if (hasMatchingEtag(req, etag)) {
-                return respond(builder.notModified(etag));
+            if (hasMatchingEtag(req, payload.etag)) {
+                return respond(builder.notModified(payload.etag));
             }
             return respond(builder
                 .withSecurity(ctx.securityConfig ?? undefined, req)
-                .withCache({ maxAge: 60, public: true })
-                .withETag(etag)
-                .json(pageData, 200));
+                .withCache(cacheStrategy)
+                .withETag(payload.etag)
+                .withHeaders({ "content-type": "application/json" })
+                .build(payload.body, 200));
         }
         catch (e) {
             if (e instanceof TimeoutError) {
@@ -63,3 +78,78 @@ export function handlePageDataEndpoint(req, pathname, ctx, createResponseBuilder
         "module.pageData.projectSlug": ctx.projectSlug || "unknown",
     });
 }
+async function resolveCachedPageData(cacheKey, resolve) {
+    const cached = getCachedPageData(cacheKey);
+    if (cached) {
+        markRequestProfilePhase("page_data.cache_hit");
+        return cached;
+    }
+    markRequestProfilePhase("page_data.cache_miss");
+    return await pageDataFlight.do(cacheKey, async () => {
+        const concurrentCached = getCachedPageData(cacheKey);
+        if (concurrentCached) {
+            markRequestProfilePhase("page_data.cache_hit_after_wait");
+            return concurrentCached;
+        }
+        const payload = await resolveUncachedPageData(resolve);
+        setCachedPageData(cacheKey, payload);
+        return payload;
+    });
+}
+async function resolveUncachedPageData(resolve) {
+    const startedAt = performance.now();
+    const pageData = await resolve();
+    markRequestProfilePhase("page_data.resolve", performance.now() - startedAt);
+    const bodyStart = performance.now();
+    const body = JSON.stringify(pageData);
+    const etag = computeEtag(body);
+    markRequestProfilePhase("page_data.serialize", performance.now() - bodyStart);
+    return {
+        body,
+        etag,
+        expiresAt: Date.now() + PAGE_DATA_CACHE_TTL_MS,
+    };
+}
+function getCachedPageData(cacheKey) {
+    const entry = pageDataCache.get(cacheKey);
+    if (!entry)
+        return null;
+    if (Date.now() <= entry.expiresAt)
+        return entry;
+    pageDataCache.delete(cacheKey);
+    markRequestProfilePhase("page_data.cache_expired");
+    return null;
+}
+function setCachedPageData(cacheKey, entry) {
+    if (pageDataCache.size >= PAGE_DATA_CACHE_MAX_ENTRIES && !pageDataCache.has(cacheKey)) {
+        const oldestKey = pageDataCache.keys().next().value;
+        if (oldestKey)
+            pageDataCache.delete(oldestKey);
+    }
+    pageDataCache.set(cacheKey, entry);
+}
+function buildPageDataCacheKey(ctx, slug, url) {
+    const projectKey = ctx.projectId ?? ctx.projectSlug ?? ctx.projectDir;
+    const environment = ctx.resolvedEnvironment ?? ctx.requestContext?.mode ?? "preview";
+    const contentSource = ctx.enriched?.contentSourceId ??
+        (environment === "production"
+            ? ctx.releaseId ?? "release"
+            : ctx.requestContext?.branch ?? "main");
+    const query = buildSortedQueryKey(url);
+    return [
+        projectKey,
+        environment,
+        contentSource,
+        slug || "index",
+        query,
+    ].join("|");
+}
+function buildSortedQueryKey(url) {
+    const entries = Array.from(url.searchParams.entries());
+    if (entries.length === 0)
+        return "";
+    return entries
+        .sort(([leftKey, leftValue], [rightKey, rightValue]) => leftKey === rightKey ? leftValue.localeCompare(rightValue) : leftKey.localeCompare(rightKey))
+        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+        .join("&");
+}

package/esm/src/utils/version-constant.d.ts

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.812";
+export declare const VERSION = "0.1.813";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,4 +1,4 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
 /** Shared version value. */
-export const VERSION = "0.1.812";
+export const VERSION = "0.1.813";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.812",
+  "version": "0.1.813",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",