@askrjs/askr 0.0.94 → 0.0.96

package/dist/resources/index.d.ts

@@ -1,5 +1,5 @@
-import { Z as getSignal } from "../index-KQ7Vl4-8.js";
-import { i as onRouteChange, n as RouteChangeOptions, t as RouteChangeCleanup } from "../activity-CJIQyo5X.js";
+import { Z as getSignal } from "../index-CTIBOqUB.js";
+import { i as onRouteChange, n as RouteChangeOptions, t as RouteChangeCleanup } from "../activity-D_5x2HXQ.js";
 //#region src/runtime/resource-operation.d.ts
 /** Reactive result of a {@link resource}: current value, loading state, and controls. */
 interface ResourceResult<T> {

package/dist/resources/index.js

@@ -1,9 +1,9 @@
 import { t as enqueueRuntimeLane } from "../access-d_DCdwqn.js";
 import { f as getCurrentComponentInstance, g as getSignal, i as claimHookIndex } from "../component-scope-4I3yEMkb.js";
-import { a as registerCommitOperation } from "../component-internal-DOVVMjG7.js";
-import { t as resource } from "../resource-operation-CLQXCn1p.js";
-import { a as task, i as routeActive, n as documentVisible, o as timer, r as on, s as windowFocused, t as capture } from "../lifecycle-operations-Qxq6ABrC.js";
-import { n as onRouteChange } from "../activity-BshyLB3_.js";
+import { a as registerCommitOperation } from "../component-internal-D0yE2Ch3.js";
+import { t as resource } from "../resource-operation-B62UQKHV.js";
+import { a as task, i as routeActive, n as documentVisible, o as timer, r as on, s as windowFocused, t as capture } from "../lifecycle-operations-CBzG5PyB.js";
+import { n as onRouteChange } from "../activity-d4t3CdzK.js";
 //#region src/runtime/stream-operation.ts
 function toError(value) {
 	return value instanceof Error ? value : new Error(String(value));

package/dist/router/index.d.ts

@@ -1,7 +1,7 @@
-import { $ as AccessDecision, At as RouteRegistry, Ct as RouteParams, Dt as RouteRecord, Et as RouteQuery, Ft as RouteSearch, It as RouteSearchValue, Lt as RouteSnapshot, Mt as RouteRenderResult, Nt as RouteRequestOptions, Ot as RouteRef, Pt as RouteRequestResult, Q as AccessAllowDecision, St as RouteOptions, Tt as RoutePolicy, _t as RouteManifest, at as LayoutScopeRecord, bt as RouteMetaSource, ct as ParsedSegment, dt as RouteAuthResolver, et as AccessDenyDecision, ft as RouteComponent, gt as RouteHandler, ht as RouteDestination, it as GroupHelperOptions, jt as RouteRegistryOptions, kt as RouteRefSearch, lt as Route, mt as RouteDefinition, nt as AccessRedirectDecision, ot as PageHelperOptions, pt as RouteContext, rn as RenderableChild, rt as AccessRedirectStatus, st as PageScopeRecord, tt as AccessDenyStatus, ut as RouteAuthOptions, vt as RouteMatch, wt as RoutePathParams, xt as RouteMode, yt as RouteMeta } from "../index-KQ7Vl4-8.js";
+import { $ as AccessDecision, At as RouteRegistry, Ct as RouteParams, Dt as RouteRecord, Et as RouteQuery, Ft as RouteSearch, It as RouteSearchValue, Lt as RouteSnapshot, Mt as RouteRenderResult, Nt as RouteRequestOptions, Ot as RouteRef, Pt as RouteRequestResult, Q as AccessAllowDecision, St as RouteOptions, Tt as RoutePolicy, _t as RouteManifest, at as LayoutScopeRecord, bt as RouteMetaSource, ct as ParsedSegment, dt as RouteAuthResolver, et as AccessDenyDecision, ft as RouteComponent, gt as RouteHandler, ht as RouteDestination, it as GroupHelperOptions, jt as RouteRegistryOptions, kt as RouteRefSearch, lt as Route, mt as RouteDefinition, nt as AccessRedirectDecision, ot as PageHelperOptions, pt as RouteContext, rn as RenderableChild, rt as AccessRedirectStatus, st as PageScopeRecord, tt as AccessDenyStatus, ut as RouteAuthOptions, vt as RouteMatch, wt as RoutePathParams, xt as RouteMode, yt as RouteMeta } from "../index-CTIBOqUB.js";
 import { r as JSXElement, s as Props } from "../types-DkVJhVs9.js";
-import { a as ScrollRestorationOptions, i as NavigationScrollBehavior, n as NavigateOptions, r as HistoryScrollBehavior, t as navigate } from "../navigate-BL_FIIJ6.js";
-import { i as onRouteChange, n as RouteChangeOptions, r as currentRoute, t as RouteChangeCleanup } from "../activity-CJIQyo5X.js";
+import { a as ScrollRestorationOptions, i as NavigationScrollBehavior, n as NavigateOptions, r as HistoryScrollBehavior, t as navigate } from "../navigate-eGm4omPj.js";
+import { i as onRouteChange, n as RouteChangeOptions, r as currentRoute, t as RouteChangeCleanup } from "../activity-D_5x2HXQ.js";
 import { AuthContext, AuthContext as AuthContext$1, AuthRequirement, AuthRequirement as AuthRequirement$1 } from "@askrjs/auth";
 import { ObjectSchema } from "@askrjs/schema";
 //#region src/router/route-query.d.ts

package/dist/router/index.js

@@ -1,11 +1,11 @@
 import { n as createRouteRegistry } from "../manifest-D6rfj_jC.js";
-import { a as isSafeHref } from "../csp-nonce-BBxq1zq4.js";
+import { a as isSafeHref } from "../csp-nonce-BVybpV1v.js";
 import { jsx } from "../jsx-runtime.js";
 import { o as addRouteBasePath, y as getActiveRouteBasePath } from "../route-matching-Bo6UqG-5.js";
-import { a as group, c as route, i as fallback, n as resolveDeferredValues, o as index, r as routeData, s as page, t as Resolve } from "../deferred-BS0Xpstg.js";
-import { S as RouteDataLoadError, a as resolveRouteRequest, b as lazy, f as defer, g as Outlet, h as currentAuth, p as isDeferred, x as lazyRouteData } from "../resolution-D8PgnTzh.js";
-import { n as onRouteChange, t as currentRoute } from "../activity-BshyLB3_.js";
-import { a as serializeRouteMeta, c as getCurrentHref, d as parseTargetUrl, h as syncRegisteredRouteSnapshot, i as resolveRouteMeta, l as getRegisteredAppsSnapshot, m as syncAppRegistrationLocation, n as navigate, p as setCurrentRouteLocation, r as reconcileRouteMeta, s as saveScrollPosition, u as getWindowHref } from "../navigate-CECCMPAr.js";
+import { a as group, c as route, i as fallback, n as resolveDeferredValues, o as index, r as routeData, s as page, t as Resolve } from "../deferred-p8hyanxJ.js";
+import { S as RouteDataLoadError, a as resolveRouteRequest, b as lazy, f as defer, g as Outlet, h as currentAuth, p as isDeferred, x as lazyRouteData } from "../resolution-BQyo7qNn.js";
+import { n as onRouteChange, t as currentRoute } from "../activity-d4t3CdzK.js";
+import { a as serializeRouteMeta, c as getCurrentHref, d as parseTargetUrl, h as syncRegisteredRouteSnapshot, i as resolveRouteMeta, l as getRegisteredAppsSnapshot, m as syncAppRegistrationLocation, n as navigate, p as setCurrentRouteLocation, r as reconcileRouteMeta, s as saveScrollPosition, u as getWindowHref } from "../navigate-DChM5m8m.js";
 import { o as mergeProps } from "../compose-ref-1Fhs7mbF.js";
 import { t as applyInteractionPolicy } from "../interactions-B4XaFxt1.js";
 //#region src/router/route-query.ts

package/dist/ssg/index.d.ts

@@ -1,4 +1,4 @@
-import { At as RouteRegistry, St as RouteOptions, Tt as RoutePolicy, an as DocumentRenderArgs, gt as RouteHandler, on as DocumentRenderContext, sn as DocumentRenderer, un as SSRStyleRegistrationValidation, wt as RoutePathParams } from "../index-KQ7Vl4-8.js";
+import { At as RouteRegistry, St as RouteOptions, Tt as RoutePolicy, an as DocumentRenderArgs, gt as RouteHandler, on as DocumentRenderContext, sn as DocumentRenderer, un as SSRStyleRegistrationValidation, wt as RoutePathParams } from "../index-CTIBOqUB.js";
 import { AuthRequirement } from "@askrjs/auth";
 import "node:fs/promises";
 //#region src/ssg/types.d.ts

package/dist/ssg/index.js

@@ -1,15 +1,32 @@
 import "../access-d_DCdwqn.js";
 import { n as createRouteRegistry } from "../manifest-D6rfj_jC.js";
 import { o as addRouteBasePath } from "../route-matching-Bo6UqG-5.js";
-import { c as route, n as resolveDeferredValues } from "../deferred-BS0Xpstg.js";
-import { S as RouteDataLoadError, c as prepareRouteHydrationData, t as bindResolvedRouteData, v as getRenderHandler, y as _preloadRouteHandler } from "../resolution-D8PgnTzh.js";
+import { c as route, n as resolveDeferredValues } from "../deferred-p8hyanxJ.js";
+import { S as RouteDataLoadError, c as prepareRouteHydrationData, t as bindResolvedRouteData, v as getRenderHandler, y as _preloadRouteHandler } from "../resolution-BQyo7qNn.js";
 import { n as renderDocument } from "../ssr-DSHd_Q9K.js";
-import { n as renderToString } from "../ssr-8_vHDWqV.js";
+import { n as renderToString } from "../ssr-DYcK20IX.js";
 import * as fs from "node:fs/promises";
 import * as pathModule from "node:path";
 import * as os from "node:os";
 import * as fsSync from "node:fs";
 //#region src/ssg/route-utils.ts
+function getPortableOutputPathKey(filePath) {
+	return filePath.normalize("NFC").replaceAll("\\", "/").toLowerCase();
+}
+function describeRoute(descriptor) {
+	if (descriptor.route.path === descriptor.path) return `"${descriptor.path}"`;
+	return `"${descriptor.route.path}" (resolved as "${descriptor.path}")`;
+}
+/** Reject routes that could overwrite one another on any supported filesystem. */
+function validateOutputPathCollisions(descriptors) {
+	const seen = /* @__PURE__ */ new Map();
+	for (const descriptor of descriptors) {
+		const key = getPortableOutputPathKey(descriptor.filePath);
+		const existing = seen.get(key);
+		if (existing) throw new Error(`SSG output path collision: routes ${describeRoute(existing)} and ${describeRoute(descriptor)} both map to "${descriptor.filePath}" after case-insensitive normalization`);
+		seen.set(key, descriptor);
+	}
+}
 function assertSafeRoutePath(pathStr) {
 	if (!pathStr.startsWith("/") || pathStr.startsWith("//") || pathStr.includes("\\") || pathStr.includes("\0") || pathStr.split("/").some((segment) => segment === "." || segment === "..")) throw new Error(`SSG route path must be an absolute URL path without dot segments or backslashes: ${pathStr}`);
 }
@@ -663,6 +680,24 @@ function resolveParallelism(requested) {
 	const availableParallelism = os.availableParallelism;
 	return Math.max(1, availableParallelism?.() ?? os.cpus().length ?? 1);
 }
+const outputDirectoryQueues = /* @__PURE__ */ new Map();
+async function withOutputDirectoryLock(outputDir, operation) {
+	const key = pathModule.resolve(outputDir).normalize("NFC").toLowerCase();
+	const previous = outputDirectoryQueues.get(key) ?? Promise.resolve();
+	let release;
+	const current = new Promise((resolve) => {
+		release = resolve;
+	});
+	const tail = previous.then(() => current, () => current);
+	outputDirectoryQueues.set(key, tail);
+	await previous.catch(() => void 0);
+	try {
+		return await operation();
+	} finally {
+		release();
+		if (outputDirectoryQueues.get(key) === tail) outputDirectoryQueues.delete(key);
+	}
+}
 async function createStagingDirectory(outputDir) {
 	const parent = pathModule.dirname(outputDir);
 	const base = pathModule.basename(outputDir);
@@ -753,136 +788,142 @@ function createStaticGen(options) {
 		* Returns detailed results
 		*/
 		async generate(generateOptions = {}) {
-			const splitRoutes = await splitStaticRoutes(configuredRoutes);
-			const routes = splitRoutes.routes;
-			validateRoutes(routes);
-			const changedKeys = dedupeStrings(generateOptions.changedKeys);
-			const changedRoutes = dedupeStrings(generateOptions.changedRoutes);
-			const requestedMode = generateOptions.mode ?? "full";
-			const previousManifest = !generateOptions.forceFull && requestedMode === "incremental" ? readIncrementalManifest(options.outputDir, seed) : null;
-			const effectiveMode = generateOptions.forceFull || requestedMode !== "incremental" || previousManifest === null ? "full" : "incremental";
-			const dataMap = resolveSsgData(routes, { dataOverrides: options.dataOverrides });
-			const descriptors = routes.map(resolveRouteDescriptor);
-			const routeResultsById = /* @__PURE__ */ new Map();
-			for (const runtimeRoute of splitRoutes.runtimeOnly) routeResultsById.set(runtimeRoute.routeId, runtimeRoute.result);
-			const eligibleDescriptors = descriptors;
-			const previousEntries = new Map((previousManifest?.routes ?? []).map((entry) => [entry.routeId, entry]));
-			const currentRouteIds = new Set(eligibleDescriptors.map((descriptor) => descriptor.routeId));
-			const selected = [];
-			const routesToRender = [];
-			for (let index = 0; index < eligibleDescriptors.length; index += 1) {
-				const descriptor = eligibleDescriptors[index];
-				const entry = selectRouteForGeneration(descriptor, previousEntries.get(descriptor.routeId) ?? null, effectiveMode, changedKeys, changedRoutes);
-				selected.push(entry);
-				if (entry.reason !== "unchanged") routesToRender.push(entry);
-			}
-			const renderStartTime = performance.now();
-			const renderedResults = routesToRender.length > 0 ? await batchRenderRoutes(getRoutesToRender(routesToRender), {
-				seed,
-				dataMap,
-				concurrency: resolvedConcurrency,
-				document: options.document,
-				styleRegistrationValidation: options.styleRegistrationValidation
-			}) : [];
-			performance.now() - renderStartTime;
-			const renderedByRouteId = /* @__PURE__ */ new Map();
-			for (let index = 0; index < renderedResults.length; index += 1) renderedByRouteId.set(routesToRender[index].descriptor.routeId, renderedResults[index]);
-			let cacheHits = 0;
-			const nextManifestRoutes = [];
-			for (const entry of selected) {
-				const { descriptor, previous, reason } = entry;
-				const resolvedData = resolveSsgRouteData(dataMap, descriptor.route.path, descriptor.path);
-				const baseData = resolvedData.hasData ? resolvedData.data : void 0;
-				const resourceCount = resolvedData.hasData && baseData ? Object.keys(baseData).length : 0;
-				if (reason === "unchanged") {
-					routeResultsById.set(descriptor.routeId, {
+			return withOutputDirectoryLock(options.outputDir, async () => {
+				const splitRoutes = await splitStaticRoutes(configuredRoutes);
+				const routes = splitRoutes.routes;
+				validateRoutes(routes);
+				const changedKeys = dedupeStrings(generateOptions.changedKeys);
+				const changedRoutes = dedupeStrings(generateOptions.changedRoutes);
+				const requestedMode = generateOptions.mode ?? "full";
+				const previousManifest = !generateOptions.forceFull && requestedMode === "incremental" ? readIncrementalManifest(options.outputDir, seed) : null;
+				const effectiveMode = generateOptions.forceFull || requestedMode !== "incremental" || previousManifest === null ? "full" : "incremental";
+				const dataMap = resolveSsgData(routes, { dataOverrides: options.dataOverrides });
+				const descriptors = routes.map(resolveRouteDescriptor);
+				validateOutputPathCollisions(descriptors);
+				const routeResultsById = /* @__PURE__ */ new Map();
+				for (const runtimeRoute of splitRoutes.runtimeOnly) routeResultsById.set(runtimeRoute.routeId, runtimeRoute.result);
+				const eligibleDescriptors = descriptors;
+				const previousEntries = new Map((previousManifest?.routes ?? []).map((entry) => [entry.routeId, entry]));
+				const currentRouteIds = new Set(eligibleDescriptors.map((descriptor) => descriptor.routeId));
+				const selected = [];
+				const routesToRender = [];
+				for (let index = 0; index < eligibleDescriptors.length; index += 1) {
+					const descriptor = eligibleDescriptors[index];
+					const entry = selectRouteForGeneration(descriptor, previousEntries.get(descriptor.routeId) ?? null, effectiveMode, changedKeys, changedRoutes);
+					selected.push(entry);
+					if (entry.reason !== "unchanged") routesToRender.push(entry);
+				}
+				const renderStartTime = performance.now();
+				const renderedResults = routesToRender.length > 0 ? await batchRenderRoutes(getRoutesToRender(routesToRender), {
+					seed,
+					dataMap,
+					concurrency: resolvedConcurrency,
+					document: options.document,
+					styleRegistrationValidation: options.styleRegistrationValidation
+				}) : [];
+				performance.now() - renderStartTime;
+				const renderedByRouteId = /* @__PURE__ */ new Map();
+				for (let index = 0; index < renderedResults.length; index += 1) renderedByRouteId.set(routesToRender[index].descriptor.routeId, renderedResults[index]);
+				let cacheHits = 0;
+				const nextManifestRoutes = [];
+				for (const entry of selected) {
+					const { descriptor, previous, reason } = entry;
+					const resolvedData = resolveSsgRouteData(dataMap, descriptor.route.path, descriptor.path);
+					const baseData = resolvedData.hasData ? resolvedData.data : void 0;
+					const resourceCount = resolvedData.hasData && baseData ? Object.keys(baseData).length : 0;
+					if (reason === "unchanged") {
+						routeResultsById.set(descriptor.routeId, {
+							path: descriptor.path,
+							filePath: descriptor.filePath,
+							html: "",
+							fileSize: previous?.htmlHash !== null && previous !== null ? getExistingOutputFileSize(options.outputDir, descriptor.filePath) : 0,
+							renderDuration: 0,
+							resourceCount,
+							status: "skipped",
+							reason: "unchanged",
+							written: false
+						});
+						if (previous) nextManifestRoutes.push({
+							...previous,
+							path: descriptor.path,
+							filePath: descriptor.filePath,
+							invalidationKeys: descriptor.invalidationKeys.slice()
+						});
+						continue;
+					}
+					const rendered = renderedByRouteId.get(descriptor.routeId);
+					if (!rendered) throw new Error(`Missing rendered result for route "${descriptor.path}"`);
+					const nextResult = {
+						...rendered,
 						path: descriptor.path,
 						filePath: descriptor.filePath,
-						html: "",
-						fileSize: previous?.htmlHash !== null && previous !== null ? getExistingOutputFileSize(options.outputDir, descriptor.filePath) : 0,
-						renderDuration: 0,
 						resourceCount,
-						status: "skipped",
-						reason: "unchanged",
+						reason,
 						written: false
-					});
-					if (previous) nextManifestRoutes.push({
-						...previous,
-						path: descriptor.path,
-						filePath: descriptor.filePath,
-						invalidationKeys: descriptor.invalidationKeys.slice()
-					});
-					continue;
-				}
-				const rendered = renderedByRouteId.get(descriptor.routeId);
-				if (!rendered) throw new Error(`Missing rendered result for route "${descriptor.path}"`);
-				const nextResult = {
-					...rendered,
-					path: descriptor.path,
-					filePath: descriptor.filePath,
-					resourceCount,
-					reason,
-					written: false
-				};
-				if (nextResult.status === "success") {
-					const htmlDigest = hashHtml(nextResult.html);
-					const shouldWrite = effectiveMode === "full" || !previous || previous.htmlHash !== htmlDigest || !outputFileExists(options.outputDir, descriptor.filePath);
-					nextResult.written = shouldWrite;
-					if (!shouldWrite) cacheHits += 1;
-					nextManifestRoutes.push({
+					};
+					if (nextResult.status === "success") {
+						const htmlDigest = hashHtml(nextResult.html);
+						const shouldWrite = effectiveMode === "full" || !previous || previous.htmlHash !== htmlDigest || !outputFileExists(options.outputDir, descriptor.filePath);
+						nextResult.written = shouldWrite;
+						if (!shouldWrite) cacheHits += 1;
+						nextManifestRoutes.push({
+							routeId: descriptor.routeId,
+							path: descriptor.path,
+							filePath: descriptor.filePath,
+							invalidationKeys: descriptor.invalidationKeys.slice(),
+							htmlHash: htmlDigest,
+							lastStatus: "success"
+						});
+					} else nextManifestRoutes.push({
 						routeId: descriptor.routeId,
 						path: descriptor.path,
 						filePath: descriptor.filePath,
 						invalidationKeys: descriptor.invalidationKeys.slice(),
-						htmlHash: htmlDigest,
-						lastStatus: "success"
+						htmlHash: previous?.htmlHash ?? null,
+						lastStatus: "error"
 					});
-				} else nextManifestRoutes.push({
-					routeId: descriptor.routeId,
-					path: descriptor.path,
-					filePath: descriptor.filePath,
-					invalidationKeys: descriptor.invalidationKeys.slice(),
-					htmlHash: previous?.htmlHash ?? null,
-					lastStatus: "error"
-				});
-				routeResultsById.set(descriptor.routeId, nextResult);
-			}
-			const removedResults = collectRemovedRouteResults(previousManifest, currentRouteIds);
-			const routeResults = [];
-			for (const routeId of splitRoutes.outputRouteIds) {
-				const routeResult = routeResultsById.get(routeId);
-				if (routeResult) routeResults.push(routeResult);
-			}
-			routeResults.push(...removedResults);
-			result = generateSSGResult(routeResults, {
-				mode: effectiveMode,
-				cacheHits,
-				invalidatedKeys: changedKeys,
-				invalidatedRoutes: changedRoutes
-			});
-			if (effectiveMode === "full" && result.failed > 0) return result;
-			const targetOutputDir = effectiveMode === "full" ? await createStagingDirectory(options.outputDir) : options.outputDir;
-			try {
-				const writeStartTime = performance.now();
-				await writeStaticFiles(routeResults, targetOutputDir, { concurrency: resolvedConcurrency });
-				performance.now() - writeStartTime;
-				await writeMetadata(resultToMetadata(result), targetOutputDir);
-				await writeIncrementalManifest({
-					schemaVersion: 1,
-					seed,
+					routeResultsById.set(descriptor.routeId, nextResult);
+				}
+				const removedResults = collectRemovedRouteResults(previousManifest, currentRouteIds);
+				const routeResults = [];
+				for (const routeId of splitRoutes.outputRouteIds) {
+					const routeResult = routeResultsById.get(routeId);
+					if (routeResult) routeResults.push(routeResult);
+				}
+				routeResults.push(...removedResults);
+				result = generateSSGResult(routeResults, {
 					mode: effectiveMode,
-					routes: nextManifestRoutes
-				}, targetOutputDir);
-				await copyStaticAssets(options.assets, targetOutputDir);
-				if (effectiveMode === "full") await replaceOutputDirectory(targetOutputDir, options.outputDir);
-			} catch (error) {
-				if (effectiveMode === "full") await fs.rm(targetOutputDir, {
-					recursive: true,
-					force: true
+					cacheHits,
+					invalidatedKeys: changedKeys,
+					invalidatedRoutes: changedRoutes
 				});
-				throw error;
-			}
-			return result;
+				if (effectiveMode === "full" && result.failed > 0) {
+					for (const routeResult of result.routes) if (routeResult.status === "success") routeResult.written = false;
+					return result;
+				}
+				const targetOutputDir = effectiveMode === "full" ? await createStagingDirectory(options.outputDir) : options.outputDir;
+				try {
+					const writeStartTime = performance.now();
+					await writeStaticFiles(routeResults, targetOutputDir, { concurrency: resolvedConcurrency });
+					performance.now() - writeStartTime;
+					await writeMetadata(resultToMetadata(result), targetOutputDir);
+					await writeIncrementalManifest({
+						schemaVersion: 1,
+						seed,
+						mode: effectiveMode,
+						routes: nextManifestRoutes
+					}, targetOutputDir);
+					await copyStaticAssets(options.assets, targetOutputDir);
+					if (effectiveMode === "full") await replaceOutputDirectory(targetOutputDir, options.outputDir);
+				} catch (error) {
+					if (effectiveMode === "full") await fs.rm(targetOutputDir, {
+						recursive: true,
+						force: true
+					});
+					throw error;
+				}
+				return result;
+			});
 		},
 		/**
 		* Get effective config in a serializable form for diagnostics.

package/dist/ssr/index.d.ts

@@ -1,4 +1,4 @@
-import { At as RouteRegistry, Dt as RouteRecord, E as SSRPortalState, Pt as RouteRequestResult, Rt as CoreTelemetry, T as DeferredBoundaryRegistration, Yt as QueryPrefetchContext, an as DocumentRenderArgs, c as ServerQueryRegistry, cn as SSRData, et as AccessDenyDecision, gt as RouteHandler, ln as SSRStyleRegistration, lt as Route, nt as AccessRedirectDecision, on as DocumentRenderContext, sn as DocumentRenderer, un as SSRStyleRegistrationValidation, ut as RouteAuthOptions, zt as DataRuntime } from "../index-KQ7Vl4-8.js";
+import { At as RouteRegistry, Dt as RouteRecord, E as SSRPortalState, Pt as RouteRequestResult, Rt as CoreTelemetry, T as DeferredBoundaryRegistration, Yt as QueryPrefetchContext, an as DocumentRenderArgs, c as ServerQueryRegistry, cn as SSRData, et as AccessDenyDecision, gt as RouteHandler, ln as SSRStyleRegistration, lt as Route, nt as AccessRedirectDecision, on as DocumentRenderContext, sn as DocumentRenderer, un as SSRStyleRegistrationValidation, ut as RouteAuthOptions, zt as DataRuntime } from "../index-CTIBOqUB.js";
 import { r as JSXElement, s as Props } from "../types-DkVJhVs9.js";
 import { AuthContext } from "@askrjs/auth";
 //#region src/common/page-render-envelope.d.ts

package/dist/ssr/index.js

@@ -1,3 +1,3 @@
 import { C as SSRDataMissingError } from "../render-context-B7ohlh6t.js";
-import { a as renderResolvedToStringSync, c as createRenderContext, d as withRenderContextAsync, i as renderRouteRequestToString, l as getRenderContext, n as renderToString, o as renderToStringSync, r as renderRouteRequest, s as resolveRequest, t as renderToStream, u as withRenderContext } from "../ssr-8_vHDWqV.js";
+import { a as renderResolvedToStringSync, c as createRenderContext, d as withRenderContextAsync, i as renderRouteRequestToString, l as getRenderContext, n as renderToString, o as renderToStringSync, r as renderRouteRequest, s as resolveRequest, t as renderToStream, u as withRenderContext } from "../ssr-DYcK20IX.js";
 export { SSRDataMissingError, createRenderContext, getRenderContext, renderResolvedToStringSync, renderRouteRequest, renderRouteRequestToString, renderToStream, renderToString, renderToStringSync, resolveRequest, withRenderContext, withRenderContextAsync };

package/dist/{ssr-8_vHDWqV.js → ssr-DYcK20IX.js}

@@ -3,18 +3,18 @@ import { t as __ERROR_BOUNDARY__ } from "./vnode-D24p6IW2.js";
 import { y as logger } from "./access-d_DCdwqn.js";
 import { f as getCurrentComponentInstance, w as setCurrentComponentInstance } from "./component-scope-4I3yEMkb.js";
 import { i as isFragmentType, n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { g as markVNodeTreeWithContextFrame, m as getVNodeContextFrame, n as createComponentInstance, p as getExecutionContextFrame, u as callWithContext } from "./component-internal-DOVVMjG7.js";
-import { t as cleanupComponent } from "./component-cleanup-hrqSikl2.js";
+import { f as callWithContext, g as getVNodeContextFrame, h as getExecutionContextFrame, n as createComponentInstance, v as markVNodeTreeWithContextFrame } from "./component-internal-D0yE2Ch3.js";
+import { t as cleanupComponent } from "./component-cleanup-DYG80yhG.js";
 import { p as isPromiseLike } from "./lifecycle-batch-BH0fax4F.js";
-import { _ as setControlBoundaryContextFrame, g as evaluateShowState, h as evaluateCaseState, i as evaluateForState, o as rollbackForStateTransaction, r as commitForStateTransaction } from "./for-internal-jrliHZmF.js";
+import { _ as setControlBoundaryContextFrame, g as evaluateShowState, h as evaluateCaseState, i as evaluateForState, o as rollbackForStateTransaction, r as commitForStateTransaction } from "./for-internal-DkBwTG4S.js";
 import { C as SSRDataMissingError, _ as isEmptyPageRenderEnvelope, f as stopRenderPhase$1, h as createPageRenderEnvelope, t as configureRenderContextProvider, u as startRenderPhase$1, v as isPageRenderEnvelope, x as withHydrationRenderUrl } from "./render-context-B7ohlh6t.js";
 import { n as getPublicAttributeName, t as sanitizeCssValue } from "./css-BuPaTOfe.js";
-import { o as isUnsafeUrlAttribute, r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-BBxq1zq4.js";
+import { o as isUnsafeUrlAttribute, r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-BVybpV1v.js";
 import { n as SSR_PORTAL_HOST, t as SSR_PORTAL_ANCHOR } from "./portal-w3oQ6oQU.js";
 import { t as createDataRuntime } from "./data-runtime-JxoRgrrt.js";
 import { c as withTelemetry, i as dehydrateDataRuntime, t as createQueryPrefetchContext } from "./query-registry-CimB1YeW.js";
 import { a as resolveRouteFromRoutes, c as removeRouteBasePath, s as normalizeRouteBasePath, t as _resolveRouteMatchFromRoutes } from "./route-matching-Bo6UqG-5.js";
-import { a as resolveRouteRequest, d as DEFERRED_BOUNDARY, l as validateRouteHydrationData, o as getRouteHydrationMetadata, p as isDeferred } from "./resolution-D8PgnTzh.js";
+import { a as resolveRouteRequest, d as DEFERRED_BOUNDARY, l as validateRouteHydrationData, o as getRouteHydrationMetadata, p as isDeferred } from "./resolution-BQyo7qNn.js";
 import { n as disposeRegisteredDefaultPortalScope, r as getDefaultPortalHost } from "./default-portal-runtime-DvMvWJVp.js";
 import { n as renderDocument, t as SSR_RENDER_DATA_ATTR } from "./ssr-DSHd_Q9K.js";
 //#region src/ssr/escape.ts

package/dist/{structures-umvVUD-M.js → structures-CPycoyZj.js}

@@ -2,7 +2,7 @@ import { o as getRuntimeRenderer } from "./access-d_DCdwqn.js";
 import { f as getCurrentComponentInstance, m as getCurrentPortalScope } from "./component-scope-4I3yEMkb.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
 import { l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-BsdGWsDE.js";
-import { t as cleanupComponent } from "./component-cleanup-hrqSikl2.js";
+import { t as cleanupComponent } from "./component-cleanup-DYG80yhG.js";
 import { c as getCurrentLifecycleCommitBatch, u as registerLifecycleTransaction } from "./lifecycle-batch-BH0fax4F.js";
 import { n as getActiveRenderContext } from "./render-context-B7ohlh6t.js";
 import { i as createSSRPortalHostToken, n as SSR_PORTAL_HOST, r as createSSRPortalAnchorToken, t as SSR_PORTAL_ANCHOR } from "./portal-w3oQ6oQU.js";
@@ -110,6 +110,16 @@ function Presence({ present, children }) {
 //#endregion
 //#region src/runtime/portal.ts
 const DEFAULT_SSR_PORTAL_KEY = {};
+function setPortalErrorParent(host, owner) {
+	if (!host) return;
+	if (owner && owner.instance._ownershipGeneration === owner.generation && owner.instance.notifyUpdate !== null) {
+		host._portalErrorParent = owner.instance;
+		host._portalErrorParentGeneration = owner.generation;
+		return;
+	}
+	host._portalErrorParent = null;
+	host._portalErrorParentGeneration = void 0;
+}
 function getSSRPortalSlot(key) {
 	const context = getActiveRenderContext();
 	if (context?.mode !== "ssr") return null;
@@ -160,6 +170,7 @@ function createSSRPortalAnchor() {
 }
 function createPortalSlot() {
 	let currentValue;
+	let currentOwner = null;
 	const source = (() => {
 		recordReadableRead(source);
 		return currentValue;
@@ -168,12 +179,17 @@ function createPortalSlot() {
 		read() {
 			return source();
 		},
-		write(value) {
-			if (Object.is(currentValue, value)) return;
+		write(value, owner) {
+			const ownerChanged = currentOwner?.instance !== owner?.instance || currentOwner?.generation !== owner?.generation;
+			currentOwner = owner;
+			if (Object.is(currentValue, value) && !ownerChanged) return;
 			currentValue = value;
 			markReadableDerivedSubscribersDirty(source);
 			markReactivePropsDirtySource(source);
 			notifyReadableReaders(source);
+		},
+		getOwner() {
+			return currentOwner;
 		}
 	};
 }
@@ -185,11 +201,17 @@ function definePortal() {
 		function PortalHost() {
 			const serverHost = createSSRPortalHost(ssrPortalKey, false);
 			if (serverHost) return serverHost;
+			const host = getCurrentComponentInstance();
+			if (host?.fn === PortalHost) setPortalErrorParent(host, slot.getOwner());
 			return slot.read();
 		}
 		PortalHost.render = function PortalRender(props) {
 			if (writeSSRPortal(ssrPortalKey, props.children)) return null;
-			slot.write(props.children);
+			const owner = getCurrentComponentInstance();
+			slot.write(props.children, owner ? {
+				instance: owner,
+				generation: owner._ownershipGeneration
+			} : null);
 			return null;
 		};
 		return PortalHost;
@@ -232,7 +254,7 @@ function clearTrackedBatchPortalWrite(transaction) {
 		batch = batch.parent;
 	}
 }
-function createExplicitHostSource(readCount) {
+function createPortalStateSource(readCount) {
 	let source = (() => {
 		recordReadableRead(source);
 		return readCount();
@@ -247,6 +269,14 @@ function notifyExplicitDefaultPortalHostReaders(state) {
 	markReactivePropsDirtySource(state.explicitHostSource);
 	notifyReadableReaders(state.explicitHostSource);
 }
+function setDefaultPortalOwner(state, owner) {
+	if (state.owner?.instance === owner?.instance && state.owner?.generation === owner?.generation) return;
+	state.owner = owner;
+	state.ownerVersion += 1;
+	markReadableDerivedSubscribersDirty(state.ownerSource);
+	markReactivePropsDirtySource(state.ownerSource);
+	notifyReadableReaders(state.ownerSource);
+}
 function createDefaultPortalState() {
 	const state = {
 		portal: definePortal(),
@@ -255,9 +285,12 @@ function createDefaultPortalState() {
 		cleanupOwners: /* @__PURE__ */ new WeakSet(),
 		explicitHostOwners: /* @__PURE__ */ new Map(),
 		explicitHostCleanupOwners: /* @__PURE__ */ new WeakSet(),
-		explicitHostSource: (() => 0)
+		explicitHostSource: (() => 0),
+		ownerVersion: 0,
+		ownerSource: (() => 0)
 	};
-	state.explicitHostSource = createExplicitHostSource(() => state.explicitHostOwners.size);
+	state.explicitHostSource = createPortalStateSource(() => state.explicitHostOwners.size);
+	state.ownerSource = createPortalStateSource(() => state.ownerVersion);
 	return state;
 }
 function disposeDefaultPortalScope(scope) {
@@ -295,7 +328,7 @@ function detachDefaultPortalHostOutput(state) {
 }
 function applyDefaultPortalWrite(state, children, owner) {
 	state.portal.render({ children });
-	state.owner = owner;
+	setDefaultPortalOwner(state, owner);
 	if (isEmptyPortalValue(children)) detachDefaultPortalHostOutput(state);
 }
 function isStaleDefaultPortalScope(scope) {
@@ -405,7 +438,7 @@ function applyPendingDefaultPortalValue(scope) {
 	if (!_hasPendingDefaultPortalValue) return;
 	const state = getDefaultPortalState(scope);
 	state.portal.render({ children: _pendingDefaultPortalValue });
-	state.owner = null;
+	setDefaultPortalOwner(state, null);
 	_hasPendingDefaultPortalValue = false;
 	_pendingDefaultPortalValue = void 0;
 }
@@ -460,7 +493,7 @@ function clearDefaultPortalForInstance(instance) {
 	_hasPendingDefaultPortalValue = false;
 	_pendingDefaultPortalValue = void 0;
 	state.portal.render({ children: void 0 });
-	state.owner = null;
+	setDefaultPortalOwner(state, null);
 	detachDefaultPortalHostOutput(state);
 }
 /**
@@ -482,6 +515,8 @@ const DefaultPortal = (() => {
 		if (!(props?.__askrAutoDefaultPortal === true)) registerExplicitDefaultPortalHost(scope, state, owner);
 		else if (readExplicitDefaultPortalHosts(state) > 0) return null;
 		applyPendingDefaultPortalValue(scope);
+		state.ownerSource();
+		setPortalErrorParent(owner, state.owner);
 		const value = state.portal();
 		return value === void 0 ? null : value;
 	}

package/dist/testing/index.d.ts

@@ -1,4 +1,4 @@
-import { At as RouteRegistry, Gt as Query, Ut as Mutation, Zt as QueryStaleReason, nn as ComponentFunction, ut as RouteAuthOptions, vt as RouteMatch, zt as DataRuntime } from "../index-KQ7Vl4-8.js";
+import { At as RouteRegistry, Gt as Query, Ut as Mutation, Zt as QueryStaleReason, nn as ComponentFunction, ut as RouteAuthOptions, vt as RouteMatch, zt as DataRuntime } from "../index-CTIBOqUB.js";
 //#region src/testing/render.d.ts
 /** Options for {@link render} and {@link mount}. */
 interface RenderOptions {

package/dist/testing/index.js

@@ -1,9 +1,9 @@
 import { r as flushRuntimeScheduler } from "../access-d_DCdwqn.js";
 import { u as recordReadableRead } from "../readable-BsdGWsDE.js";
 import { l as addInvalidationListener, t as createDataRuntime } from "../data-runtime-JxoRgrrt.js";
-import { a as notifySource, i as normalizeAsyncDataError, r as createReadableSource } from "../data-DYqokZzc.js";
+import { a as notifySource, i as normalizeAsyncDataError, r as createReadableSource } from "../data-Bm8L6JOm.js";
 import { r as computeRouteActivityMatches } from "../route-matching-Bo6UqG-5.js";
-import { a as cleanupApp, r as createSPA, t as createIsland } from "../boot-BsMB_ySP.js";
+import { a as cleanupApp, r as createSPA, t as createIsland } from "../boot-C1wT3Vfs.js";
 //#region src/testing/render.ts
 const renderStates = /* @__PURE__ */ new WeakMap();
 const eventConstructorNames = {

package/dist/{verify-hydration-jf8X2V3x.js → verify-hydration-m-wVbYOD.js}

@@ -1,6 +1,6 @@
 import { g as getHydrationRenderUrl, m as withHydrationVerificationRender } from "./render-context-B7ohlh6t.js";
 import { t as SSR_RENDER_DATA_ATTR } from "./ssr-DSHd_Q9K.js";
-import { a as renderResolvedToStringSync } from "./ssr-8_vHDWqV.js";
+import { a as renderResolvedToStringSync } from "./ssr-DYcK20IX.js";
 //#region src/ssr/verify-hydration.ts
 function normalizeHydrationHtml(html) {
 	const template = document.createElement("template");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askrjs/askr",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "description": "Actor-backed deterministic UI framework",
   "keywords": [
     "askr",