@askrjs/askr 0.0.83 → 0.0.85

package/dist/{deferred-rdHAgyKe.js → deferred-vUOy-awa.js}

@@ -1,10 +1,10 @@
-import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-C3IECePB.js";
-import { g as readScope, u as defineScope } from "./component-internal-DsM75Gl1.js";
 import { d as getCurrentAppRenderRuntime } from "./component-scope-DzJEbYGE.js";
-import { p as isPromiseLike } from "./lifecycle-batch-CwHCDseR.js";
+import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-C3IECePB.js";
+import { g as readScope, u as defineScope } from "./component-internal-DcrLymUJ.js";
+import { p as isPromiseLike } from "./lifecycle-batch-Dfpid9-A.js";
 import { n as getActiveRenderContext, r as getCurrentRenderData } from "./render-context-D-DFk2WN.js";
-import { A as insertRecordSorted, D as getRouteRecords, E as getRouteList, F as snapshotRouteState, N as restoreRouteState, P as setDefaultRouteAuthOptions, T as getDefaultRouteAuthOptions, f as addRouteToStores, h as getActiveRouteAuthOptions, i as getMatchingRouteRecord, m as clearRouteState, o as buildRouteContext, s as buildRouteContextBase, z as resource } from "./route-matching-BUwz4kfl.js";
-import { i as ROUTE_ROOT_COMPONENT } from "./csp-nonce-DDt0UNdt.js";
+import { A as getDefaultRouteBasePath, B as setDefaultRouteBasePath, F as insertRecordSorted, G as resource, M as getRouteRecords, R as restoreRouteState, V as snapshotRouteState, _ as clearRouteState, c as removeRouteBasePath, h as addRouteToStores, i as getMatchingRouteRecord, j as getRouteList, k as getDefaultRouteAuthOptions, l as buildRouteContext, o as addRouteBasePath, s as normalizeRouteBasePath, u as buildRouteContextBase, v as getActiveRouteAuthOptions, z as setDefaultRouteAuthOptions } from "./route-matching-DHduNiGk.js";
+import { i as ROUTE_ROOT_COMPONENT } from "./csp-nonce-Bc52OIVc.js";
 import { c as withTelemetry, t as createQueryPrefetchContext } from "./query-registry-BL6rjGsO.js";
 //#region src/runtime/execution-model.ts
 const EXECUTION_MODEL_KEY = Symbol.for("__ASKR_EXECUTION_MODEL__");
@@ -173,10 +173,168 @@ function replacePageRoute(value, route) {
 		framework: current.framework
 	});
 }
+function withPageFramework(value, framework) {
+	const current = pageRenderEnvelope(value);
+	return createPageRenderEnvelope({
+		resources: current.resources,
+		route: current.route,
+		framework
+	});
+}
 function isEmptyPageRenderEnvelope(value) {
 	return value.route === void 0 && Object.keys(value.resources).length === 0 && Object.keys(value.framework).length === 0;
 }
 //#endregion
