@timber-js/app 0.2.0-alpha.115 → 0.2.0-alpha.117

package/dist/server/als-registry.d.ts

@@ -53,12 +53,25 @@ export interface RequestContextStore {
      */
     segmentParams?: Record<string, string | string[]>;
     /**
-     * The matched route pattern (e.g. '/[artistSlug]/[year]').
-     * Set by the pipeline alongside segmentParams. Used by
-     * getSegmentParams() for dev-mode route mismatch validation.
+     * The matched segment path (e.g. '/(browse)/[artistSlug]/[year]').
+     * Includes route groups and parallel slots — uniquely identifies the
+     * segment in the route tree. Set by the pipeline alongside segmentParams.
+     * Used by getSegmentParams() for dev-mode validation.
      * See design/41-global-params.md §Runtime Validation
      */
-    matchedRoutePattern?: string;
+    matchedSegmentPath?: string;
+    /**
+     * Per-slot coerced segment params, keyed by the slot's full tree path
+     * (e.g. '/(browse)/@shows/[artistSlug]/[...year]').
+     *
+     * Each slot walks its own segment tree and may interpret URL parts
+     * differently from the main route (e.g. catch-all vs dynamic). This
+     * map stores slot-specific params so getSegmentParams(segmentPath)
+     * returns the correct types for slot pages.
+     *
+     * See design/07-routing.md §"Parallel Slot Params"
+     */
+    slotParamsMap?: Map<string, Record<string, string | string[]>>;
     /** Outgoing Set-Cookie entries (name → serialized value + options). Last write wins. */
     cookieJar: Map<string, CookieEntry>;
     /** Whether the response has flushed (headers committed). */

package/dist/server/als-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"als-registry.d.ts","sourceRoot":"","sources":["../../src/server/als-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAMlE,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,wCAA+C,CAAC;AAE9E,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,uEAAuE;IACvE,eAAe,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,YAAY,EAAE,eAAe,CAAC;IAC9B;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAClD;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,wFAAwF;IACxF,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACpC,4DAA4D;IAC5D,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,cAAc,EAAE,OAAO,CAAC;IACxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,mBAAmB,EAAE,CAAC;CACrD;AAED,wDAAwD;AACxD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,qBAAqB,EAAE,aAAa,CAAC;CACtD;AAMD,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,mDAAmD;AACnD,eAAO,MAAM,QAAQ,+BAAsC,CAAC;AAM5D,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,oBAAoB,EAAE,WAAW,EAAE,CAAC;CACrD;AAED,yDAAyD;AACzD,eAAO,MAAM,SAAS,gCAAuC,CAAC;AAM9D,MAAM,WAAW,iBAAiB;IAChC,8DAA8D;IAC9D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,6DAA6D;IAC7D,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,mDAAmD;AACnD,eAAO,MAAM,eAAe,sCAA6C,CAAC;AAM1E,sDAAsD;AACtD,eAAO,MAAM,YAAY,4DAAmE,CAAC;AAM7F,4EAA4E;AAC5E,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;AAE3D,8DAA8D;AAC9D,eAAO,MAAM,mBAAmB,uCAA8C,CAAC;AAM/E,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;AAE9D,4DAA4D;AAC5D,eAAO,MAAM,YAAY,gCAAuC,CAAC"}
+{"version":3,"file":"als-registry.d.ts","sourceRoot":"","sources":["../../src/server/als-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAMlE,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,wCAA+C,CAAC;AAE9E,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,uEAAuE;IACvE,eAAe,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,YAAY,EAAE,eAAe,CAAC;IAC9B;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAClD;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;;;;;OAUG;IACH,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/D,wFAAwF;IACxF,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACpC,4DAA4D;IAC5D,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,cAAc,EAAE,OAAO,CAAC;IACxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,mBAAmB,EAAE,CAAC;CACrD;AAED,wDAAwD;AACxD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,qBAAqB,EAAE,aAAa,CAAC;CACtD;AAMD,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,mDAAmD;AACnD,eAAO,MAAM,QAAQ,+BAAsC,CAAC;AAM5D,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,oBAAoB,EAAE,WAAW,EAAE,CAAC;CACrD;AAED,yDAAyD;AACzD,eAAO,MAAM,SAAS,gCAAuC,CAAC;AAM9D,MAAM,WAAW,iBAAiB;IAChC,8DAA8D;IAC9D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,6DAA6D;IAC7D,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,mDAAmD;AACnD,eAAO,MAAM,eAAe,sCAA6C,CAAC;AAM1E,sDAAsD;AACtD,eAAO,MAAM,YAAY,4DAAmE,CAAC;AAM7F,4EAA4E;AAC5E,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;AAE3D,8DAA8D;AAC9D,eAAO,MAAM,mBAAmB,uCAA8C,CAAC;AAM/E,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;AAE9D,4DAA4D;AAC5D,eAAO,MAAM,YAAY,gCAAuC,CAAC"}

package/dist/server/index.js

@@ -1,6 +1,6 @@
 import { a as getSpanId, d as withSpan, o as getTraceId, p as formFlashAls, t as addSpanEvent, v as isDebug, y as isDevMode } from "../_chunks/tracing-DvKLzCFa.js";
 import { t as formatSize } from "../_chunks/format-CR6v1pWE.js";
-import { D as getCookieJar, a as revalidateTag, b as getSegmentParams, c as DenySignal, f as deny, h as waitUntil, i as revalidatePath, l as RedirectSignal, m as redirectExternal, p as redirect, s as parseFormData, u as RedirectType, v as getHeaders } from "../_chunks/actions-ILhDUzES.js";
+import { D as getCookieJar, a as revalidateTag, b as getSegmentParams, c as DenySignal, f as deny, h as waitUntil, i as revalidatePath, l as RedirectSignal, m as redirectExternal, p as redirect, s as parseFormData, u as RedirectType, v as getHeaders } from "../_chunks/actions-Cw-7NfJJ.js";
 //#region src/server/sensitive-fields.ts
 /**
 * Sensitive field stripping — removes password/token/CVV-style fields

package/dist/server/internal.js

@@ -3,10 +3,10 @@ import { a as warnRedirectInSuspense, c as warnSuspenseWrappingChildren, i as wa
 import { n as classifyUrlSegment } from "../_chunks/segment-classify-CnfLLvir.js";
 import { i as getMetadataRouteServePath, n as classifyMetadataRoute, r as getMetadataRouteAutoLink, t as METADATA_ROUTE_CONVENTIONS } from "../_chunks/metadata-routes-Cjmvi3rQ.js";
 import { a as logProxyError, c as logRequestReceived, d as logSwrRefetchFailed, f as logWaitUntilRejected, h as swallow, i as logMiddlewareShortCircuit, l as logRouteError, m as setLogger, n as logCacheMiss, o as logRenderError, p as logWaitUntilUnsupported, r as logMiddlewareError, s as logRequestCompleted, t as getLogger, u as logSlowRequest } from "../_chunks/logger-DDmK5skc.js";
-import { C as setMatchedRoutePattern, E as getCookie, O as getSetCookieHeaders, S as runWithRequestContext, T as setSegmentParams, _ as getHeader, b as getSegmentParams, c as DenySignal, d as RenderError, g as applyRequestHeaderOverlay, l as RedirectSignal, n as executeAction, o as coerce, r as isRscActionRequest, t as buildNoJsResponse, w as setMutableCookieContext, x as markResponseFlushed, y as getSearchParams } from "../_chunks/actions-ILhDUzES.js";
+import { C as setMatchedSegmentPath, E as getCookie, O as getSetCookieHeaders, S as runWithRequestContext, T as setSegmentParams, _ as getHeader, b as getSegmentParams, c as DenySignal, d as RenderError, g as applyRequestHeaderOverlay, l as RedirectSignal, n as executeAction, o as coerce, r as isRscActionRequest, t as buildNoJsResponse, w as setMutableCookieContext, x as markResponseFlushed, y as getSearchParams } from "../_chunks/actions-Cw-7NfJJ.js";
 import "../client/error-boundary.js";
-import "../_chunks/segment-context-EsfQpS--.js";
-import { n as toBracketKey } from "../_chunks/resolve-schema-DO8B0mO9.js";
+import { n as toBracketKey } from "../_chunks/resolve-schema-23Mc8aLi.js";
+import "../_chunks/segment-context-Bg0pFbLT.js";
 import { readFile } from "node:fs/promises";
 import { createElement } from "react";
 //#region src/server/server-timing.ts
@@ -1336,6 +1336,70 @@ function buildDeniedFallback(DeniedComponent, slotName, data, createElement) {
 	});
 }
 //#endregion
+//#region src/server/param-coercion.ts
+/** Global schema codecs, set once at startup from virtual:timber-schema. */
+var _globalCodecs = null;
+/**
+* Run segment param coercion on the matched route's segments.
+*
+* When `globalCodecs` is provided (from app/schema.ts), uses the global
+* codec map keyed by bare param name. Otherwise falls back to loading
+* per-segment params.ts modules.
+*
+* Throws ParamCoercionError if any codec fails (→ 404).
+*
+* This runs BEFORE middleware, so ctx.segmentParams is already typed.
+* See design/07-routing.md §"Where Coercion Runs"
+* See design/41-global-params.md §"Pipeline Integration"
+*/
+async function coerceSegmentParams(match) {
+	const globalCodecs = _globalCodecs;
+	const mergeTarget = Object.create(null);
+	for (const key of Object.keys(match.segmentParams)) if (key !== "__proto__") mergeTarget[key] = match.segmentParams[key];
+	match.segmentParams = mergeTarget;
+	if (globalCodecs) {
+		for (const segment of match.segments) {
+			if (!segment.paramName) continue;
+			const bracketKey = toBracketKey(segment.segmentType, segment.paramName);
+			const codec = globalCodecs[bracketKey];
+			if (!codec) continue;
+			const key = segment.paramName;
+			try {
+				mergeTarget[key] = sanitizeParamValue(codec.parse(mergeTarget[key]));
+			} catch (err) {
+				const message = err instanceof Error ? err.message : String(err);
+				if (isDebug()) console.warn(`[timber] Global schema codec rejected value for param "${key}"\n  Error: ${message}\n  Raw value: ${JSON.stringify(mergeTarget[key])}\n  Hint: check the codec in app/schema.ts for key '${bracketKey}'.`);
+				throw new ParamCoercionError(message);
+			}
+		}
+		return;
+	}
+	for (const segment of match.segments) {
+		if (!segment.params) continue;
+		let mod;
+		try {
+			mod = await loadModule(segment.params);
+		} catch (err) {
+			const message = `Failed to load params module for segment "${segment.segmentName}": ${err instanceof Error ? err.message : String(err)}`;
+			if (isDebug()) console.warn(`[timber] Param coercion error: ${message}\n  Segment: ${segment.segmentName}\n  Params file: ${segment.params}`);
+			throw new ParamCoercionError(message);
+		}
+		const segmentParamsDef = mod.segmentParams;
+		if (!segmentParamsDef || typeof segmentParamsDef.parse !== "function") continue;
+		try {
+			const coerced = segmentParamsDef.parse(match.segmentParams);
+			for (const key of Object.keys(coerced)) if (key !== "__proto__") mergeTarget[key] = sanitizeParamValue(coerced[key]);
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			if (isDebug()) {
+				const rawKeys = Object.keys(match.segmentParams).join(", ");
+				console.warn(`[timber] Param codec rejected values for segment "${segment.segmentName}"\n  Error: ${message}\n  Available raw params: { ${rawKeys} }\n  Params file: ${segment.params}\n  Hint: this usually means a codec threw for the raw URL value.\n  Check that the regex/schema accepts the actual path segment string.`);
+			}
+			throw new ParamCoercionError(message);
+		}
+	}
+}
+//#endregion
 //#region src/server/route-element-builder.ts
 /**
 * Thrown when a defineSegmentParams codec's parse() fails.
@@ -1536,70 +1600,6 @@ function pathnameMatchesPattern(pathname, pattern) {
 	return pi === pathParts.length;
 }
 //#endregion
-//#region src/server/param-coercion.ts
-/** Global schema codecs, set once at startup from virtual:timber-schema. */
-var _globalCodecs = null;
-/**
-* Run segment param coercion on the matched route's segments.
-*
-* When `globalCodecs` is provided (from app/schema.ts), uses the global
-* codec map keyed by bare param name. Otherwise falls back to loading
-* per-segment params.ts modules.
-*
-* Throws ParamCoercionError if any codec fails (→ 404).
-*
-* This runs BEFORE middleware, so ctx.segmentParams is already typed.
-* See design/07-routing.md §"Where Coercion Runs"
-* See design/41-global-params.md §"Pipeline Integration"
-*/
-async function coerceSegmentParams(match) {
-	const globalCodecs = _globalCodecs;
-	const mergeTarget = Object.create(null);
-	for (const key of Object.keys(match.segmentParams)) if (key !== "__proto__") mergeTarget[key] = match.segmentParams[key];
-	match.segmentParams = mergeTarget;
-	if (globalCodecs) {
-		for (const segment of match.segments) {
-			if (!segment.paramName) continue;
-			const bracketKey = toBracketKey(segment.segmentType, segment.paramName);
-			const codec = globalCodecs[bracketKey];
-			if (!codec) continue;
-			const key = segment.paramName;
-			try {
-				mergeTarget[key] = sanitizeParamValue(codec.parse(mergeTarget[key]));
-			} catch (err) {
-				const message = err instanceof Error ? err.message : String(err);
-				if (isDebug()) console.warn(`[timber] Global schema codec rejected value for param "${key}"\n  Error: ${message}\n  Raw value: ${JSON.stringify(mergeTarget[key])}\n  Hint: check the codec in app/schema.ts for key '${bracketKey}'.`);
-				throw new ParamCoercionError(message);
-			}
-		}
-		return;
-	}
-	for (const segment of match.segments) {
-		if (!segment.params) continue;
-		let mod;
-		try {
-			mod = await loadModule(segment.params);
-		} catch (err) {
-			const message = `Failed to load params module for segment "${segment.segmentName}": ${err instanceof Error ? err.message : String(err)}`;
-			if (isDebug()) console.warn(`[timber] Param coercion error: ${message}\n  Segment: ${segment.segmentName}\n  Params file: ${segment.params}`);
-			throw new ParamCoercionError(message);
-		}
-		const segmentParamsDef = mod.segmentParams;
-		if (!segmentParamsDef || typeof segmentParamsDef.parse !== "function") continue;
-		try {
-			const coerced = segmentParamsDef.parse(match.segmentParams);
-			for (const key of Object.keys(coerced)) if (key !== "__proto__") mergeTarget[key] = sanitizeParamValue(coerced[key]);
-		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			if (isDebug()) {
-				const rawKeys = Object.keys(match.segmentParams).join(", ");
-				console.warn(`[timber] Param codec rejected values for segment "${segment.segmentName}"\n  Error: ${message}\n  Available raw params: { ${rawKeys} }\n  Params file: ${segment.params}\n  Hint: this usually means a codec threw for the raw URL value.\n  Check that the regex/schema accepts the actual path segment string.`);
-			}
-			throw new ParamCoercionError(message);
-		}
-	}
-}
-//#endregion
 //#region src/server/pipeline-outcome.ts
 /**
 * Pipeline outcome translator — converts a `PhaseOutcome` (the value
@@ -1935,6 +1935,7 @@ async function handleRequest(config, req, method, path) {
 	} catch (err) {
 		swallow(err, "early hints hook threw");
 	}
+	match.rawSegmentParams = { ...match.segmentParams };
 	try {
 		await coerceSegmentParams(match);
 	} catch (error) {
@@ -1951,8 +1952,8 @@ async function handleRequest(config, req, method, path) {
 		throw error;
 	}
 	setSegmentParams(match.segmentParams);
-	const leaf = match.segments[match.segments.length - 1];
-	if (leaf) setMatchedRoutePattern(leaf.urlPath);
+	const segmentPath = match.segments.map((s) => s.segmentName).filter(Boolean).join("/") || "/";
+	setMatchedSegmentPath(segmentPath.startsWith("/") ? segmentPath : `/${segmentPath}`);
 	return outcomeToResponse(config, !shouldBypassMiddleware(req) && match.middlewareChain.length > 0 ? await runMiddlewarePhase(config, req, match, responseHeaders, requestHeaderOverlay, {
 		canonicalPathname,
 		interception