@voltro/web 0.9.0 → 0.11.0

package/dist/index.d.ts

@@ -165,10 +165,12 @@ export declare const defaultFallbackStrings: FallbackStrings;
  * Split a loader's result into data that blocks the shell and data that
  * streams in after it.
  *
- * Only legal on a page with `renderMode: 'ssr'` and `interactive: 'full'` —
- * every other combination is a hard boot/build error naming the page, because
- * there is no honest way to stream into a stored artefact or into a document
- * with no React runtime. See {@link assertDeferralSupported}.
+ * Legal in a PAGE loader on `renderMode: 'ssr'` + `interactive: 'full'`, and in
+ * a LAYOUT loader that also serves a `renderMode:'spa'` page under it (the SSR
+ * layout shell — streamed per request by `voltro dev` / `voltro serve`). Every
+ * other combination is a hard boot/build error naming the page, because there
+ * is no honest way to stream into a stored artefact or into a document with no
+ * React runtime. See {@link assertDeferralSupported}.
  *
  * Deliberately NOT a `const` type parameter: a loader's `{ title: 'Ok' }` must
  * widen to `string`, the way any other loader's return type does. Pinning the
@@ -802,8 +804,19 @@ export declare const registerClientTrace: (traceId: string) => void;
  *               tenant-scoped first paint.
  *   - 'isr'  — Like 'ssr' on the first request, then cached and
  *               revalidated in the background on a TTL.
+ *
+ * The value set is single-sourced from {@link RENDER_MODES} so the type and
+ * every runtime check derive from ONE literal list. There are no aliases — an
+ * unrecognised value is rejected at codegen/discovery time by the CLI, not
+ * silently passed through.
+ */
+export declare const RENDER_MODES: readonly ["static", "spa", "ssr", "isr"];
+
+/**
+ * A page's render mode — one of {@link RENDER_MODES}, from which this type is
+ * derived. Closed set: an unrecognised value is rejected at codegen time.
  */
