@askrjs/askr 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -1,6 +1,48 @@
 # Changelog
 
-## Unreleased
+## 0.4.1 — 2026-10-01
+
+- fix(data): honor defined-query `skipInitialFetch` and `initialData` options,
+  retain prefetched/hydrated data precedence, and retire active or queued
+  refreshes when the last reader leaves a query retained by `gcTime` (#724).
+- fix(data): retire obsolete requests immediately when invalidation supersedes
+  them, preserve every string query key during dehydration, and keep sparse
+  query-key arrays from colliding with empty arrays. Dense-array keys are unchanged.
+- fix(resources): abort and close failed stream generations, capture stream
+  definitions from the committed render, and preserve component ownership in
+  listener and timer callbacks so nested FX and invalidation use the owning app.
+- fix(core): restore `derive()`/`selector()` definitions and subscriptions after
+  a rejected render, and run replacement refs even when previous ref cleanup
+  throws.
+- fix(core): retain the following server element when hydration adopts merged
+  adjacent text nodes, including text claimed through reserved cursors.
+- fix(control): preserve native and class instance receivers in `For` rows while
+  retaining reactive overlays for plain records and stable keyed row lifetimes.
+- fix(foundations): prevent stale collection cleanup from removing a newer
+  registration for the same node, and preserve own `__proto__` props in
+  `mergeProps()` without changing the output record's prototype.
+- fix(router): preserve prototype-named path parameters and query fields without
+  changing the prototype of the returned plain records. Server snapshots omit
+  browser history state, and hydration omission guards apply only to declared
+  omissions rather than inherited object properties.
+- fix(router): capture each committed `onRouteChange()` callback and snapshot,
+  preserving ordered changes and cleanup when several commits precede a flush.
+  Destination snapshots read the matching navigation state before browser
+  history is written, and navigation state getters run once per destination.
+- fix(ssr): distinguish actual deferred hydration values from ordinary records
+  with the same marker keys. Existing generated pages retain their original
+  deferred decoding, unambiguous pages retain their existing envelope bytes,
+  and the hydration envelope remains version 1.
+- fix(rendering): keep attribute names such as `constructor` and `toString`
+  literal rather than interpreting them as inherited alias or namespace entries.
+- fix(hydration): retain the clicked submit button when replaying a form
+  submission after hydration replaces its controls. Failed idle attempts retain
+  interaction and visibility retries, and mixed completion paths release their
+  replay and scroll listeners after the final deferred section activates.
+- fix(ssg): normalize named splat entry parameters while preserving accepted
+  raw token spellings, encode dynamic render URLs while preserving existing
+  output paths and data override keys, and rebuild
+  unchanged routes when their generated HTML is missing.
 
 ## 0.4.0 — 2026-09-28
 

package/dist/actions/index.js

@@ -1,9 +1,9 @@
-import { a as state } from "../state-DWO1KzkX.js";
-import { r as currentAppRuntime } from "../hooks-BimKStr4.js";
+import { a as state } from "../state-i9D4EtY6.js";
+import { r as currentAppRuntime } from "../hooks-kjLigwDJ.js";
 import { r as getCurrentRenderData } from "../render-context-DGHnEveC.js";
 import { i as jsxs, n as jsx } from "../jsx-runtime-C4idqHY0.js";
-import { c as invalidateQueriesForRuntime, u as resolveDataRuntimeState } from "../data-runtime-C1bFAlba.js";
-import { c as resolveNavigationUrl } from "../url-CnbfpX0K.js";
+import { c as invalidateQueriesForRuntime, u as resolveDataRuntimeState } from "../data-runtime-i-RD0Ffm.js";
+import { c as resolveNavigationUrl } from "../url-C9xMpMMv.js";
 import { n as isCurrentAsyncGeneration } from "../shared-O2ZnmYAf.js";
 //#region src/actions/runtime.ts
 const emptyFramework = Object.freeze({});

package/dist/benchmark.js

@@ -1,8 +1,8 @@
-import { y as flushSync } from "./instance-BAnfmXOR.js";
-import { a as state, i as selector } from "./state-DWO1KzkX.js";
+import { y as flushSync } from "./instance-DL-YKrj6.js";
+import { a as state, i as selector } from "./state-i9D4EtY6.js";
 import { i as jsxs, n as jsx } from "./jsx-runtime-C4idqHY0.js";
-import { r as createIsland } from "./boot-DaoTYoCw.js";
-import { n as For } from "./control-nfpT2fbK.js";
+import { r as createIsland } from "./boot-C5HnQZio.js";
+import { n as For } from "./control-hr3B0QaD.js";
 //#region src/bench/components/benchmark-row.tsx
 function BenchmarkRow({ item, isSelected, onSelect, onRemove }) {
 	return /* @__PURE__ */ jsxs("tr", {
@@ -58,8 +58,8 @@ function BenchmarkTable({ rows, isSelected, onSelect, onRemove }) {
 }
 const benchmarkMetadata = {
 	packageName: "@askrjs/askr",
-	packageVersion: "0.4.0",
-	buildLabel: "0.4.0-local"
+	packageVersion: "0.4.1",
+	buildLabel: "0.4.1-local"
 };
 function getBenchmarkMetadata() {
 	return { ...benchmarkMetadata };

package/dist/boot/index.js

@@ -1,2 +1,2 @@
-import { a as cleanupApp, i as createIslands, n as createSPA, o as hasApp, r as createIsland, t as hydrateSPA } from "../boot-DaoTYoCw.js";
+import { a as cleanupApp, i as createIslands, n as createSPA, o as hasApp, r as createIsland, t as hydrateSPA } from "../boot-C5HnQZio.js";
 export { cleanupApp, createIsland, createIslands, createSPA, hasApp, hydrateSPA };

package/dist/{boot-DaoTYoCw.js → boot-C5HnQZio.js}

@@ -1,19 +1,19 @@
-import { C as schedule, F as logger, I as isDevelopmentEnvironment, L as isProductionEnvironment, M as getOwner, N as runWithOwner, S as queueTask, _ as batch, c as setRenderHost, d as recordUndo, f as rewindJournal, g as outsideRendering, i as getContextEpoch, j as Owner, l as createRenderJournal, m as withRenderJournal, n as HookOrderChangeError, p as settleJournal, t as ComponentInstance, u as journalMark, v as effectScheduler, w as Computation, y as flushSync } from "./instance-BAnfmXOR.js";
+import { C as schedule, I as logger, L as isDevelopmentEnvironment, M as getOwner, N as runWithOwner, P as throwCollected, R as isProductionEnvironment, S as queueTask, _ as batch, c as setRenderHost, d as recordUndo, f as rewindJournal, g as outsideRendering, i as getContextEpoch, j as Owner, l as createRenderJournal, m as withRenderJournal, n as HookOrderChangeError, p as settleJournal, t as ComponentInstance, u as journalMark, v as effectScheduler, w as Computation, y as flushSync } from "./instance-DL-YKrj6.js";
 import { n as readValue } from "./readable-DFWOsTac.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { _ as RenderDepthError, b as reportUncaughtErrorLater, g as routeError, h as noteErrorOrigin, i as currentComponent, l as provideAppRuntime, m as deliverToBoundary, p as clarifyRenderError, v as clarifyRenderOverflow, y as reportUncaughtError } from "./hooks-BimKStr4.js";
-import { r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-DwGw1A6Q.js";
-import { d as startHydrationRenderPhase, p as stopHydrationRenderPhase, x as pageRenderEnvelope } from "./render-context-DGHnEveC.js";
-import { a as descriptorType, o as functionChildOutput, s as normalizeChildren } from "./error-boundary-Bpwofwps.js";
-import { D as clearStagedAppRenderRouteLocation, E as configureRootUpdateHost, O as createAppRenderRuntime, S as unregisterAppInstance, T as setServerLocation, _ as registerAppInstance, c as reconcileRouteMeta, d as configureScrollRestoration, k as stageAppRenderRouteLocation, l as resolveRouteMeta, o as readHistoryIndex, s as loadDocument, t as initializeNavigation } from "./navigate-CP_0Zy5U.js";
+import { _ as RenderDepthError, b as reportUncaughtErrorLater, g as routeError, h as noteErrorOrigin, i as currentComponent, l as provideAppRuntime, m as deliverToBoundary, p as clarifyRenderError, v as clarifyRenderOverflow, y as reportUncaughtError } from "./hooks-kjLigwDJ.js";
+import { r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-D-XM_uuJ.js";
+import { b as isPageRenderEnvelope, d as startHydrationRenderPhase, p as stopHydrationRenderPhase, x as pageRenderEnvelope } from "./render-context-DGHnEveC.js";
+import { a as descriptorType, o as functionChildOutput, s as normalizeChildren } from "./error-boundary-ChXoIFVl.js";
+import { D as clearStagedAppRenderRouteLocation, E as configureRootUpdateHost, O as createAppRenderRuntime, S as unregisterAppInstance, T as setServerLocation, _ as registerAppInstance, c as reconcileRouteMeta, d as configureScrollRestoration, k as stageAppRenderRouteLocation, l as resolveRouteMeta, o as readHistoryIndex, s as loadDocument, t as initializeNavigation } from "./navigate-DsfO12hB.js";
 import { t as assertSyncComponentResult } from "./promise-Dz8iIHAm.js";
-import { a as hydrateDataRuntime, m as reviveDeferredValue } from "./query-registry-WMCN0BJL.js";
-import { A as clearRouteState, D as _setActiveRouteAuthOptions, Y as lockRouteRegistration, a as resolveRouteRequest, gt as withoutRouteHydrationMetadata, i as hasRouteRenderData, m as withoutHydratedAuth, n as getRouteRenderContext, p as readHydratedAuth, q as hasRegisteredRoutes, r as getRouteRenderData } from "./resolution-Cx82-xjW.js";
-import { c as isSSRPortalHydrationAnchor, i as provideDefaultPortal, l as isSSRPortalWriterAnchor, t as DefaultPortal } from "./portal-DuOKfnLa.js";
-import { r as assertExecutionModel, t as _applyManifest } from "./manifest-CW9gyNBY.js";
-import { a as getDefaultDataRuntime } from "./data-runtime-C1bFAlba.js";
-import { c as resolveNavigationUrl, d as isCustomElementName, l as attributeNamespace, n as UNSAFE_URL_SCHEME_ATTRIBUTES, s as rejectUnsafeUrlAttribute, t as SCRIPT_URL_RESOURCE_ATTRIBUTES, u as getPublicAttributeName } from "./url-CnbfpX0K.js";
-import { a as PROPERTY_PROP_PREFIX, c as isKnownBooleanProperty, d as booleanAttributeValue, f as isSkippedProp, h as styleValueText, i as ATTRIBUTE_PROP_PREFIX, m as normalizeStylePropertyName, o as domPropertyValue, p as keepsFalseValue, r as sanitizeCssValue, s as getDomPropertyName, u as propertyReflectsAttribute } from "./ssr-DoV-vJ-5.js";
+import { a as hydrateDataRuntime, m as reviveDeferredValue } from "./query-registry-tzSiVrV_.js";
+import { A as clearRouteState, D as _setActiveRouteAuthOptions, Y as lockRouteRegistration, a as resolveRouteRequest, gt as withoutRouteHydrationMetadata, i as hasRouteRenderData, m as withoutHydratedAuth, n as getRouteRenderContext, p as readHydratedAuth, q as hasRegisteredRoutes, r as getRouteRenderData } from "./resolution-CF1BqHLm.js";
+import { c as isSSRPortalHydrationAnchor, i as provideDefaultPortal, l as isSSRPortalWriterAnchor, t as DefaultPortal } from "./portal-LYf4cbHd.js";
+import { r as assertExecutionModel, t as _applyManifest } from "./manifest-BNupb86f.js";
+import { a as getDefaultDataRuntime } from "./data-runtime-i-RD0Ffm.js";
+import { c as resolveNavigationUrl, d as isCustomElementName, l as attributeNamespace, n as UNSAFE_URL_SCHEME_ATTRIBUTES, s as rejectUnsafeUrlAttribute, t as SCRIPT_URL_RESOURCE_ATTRIBUTES, u as getPublicAttributeName } from "./url-C9xMpMMv.js";
+import { a as PROPERTY_PROP_PREFIX, c as isKnownBooleanProperty, d as booleanAttributeValue, f as isSkippedProp, h as styleValueText, i as ATTRIBUTE_PROP_PREFIX, m as normalizeStylePropertyName, o as domPropertyValue, p as keepsFalseValue, r as sanitizeCssValue, s as getDomPropertyName, u as propertyReflectsAttribute } from "./ssr-DPfdcq0e.js";
 //#region src/boot/root-handler.ts
 const AUTO_PORTAL = {
 	$$typeof: ELEMENT_TYPE,
@@ -50,6 +50,8 @@ function wrapRootRouteHandler(componentFn, cspNonce) {
 * `apply()` renders the destination (render phase only); `publish()` commits
 * it; `rollback()` discards it and restores the root's previous route state.
 * A navigation applies every root first and publishes only if all succeeded.
+* The destination stays staged through lifecycle-driven rerenders until
+* `complete()` releases it after the navigation settles browser history.
 */
 function prepare(root, input) {
 	const app = root;
@@ -80,7 +82,7 @@ function prepare(root, input) {
 	return {
 		apply() {
 			if (prepared || settled) return;
-			stageAppRenderRouteLocation(runtime, input.href);
+			stageAppRenderRouteLocation(runtime, input.href, input.locationState);
 			app.appRuntime = runtime;
 			if (input.replaceLifetime) {
 				app.component = input.handler;
@@ -116,8 +118,6 @@ function prepare(root, input) {
 					aborted,
 					errors: [error]
 				};
-			} finally {
-				clearStagedAppRenderRouteLocation(runtime);
 			}
 		},
 		rollback() {
@@ -130,6 +130,9 @@ function prepare(root, input) {
 		},
 		retire() {
 			return [];
+		},
+		complete() {
+			clearStagedAppRenderRouteLocation(runtime);
 		}
 	};
 }
@@ -697,15 +700,20 @@ function removeAllListeners(listeners, el, errors) {
 * removes whatever the server rendered that the client did not.
 */
 var HydrationCursor = class HydrationCursor {
-	constructor(stopAt = null) {
+	constructor(stopAt = null, successors = /* @__PURE__ */ new WeakMap()) {
 		this.stopAt = stopAt;
+		this.successors = successors;
 		this.next = /* @__PURE__ */ new Map();
 		this.deferred = [];
 	}
+	/** Detached text suffixes retain the server sibling that follows them. */
+	followingSibling(node) {
+		return this.successors.has(node) ? this.successors.get(node) : node.nextSibling;
+	}
 	/** Consume private SSR metadata emitted immediately before a component output. */
 	claimResourceSlots(container) {
 		let node = this.next.has(container) ? this.next.get(container) : container.firstChild;
-		for (; node && node !== this.stopAt; node = node.nextSibling) {
+		for (; node && node !== this.stopAt; node = this.followingSibling(node)) {
 			if (node.nodeType === 3 && isInsignificantWhitespace(node)) continue;
 			if (node.nodeType !== 8) return null;
 			const match = /^askr-resource:(r:\d+(?:,r:\d+)*)$/.exec(node.data);
@@ -724,7 +732,7 @@ var HydrationCursor = class HydrationCursor {
 		let node = this.next.has(container) ? this.next.get(container) : container.firstChild;
 		while (node && node !== this.stopAt) {
 			if (node.nodeType !== 8) nodes.push(node);
-			node = node.nextSibling;
+			node = this.followingSibling(node);
 		}
 		return nodes;
 	}
@@ -736,30 +744,30 @@ var HydrationCursor = class HydrationCursor {
 	*/
 	reserve(container) {
 		let node = this.next.has(container) ? this.next.get(container) : container.firstChild;
-		while (node && node !== this.stopAt && node.nodeType === 3 && isInsignificantWhitespace(node)) node = node.nextSibling;
+		while (node && node !== this.stopAt && node.nodeType === 3 && isInsignificantWhitespace(node)) node = this.followingSibling(node);
 		if (node && isRangeMarker(node, "askr-range-start")) {
 			let depth = 0;
 			let end = node;
-			for (; end && end !== this.stopAt; end = end.nextSibling) if (isRangeMarker(end, "askr-range-start")) depth++;
+			for (; end && end !== this.stopAt; end = this.followingSibling(end)) if (isRangeMarker(end, "askr-range-start")) depth++;
 			else if (isRangeMarker(end, "askr-range-end") && --depth === 0) break;
 			if (end && end !== this.stopAt) {
-				this.next.set(container, end.nextSibling);
-				const inner = new HydrationCursor(end);
-				inner.next.set(container, node.nextSibling);
+				this.next.set(container, this.followingSibling(end));
+				const inner = new HydrationCursor(end, this.successors);
+				inner.next.set(container, this.followingSibling(node));
 				return inner;
 			}
 		}
-		const later = new HydrationCursor(this.stopAt);
+		const later = new HydrationCursor(this.stopAt, this.successors);
 		later.next.set(container, node);
 		return later;
 	}
 	peek(container) {
 		let node = this.next.has(container) ? this.next.get(container) : container.firstChild;
-		while (node && node !== this.stopAt && (node.nodeType === 8 || node.nodeType === 3 && isInsignificantWhitespace(node))) node = node.nextSibling;
+		while (node && node !== this.stopAt && (node.nodeType === 8 || node.nodeType === 3 && isInsignificantWhitespace(node))) node = this.followingSibling(node);
 		return node === this.stopAt ? null : node;
 	}
 	advance(container, node) {
-		this.next.set(container, node.nextSibling);
+		this.next.set(container, this.followingSibling(node));
 	}
 	claimElement(container, tag, namespace) {
 		const node = this.peek(container);
@@ -782,6 +790,7 @@ var HydrationCursor = class HydrationCursor {
 		const textNode = node;
 		if (text.length > 0 && textNode.data.length > text.length && textNode.data.startsWith(text)) {
 			const remainder = document.createTextNode(textNode.data.slice(text.length));
+			this.successors.set(remainder, this.followingSibling(textNode));
 			this.next.set(container, remainder);
 			return textNode;
 		}
@@ -1872,8 +1881,18 @@ function attachRef(pass, node, previous) {
 	if (ref === previous) return;
 	const el = node.el;
 	pass.after(() => {
-		if (previous) setRef(previous, null);
-		if (ref) setRef(ref, el);
+		const errors = [];
+		try {
+			if (previous) setRef(previous, null);
+		} catch (error) {
+			errors.push(error);
+		}
+		try {
+			if (ref) setRef(ref, el);
+		} catch (error) {
+			errors.push(error);
+		}
+		throwCollected(errors, "Ref replacement callbacks failed");
 	});
 }
 /** End a removed element's bindings, listeners, and ref. */
@@ -3517,6 +3536,27 @@ function hydrationReviver(_key, value) {
 	if (payload[DEFERRED_PAYLOAD] === "rejected") return reviveDeferredValue("rejected", void 0, payload.error);
 	return value;
 }
+function parseHydrationRenderData(raw) {
+	const value = JSON.parse(raw);
+	if (!isPageRenderEnvelope(value) || !Object.prototype.hasOwnProperty.call(value, "deferredPaths")) return JSON.parse(raw, hydrationReviver);
+	const payload = value;
+	const paths = payload.deferredPaths;
+	if (!Array.isArray(paths) || paths.some((path) => !Array.isArray(path) || path.some((key) => typeof key !== "string"))) throw new TypeError("Invalid deferred hydration locations.");
+	for (let index = paths.length - 1; index >= 0; index--) {
+		const path = paths[index];
+		let parent = value;
+		for (const key of path.slice(0, -1)) {
+			if (!parent || typeof parent !== "object" || !Object.prototype.hasOwnProperty.call(parent, key)) throw new TypeError("Missing deferred hydration location.");
+			parent = parent[key];
+		}
+		const key = path[path.length - 1];
+		if (path.length === 0 || !parent || typeof parent !== "object" || !Object.prototype.hasOwnProperty.call(parent, key)) throw new TypeError("Missing deferred hydration location.");
+		const record = parent;
+		Object.defineProperty(record, key, { value: hydrationReviver(key, record[key]) });
+	}
+	delete payload.deferredPaths;
+	return payload;
+}
 /**
 * Relocate the SSR style registry carrier out of the hydration root.
 *
@@ -3541,7 +3581,7 @@ function takeHydrationRenderData(rootElement) {
 		child.remove();
 		if (!raw) return pageRenderEnvelope(void 0);
 		try {
-			return pageRenderEnvelope(JSON.parse(raw, hydrationReviver));
+			return pageRenderEnvelope(parseHydrationRenderData(raw));
 		} catch (err) {
 			const error = /* @__PURE__ */ new Error("[Askr] Failed to parse embedded SSR render data during hydration.");
 			error.cause = err;
@@ -3631,8 +3671,7 @@ async function applySelectiveHydration(rootElement, resolved, path, cleanupStric
 		let selectiveHydrationResourcesReleased = false;
 		let unregisterRootCleanupCallback = () => {};
 		function handleScroll() {
-			const { activated, remaining } = activateVisibleDeferredBoundaries(rootElement, deferredBoundaries, foldY, hooks.activateHydrationBoundary, reportedDepthErrors);
-			if (!activated) return;
+			const { remaining } = activateVisibleDeferredBoundaries(rootElement, deferredBoundaries, foldY, hooks.activateHydrationBoundary, reportedDepthErrors);
 			if (remaining === 0) releaseSelectiveHydrationResources();
 		}
 		releaseSelectiveHydrationResources = () => {
@@ -3671,9 +3710,11 @@ async function applySelectiveHydration(rootElement, resolved, path, cleanupStric
 	}
 	if (hydrateOptions.deferUntilIdle && deferredBoundaries.length > 0) await queueIdleWork(() => {
 		try {
-			activateVisibleDeferredBoundaries(rootElement, deferredBoundaries, Number.POSITIVE_INFINITY, hooks.activateHydrationBoundary, reportedDepthErrors);
-		} finally {
+			const { remaining } = activateVisibleDeferredBoundaries(rootElement, deferredBoundaries, Number.POSITIVE_INFINITY, hooks.activateHydrationBoundary, reportedDepthErrors);
+			if (remaining === 0) releaseSelectiveHydrationResources();
+		} catch (error) {
 			releaseSelectiveHydrationResources();
+			throw error;
 		}
 	});
 	if (deferredBoundaries.length === 0) releaseSelectiveHydrationResources();
@@ -3719,7 +3760,8 @@ function cloneInteractionEvent(event) {
 		pointerType: eventWithDetails.pointerType,
 		isPrimary: eventWithDetails.isPrimary,
 		data: eventWithDetails.data,
-		inputType: eventWithDetails.inputType
+		inputType: eventWithDetails.inputType,
+		submitter: eventWithDetails.submitter
 	};
 	try {
 		return new EventConstructor(event.type, init);
@@ -3768,6 +3810,7 @@ function beginHydrationInteractionReplay(root, activateBoundary, permanentSkipSe
 		if (!hydratingRoot && deferredBoundaries.size === 0) removeCaptureListeners();
 	}
 	function notifyIfDeferredBoundariesDrained() {
+		for (const boundary of deferredBoundaries) if (!boundary.hasAttribute("data-skip-hydrate") || !root.contains(boundary)) deferredBoundaries.delete(boundary);
 		if (hadDeferredBoundaries && deferredBoundaries.size === 0) onDeferredBoundariesDrained?.();
 	}
 	function replayInteraction(interaction) {
@@ -3923,7 +3966,7 @@ async function hydrateSPA(config) {
 			onCommit: captureClientMarkup
 		});
 		if (shouldVerifyHydrationMarkup(config)) {
-			const { captureServerHydrationMarkup, verifyClientHydrationMarkup, verifyHydrationSyncForUrl } = await import("./verify-hydration-DpVaDnqz.js");
+			const { captureServerHydrationMarkup, verifyClientHydrationMarkup, verifyHydrationSyncForUrl } = await import("./verify-hydration-D_cyn1OX.js");
 			if (!verifyHydrationSyncForUrl({
 				root: rootElement,
 				url: currentUrl,

package/dist/{browser-activity-CB8e-V4f.js → browser-activity-2r5gA1Cb.js}

@@ -1,5 +1,5 @@
-import { S as queueTask, d as recordUndo, v as effectScheduler, w as Computation } from "./instance-BAnfmXOR.js";
-import { c as onCommit, d as reportLifecycleError, f as withOwner, i as currentComponent, o as hookSlot } from "./hooks-BimKStr4.js";
+import { S as queueTask, d as recordUndo, v as effectScheduler, w as Computation } from "./instance-DL-YKrj6.js";
+import { c as onCommit, d as reportLifecycleError, f as withOwner, i as currentComponent, o as hookSlot } from "./hooks-kjLigwDJ.js";
 import { t as isRouteActivityActive } from "./route-activity-CNJfpwx-.js";
 //#region src/core/api/lifecycle.ts
 /**
@@ -152,7 +152,9 @@ function timer(intervalMs, fn, options) {
 		if (slot.id !== null) clearInterval(slot.id);
 		slot.intervalMs = intervalMs;
 		slot.id = setInterval(() => {
-			if (slot.predicates.every((predicate) => predicate())) slot.callback();
+			withOwner(instance, () => {
+				if (slot.predicates.every((predicate) => predicate())) slot.callback();
+			});
 		}, intervalMs);
 		if (first) instance.onCleanup(() => {
 			if (slot.id !== null) clearInterval(slot.id);
@@ -181,7 +183,7 @@ function on(target, event, handler, options) {
 			handler,
 			attached: false,
 			listener: ((evt) => {
-				created.handler.call(created.target, evt);
+				withOwner(instance, () => created.handler.call(created.target, evt));
 			})
 		};
 		return created;

package/dist/components/index.js

@@ -1,2 +1,2 @@
-import { t as ErrorBoundary } from "../error-boundary-Bpwofwps.js";
+import { t as ErrorBoundary } from "../error-boundary-ChXoIFVl.js";
 export { ErrorBoundary };

package/dist/{compose-ref-DWzdbxsD.js → compose-ref-ccRU59BM.js}

@@ -75,7 +75,13 @@ function mergeProps(base, injected) {
 			out[key] = composeHandlers(injectedValue, baseValue);
 			continue;
 		}
-		out[key] = baseValue;
+		if (key === "__proto__") Object.defineProperty(out, key, {
+			value: baseValue,
+			enumerable: true,
+			configurable: true,
+			writable: true
+		});
+		else out[key] = baseValue;
 	}
 	return out;
 }

package/dist/control/index.js

@@ -1,2 +1,2 @@
-import { i as Show, n as For, r as Match, t as Case } from "../control-nfpT2fbK.js";
+import { i as Show, n as For, r as Match, t as Case } from "../control-hr3B0QaD.js";
 export { Case, For, Match, Show };

package/dist/{control-nfpT2fbK.js → control-hr3B0QaD.js}

@@ -1,6 +1,6 @@
-import { F as logger, I as isDevelopmentEnvironment, T as Signal, d as recordUndo, h as isRendering } from "./instance-BAnfmXOR.js";
+import { I as logger, L as isDevelopmentEnvironment, T as Signal, d as recordUndo, h as isRendering } from "./instance-DL-YKrj6.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { c as onCommit, i as currentComponent, o as hookSlot } from "./hooks-BimKStr4.js";
+import { c as onCommit, i as currentComponent, o as hookSlot } from "./hooks-kjLigwDJ.js";
 //#region src/core/api/control.ts
 /**
 * Control flow as ordinary components.
@@ -89,6 +89,8 @@ function createRow(index, item) {
 		readItem: () => {
 			const item = source.peek();
 			if (typeof item !== "object" || item === null || Array.isArray(item)) return item;
+			const prototype = Object.getPrototypeOf(item);
+			if (prototype !== Object.prototype && prototype !== null) return source.read();
 			if (proxy) return proxy;
 			proxy = new Proxy({}, {
 				get(_target, key) {

package/dist/{csp-nonce-DwGw1A6Q.js → csp-nonce-D-XM_uuJ.js}

@@ -1,4 +1,4 @@
-import { n as isScopeReadable, r as readScope, t as defineScope } from "./scope-CwpVSHVf.js";
+import { n as isScopeReadable, r as readScope, t as defineScope } from "./scope-ila_zaId.js";
 //#region src/csp-nonce.ts
 /** Lexical scope carrying the CSP nonce for the current render, if any. */
 const CspNonceScope = defineScope(void 0);

package/dist/data/index.js

@@ -1,4 +1,4 @@
-import { a as hydrateDataRuntime, i as dehydrateDataRuntime, n as defineQuery, o as prefetchQuery, r as defineServerQueries, s as serveQuery, t as createQueryPrefetchContext } from "../query-registry-WMCN0BJL.js";
-import { a as getDefaultDataRuntime, t as createDataRuntime } from "../data-runtime-C1bFAlba.js";
-import { c as createMutation, d as queryScope, l as invalidate, n as createQuery, t as createQueryCollection, u as invalidateOnInterval } from "../data-BCwClJiF.js";
+import { a as hydrateDataRuntime, i as dehydrateDataRuntime, n as defineQuery, o as prefetchQuery, r as defineServerQueries, s as serveQuery, t as createQueryPrefetchContext } from "../query-registry-tzSiVrV_.js";
+import { a as getDefaultDataRuntime, t as createDataRuntime } from "../data-runtime-i-RD0Ffm.js";
+import { c as createMutation, d as queryScope, l as invalidate, n as createQuery, t as createQueryCollection, u as invalidateOnInterval } from "../data-BsnOUpQ6.js";
 export { createDataRuntime, createMutation, createQuery, createQueryCollection, createQueryPrefetchContext, defineQuery, defineServerQueries, dehydrateDataRuntime, getDefaultDataRuntime, hydrateDataRuntime, invalidate, invalidateOnInterval, prefetchQuery, queryScope, serveQuery };

package/dist/{data-BCwClJiF.js → data-BsnOUpQ6.js}

@@ -1,8 +1,8 @@
-import { C as schedule, F as logger } from "./instance-BAnfmXOR.js";
-import { i as currentComponent, n as createSource, r as currentAppRuntime, s as notify, t as claimHookIndex, u as readSource } from "./hooks-BimKStr4.js";
+import { C as schedule, I as logger } from "./instance-DL-YKrj6.js";
+import { i as currentComponent, n as createSource, r as currentAppRuntime, s as notify, t as claimHookIndex, u as readSource } from "./hooks-kjLigwDJ.js";
 import { n as getActiveRenderContext } from "./render-context-DGHnEveC.js";
-import { a as getDefaultDataRuntime, c as invalidateQueriesForRuntime, f as invalidateCollectionCell, l as readQueryData, m as unregisterCollectionCell, n as ensureMutationCleanup, o as getMutationSlotStore, p as registerCollectionCell, r as ensureQueryCleanup, s as getQuerySlotStore, u as resolveDataRuntimeState } from "./data-runtime-C1bFAlba.js";
-import { a as routeActive, n as windowFocused, s as timer, t as documentVisible } from "./browser-activity-CB8e-V4f.js";
+import { a as getDefaultDataRuntime, c as invalidateQueriesForRuntime, f as invalidateCollectionCell, l as readQueryData, m as unregisterCollectionCell, n as ensureMutationCleanup, o as getMutationSlotStore, p as registerCollectionCell, r as ensureQueryCleanup, s as getQuerySlotStore, u as resolveDataRuntimeState } from "./data-runtime-i-RD0Ffm.js";
+import { a as routeActive, n as windowFocused, s as timer, t as documentVisible } from "./browser-activity-2r5gA1Cb.js";
 import { i as normalizeAsyncDataError, r as isCurrentAsyncOperation, t as isAbortError } from "./shared-O2ZnmYAf.js";
 //#region src/data/query-key.ts
 function serializeQueryKeyNumber(part) {
@@ -21,7 +21,12 @@ function serializeQueryKeyPart(part) {
 		case "number": return `n=${serializeQueryKeyNumber(part)}`;
 		case "boolean": return `b=${part ? "1" : "0"}`;
 		case "object":
-			if (Array.isArray(part)) return `a[${part.map((item) => serializeQueryKeyPart(item)).join(",")}]`;
+			if (Array.isArray(part)) {
+				const items = [];
+				const length = part.length;
+				for (let index = 0; index < length; index++) items.push(serializeQueryKeyPart(part[index]));
+				return `a[${items.join(",")}]`;
+			}
 			const objectPart = part;
 			return `o{${Object.keys(objectPart).sort().map((key) => `${encodeURIComponent(key)}=${serializeQueryKeyPart(objectPart[key])}`).join(",")}}`;
 		default: return String(part);
@@ -395,12 +400,15 @@ var QueryCell = class {
 			if (gcTime === 0 || this.state.data === null || isServerRender()) this.destroy();
 			else {
 				this.generation += 1;
-				this.controller?.abort();
+				const controller = this.controller;
 				this.controller = null;
 				this.finishPendingRefresh();
+				this.pendingRefreshToken += 1;
 				this.definitionOwner = null;
 				this.definitionOwnerHook = -1;
+				if (this.state.refreshing) this.setState(staleQueryState(this.state.data, "aborted"));
 				this.gcTimer = setTimeout(() => this.destroy(), gcTime);
+				controller?.abort();
 			}
 			return;
 		}
@@ -538,6 +546,7 @@ var QueryCell = class {
 		}
 		if (this.pendingRefresh) {
 			if (this.pendingRefreshKind === "invalidation") {
+				this.generation += 1;
 				this.controller?.abort();
 				this.queueStart(void 0, "manual", true);
 				return this.pendingRefresh ?? Promise.resolve();
@@ -560,6 +569,7 @@ var QueryCell = class {
 			return Promise.resolve();
 		}
 		if (this.pendingRefresh) {
+			this.generation += 1;
 			this.controller?.abort();
 			this.queueStart(void 0, "invalidation", true);
 			return this.pendingRefresh ?? Promise.resolve();
@@ -673,7 +683,7 @@ function isServerRender() {
 function createCell(options, cache) {
 	const cell = new QueryCell(options.takeInitialData ? {
 		...options,
-		initialData: options.takeInitialData()
+		initialData: options.takeInitialData() ?? options.initialData
 	} : options, options.key, cache);
 	cache.set(options.key, cell);
 	cell.ensureStarted();
@@ -729,7 +739,7 @@ function createDefinedQuery(definition, input, options = {}) {
 		isConsistent: definition.isConsistent,
 		reconcile: definition.reconcile,
 		takeInitialData: () => readQueryData(runtimeState, key, !serverRender),
-		skipInitialFetch: serverRender,
+		skipInitialFetch: serverRender || options.skipInitialFetch === true,
 		runtime: dataRuntime
 	});
 }

package/dist/{data-runtime-C1bFAlba.js → data-runtime-i-RD0Ffm.js}

@@ -1,4 +1,4 @@
-import { r as currentAppRuntime } from "./hooks-BimKStr4.js";
+import { r as currentAppRuntime } from "./hooks-kjLigwDJ.js";
 import { n as getActiveRenderContext } from "./render-context-DGHnEveC.js";
 //#region src/data/invalidation-listeners.ts
 const invalidationListeners = /* @__PURE__ */ new Set();

package/dist/{deferred-bEEHHvic.js → deferred-nGZglpj6.js}

@@ -1,9 +1,9 @@
-import { i as currentComponent, r as currentAppRuntime } from "./hooks-BimKStr4.js";
+import { i as currentComponent, r as currentAppRuntime } from "./hooks-kjLigwDJ.js";
 import { c as registerDeferredBoundary, n as getActiveRenderContext, r as getCurrentRenderData } from "./render-context-DGHnEveC.js";
-import { d as DEFERRED_BOUNDARY, p as isDeferred } from "./query-registry-WMCN0BJL.js";
-import { B as getCurrentPathPrefix, F as getCurrentInheritedMeta, G as getRouteRecords, I as getCurrentInheritedPolicies, J as insertRecordSorted, K as hasActivePageScope, L as getCurrentLayoutChain, O as addRouteToStores, P as getCurrentInheritedAuthRequirements, R as getCurrentPageChain, U as getDefaultRouteBasePath, V as getCurrentScopeKind, X as pushRegistrationScope, dt as routeMatchKey, k as assertRouteRegistrationUnlocked, lt as normalizeRouteSegmentName, pt as guardHydratedRouteData, st as computeRank, tt as createRouteHandler, ut as parseSegments, z as getCurrentPageScope } from "./resolution-Cx82-xjW.js";
-import { i as getExecutionModel } from "./manifest-CW9gyNBY.js";
-import { t as resource } from "./resource-CLjB7RBQ.js";
+import { d as DEFERRED_BOUNDARY, p as isDeferred } from "./query-registry-tzSiVrV_.js";
+import { B as getCurrentPathPrefix, F as getCurrentInheritedMeta, G as getRouteRecords, I as getCurrentInheritedPolicies, J as insertRecordSorted, K as hasActivePageScope, L as getCurrentLayoutChain, O as addRouteToStores, P as getCurrentInheritedAuthRequirements, R as getCurrentPageChain, U as getDefaultRouteBasePath, V as getCurrentScopeKind, X as pushRegistrationScope, dt as routeMatchKey, k as assertRouteRegistrationUnlocked, lt as normalizeRouteSegmentName, pt as guardHydratedRouteData, st as computeRank, tt as createRouteHandler, ut as parseSegments, z as getCurrentPageScope } from "./resolution-CF1BqHLm.js";
+import { i as getExecutionModel } from "./manifest-BNupb86f.js";
+import { t as resource } from "./resource-BhcaFqdB.js";
 //#region src/router/access.ts
 function compileNodePolicies(node) {
 	return node.policies ? [...node.policies] : [];

package/dist/{error-boundary-Bpwofwps.js → error-boundary-ChXoIFVl.js}

@@ -1,6 +1,6 @@
-import { F as logger, I as isDevelopmentEnvironment, d as recordUndo, s as requireInstance } from "./instance-BAnfmXOR.js";
+import { I as logger, L as isDevelopmentEnvironment, d as recordUndo, s as requireInstance } from "./instance-DL-YKrj6.js";
 import { i as isFragmentType, n as Fragment, r as STATIC_CHILDREN, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { c as onCommit, o as hookSlot } from "./hooks-BimKStr4.js";
+import { c as onCommit, o as hookSlot } from "./hooks-kjLigwDJ.js";
 /** Explicitly adopted DOM node, used by an error-boundary fallback. */
 const NATIVE_TYPE = Symbol.for("askr.core.native");
 /**

package/dist/foundations/index.js

@@ -1,3 +1,3 @@
-import { a as layout, i as Slot, r as Presence } from "../structures-D4dDMqHX.js";
-import { n as Portal, r as definePortal, t as DefaultPortal } from "../portal-DuOKfnLa.js";
+import { a as layout, i as Slot, r as Presence } from "../structures-CkehlOT3.js";
+import { n as Portal, r as definePortal, t as DefaultPortal } from "../portal-LYf4cbHd.js";
 export { DefaultPortal, Portal, Presence, Slot, definePortal, layout };

package/dist/foundations/interactions/index.js

@@ -1,2 +1,2 @@
-import { a as focusable, i as hoverable, n as mergeInteractionProps, o as dismissable, r as rovingFocus, s as pressable, t as applyInteractionPolicy } from "../../interactions-D2BoREb-.js";
+import { a as focusable, i as hoverable, n as mergeInteractionProps, o as dismissable, r as rovingFocus, s as pressable, t as applyInteractionPolicy } from "../../interactions-BAa2xuJ-.js";
 export { applyInteractionPolicy, dismissable, focusable, hoverable, mergeInteractionProps, pressable, rovingFocus };

package/dist/foundations/state/index.js

@@ -1,5 +1,5 @@
 import { t as markReadable } from "../../readable-DFWOsTac.js";
-import { a as state, r as makeDestructurable } from "../../state-DWO1KzkX.js";
+import { a as state, r as makeDestructurable } from "../../state-i9D4EtY6.js";
 //#region src/foundations/state/controllable.ts
 /**
 * controllable

package/dist/foundations/structures/index.js

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

package/dist/foundations/utilities/index.js

@@ -1,3 +1,3 @@
-import { a as ariaSelected, i as ariaExpanded, n as setRef, o as mergeProps, r as ariaDisabled, s as composeHandlers, t as composeRefs } from "../../compose-ref-DWzdbxsD.js";
+import { a as ariaSelected, i as ariaExpanded, n as setRef, o as mergeProps, r as ariaDisabled, s as composeHandlers, t as composeRefs } from "../../compose-ref-ccRU59BM.js";
 import { t as formatId } from "../../utilities-C_CGX4Dz.js";
 export { ariaDisabled, ariaExpanded, ariaSelected, composeHandlers, composeRefs, formatId, mergeProps, setRef };

package/dist/fx/index.js

@@ -1,5 +1,5 @@
-import { S as queueTask } from "../instance-BAnfmXOR.js";
-import { a as currentOwner, f as withOwner, i as currentComponent, y as reportUncaughtError } from "../hooks-BimKStr4.js";
+import { S as queueTask } from "../instance-DL-YKrj6.js";
+import { a as currentOwner, f as withOwner, i as currentComponent, y as reportUncaughtError } from "../hooks-kjLigwDJ.js";
 import { n as isPromiseLike } from "../promise-Dz8iIHAm.js";
 //#region src/fx/timing.ts
 /**

package/dist/{hooks-BimKStr4.js → hooks-kjLigwDJ.js}

@@ -1,4 +1,4 @@
-import { F as logger, M as getOwner, N as runWithOwner, O as notifySource, a as getCurrentInstance, k as trackSource, r as claimHook, t as ComponentInstance } from "./instance-BAnfmXOR.js";
+import { I as logger, M as getOwner, N as runWithOwner, O as notifySource, a as getCurrentInstance, k as trackSource, r as claimHook, t as ComponentInstance } from "./instance-DL-YKrj6.js";
 //#region src/common/report-error.ts
 /**
 * Report an error the way the host reports an uncaught listener exception.

package/dist/index.js

@@ -1,9 +1,9 @@
-import { P as configureRenderDiagnostics } from "./instance-BAnfmXOR.js";
-import { a as state, i as selector, n as getSignal, t as derive } from "./state-DWO1KzkX.js";
+import { F as configureRenderDiagnostics } from "./instance-DL-YKrj6.js";
+import { a as state, i as selector, n as getSignal, t as derive } from "./state-i9D4EtY6.js";
 import { n as Fragment } from "./jsx-DRS-qjiN.js";
-import { _ as RenderDepthError } from "./hooks-BimKStr4.js";
-import { r as readScope, t as defineScope } from "./scope-CwpVSHVf.js";
-import { n as cspNonce, t as CspNonceScope } from "./csp-nonce-DwGw1A6Q.js";
+import { _ as RenderDepthError } from "./hooks-kjLigwDJ.js";
+import { r as readScope, t as defineScope } from "./scope-ila_zaId.js";
+import { n as cspNonce, t as CspNonceScope } from "./csp-nonce-D-XM_uuJ.js";
 import { l as registerSSRStyle } from "./render-context-DGHnEveC.js";
 import { i as jsxs, n as jsx, t as createElement } from "./jsx-runtime-C4idqHY0.js";
 //#region src/ref.ts