+//#region src/router/route-hydration.ts
+const DEFERRED_VALUE$1 = Symbol.for("@askrjs/askr/deferred-value");
+function isDeferredHydrationValue(value) {
+	if (!value || typeof value !== "object") return false;
+	const marker = Object.getOwnPropertyDescriptor(value, DEFERRED_VALUE$1);
+	return Boolean(marker && "value" in marker && marker.value === true);
+}
+const omissionGuards = /* @__PURE__ */ new WeakMap();
+function propertyPath(parent, key) {
+	if (/^(?:0|[1-9]\d*)$/.test(key)) return `${parent}[${key}]`;
+	if (/^[A-Za-z_$][\w$]*$/.test(key)) return `${parent}.${key}`;
+	return `${parent}[${JSON.stringify(key)}]`;
+}
+function invalid(route, path, reason) {
+	throw new TypeError(`[Askr] Route hydration data for "${route}" at "${path}" is not JSON transport-safe: ${reason}. Return JSON-compatible data or use route(..., { dehydrate(data) { ... } }) to omit server-only values.`);
+}
+function objectLabel(value) {
+	if (value instanceof Date) return "Date";
+	if (value instanceof Map) return "Map";
+	if (value instanceof Set) return "Set";
+	const constructor = value.constructor;
+	return typeof constructor === "function" && constructor.name ? constructor.name : "class instance";
+}
+/** Validate the exact value that will enter the route hydration envelope. */
+function validateRouteHydrationData(value, route, path = "$", ancestors = /* @__PURE__ */ new Set()) {
+	if (value === null || typeof value === "string" || typeof value === "boolean") return;
+	if (typeof value === "number") {
+		if (!Number.isFinite(value)) invalid(route, path, "non-finite numbers are not supported");
+		return;
+	}
+	if (typeof value === "undefined") invalid(route, path, "undefined is not supported");
+	if (typeof value === "bigint") invalid(route, path, "bigint is not supported");
+	if (typeof value === "symbol") invalid(route, path, "symbols are not supported");
+	if (typeof value === "function") invalid(route, path, "functions are not supported");
+	const object = value;
+	if (isDeferredHydrationValue(object)) {
+		if (object.state === "fulfilled") validateRouteHydrationData(object.value, route, `${path}.value`, ancestors);
+		return;
+	}
+	if (ancestors.has(object)) invalid(route, path, "cyclic references are not supported");
+	ancestors.add(object);
+	try {
+		if (Array.isArray(object)) {
+			for (let index = 0; index < object.length; index += 1) if (!Object.prototype.hasOwnProperty.call(object, index)) invalid(route, `${path}[${index}]`, "sparse arrays are not supported");
+			for (const key of Reflect.ownKeys(object)) {
+				if (key === "length") continue;
+				if (typeof key === "symbol") invalid(route, path, "symbol-keyed properties are not supported");
+				const descriptor = Object.getOwnPropertyDescriptor(object, key);
+				if (!descriptor.enumerable) invalid(route, propertyPath(path, key), "non-enumerable properties are not supported");
+				if (!("value" in descriptor)) invalid(route, propertyPath(path, key), "accessors are not supported");
+				if (!/^(?:0|[1-9]\d*)$/.test(key) || Number(key) >= object.length) invalid(route, propertyPath(path, key), "named array properties are not supported");
+				validateRouteHydrationData(descriptor.value, route, propertyPath(path, key), ancestors);
+			}
+			return;
+		}
+		const prototype = Object.getPrototypeOf(object);
+		if (prototype !== Object.prototype && prototype !== null) invalid(route, path, `${objectLabel(object)} instances are not supported; use a plain object`);
+		for (const key of Reflect.ownKeys(object)) {
+			if (typeof key === "symbol") invalid(route, path, "symbol-keyed properties are not supported");
+			const descriptor = Object.getOwnPropertyDescriptor(object, key);
+			const childPath = propertyPath(path, key);
+			if (!descriptor.enumerable) invalid(route, childPath, "non-enumerable properties are not supported");
+			if (!("value" in descriptor)) invalid(route, childPath, "accessors are not supported");
+			validateRouteHydrationData(descriptor.value, route, childPath, ancestors);
+		}
+	} finally {
+		ancestors.delete(object);
+	}
+}
+function omissionMap(complete, selected, ancestors = /* @__PURE__ */ new Set()) {
+	if (!complete || typeof complete !== "object" || isDeferredHydrationValue(complete)) return void 0;
+	if (ancestors.has(complete)) return void 0;
+	ancestors.add(complete);
+	const selectedObject = selected && typeof selected === "object" ? selected : void 0;
+	const output = Object.create(null);
+	try {
+		for (const key of Object.keys(complete)) {
+			if (!selectedObject || !Object.prototype.hasOwnProperty.call(selectedObject, key)) {
+				output[key] = 1;
+				continue;
+			}
+			const completeDescriptor = Object.getOwnPropertyDescriptor(complete, key);
+			const selectedDescriptor = Object.getOwnPropertyDescriptor(selectedObject, key);
+			if (!completeDescriptor || !selectedDescriptor) continue;
+			if (!("value" in completeDescriptor) || !("value" in selectedDescriptor)) continue;
+			const nested = omissionMap(completeDescriptor.value, selectedDescriptor.value, ancestors);
+			if (nested) output[key] = nested;
+		}
+	} finally {
+		ancestors.delete(complete);
+	}
+	return Object.keys(output).length > 0 ? Object.freeze(output) : void 0;
+}
+function prepareRouteHydrationData(complete, dehydrate, context, route = context.href || context.pathname) {
+	const selected = dehydrate ? dehydrate(complete, context) : complete;
+	if (isPromiseLike(selected)) throw new TypeError(`[Askr] Route dehydrate() for "${route}" returned a Promise. dehydrate(data, context) must be synchronous.`);
+	validateRouteHydrationData(selected, route);
+	return {
+		data: selected,
+		metadata: Object.freeze({
+			r: route,
+			...dehydrate ? { o: omissionMap(complete, selected) } : {}
+		})
+	};
+}
+function readMetadata(framework) {
+	const value = framework["rh"];
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	const metadata = value;
+	return typeof metadata.r === "string" ? metadata : void 0;
+}
+function omittedRead(route, path) {
+	throw new Error(`[Askr] routeData() read "${path}" on the initial hydration of "${route}", but that branch was intentionally omitted by dehydrate(). Keep initial hydrated rendering within the selected data, or wait for a client navigation that reruns the loader with the complete result.`);
+}
+function guardOmissions(value, omissions, route, path = "$") {
+	if (!omissions || !value || typeof value !== "object" || isDeferredHydrationValue(value)) return value;
+	let guards = omissionGuards.get(value);
+	if (!guards) {
+		guards = /* @__PURE__ */ new WeakMap();
+		omissionGuards.set(value, guards);
+	}
+	const cached = guards.get(omissions);
+	if (cached) return cached;
+	const guarded = new Proxy(value, { get(target, property, receiver) {
+		if (typeof property === "string") {
+			const omitted = omissions[property];
+			if (omitted && !Object.prototype.hasOwnProperty.call(target, property)) omittedRead(route, propertyPath(path, property));
+			const child = Reflect.get(target, property, receiver);
+			return omitted === 1 ? child : guardOmissions(child, omitted, route, propertyPath(path, property));
+		}
+		return Reflect.get(target, property, receiver);
+	} });
+	guards.set(omissions, guarded);
+	return guarded;
+}
+function guardHydratedRouteData(value, framework) {
+	const metadata = readMetadata(framework);
+	return metadata ? guardOmissions(value, metadata.o, metadata.r) : value;
+}
+function getRouteHydrationMetadata(framework) {
+	return readMetadata(framework);
+}
+/** @internal Remove initial-only omission guards after a client loader reruns. */
+function withoutRouteHydrationMetadata(framework) {
+	if (!framework || !("rh" in framework)) return framework;
+	const next = { ...framework };
+	delete next["rh"];
+	return next;
+}
+//#endregion
 //#region src/router/resolution.ts
 const anonymous = () => ({
 	authenticated: false,
@@ -208,14 +366,21 @@ function createRouteRenderResult(record, params, context, handler) {
 function getDefaultRouteMode() {
 	return typeof window !== "undefined" ? "spa" : "ssr";
 }
+function withoutInitialRouteHydrationMetadata(envelope) {
+	return withPageFramework(envelope, withoutRouteHydrationMetadata(envelope.framework) ?? {});
+}
 /** @internal Bind resolved loader output to one route subtree and its hydration envelope. */
-function bindResolvedRouteData(handler, data) {
+function bindResolvedRouteData(handler, data, hydration) {
 	return (params, context) => {
 		const renderContext = getActiveRenderContext();
 		if (renderContext) {
 			const envelope = replacePageRoute(renderContext.renderData, data);
-			renderContext.renderData = envelope;
-			renderContext.hydrationData = envelope;
+			renderContext.renderData = hydration ? envelope : withoutInitialRouteHydrationMetadata(envelope);
+			const hydrationEnvelope = replacePageRoute(renderContext.hydrationData, hydration?.data ?? data);
+			renderContext.hydrationData = hydration ? withPageFramework(hydrationEnvelope, {
+				...hydrationEnvelope.framework,
+				["rh"]: hydration.metadata
+			}) : withoutInitialRouteHydrationMetadata(hydrationEnvelope);
 		}
 		return handler(params, context);
 	};
@@ -254,7 +419,12 @@ function buildLoadedRenderResult(record, params, context, request, telemetry, lo
 		}));
 		const loaded = runPreload ? runPreload.then(load) : load();
 		const finalize = (data) => {
-			const result = createRouteRenderResult(record, params, context, bindResolvedRouteData(renderHandler, data));
+			const hydration = context.mode === "ssr" ? prepareRouteHydrationData(data, record.options?.dehydrate, {
+				...context,
+				params,
+				request
+			}, context.href || context.pathname || record.path) : void 0;
+			const result = createRouteRenderResult(record, params, context, bindResolvedRouteData(renderHandler, data, hydration));
 			routeRenderData.set(result, data);
 			return result;
 		};
@@ -308,24 +478,33 @@ function resolveMatchedRoute(record, params, context, authOptions, request, tele
 }
 function resolveRouteRequest(target, options) {
 	if (!options?.registry) throw new TypeError("resolveRouteRequest requires options.registry.");
+	const basePath = normalizeRouteBasePath(options.registry.manifest.basePath);
+	const logicalTarget = removeRouteBasePath(target, basePath);
+	if (logicalTarget === void 0) return null;
 	return withTelemetry(options.telemetry?.routeMatch, {}, () => {
 		const records = options.registry.manifest.records;
-		const match = getMatchingRouteRecord(target, records);
+		const match = getMatchingRouteRecord(logicalTarget, records);
 		if (!match) return null;
 		const mode = options.mode ?? getDefaultRouteMode();
 		const signal = options.signal ?? getActiveRenderContext()?.signal ?? new AbortController().signal;
 		const authOptions = getActiveRouteAuthOptions(options.auth ?? options.registry.manifest.auth);
-		const base = buildRouteContextBase(target, match.params, {
+		const base = buildRouteContextBase(logicalTarget, match.params, {
 			mode,
 			signal
 		});
+		const exposeRedirect = (result) => result?.kind === "redirect" ? {
+			...result,
+			to: addRouteBasePath(result.to, basePath)
+		} : result;
 		const finalize = (authContext) => {
 			setCurrentAuth(authContext);
-			return resolveMatchedRoute(match.record, match.params, buildRouteContext(target, match.params, {
+			const result = resolveMatchedRoute(match.record, match.params, buildRouteContext(logicalTarget, match.params, {
 				mode,
 				signal,
 				authContext
 			}), authOptions, options.request, options.telemetry, options.load !== false);
+			if (!basePath) return result;
+			return isPromiseLike(result) ? Promise.resolve(result).then(exposeRedirect) : exposeRedirect(result);
 		};
 		if (options.authContext) return finalize(options.authContext);
 		if (!authOptions?.resolve) return finalize(anonymous());
@@ -339,11 +518,13 @@ function createRouteManifest() {
 	const auth = getDefaultRouteAuthOptions();
 	return {
 		records: [...getRouteRecords()],
-		...auth ? { auth } : {}
+		...auth ? { auth } : {},
+		...getDefaultRouteBasePath() ? { basePath: getDefaultRouteBasePath() } : {}
 	};
 }
 function _applyManifest(manifest) {
 	setDefaultRouteAuthOptions(manifest.auth);
+	setDefaultRouteBasePath(normalizeRouteBasePath(manifest.basePath));
 	for (const record of manifest.records) {
 		insertRecordSorted(record);
 		addRouteToStores({
@@ -359,6 +540,7 @@ function createRouteRegistry(definition, options = {}) {
 	clearRouteState();
 	try {
 		setDefaultRouteAuthOptions(options.auth);
+		setDefaultRouteBasePath(normalizeRouteBasePath(options.basePath));
 		definition();
 		const manifest = createRouteManifest();
 		return Object.freeze({
@@ -465,10 +647,10 @@ async function resolveDeferredValues(input, signal) {
 }
 function routeData() {
 	const envelope = getCurrentRenderData();
-	if (envelope) return envelope.route;
+	if (envelope) return guardHydratedRouteData(envelope.route, envelope.framework);
 	const runtime = getCurrentAppRenderRuntime();
 	if (!runtime?.hasRoute) throw new Error("routeData() can only be read while rendering a route with loader data.");
-	return runtime.route;
+	return guardHydratedRouteData(runtime.route, runtime.framework);
 }
 function rejectedChild(props, error) {
 	return typeof props.rejected === "function" ? props.rejected(error) : props.rejected ?? null;
@@ -499,4 +681,4 @@ function Resolve(props) {
 	return props.children(result.value);
 }
 //#endregion
-export { _preloadRouteHandler as C, getExecutionModel as E, getRenderHandler as S, assertExecutionModel as T, isPageRenderEnvelope as _, resolveDeferredValues as a, Outlet as b, _applyManifest as c, getRouteRenderContext as d, getRouteRenderData as f, isEmptyPageRenderEnvelope as g, createPageRenderEnvelope as h, isDeferred as i, createRouteRegistry as l, resolveRouteRequest as m, Resolve as n, reviveDeferredValue as o, hasRouteRenderData as p, defer as r, routeData as s, DEFERRED_BOUNDARY as t, bindResolvedRouteData as u, pageRenderEnvelope as v, lazy as w, createRouteHandler as x, currentAuth as y };
+export { getExecutionModel as A, currentAuth as C, _preloadRouteHandler as D, getRenderHandler as E, lazy as O, pageRenderEnvelope as S, createRouteHandler as T, validateRouteHydrationData as _, resolveDeferredValues as a, isEmptyPageRenderEnvelope as b, _applyManifest as c, getRouteRenderContext as d, getRouteRenderData as f, prepareRouteHydrationData as g, getRouteHydrationMetadata as h, isDeferred as i, assertExecutionModel as k, createRouteRegistry as l, resolveRouteRequest as m, Resolve as n, reviveDeferredValue as o, hasRouteRenderData as p, defer as r, routeData as s, DEFERRED_BOUNDARY as t, bindResolvedRouteData as u, withoutRouteHydrationMetadata as v, Outlet as w, isPageRenderEnvelope as x, createPageRenderEnvelope as y };

package/dist/{effect-2IIWvUjG.js → effect-lnxQIpJG.js}

@@ -1,5 +1,5 @@
-import { t as enqueueRuntimeLane } from "./access-ePqdQqkV.js";
-import { m as withFineGrainedReadTracking } from "./readable-B3VIOfd7.js";
+import { t as enqueueRuntimeLane } from "./access-Dpfoi4cA.js";
+import { m as withFineGrainedReadTracking } from "./readable-B5NtV7V0.js";
 //#region src/runtime/effect.ts
 const SOURCE_EFFECTS = Symbol("askr.source-effects");
 const effectSources = /* @__PURE__ */ new WeakMap();

package/dist/{fastlane-CkBXZ_3K.js → fastlane-CrfB3QG0.js}

@@ -1,6 +1,6 @@
-import { b as isDevelopmentEnvironment, l as runRuntimeWithSyncProgress, o as getRuntimeRenderer, u as setRuntimeBulkCommitProbe } from "./access-ePqdQqkV.js";
+import { b as isDevelopmentEnvironment, l as runRuntimeWithSyncProgress, o as getRuntimeRenderer, u as setRuntimeBulkCommitProbe } from "./access-Dpfoi4cA.js";
 import { i as isFragmentType } from "./jsx-C3IECePB.js";
-import { i as finalizeReadableSubscriptions } from "./readable-B3VIOfd7.js";
+import { i as finalizeReadableSubscriptions } from "./readable-B5NtV7V0.js";
 //#region src/runtime/dev-namespace.ts
 /**
 * Set a value in the dev namespace (no-op in production).

package/dist/{for-internal-DRbV0h1d.js → for-internal-B_mnQhan.js}

@@ -1,10 +1,10 @@
 import { n as _isDOMElement } from "./vnode-D24p6IW2.js";
-import { b as isDevelopmentEnvironment, o as getRuntimeRenderer, v as logger } from "./access-ePqdQqkV.js";
-import { _ as rebaseVNodeTreeWithContextFrame, m as haveEquivalentContextFrames, n as createComponentInstance, s as renderScopedComponent } from "./component-internal-DsM75Gl1.js";
-import { d as shouldCoalesceFineGrainedItemReads, l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-B3VIOfd7.js";
+import { b as isDevelopmentEnvironment, o as getRuntimeRenderer, v as logger } from "./access-Dpfoi4cA.js";
 import { h as getCurrentStateIndex, i as claimHookIndex, o as clearRenderTracking, p as getCurrentInstance } from "./component-scope-DzJEbYGE.js";
-import { i as unregisterOwnedChildScope, r as registerOwnedChildScope, t as cleanupComponent } from "./component-cleanup-oWN45rfa.js";
-import { o as finalizeInlineReadSubscriptions, u as registerLifecycleTransaction } from "./lifecycle-batch-CwHCDseR.js";
+import { _ as rebaseVNodeTreeWithContextFrame, m as haveEquivalentContextFrames, n as createComponentInstance, s as renderScopedComponent } from "./component-internal-DcrLymUJ.js";
+import { d as shouldCoalesceFineGrainedItemReads, l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-B5NtV7V0.js";
+import { i as unregisterOwnedChildScope, r as registerOwnedChildScope, t as cleanupComponent } from "./component-cleanup-BUfUleGZ.js";
+import { o as finalizeInlineReadSubscriptions, u as registerLifecycleTransaction } from "./lifecycle-batch-Dfpid9-A.js";
 //#region src/runtime/child-scope.ts
 const EMPTY_CHILD_SCOPE_PROPS = {};
 const childScopesByInstance = /* @__PURE__ */ new WeakMap();
@@ -200,9 +200,10 @@ function stageBranchRemoval(state, scope) {
 	const transaction = state._transaction;
 	if (transaction && !transaction.removedScopes.includes(scope)) transaction.removedScopes.push(scope);
 	else if (!transaction) disposeChildScope(scope);
-	const removedDom = scope.dom;
+	const removedRange = getRuntimeRenderer().resolveChildScopeRange?.(scope) ?? scope.range;
+	const removedDom = removedRange?.single ? removedRange.start : scope.dom;
 	if (removedDom) state.lastRemovedNodes.push(removedDom);
-	if (scope.range) state.lastRemovedRanges.push(scope.range);
+	if (removedRange) state.lastRemovedRanges.push(removedRange);
 }
 function commitControlTransaction(state, transaction) {
 	if (state._transaction !== transaction) return;
@@ -603,11 +604,30 @@ const REACTIVE_FOR_ITEM_PROXY_HANDLER = {
 		metadata.wholeItemRead = true;
 		recordReadableRead(getWholeItemSignal(metadata));
 		return Object.getPrototypeOf(Object(metadata.currentItem));
+	},
+	set(target, prop, value) {
+		if (!(prop in target) && typeof prop !== "symbol" && isDevelopmentEnvironment()) {
+			const metadata = getReactiveForItemState(target);
+			if (prop in Object(metadata.currentItem)) logger.warn(`[Askr] Assigning to "${String(prop)}" on a <For> item shadows a property from the source data - it will not update when the source item changes and does not trigger a re-render. Use a different property name for cached/derived per-row values, or a state() cell for values that should be reactive.`);
+		}
+		return Reflect.defineProperty(target, prop, {
+			value,
+			writable: true,
+			enumerable: true,
+			configurable: true
+		});
 	}
 };
 const recordBenchEvent = (_event) => {};
 //#endregion
 //#region src/runtime/for-scopes.ts
+function resolveScopeBoundary(scope) {
+	const range = getRuntimeRenderer().resolveChildScopeRange?.(scope) ?? scope.range;
+	return {
+		dom: range?.single ? range.start : scope.dom,
+		range
+	};
+}
 function recordRemovedBoundary(forState, dom, range) {
 	if (range && !range.single) forState.lastRemovedRanges.push(range);
 	else if (dom) forState.lastRemovedNodes.push(dom);
@@ -616,8 +636,11 @@ function captureRemovedScopeNodes(forState, dom, range) {
 	const transaction = forState._transaction;
 	if (!transaction) return;
 	const nodes = transaction.removedScopeNodes ??= [];
-	if (range && !range.single) for (let node = range.start.nextSibling; node && node !== range.end; node = node.nextSibling) nodes.push(node);
-	else if (dom) nodes.push(dom);
+	if (range && !range.single) {
+		nodes.push(range.start);
+		for (let node = range.start.nextSibling; node && node !== range.end; node = node.nextSibling) nodes.push(node);
+		nodes.push(range.end);
+	} else if (dom) nodes.push(dom);
 }
 function enqueueForScopeUpdate(parent) {
 	parent?._enqueueRun?.();
@@ -734,8 +757,7 @@ function renderItemScope(forState, scope, item, indexSignal, key) {
 	return vnode;
 }
 function disposeItemInstance(forState, itemInstance, domCleanup) {
-	const removedDom = itemInstance.scope.dom;
-	const removedRange = itemInstance.scope.range;
+	const { dom: removedDom, range: removedRange } = resolveScopeBoundary(itemInstance.scope);
 	const transaction = forState._transaction;
 	if (transaction) {
 		(transaction.removedScopes ??= []).push(itemInstance.scope);
@@ -748,7 +770,7 @@ function disposeItemInstance(forState, itemInstance, domCleanup) {
 	} catch (err) {
 		if (isDevelopmentEnvironment()) console.error("[For] Cleanup error:", err);
 	}
-	if (!removedDom) return;
+	if (!removedDom && !removedRange) return;
 	if (removedDom instanceof Element) {
 		if (domCleanup === "teardown") getRuntimeRenderer().teardownNodeSubtree(removedDom);
 	}
@@ -842,15 +864,14 @@ const FOR_FALLBACK_SCOPE_KEY = "__for-fallback__";
 function disposeFallbackScope(forState, domCleanup) {
 	const fallbackScope = forState.fallbackScope;
 	if (!fallbackScope) return;
-	const removedDom = fallbackScope.dom;
-	const removedRange = fallbackScope.range;
+	const { dom: removedDom, range: removedRange } = resolveScopeBoundary(fallbackScope);
 	const transaction = forState._transaction;
 	if (transaction) {
 		(transaction.removedScopes ??= []).push(fallbackScope);
 		captureRemovedScopeNodes(forState, removedDom, removedRange);
 	} else disposeChildScope(fallbackScope);
 	forState.fallbackScope = null;
-	if (!removedDom) return;
+	if (!removedDom && !removedRange) return;
 	if (removedDom instanceof Element) {
 		if (domCleanup === "teardown") getRuntimeRenderer().teardownNodeSubtree(removedDom);
 	}
@@ -880,8 +901,10 @@ function disposeAllItems(forState, domCleanup) {
 		transaction.removeAllItems = true;
 		for (let index = 0; index < forState.orderedItems.length; index++) {
 			const scope = forState.orderedItems[index]?.scope;
-			const removedDom = scope?.dom;
-			const range = scope?.range;
+			const { dom: removedDom, range } = scope ? resolveScopeBoundary(scope) : {
+				dom: void 0,
+				range: void 0
+			};
 			if (scope) captureRemovedScopeNodes(forState, removedDom, range);
 			recordRemovedBoundary(forState, removedDom, range);
 		}
@@ -901,6 +924,12 @@ function disposeAllItems(forState, domCleanup) {
 }
 //#endregion
 //#region src/runtime/for-reconcile.ts
+function hasUnmountedComponentHost(node) {
+	if (!node) return false;
+	const host = node;
+	if (host.__ASKR_INSTANCE?.mounted === false) return true;
+	return host.__ASKR_INSTANCES?.some((instance) => !instance.mounted) ?? false;
+}
 function failForValidation(message) {
 	throw new Error(message);
 }
@@ -1087,11 +1116,15 @@ function reconcileForItems(forState, newArray) {
 			resultVNodes.length = newLen;
 			resultItems.length = newLen;
 			const isFullClear = newLen === 0;
+			const dirtyIndices = [];
 			for (let i = 0; i < newLen; i++) {
 				const item = newArray[i];
 				const key = orderedKeys[i];
 				const existing = items.get(key);
-				updateItemInstance(forState, existing, item);
+				const itemChanged = existing.item !== item;
+				const scopeNeedsDomUpdate = existing.scope.needsDomUpdate || hasUnmountedComponentHost(existing.scope.dom);
+				if (itemChanged) updateItemInstance(forState, existing, item);
+				if (itemChanged || scopeNeedsDomUpdate) dirtyIndices.push(i);
 				resultItems[i] = existing;
 				resultVNodes[i] = existing.scope.vnode;
 			}
@@ -1107,7 +1140,7 @@ function reconcileForItems(forState, newArray) {
 			forState.orderedKeys = orderedKeys;
 			forState.orderedItems.length = newLen;
 			forState.orderedVNodes = resultVNodes;
-			forState.pendingDirtyIndices = null;
+			forState.pendingDirtyIndices = dirtyIndices;
 			forState.pendingSwapIndices = null;
 			forState.pendingMoveOnly = false;
 			return resultVNodes;
@@ -1151,7 +1184,7 @@ function reconcileForItems(forState, newArray) {
 			const key = byFn(newArray[i], i);
 			if (key === orderedKeys[i]) {
 				const existing = items.get(key);
-				if (existing && existing.item !== item) {
+				if (existing && (existing.item !== item || existing.scope.needsDomUpdate)) {
 					canUseSwapPath = false;
 					break;
 				}
@@ -1182,8 +1215,8 @@ function reconcileForItems(forState, newArray) {
 			const firstItem = newArray[firstMismatch];
 			const secondItem = newArray[secondMismatch];
 			const nextOrderedItems = forState.orderedItems.slice();
-			nextOrderedItems[firstMismatch] = secondExisting;
-			nextOrderedItems[secondMismatch] = firstExisting;
+			nextOrderedItems[firstMismatch] = firstExisting;
+			nextOrderedItems[secondMismatch] = secondExisting;
 			if (firstExisting.item !== firstItem) updateItemInstance(forState, firstExisting, firstItem);
 			if (secondExisting.item !== secondItem) updateItemInstance(forState, secondExisting, secondItem);
 			syncForItemIndex(forState, firstExisting, firstMismatch);

package/dist/foundations/index.d.ts

@@ -1,3 +1,3 @@
 import { r as JSXElement } from "../jsx-Dvr2SGRG.js";
-import { _ as definePortal, c as Presence, d as SlotProps, f as LayoutComponent, g as PortalProps, h as Portal, l as PresenceProps, m as DefaultPortal, p as layout, u as Slot } from "../index-Vs1EeWEr.js";
+import { _ as Portal, c as Presence, d as SlotProps, g as DefaultPortal, h as layout, l as PresenceProps, m as LayoutComponent, u as Slot, v as PortalProps, y as definePortal } from "../index-Bkh9S9-t.js";
 export { DefaultPortal, type JSXElement, type LayoutComponent, Portal, type PortalProps, Presence, type PresenceProps, Slot, type SlotProps, definePortal, layout };

package/dist/foundations/index.js

@@ -1,3 +1,3 @@
-import { a as layout, i as Slot, r as Presence } from "../structures-D3vO-WMN.js";
-import { i as definePortal, n as Portal, t as DefaultPortal } from "../portal-BZ_rN17v.js";
+import { a as layout, i as Slot, r as Presence } from "../structures-DSLF_iis.js";
+import { i as definePortal, n as Portal, t as DefaultPortal } from "../portal-BVWjAhNQ.js";
 export { DefaultPortal, Portal, Presence, Slot, definePortal, layout };

package/dist/foundations/state/index.d.ts

@@ -1,4 +1,4 @@
-import { h as State } from "../../control-Cix3yjVf.js";
+import { v as State } from "../../control-DhUZU4_V.js";
 //#region src/foundations/state/controllable.d.ts
 declare function isControlled<T>(value: T | undefined): value is T;
 declare function resolveControllable<T>(value: T | undefined, defaultValue: T): {

package/dist/foundations/state/index.js

@@ -1,4 +1,4 @@
-import { t as state } from "../../state-BCl9DeiN.js";
+import { t as state } from "../../state-DCjONcHK.js";
 //#region src/foundations/state/controllable.ts
 /**
 * controllable

package/dist/foundations/structures/index.d.ts

@@ -1,3 +1,3 @@
 import { r as JSXElement } from "../../jsx-Dvr2SGRG.js";
-import { _ as definePortal, a as Collection, c as Presence, d as SlotProps, f as LayoutComponent, g as PortalProps, h as Portal, i as createLayer, l as PresenceProps, m as DefaultPortal, n as LayerManager, o as CollectionItem, p as layout, r as LayerOptions, s as createCollection, t as Layer, u as Slot } from "../../index-Vs1EeWEr.js";
-export { type Collection, type CollectionItem, DefaultPortal, type JSXElement, type Layer, type LayerManager, type LayerOptions, type LayoutComponent, Portal, type PortalProps, Presence, type PresenceProps, Slot, type SlotProps, createCollection, createLayer, definePortal, layout };
+import { _ as Portal, a as Collection, c as Presence, d as SlotProps, f as cloneElement, g as DefaultPortal, h as layout, i as createLayer, l as PresenceProps, m as LayoutComponent, n as LayerManager, o as CollectionItem, p as isElement, r as LayerOptions, s as createCollection, t as Layer, u as Slot, v as PortalProps, y as definePortal } from "../../index-Bkh9S9-t.js";
+export { type Collection, type CollectionItem, DefaultPortal, type JSXElement, type Layer, type LayerManager, type LayerOptions, type LayoutComponent, Portal, type PortalProps, Presence, type PresenceProps, Slot, type SlotProps, cloneElement, createCollection, createLayer, definePortal, isElement, layout };

package/dist/foundations/structures/index.js

@@ -1,3 +1,3 @@
-import { a as layout, i as Slot, n as createCollection, r as Presence, t as createLayer } from "../../structures-D3vO-WMN.js";
-import { i as definePortal, n as Portal, t as DefaultPortal } from "../../portal-BZ_rN17v.js";
-export { DefaultPortal, Portal, Presence, Slot, createCollection, createLayer, definePortal, layout };
+import { a as layout, i as Slot, n as createCollection, o as cloneElement, r as Presence, s as isElement, t as createLayer } from "../../structures-DSLF_iis.js";
+import { i as definePortal, n as Portal, t as DefaultPortal } from "../../portal-BVWjAhNQ.js";
+export { DefaultPortal, Portal, Presence, Slot, cloneElement, createCollection, createLayer, definePortal, isElement, layout };

package/dist/fx/index.js

@@ -1,4 +1,4 @@
-import { h as scheduleEventHandler, n as enqueueRuntimeTask, v as logger } from "../access-ePqdQqkV.js";
+import { h as scheduleEventHandler, n as enqueueRuntimeTask, v as logger } from "../access-Dpfoi4cA.js";
 import { f as getCurrentComponentInstance } from "../component-scope-DzJEbYGE.js";
 //#region src/fx/timing.ts
 /**

package/dist/{index-Vs1EeWEr.d.ts → index-Bkh9S9-t.d.ts}

@@ -1,4 +1,4 @@
-import { c as RenderableChild } from "./control-Cix3yjVf.js";
+import { u as RenderableChild } from "./control-DhUZU4_V.js";
 import { r as JSXElement } from "./jsx-Dvr2SGRG.js";
 import "./types-C9YcqVpk.js";
 //#region src/runtime/portal.d.ts
@@ -44,6 +44,10 @@ type LayoutComponent<P = object> = (props: P & {
 }) => unknown;
 declare function layout<P = object>(Layout: LayoutComponent<P>): (children?: RenderableChild, props?: P) => unknown;
 //#endregion
+//#region src/jsx/utils.d.ts
+declare function isElement(value: unknown): value is JSXElement;
+declare function cloneElement(element: JSXElement, props: Record<string, unknown>): JSXElement;
+//#endregion
 //#region src/foundations/structures/slot.d.ts
 type SlotProps = {
   asChild: true;
@@ -276,4 +280,4 @@ declare function createLayer(): LayerManager;
  * }
  */
 //#endregion
-export { definePortal as _, Collection as a, Presence as c, SlotProps as d, LayoutComponent as f, PortalProps as g, Portal as h, createLayer as i, PresenceProps as l, DefaultPortal as m, LayerManager as n, CollectionItem as o, layout as p, LayerOptions as r, createCollection as s, Layer as t, Slot as u };
+export { Portal as _, Collection as a, Presence as c, SlotProps as d, cloneElement as f, DefaultPortal as g, layout as h, createLayer as i, PresenceProps as l, LayoutComponent as m, LayerManager as n, CollectionItem as o, isElement as p, LayerOptions as r, createCollection as s, Layer as t, Slot as u, PortalProps as v, definePortal as y };

package/dist/{index-TlEvex-C.d.ts → index-pIgGaXvS.d.ts}

@@ -1,4 +1,4 @@
-import { _ as StateTuple, c as RenderableChild, i as Scope, n as ReadableSource, r as ComponentInstance } from "./control-Cix3yjVf.js";
+import { a as ComponentInstance, b as StateTuple, i as ReadableSource, n as ChildScope, o as Scope, r as DOMRange, u as RenderableChild } from "./control-DhUZU4_V.js";
 import { r as JSXElement } from "./jsx-Dvr2SGRG.js";
 import { t as Scheduler } from "./scheduler-CmLO4Dfm.js";
 import { D as QueryPrefetchContext, _ as CoreTelemetry } from "./index-5S-fi2xy.js";
@@ -30,7 +30,8 @@ interface RuntimeKeyedReorderDecision {
 interface RuntimeRendererHost {
   evaluate(node: unknown, target: Element | null, context?: object, retainedOwner?: ComponentInstance): void;
   cleanupInstancesUnder(node: Node): void;
-  replaceComponentRange(instance: ComponentInstance, result: unknown, placeholder: Comment): Node | null;
+  replaceComponentRange(instance: ComponentInstance, result: unknown, host: Element | Comment): Node | null;
+  resolveChildScopeRange?(scope: ChildScope): DOMRange | null;
   teardownNodeSubtree(root: Node): void;
   populateKeyMapForElement(parent: Element): void;
   getKeyMapForElement(parent: Element): Map<string | number, Element> | undefined;
@@ -157,10 +158,20 @@ type RouteMetaSource<TParams extends RouteParams = RouteParams> = RouteMeta | ((
  * - `title`: page title hint used by SSG and document-meta integrations
  * - `namespace`: MFE namespace key for grouped route management
  */
-interface RouteOptions<TParams extends RouteParams = RouteParams, TSearchSchema extends ObjectSchema<RouteSearch> | undefined = ObjectSchema<RouteSearch> | undefined> extends CommonAccessOptions {
+interface RouteOptions<TParams extends RouteParams = RouteParams, TSearchSchema extends ObjectSchema<RouteSearch> | undefined = ObjectSchema<RouteSearch> | undefined, TLoaderData = unknown, TDehydratedData = TLoaderData> extends CommonAccessOptions {
   loader?: (context: RouteContext<TParams> & {
     request?: Request;
-  }) => unknown;
+  }) => TLoaderData | PromiseLike<TLoaderData>;
+  /**
+   * Select the loader data transported to the browser for initial hydration.
+   *
+   * Server rendering still receives the complete loader value. The selector
+   * must be synchronous; client navigations rerun the loader and receive its
+   * complete result.
+   */
+  dehydrate?: (data: TLoaderData, context: RouteContext<TParams> & {
+    request?: Request;
+  }) => TDehydratedData extends PromiseLike<unknown> ? never : TDehydratedData;
   preload?: (context: RouteContext<TParams> & {
     request?: Request;
     data: QueryPrefetchContext;
@@ -198,6 +209,8 @@ interface RouteRef<TParams extends RouteParams = RouteParams, TSearch = RouteSea
   readonly path: string;
   /** @internal Executable schema retained for destination validation. */
   readonly searchSchema?: ObjectSchema<TSearch & RouteSearch>;
+  /** @internal Public mount point captured by createRouteRegistry(). */
+  readonly basePath?: string;
   readonly __params?: TParams;
   readonly __search?: TSearch;
 }
@@ -238,6 +251,8 @@ interface PageScopeRecord {
 }
 interface RouteRegistryOptions {
   auth?: RouteAuthOptions;
+  /** Public pathname prefix for applications mounted below the origin root. */
+  basePath?: string;
 }
 type RouteDefinition = () => void;
 interface RouteRequestOptions {
@@ -313,6 +328,8 @@ interface RouteRecord {
 interface RouteManifest {
   records: RouteRecord[];
   auth?: RouteAuthOptions;
+  /** Normalized public pathname prefix. Empty and root mounts omit it. */
+  basePath?: string;
 }
 declare const routeRegistryBrand: unique symbol;
 interface RouteHandler<TParams extends RouteParams = RouteParams> {