-export declare type RenderMode = 'static' | 'spa' | 'ssr' | 'isr';
+export declare type RenderMode = (typeof RENDER_MODES)[number];
 
 /**
  * Auth headers for an api's WS rpc client. @effect/rpc sends these in the

package/dist/index.js

@@ -2,28 +2,28 @@ import { t as e } from "./globalContext-d4A-ugDg.js";
 import { AppClientsContext as t, useAppClient as n } from "./hooks.js";
 import { a as r, c as i, i as a, l as o, o as s, r as c, s as l, u } from "./frameworkBoot-C_d7E8Fj.js";
 import { a as d, c as f, i as p, l as m, o as h, s as g } from "./defaultFallbacks-CGs2z5qv.js";
-import { i as _, n as ee, r as te, t as ne } from "./mount-Gsn3ouYx.js";
-import { c as re, d as ie, h as ae, l as oe, p as se, u as ce } from "./routerState-DpUqogK8.js";
-import { A as le, B as ue, C as de, D as fe, E as pe, F as me, H as v, I as y, L as b, M as x, N as S, O as C, P as w, R as T, S as E, T as D, U as O, V as k, _ as A, a as j, b as M, c as N, d as P, f as F, g as I, h as L, i as R, j as z, k as he, l as ge, m as _e, n as ve, o as ye, p as be, r as xe, s as Se, t as Ce, u as we, v as Te, w as Ee, x as De, y as Oe, z as ke } from "./serverContext-COzippNt.js";
-import { Component as Ae, Suspense as je, createElement as B, use as Me, useCallback as Ne, useContext as Pe, useSyncExternalStore as Fe } from "react";
+import { i as _, n as ee, r as te, t as ne } from "./mount-CKsOnjiF.js";
+import { c as re, d as ie, h as ae, l as oe, p as se, u as ce } from "./routerState-cjTiUIum.js";
+import { A as le, B as ue, C as de, D as fe, E as pe, F as me, H as v, I as y, L as b, M as x, N as S, O as C, P as w, R as T, S as E, T as D, U as O, V as k, W as A, _ as j, a as M, b as N, c as P, d as F, f as I, g as L, h as R, i as z, j as he, k as ge, l as _e, m as ve, n as ye, o as be, p as xe, r as Se, s as Ce, t as we, u as Te, v as Ee, w as De, x as Oe, y as ke, z as Ae } from "./serverContext-BP0ywwLZ.js";
+import { Component as je, Suspense as Me, createElement as B, use as Ne, useCallback as Pe, useContext as Fe, useSyncExternalStore as Ie } from "react";
 import { Fragment as V, jsx as H, jsxs as U } from "react/jsx-runtime";
 export * from "@voltro/client";
 export * from "@voltro/ui";
 //#region src/await.tsx
-var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PURE__ */ H(je, {
+var Le = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PURE__ */ H(Me, {
 	fallback: t,
-	children: /* @__PURE__ */ H(Re, {
+	children: /* @__PURE__ */ H(ze, {
 		errorFallback: r,
-		children: /* @__PURE__ */ H(Le, {
+		children: /* @__PURE__ */ H(Re, {
 			value: e,
 			errorFallback: r ?? null,
 			children: n
 		})
 	})
-}), W = ({ body: e }) => /* @__PURE__ */ H("script", { dangerouslySetInnerHTML: { __html: e } }), Le = ({ value: e, errorFallback: t, children: n }) => {
-	let r = Me(e), i = ce(e), a = ae(r);
+}), W = ({ body: e }) => /* @__PURE__ */ H("script", { dangerouslySetInnerHTML: { __html: e } }), Re = ({ value: e, errorFallback: t, children: n }) => {
+	let r = Ne(e), i = ce(e), a = ae(r);
 	return a === void 0 ? /* @__PURE__ */ U(V, { children: [i === void 0 ? null : /* @__PURE__ */ H(W, { body: ie(i, r) }), n(r)] }) : /* @__PURE__ */ U(V, { children: [i === void 0 ? null : /* @__PURE__ */ H(W, { body: oe(i, a) }), t] });
-}, Re = class extends Ae {
+}, ze = class extends je {
 	state = { error: void 0 };
 	static getDerivedStateFromError(e) {
 		return { error: e };
@@ -31,7 +31,7 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 	render() {
 		return this.state.error === void 0 ? this.props.children : this.props.errorFallback ?? null;
 	}
-}, G = ({ src: e }) => e, K = e("imageConfig", { loader: G }), ze = ({ loader: e, children: t }) => B(K.Provider, { value: { loader: e } }, t), q = [
+}, G = ({ src: e }) => e, K = e("imageConfig", { loader: G }), Be = ({ loader: e, children: t }) => B(K.Provider, { value: { loader: e } }, t), q = [
 	640,
 	750,
 	828,
@@ -40,7 +40,7 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 	1920,
 	2048,
 	3840
-], Be = (e, t, n, r) => {
+], Ve = (e, t, n, r) => {
 	let i = n !== void 0 && !r ? Array.from(new Set(q.filter((e) => e <= n * 2).concat(n))).sort((e, t) => e - t) : [...q];
 	return {
 		srcSet: i.map((n) => `${e({
@@ -52,10 +52,10 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 			width: i[i.length - 1]
 		})
 	};
-}, Ve = ({ src: e, alt: t, width: n, height: r, fill: i = !1, sizes: a, priority: o = !1, loader: s, placeholder: c = "empty", blurDataURL: l, style: u, ...d }) => {
-	let f = Pe(K).loader, p = s ?? f;
+}, He = ({ src: e, alt: t, width: n, height: r, fill: i = !1, sizes: a, priority: o = !1, loader: s, placeholder: c = "empty", blurDataURL: l, style: u, ...d }) => {
+	let f = Fe(K).loader, p = s ?? f;
 	!i && (n === void 0 || r === void 0) && typeof console < "u" && console.warn(`<Image src="${e}"> needs both width and height (or fill) to reserve layout space and avoid CLS.`);
-	let { srcSet: m, fallback: h } = Be(p, e, n, i), g = c === "blur" && l ? {
+	let { srcSet: m, fallback: h } = Ve(p, e, n, i), g = c === "blur" && l ? {
 		backgroundImage: `url(${l})`,
 		backgroundSize: "cover",
 		backgroundPosition: "center"
@@ -85,10 +85,10 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 		},
 		...d
 	});
-}, He = ({ to: e, children: t, className: n }) => B("a", {
+}, Ue = ({ to: e, children: t, className: n }) => B("a", {
 	href: e,
 	className: n
-}, t), Ue = {
+}, t), We = {
 	position: "sticky",
 	top: 0,
 	zIndex: 10,
@@ -99,13 +99,13 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 	padding: "1rem 1.5rem",
 	borderBottom: "1px solid var(--voltro-blog-border, rgba(127,127,127,0.2))",
 	backdropFilter: "blur(8px)"
-}, We = {
+}, Ge = {
 	maxWidth: "48rem",
 	margin: "0 auto",
 	padding: "2rem 1.5rem",
 	width: "100%"
-}, Ge = (e) => {
-	let { brand: t, topNav: n, children: r, pathname: i, footer: a, breadcrumbs: o, headerRight: s } = e, c = e.Link ?? He, l = B("nav", {
+}, Ke = (e) => {
+	let { brand: t, topNav: n, children: r, pathname: i, footer: a, breadcrumbs: o, headerRight: s } = e, c = e.Link ?? Ue, l = B("nav", {
 		className: "voltro-blog-nav",
 		style: {
 			display: "flex",
@@ -122,7 +122,7 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 		});
 	})), u = B("header", {
 		className: "voltro-blog-header",
-		style: Ue
+		style: We
 	}, B("div", { className: "voltro-blog-brand" }, t), s ? B("div", { style: {
 		display: "flex",
 		gap: "1rem",
@@ -150,7 +150,7 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 	})) : null;
 	return B("div", { className: "voltro-blog-layout" }, u, B("main", {
 		className: "voltro-blog-main",
-		style: We
+		style: Ge
 	}, d, r), a ? B("footer", {
 		className: "voltro-blog-footer",
 		style: {
@@ -160,7 +160,7 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 			borderTop: "1px solid var(--voltro-blog-border, rgba(127,127,127,0.2))"
 		}
 	}, a) : null);
-}, J = "voltro:theme", Y = 31536e3, Ke = () => {
+}, J = "voltro:theme", qe = 31536e3, Je = () => {
 	if (typeof document > "u") return "system";
 	try {
 		let e = document.cookie.match(/(?:^|;\s*)voltro:theme=([^;]*)/), t = e?.[1] === void 0 ? "" : decodeURIComponent(e[1]);
@@ -168,17 +168,17 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 	} catch {
 		return "system";
 	}
-}, qe = () => {
+}, Y = () => {
 	if (typeof window > "u" || !window.matchMedia) return !1;
 	try {
 		return window.matchMedia("(prefers-color-scheme: dark)").matches;
 	} catch {
 		return !1;
 	}
-}, X = (e) => e === "system" ? qe() ? "dark" : "light" : e, Z = 0, Q = /* @__PURE__ */ new Set(), $ = () => {
+}, X = (e) => e === "system" ? Y() ? "dark" : "light" : e, Z = 0, Q = /* @__PURE__ */ new Set(), $ = () => {
 	Z++;
 	for (let e of Q) e();
-}, Je = (e) => {
+}, Ye = (e) => {
 	Q.add(e);
 	let t, n = () => $();
 	if (typeof window < "u" && window.matchMedia) try {
@@ -190,21 +190,21 @@ var Ie = ({ value: e, fallback: t, children: n, errorFallback: r }) => /* @__PUR
 			t?.removeEventListener("change", n);
 		} catch {}
 	};
-}, Ye = () => {
-	let e = Ke();
+}, Xe = () => {
+	let e = Je();
 	return `${Z}:${e}:${X(e)}`;
-}, Xe = () => "0:system:light", Ze = () => {
-	let [, e, t] = Fe(Je, Ye, Xe).split(":");
+}, Ze = () => "0:system:light", Qe = () => {
+	let [, e, t] = Ie(Ye, Xe, Ze).split(":");
 	return {
 		theme: e,
 		resolvedTheme: t,
-		setTheme: Ne((e) => {
+		setTheme: Pe((e) => {
 			if (typeof document < "u") try {
-				document.cookie = e === "system" ? `${J}=; path=/; max-age=0; SameSite=Lax` : `${J}=${e}; path=/; max-age=${Y}; SameSite=Lax`, document.documentElement.classList.toggle("dark", X(e) === "dark");
+				document.cookie = e === "system" ? `${J}=; path=/; max-age=0; SameSite=Lax` : `${J}=${e}; path=/; max-age=${qe}; SameSite=Lax`, document.documentElement.classList.toggle("dark", X(e) === "dark");
 			} catch {}
 			$();
 		}, [])
 	};
-}, Qe = "framework-web";
+}, $e = "framework-web";
 //#endregion
-export { t as AppClientsContext, Ie as Await, Ge as BlogLayout, p as FallbackStringsProvider, Ve as Image, ze as ImageConfigProvider, ye as Link, Se as LoaderCache, N as LoaderDataContext, i as NavigationIndicator, me as NotFoundError, ge as PAGE_SLOT_ATTR, we as PageSlot, P as PlainLink, o as ReconnectContext, y as RedirectError, F as Router, be as RouterContext, Ce as ServerRequestContext, ve as ServerRequestProvider, J as THEME_COOKIE, Qe as WEB_NAME, _e as compileRoute, d as defaultFallbackStrings, re as defer, L as externalUrl, I as findNotFound, c as formatPrintf, ee as getIslandComponent, k as getRouteSnapshot, g as getStatuses, te as hydrateIslandsOnPage, a as installBrowserConsoleBridge, r as installServerLogRelay, se as isDeferredLoaderResult, b as isNotFound, T as isRedirect, _ as island, A as lazyPageRoute, Te as loaderCacheKey, Oe as matchRoute, ne as mount, ke as notFound, M as pageRoute, xe as parseCookieHeader, G as passthroughImageLoader, De as preloadRouteModule, f as pushStatus, ue as redirect, s as registerClientTrace, E as resolveAnchorNavigation, de as resolveMeta, Ee as segmentLoaderKey, v as setRouteSnapshot, D as sortRoutesByPriority, O as subscribeRouteSnapshot, m as subscribeStatuses, l as subscribeTraceErrors, n as useAppClient, pe as useBlocker, h as useFallbackStrings, fe as useLoaderData, C as useLocation, he as useNavigate, le as useParams, z as usePrefetch, u as useReconnect, R as useSearchParams, j as useServerRequest, x as useSetSearchParams, Ze as useTheme, S as withHash, w as withQuery };
+export { t as AppClientsContext, Le as Await, Ke as BlogLayout, p as FallbackStringsProvider, He as Image, Be as ImageConfigProvider, be as Link, Ce as LoaderCache, P as LoaderDataContext, i as NavigationIndicator, y as NotFoundError, _e as PAGE_SLOT_ATTR, Te as PageSlot, F as PlainLink, I as RENDER_MODES, o as ReconnectContext, b as RedirectError, xe as Router, ve as RouterContext, we as ServerRequestContext, ye as ServerRequestProvider, J as THEME_COOKIE, $e as WEB_NAME, R as compileRoute, d as defaultFallbackStrings, re as defer, L as externalUrl, j as findNotFound, c as formatPrintf, ee as getIslandComponent, v as getRouteSnapshot, g as getStatuses, te as hydrateIslandsOnPage, a as installBrowserConsoleBridge, r as installServerLogRelay, se as isDeferredLoaderResult, T as isNotFound, Ae as isRedirect, _ as island, Ee as lazyPageRoute, ke as loaderCacheKey, N as matchRoute, ne as mount, ue as notFound, Oe as pageRoute, Se as parseCookieHeader, G as passthroughImageLoader, E as preloadRouteModule, f as pushStatus, k as redirect, s as registerClientTrace, de as resolveAnchorNavigation, De as resolveMeta, D as segmentLoaderKey, O as setRouteSnapshot, pe as sortRoutesByPriority, A as subscribeRouteSnapshot, m as subscribeStatuses, l as subscribeTraceErrors, n as useAppClient, fe as useBlocker, h as useFallbackStrings, C as useLoaderData, ge as useLocation, le as useNavigate, he as useParams, x as usePrefetch, u as useReconnect, z as useSearchParams, M as useServerRequest, S as useSetSearchParams, Qe as useTheme, w as withHash, me as withQuery };

package/dist/{mount-Gsn3ouYx.js → mount-CKsOnjiF.js}

@@ -1,5 +1,5 @@
 import { t as e } from "./frameworkBoot-C_d7E8Fj.js";
-import { o as t, r as n, t as r } from "./routerState-DpUqogK8.js";
+import { o as t, r as n, t as r } from "./routerState-cjTiUIum.js";
 import { StrictMode as i, createElement as a } from "react";
 import { createRoot as o, hydrateRoot as s } from "react-dom/client";
 import { jsx as c } from "react/jsx-runtime";
@@ -58,13 +58,13 @@ var l = /* @__PURE__ */ new Map(), u = (e, t) => {
 		descriptors: t.descriptors ?? {},
 		wsUrl: t.wsUrl ?? h(e),
 		headers: t.headers
-	})), f = document.getElementById(r), p = f !== null && u.children.length > 0, g = document.querySelector("meta[name=\"voltro-interactive\"]")?.getAttribute("content") ?? "full";
+	})), f = n(document.getElementById(r)?.textContent, window.location.pathname), p = f !== null && u.children.length > 0, g = document.querySelector("meta[name=\"voltro-interactive\"]")?.getAttribute("content") ?? "full";
 	if (g === "none") return;
 	if (g === "islands") {
 		m();
 		return;
 	}
-	p && t(n(f.textContent, window.location.pathname));
+	p && t(f);
 	let _ = /* @__PURE__ */ c(i, { children: /* @__PURE__ */ c(e, {
 		App: a,
 		apis: d,

package/dist/mount.js

@@ -1,2 +1,2 @@
-import { t as e } from "./mount-Gsn3ouYx.js";
+import { t as e } from "./mount-CKsOnjiF.js";
 export { e as mount };

package/dist/{routerState-DpUqogK8.js → routerState-cjTiUIum.js}

@@ -53,12 +53,14 @@ var e = /* @__PURE__ */ RegExp("\\u2028", "g"), t = /* @__PURE__ */ RegExp("\\u2
 		deferredIds: r
 	};
 }, x = (e) => {
-	let { page: t, renderMode: n, interactive: r } = e;
-	if (n !== "ssr") throw Error(`[voltro] "${t}" uses defer() in its loader but has renderMode: '${n}'. defer() streams values in AFTER the shell, which only a per-request response can do — '${n}' produces a stored HTML artefact with no "after". Set \`export const renderMode = 'ssr'\` on this page, or drop defer() and return the values directly.`);
+	let { page: t, renderMode: n, interactive: r, layoutShell: i } = e;
+	if (i === "artefact") throw Error(`[voltro] a layout in "${t}"'s chain uses defer() in its loader, but this page's SSR layout shell is PRERENDERED at build time into a static HTML file. defer() streams values in AFTER the shell, and a file has no "after" — the <Await> fallback would be frozen into the artefact forever. Drop defer() from the layout loader and return the values directly (the shell then prerenders as before), or give the layout per-request data so the page is served on demand.`);
+	if (!(n === "ssr" || n === "spa" && i === "stream")) throw Error(`[voltro] "${t}" uses defer() in its loader but has renderMode: '${n}'. defer() streams values in AFTER the shell, which only a per-request response can do — '${n}' produces a stored HTML artefact with no "after". Set \`export const renderMode = 'ssr'\` on this page, or drop defer() and return the values directly.`);
 	if (r !== "full") throw Error(`[voltro] "${t}" uses defer() in its loader but has interactive: '${r}'. ` + (r === "none" ? "Revealing a streamed <Suspense> boundary requires React's inline reveal scripts, and interactive: 'none' ships no JS at all — the <Await> fallback would be permanent. " : "interactive: 'islands' never hydrates the page's React root, so nothing consumes the streamed values and the <Await> fallback would be permanent. ") + "Remove the `interactive` export (defaults to 'full'), or drop defer() and return the values directly.");
 }, S = "__voltro_state__", C = (e) => {
 	let t = Object.keys(e.segmentLoaderData ?? {}).map((e) => Number(e)).filter((e) => Number.isInteger(e)).sort((e, t) => e - t), n = e.deferredPageIds !== void 0, r = e.deferredSegmentIds !== void 0 && Object.keys(e.deferredSegmentIds).length > 0;
 	return {
+		path: e.path,
 		page: e.loaderData,
 		...e.segmentLoaderData ? { segments: e.segmentLoaderData } : {},
 		ran: {
@@ -71,7 +73,13 @@ var e = /* @__PURE__ */ RegExp("\\u2028", "g"), t = /* @__PURE__ */ RegExp("\\u2
 			...r ? { segments: e.deferredSegmentIds } : {}
 		} } : {}
 	};
-}, w = (e) => `<script type="application/json" id="${S}">${n(C(e))}<\/script>`, T = /* @__PURE__ */ new Map(), E = (e, t) => {
+}, w = (e) => `<script type="application/json" id="${S}">${n(C(e))}<\/script>`, T = /* @__PURE__ */ new Map(), E = (e) => {
+	let t = e;
+	try {
+		t = decodeURIComponent(t);
+	} catch {}
+	return t.endsWith("/index.html") && (t = t.slice(0, -10)), t.length > 1 && t.endsWith("/") && (t = t.slice(0, -1)), t.length === 0 ? "/" : t;
+}, D = (e, t) => {
 	if (!e) return null;
 	let n;
 	try {
@@ -80,22 +88,24 @@ var e = /* @__PURE__ */ RegExp("\\u2028", "g"), t = /* @__PURE__ */ RegExp("\\u2
 		return null;
 	}
 	if (typeof n != "object" || !n || Array.isArray(n)) return null;
-	let r = n, i = new Set(r.ran?.segments ?? []), a = /* @__PURE__ */ new Map();
-	for (let e of i) a.set(e, D(r.segments?.[String(e)], r.deferred?.segments?.[String(e)]));
+	let r = n;
+	if (typeof r.path != "string" || E(r.path) !== E(t)) return null;
+	let i = new Set(r.ran?.segments ?? []), a = /* @__PURE__ */ new Map();
+	for (let e of i) a.set(e, O(r.segments?.[String(e)], r.deferred?.segments?.[String(e)]));
 	return {
-		page: D(r.page, r.deferred?.page),
+		page: O(r.page, r.deferred?.page),
 		pageRan: r.ran?.page === !0,
 		segments: a.size > 0 ? a : T,
 		pageClientOnly: r.pageClientOnly === !0,
 		pathname: t
 	};
-}, D = (e, t) => {
+}, O = (e, t) => {
 	if (!t) return e;
 	let n = g(), r = { ...e ?? {} };
 	for (let [e, i] of Object.entries(t)) r[e] = c(n.get(i), i);
 	return r;
-}, O = null, k = (e) => {
-	O = e;
-}, A = () => O;
+}, k = null, A = (e) => {
+	k = e;
+}, j = () => k;
 //#endregion
-export { n as _, w as a, i as c, m as d, o as f, p as g, y as h, A as i, h as l, b as m, C as n, k as o, a as p, E as r, x as s, S as t, l as u };
+export { n as _, w as a, i as c, m as d, o as f, p as g, y as h, j as i, h as l, b as m, C as n, A as o, a as p, D as r, x as s, S as t, l as u };