@askrjs/askr 0.2.2 → 0.2.3

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 0.2.3 — 2026-08-25
+
+- fix(data): make mutation invalidation and reconcile retries generation-safe
+  when asynchronous submissions are superseded.
+- fix(renderer): keep DOM-range ownership consistent when anchors are
+  re-registered.
+- fix(interactions): respect RTL arrow-key direction in roving focus.
+- fix(runtime): harden scheduler, hydration, SSR, and error-boundary failure
+  paths.
+
 - feat(data): add lifecycle-owned dynamic keyed query collections with bounded
   initial loading, aggregate state, per-key retry, and shared query caching.
 - fix(runtime): reject recursive `derive()` and `selector()` reads before a

package/README.md

@@ -3,9 +3,11 @@
 [![CI](https://github.com/askrjs/askr/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/askrjs/askr/actions/workflows/ci.yml)
 [![npm version](https://img.shields.io/npm/v/%40askrjs%2Faskr.svg)](https://www.npmjs.com/package/@askrjs/askr)
 
-Askr is an actor-backed UI runtime for TypeScript applications.
-It provides explicit reactivity, routed application startup, server-side rendering,
-and static-site generation entrypoints.
+Askr is a lane-scheduled UI runtime for TypeScript applications. Its
+single-threaded scheduler serializes queued framework work; it is not a
+message-passing actor system. Askr provides explicit reactivity, routed
+application startup, server-side rendering, and static-site generation
+entrypoints.
 
 ## Quick Start
 
@@ -22,6 +24,9 @@ function Counter() {
 createIsland({ root: document.body, component: Counter });
 ```
 
+The tuple form above and the direct callable form below are equivalent; see
+[State usage forms](#state-usage-forms) for when each is convenient.
+
 ## What It Provides
 
 ### Runtime
@@ -41,12 +46,30 @@ on their own subpaths.
 
 State is read through getter functions and updated through setter functions.
 
+#### State usage forms
+
+`state()` returns one callable state cell that is also iterable. Destructuring
+it gives the cell as the getter and its `.set()` method as the setter:
+
 ```ts
 const [count, setCount] = state(0);
 console.log(count());
 setCount(1);
 ```
 
+The same state can be kept as one value and updated through `.set()`:
+
+```ts
+const count = state(0);
+console.log(count());
+count.set(1);
+```
+
+Prefer destructuring when local getter and setter names make event handlers
+clear. Prefer the direct form when passing the state cell around as one value or
+when keeping reads and writes under one name. Both forms have the same tracking,
+scheduling, and update semantics.
+
 ### Routing and app startup
 
 Startup belongs in `@askrjs/askr/boot`. Routing helpers live in
@@ -86,7 +109,12 @@ return <div>{data.value.name}</div>;
 }
 ```
 
-Query and mutation helpers live in `@askrjs/askr/data`.
+`@askrjs/askr/data` is the canonical entrypoint for all query, mutation,
+invalidation, and data-runtime helpers. The root package retains query creation
+and collection, definition and serving, prefetch, and hydration exports for
+compatibility with existing applications. Mutation, invalidation, and
+data-runtime control remain subpath-only. New code should import the whole data surface from
+`@askrjs/askr/data` rather than split related imports across entrypoints.
 
 ### Developer error boundaries
 

package/dist/{access-d_DCdwqn.js → access-Rr7CMa06.js}

@@ -282,7 +282,15 @@ var Scheduler = class {
 		const target = typeof targetVersion === "number" ? targetVersion : this.flushVersion + 1;
 		if (this.flushVersion >= target) return Promise.resolve();
 		return new Promise((resolve, reject) => {
-			const timer = setTimeout(() => {
+			const waiter = {
+				target,
+				resolve,
+				reject
+			};
+			waiter.timer = setTimeout(() => {
+				const index = this.waiters.indexOf(waiter);
+				if (index >= 0) this.waiters.splice(index, 1);
+				if (waiter.timer !== void 0) clearTimeout(waiter.timer);
 				const diag = {
 					flushVersion: this.flushVersion,
 					queueLen: this.getPendingTaskCount(),
@@ -292,12 +300,7 @@ var Scheduler = class {
 				};
 				reject(/* @__PURE__ */ new Error(`waitForFlush timeout ${timeoutMs}ms: ${JSON.stringify(diag)}`));
 			}, timeoutMs);
-			this.waiters.push({
-				target,
-				resolve,
-				reject,
-				timer
-			});
+			this.waiters.push(waiter);
 		});
 	}
 	getState() {
@@ -377,7 +380,7 @@ var Scheduler = class {
 		const ready = [];
 		const remaining = [];
 		for (const w of this.waiters) if (this.flushVersion >= w.target) {
-			if (w.timer) clearTimeout(w.timer);
+			if (w.timer !== void 0) clearTimeout(w.timer);
 			ready.push(w.resolve);
 		} else remaining.push(w);
 		this.waiters = remaining;

package/dist/actions/index.js

@@ -1,8 +1,9 @@
 import { d as getCurrentAppRenderRuntime } from "../component-scope-4I3yEMkb.js";
 import { r as getCurrentRenderData } from "../render-context-B7ohlh6t.js";
-import { t as state } from "../state-Ks-sWTQi.js";
+import { t as state } from "../state-BzhOW2TX.js";
 import { jsx, jsxs } from "../jsx-runtime.js";
 import { c as resolveDataRuntimeState, s as invalidateQueriesForRuntime } from "../data-runtime-7t_Y0iv3.js";
+import { r as isCurrentAsyncGeneration } from "../shared-CGrx2AOL.js";
 //#region src/actions/runtime.ts
 const emptyFramework = Object.freeze({});
 /** @internal Read Askr-owned state from the current application root. */
@@ -97,8 +98,8 @@ function action(descriptor) {
 				if (!response.ok) throw envelope.error ?? validationError(envelope, descriptor.id) ?? /* @__PURE__ */ new Error(`Action failed (${response.status}).`);
 				const redirect = typeof envelope.redirect === "string" ? normalizeActionRedirect(envelope.redirect) : void 0;
 				const invalidates = Array.isArray(envelope.invalidates) ? envelope.invalidates.filter((prefix) => typeof prefix === "string") : descriptor.invalidates;
-				if (generation === actionSubmissionGenerations.get(value)) {
-					for (const prefix of invalidates) invalidateQueriesForRuntime(runtime, prefix, true);
+				for (const prefix of invalidates) invalidateQueriesForRuntime(runtime, prefix, true);
+				if (isCurrentAsyncGeneration(actionSubmissionGenerations.get(value) ?? 0, generation)) {
 					setValue({
 						pending: false,
 						result: envelope.result
@@ -107,7 +108,7 @@ function action(descriptor) {
 				}
 				return envelope.result;
 			} catch (error) {
-				if (generation === actionSubmissionGenerations.get(value)) setValue({
+				if (isCurrentAsyncGeneration(actionSubmissionGenerations.get(value) ?? 0, generation)) setValue({
 					pending: false,
 					error
 				});

package/dist/{activity-B2Yy7Wz9.js → activity-ZxJXI9hF.js}

@@ -1,6 +1,6 @@
 import { d as getCurrentAppRenderRuntime, f as getCurrentComponentInstance, i as claimHookIndex } from "./component-scope-4I3yEMkb.js";
-import { a as registerCommitOperation } from "./component-internal-xW_OnTmC.js";
-import { l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-D-JIKCg2.js";
+import { a as registerCommitOperation } from "./component-internal-Dl02WQKS.js";
+import { l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-CEcteIDE.js";
 import { n as getActiveRenderContext } from "./render-context-B7ohlh6t.js";
 import { n as syncRouteActivitySnapshot } from "./route-activity-CNJfpwx-.js";
 import { b as getActiveRoutes, c as removeRouteBasePath, d as deepFreeze, f as makeQuery, n as computeMatchesFromRoutes, p as parseLocation, y as getActiveRouteBasePath } from "./route-matching-Bo6UqG-5.js";

package/dist/{compose-ref-1Fhs7mbF.js → aria-hKjThHcp.js}

@@ -85,21 +85,4 @@ function ariaSelected(selected) {
 	return selected === void 0 ? {} : { "aria-selected": String(selected) };
 }
 //#endregion
-//#region src/foundations/utilities/compose-ref.ts
-/** Write `value` to a {@link Ref}, ignoring failures on readonly object refs. */
-function setRef(ref, value) {
-	if (!ref) return;
-	if (typeof ref === "function") {
-		ref(value);
-		return;
-	}
-	if (Object.isExtensible(ref)) ref.current = value;
-}
-/** Combine multiple refs into one callback ref that writes to all of them. */
-function composeRefs(...refs) {
-	return (value) => {
-		for (const ref of refs) setRef(ref, value);
-	};
-}
-//#endregion
-export { ariaSelected as a, ariaExpanded as i, setRef as n, mergeProps as o, ariaDisabled as r, composeHandlers as s, composeRefs as t };
+export { composeHandlers as a, mergeProps as i, ariaExpanded as n, ariaSelected as r, ariaDisabled as t };

package/dist/benchmark.js

@@ -1,10 +1,10 @@
-import { r as flushRuntimeScheduler } from "./access-d_DCdwqn.js";
-import { t as state } from "./state-Ks-sWTQi.js";
-import { t as selector } from "./selector-NQiYHwZC.js";
-import { t as installRendererBridge } from "./renderer-RjZ8LHbt.js";
-import { i as For } from "./control-BLVTE1gO.js";
+import { r as flushRuntimeScheduler } from "./access-Rr7CMa06.js";
+import { t as state } from "./state-BzhOW2TX.js";
+import { t as selector } from "./selector-C7rIpOnN.js";
+import { t as installRendererBridge } from "./renderer-BhXofszH.js";
+import { i as For } from "./control-57x3wa4J.js";
 import { jsx, jsxs } from "./jsx-runtime.js";
-import { t as createIsland } from "./boot-DVwjHCNh.js";
+import { t as createIsland } from "./boot-D4GaLA0d.js";
 //#region src/bench/components/benchmark-row.tsx
 function BenchmarkRow({ item, isSelected, onSelect, onRemove }) {
 	return /* @__PURE__ */ jsxs("tr", {
@@ -63,8 +63,8 @@ function BenchmarkTable({ rows, isSelected, onSelect, onRemove }) {
 installRendererBridge();
 const benchmarkMetadata = {
 	packageName: "@askrjs/askr",
-	packageVersion: "0.2.2",
-	buildLabel: "0.2.2-local"
+	packageVersion: "0.2.3",
+	buildLabel: "0.2.3-local"
 };
 function getBenchmarkMetadata() {
 	return { ...benchmarkMetadata };

package/dist/boot/index.js

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

package/dist/{boot-DVwjHCNh.js → boot-D4GaLA0d.js}

@@ -1,19 +1,19 @@
-import { S as isProductionEnvironment, r as flushRuntimeScheduler, x as isDevelopmentEnvironment, y as logger } from "./access-d_DCdwqn.js";
+import { S as isProductionEnvironment, r as flushRuntimeScheduler, x as isDevelopmentEnvironment, y as logger } from "./access-Rr7CMa06.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { n as createComponentInstance, r as executeComponent } from "./component-internal-xW_OnTmC.js";
-import { t as cleanupComponent } from "./component-cleanup-DPe8claJ.js";
-import { p as isPromiseLike } from "./lifecycle-batch-BYECQw8T.js";
-import { _ as teardownNodeSubtree, d as removeAllListeners } from "./cleanup-DPtpXtA4.js";
+import { n as createComponentInstance, r as executeComponent } from "./component-internal-Dl02WQKS.js";
+import { t as cleanupComponent } from "./component-cleanup-DjpwO9WX.js";
+import { p as isPromiseLike } from "./lifecycle-batch-Be-CLDjV.js";
+import { _ as teardownNodeSubtree, d as removeAllListeners } from "./cleanup-DsrbV-rr.js";
 import { r as assertExecutionModel, t as _applyManifest } from "./manifest-D6rfj_jC.js";
 import { d as stopHydrationRenderPhase, l as startHydrationRenderPhase, y as pageRenderEnvelope } from "./render-context-B7ohlh6t.js";
-import { a as setStaticChildSlotsCacheEnabled, c as endHydrationDirectListenerMode, d as discardHydrationListenerTransaction, i as registerDeferredHydrationBoundary, l as beginHydrationListenerTransaction, n as activateHydrationBoundary$1, o as withIntrinsicHydrationAdoption, r as clearDeferredHydrationBoundaries, s as beginHydrationDirectListenerMode, t as installRendererBridge, u as commitHydrationListenerTransaction } from "./renderer-RjZ8LHbt.js";
-import { r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-CCnMtOW-.js";
+import { a as setStaticChildSlotsCacheEnabled, c as endHydrationDirectListenerMode, d as discardHydrationListenerTransaction, i as registerDeferredHydrationBoundary, l as beginHydrationListenerTransaction, n as activateHydrationBoundary$1, o as withIntrinsicHydrationAdoption, r as clearDeferredHydrationBoundaries, s as beginHydrationDirectListenerMode, t as installRendererBridge, u as commitHydrationListenerTransaction } from "./renderer-BhXofszH.js";
+import { r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-C9OuML0U.js";
 import { i as getDefaultDataRuntime } from "./data-runtime-7t_Y0iv3.js";
 import { a as hydrateDataRuntime } from "./query-registry-Bua3cDyb.js";
 import { I as lockRouteRegistration, P as hasRegisteredRoutes, _ as clearRouteState, m as _setActiveRouteAuthOptions } from "./route-matching-Bo6UqG-5.js";
-import { a as resolveRouteRequest, i as hasRouteRenderData, m as reviveDeferredValue, n as getRouteRenderContext, r as getRouteRenderData } from "./resolution-dVYwYXrI.js";
-import { o as createAppRenderRuntime, r as setServerLocation } from "./activity-B2Yy7Wz9.js";
-import { f as registerAppInstance, g as unregisterAppInstance, i as resolveRouteMeta, o as configureScrollRestoration, r as reconcileRouteMeta, t as initializeNavigation } from "./navigate-DvJvo--6.js";
+import { a as resolveRouteRequest, i as hasRouteRenderData, m as reviveDeferredValue, n as getRouteRenderContext, r as getRouteRenderData } from "./resolution-t8J0yNaU.js";
+import { o as createAppRenderRuntime, r as setServerLocation } from "./activity-ZxJXI9hF.js";
+import { f as registerAppInstance, g as unregisterAppInstance, i as resolveRouteMeta, o as configureScrollRestoration, r as reconcileRouteMeta, t as initializeNavigation } from "./navigate-C46GtScG.js";
 import { n as disposeRegisteredDefaultPortalScope, r as getDefaultPortalHost } from "./default-portal-runtime-DvMvWJVp.js";
 import "./ssr-DSHd_Q9K.js";
 //#region src/boot/hydration.ts
@@ -109,9 +109,7 @@ function shouldVerifyHydrationMarkup(config) {
 	return !isProductionEnvironment();
 }
 async function applySelectiveHydration(rootElement, resolved, path, cleanupStrict, hydrateOptions, source, hooks, interactionReplay) {
-	const hasPermanentSkips = (hydrateOptions.skipSelectors?.length ?? 0) > 0;
 	const hasBelowFoldDeferral = !!hydrateOptions.deferBelowFold;
-	const hasSelectiveBoundaries = hasPermanentSkips || hasBelowFoldDeferral;
 	let staticChildSlotsCacheSuspended = false;
 	let releaseSelectiveHydrationResources = () => {};
 	const restoreStaticChildSlotsCache = () => {
@@ -146,7 +144,7 @@ async function applySelectiveHydration(rootElement, resolved, path, cleanupStric
 		unregisterRootCleanupCallback = hooks.registerRootCleanupCallback(rootElement, releaseSelectiveHydrationResources);
 		window.addEventListener("scroll", handleScroll, { passive: true });
 	}
-	if (hydrateOptions.deferUntilIdle && !hasSelectiveBoundaries) {
+	if (hydrateOptions.deferUntilIdle && !hasBelowFoldDeferral) {
 		await queueIdleWork(() => {
 			hooks.mountOrUpdate(rootElement, (() => resolved.handler(resolved.params)), {
 				cleanupStrict,
@@ -786,7 +784,7 @@ async function hydrateSPA(config) {
 			cspNonce: config.cspNonce
 		}));
 		if (shouldVerifyHydrationMarkup(config)) {
-			const { verifyHydrationSyncForUrl } = await import("./verify-hydration-CThsx0pq.js");
+			const { verifyHydrationSyncForUrl } = await import("./verify-hydration-_Q6avFp0.js");
 			if (!verifyHydrationSyncForUrl({
 				root: rootElement,
 				url: currentUrl,

package/dist/{cleanup-DPtpXtA4.js → cleanup-DsrbV-rr.js}

@@ -1,8 +1,9 @@
-import { l as runRuntimeHandlerScope, y as logger } from "./access-d_DCdwqn.js";
-import "./fastlane-DUxiFV9S.js";
+import { l as runRuntimeHandlerScope, y as logger } from "./access-Rr7CMa06.js";
+import "./fastlane-Buz1Rvlr.js";
 import { T as withAppRenderRuntime, d as getCurrentAppRenderRuntime } from "./component-scope-4I3yEMkb.js";
-import { t as cleanupComponent } from "./component-cleanup-DPe8claJ.js";
-import { u as registerLifecycleTransaction } from "./lifecycle-batch-BYECQw8T.js";
+import { t as cleanupComponent } from "./component-cleanup-DjpwO9WX.js";
+import { u as registerLifecycleTransaction } from "./lifecycle-batch-Be-CLDjV.js";
+import { n as setRef } from "./compose-ref-Bfaf4kUC.js";
 //#region src/runtime/events.ts
 /**
 * Event delegation system for Askr
@@ -281,13 +282,7 @@ function replaceElementRefBookkeeping(element, ref) {
 	} else elementRefs.delete(element);
 }
 function applyRefValue(ref, value) {
-	const resolvedRef = ref;
-	if (!resolvedRef) return;
-	if (typeof resolvedRef === "function") {
-		resolvedRef(value);
-		return;
-	}
-	if (Object.isExtensible(resolvedRef)) resolvedRef.current = value;
+	setRef(ref, value);
 }
 function updateElementRef(element, ref) {
 	if (registerLifecycleTransaction({}, () => updateElementRefImmediately(element, ref), () => void 0)) return;

package/dist/{component-cleanup-DPe8claJ.js → component-cleanup-DjpwO9WX.js}

@@ -1,6 +1,6 @@
-import { S as isProductionEnvironment, x as isDevelopmentEnvironment, y as logger } from "./access-d_DCdwqn.js";
+import { S as isProductionEnvironment, x as isDevelopmentEnvironment, y as logger } from "./access-Rr7CMa06.js";
 import { a as clearCurrentComponentScope, y as restoreCurrentComponentScope } from "./component-scope-4I3yEMkb.js";
-import { n as cleanupReadableSubscriptions, t as cleanupReadableSubscriptionSources } from "./readable-D-JIKCg2.js";
+import { n as cleanupReadableSubscriptions, t as cleanupReadableSubscriptionSources } from "./readable-CEcteIDE.js";
 //#region src/runtime/state-diagnostics.ts
 /**
 * Report state cells that were never read during a component's completed

package/dist/{component-internal-xW_OnTmC.js → component-internal-Dl02WQKS.js}

@@ -1,10 +1,10 @@
 import { a as markTransparentComponentResult, i as markEagerControlPrimitive } from "./control-C-ApnFs1.js";
-import { S as isProductionEnvironment, n as enqueueRuntimeTask, o as getRuntimeRenderer, x as isDevelopmentEnvironment, y as logger } from "./access-d_DCdwqn.js";
-import { i as tryRuntimeFastLaneSync, n as isBulkCommitActive } from "./fastlane-DUxiFV9S.js";
+import { S as isProductionEnvironment, n as enqueueRuntimeTask, o as getRuntimeRenderer, x as isDevelopmentEnvironment, y as logger } from "./access-Rr7CMa06.js";
+import { i as tryRuntimeFastLaneSync, n as isBulkCommitActive } from "./fastlane-Buz1Rvlr.js";
 import { C as restoreRenderScopedComponent, S as restoreInlineRenderTracking, _ as getSignalForInstance, b as restoreDomCommitScope, c as enterDomCommitScope, f as getCurrentComponentInstance, l as enterRenderScopedComponent, m as getCurrentPortalScope, n as captureInlineComponentScope, o as clearRenderTracking, p as getCurrentInstance, r as captureInlineRenderTracking, s as enterComponentExecutionScope, t as beginRenderTracking, u as exitComponentExecutionScope, v as resetRenderState, x as restoreInlineComponentScope } from "./component-scope-4I3yEMkb.js";
 import { r as STATIC_CHILDREN, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { i as finalizeReadableSubscriptions } from "./readable-D-JIKCg2.js";
-import { a as enqueueLifecycleCommitForInstance, d as discardCommitOperations, f as executeCommittedLifecycleOperations, n as captureInlineRenderSnapshot$1, o as finalizeInlineReadSubscriptions, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch } from "./lifecycle-batch-BYECQw8T.js";
+import { i as finalizeReadableSubscriptions } from "./readable-CEcteIDE.js";
+import { a as enqueueLifecycleCommitForInstance, d as discardCommitOperations, f as executeCommittedLifecycleOperations, n as captureInlineRenderSnapshot$1, o as finalizeInlineReadSubscriptions, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch } from "./lifecycle-batch-Be-CLDjV.js";
 //#region src/runtime/context.ts
 const TransparentContextScopeComponent = markTransparentComponentResult(ContextScopeComponent);
 let nextScopeIdentityKey = 0;
@@ -689,7 +689,7 @@ function commitRenderedComponent(instance) {
 function mountInstanceInline(instance, target) {
 	instance.target = target;
 	try {
-		if (target instanceof Element) {
+		if (typeof Element !== "undefined" && target instanceof Element) {
 			const host = target;
 			const instances = host.__ASKR_INSTANCES;
 			if (!instances) {
@@ -702,7 +702,16 @@ function mountInstanceInline(instance, target) {
 				host.__ASKR_INSTANCE = nextInstances[0] ?? instance;
 			}
 		}
-	} catch (err) {}
+	} catch (err) {
+		if (isDevelopmentEnvironment()) {
+			const componentName = instance.fn.name || instance.id;
+			let hostName = "unknown";
+			try {
+				hostName = target?.tagName?.toLowerCase() || hostName;
+			} catch {}
+			logger.warn(`[askr] Failed to record DOM ownership for ${componentName} on <${hostName}>.`, err);
+		}
+	}
 	instance.notifyUpdate = instance._enqueueRun;
 	const wasFirstMount = !instance.mounted;
 	instance.mounted = true;

package/dist/compose-ref-Bfaf4kUC.js

@@ -0,0 +1,20 @@
+//#region src/foundations/utilities/compose-ref.ts
+/** Write `value` to a {@link Ref}, ignoring failures on readonly object refs. */
+function setRef(ref, value) {
+	if (!ref) return;
+	if (typeof ref === "function") {
+		ref(value);
+		return;
+	}
+	try {
+		ref.current = value;
+	} catch {}
+}
+/** Combine multiple refs into one callback ref that writes to all of them. */
+function composeRefs(...refs) {
+	return (value) => {
+		for (const ref of refs) setRef(ref, value);
+	};
+}
+//#endregion
+export { setRef as n, composeRefs as t };

package/dist/control/index.js

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

package/dist/{control-BLVTE1gO.js → control-57x3wa4J.js}

@@ -1,9 +1,9 @@
 import { i as markEagerControlPrimitive, t as __CONTROL_BOUNDARY__ } from "./control-C-ApnFs1.js";
-import { x as isDevelopmentEnvironment } from "./access-d_DCdwqn.js";
+import { x as isDevelopmentEnvironment } from "./access-Rr7CMa06.js";
 import { n as Fragment } from "./jsx-DRS-qjiN.js";
-import { m as createShowState, p as createCaseState, s as useForState } from "./for-internal-DKcYl3nl.js";
-import { t as createFineGrainedEffect } from "./effect-BQP5o0Kx.js";
-import { t as state } from "./state-Ks-sWTQi.js";
+import { m as createShowState, p as createCaseState, s as useForState } from "./for-internal-DeoSg_AV.js";
+import { t as createFineGrainedEffect } from "./effect-4LwBwV58.js";
+import { t as state } from "./state-BzhOW2TX.js";
 //#region src/control/shared.ts
 function normalizeBoundaryChild(value) {
 	if (Array.isArray(value)) {

package/dist/{csp-nonce-CCnMtOW-.js → csp-nonce-C9OuML0U.js}

@@ -1,4 +1,4 @@
-import { p as defineScope, y as readScope } from "./component-internal-xW_OnTmC.js";
+import { p as defineScope, y as readScope } from "./component-internal-Dl02WQKS.js";
 //#region src/common/url.ts
 const SAFE_URL_SCHEMES = /* @__PURE__ */ new Set([
 	"http",

package/dist/data/index.js

@@ -1,4 +1,4 @@
 import { i as getDefaultDataRuntime, t as createDataRuntime } from "../data-runtime-7t_Y0iv3.js";
-import { c as invalidateOnInterval, l as queryScope, n as createQuery, r as createMutation, s as invalidate, t as createQueryCollection } from "../data-BjUf0PPS.js";
+import { a as invalidateOnInterval, i as invalidate, n as createQuery, o as queryScope, r as createMutation, t as createQueryCollection } from "../data-B7XCDeC8.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-Bua3cDyb.js";
 export { createDataRuntime, createMutation, createQuery, createQueryCollection, createQueryPrefetchContext, defineQuery, defineServerQueries, dehydrateDataRuntime, getDefaultDataRuntime, hydrateDataRuntime, invalidate, invalidateOnInterval, prefetchQuery, queryScope, serveQuery };

package/dist/{data-BjUf0PPS.js → data-B7XCDeC8.js}

@@ -1,9 +1,10 @@
-import { n as enqueueRuntimeTask, y as logger } from "./access-d_DCdwqn.js";
+import { n as enqueueRuntimeTask, y as logger } from "./access-Rr7CMa06.js";
 import { d as getCurrentAppRenderRuntime, f as getCurrentComponentInstance, i as claimHookIndex } from "./component-scope-4I3yEMkb.js";
-import { l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-D-JIKCg2.js";
+import { u as recordReadableRead } from "./readable-CEcteIDE.js";
 import { n as getActiveRenderContext } from "./render-context-B7ohlh6t.js";
-import { i as routeActive, n as documentVisible, o as timer, s as windowFocused } from "./lifecycle-operations-DJk_5MrD.js";
+import { i as routeActive, n as documentVisible, o as timer, s as windowFocused } from "./lifecycle-operations-C5m03NQc.js";
 import { a as getMutationSlotStore, c as resolveDataRuntimeState, i as getDefaultDataRuntime, n as ensureMutationCleanup, o as getQuerySlotStore, r as ensureQueryCleanup, s as invalidateQueriesForRuntime } from "./data-runtime-7t_Y0iv3.js";
+import { a as normalizeAsyncDataError, i as isCurrentAsyncOperation, n as isAbortError, o as notifySource, t as createReadableSource } from "./shared-CGrx2AOL.js";
 //#region src/data/query-key.ts
 function serializeQueryKeyNumber(part) {
 	if (Number.isNaN(part)) return "NaN";
@@ -69,23 +70,6 @@ function invalidateOnInterval(prefix, options) {
 	}, when.length > 0 ? { when } : void 0);
 }
 //#endregion
-//#region src/data/shared.ts
-function createReadableSource() {
-	return (() => void 0);
-}
-function notifySource(source) {
-	markReadableDerivedSubscribersDirty(source);
-	markReactivePropsDirtySource(source);
-	notifyReadableReaders(source);
-}
-function isAbortError(error, signal) {
-	return signal.aborted || error instanceof Error && error.name === "AbortError" || typeof DOMException !== "undefined" && error instanceof DOMException && error.name === "AbortError";
-}
-function normalizeAsyncDataError(error, fallbackMessage) {
-	if (error instanceof Error) return error;
-	return new Error(error == null ? fallbackMessage : String(error));
-}
-//#endregion
 //#region src/data/mutation-cell.ts
 var MutationCell = class {
 	constructor(options, runtimeState) {
@@ -148,7 +132,7 @@ var MutationCell = class {
 		try {
 			result = await action(input, { signal: controller.signal });
 		} catch (error) {
-			if (this.generation !== generation || this.controller !== controller) throw error;
+			if (!isCurrentAsyncOperation(this.generation, generation, this.controller, controller)) throw error;
 			if (isAbortError(error, controller.signal)) {
 				this.setState({
 					status: "idle",
@@ -162,8 +146,7 @@ var MutationCell = class {
 			});
 			throw error;
 		}
-		if (this.generation !== generation || this.controller !== controller) return result;
-		this.setState({
+		if (isCurrentAsyncOperation(this.generation, generation, this.controller, controller)) this.setState({
 			status: "success",
 			error: null,
 			result
@@ -249,6 +232,7 @@ var QueryCell = class {
 		this.pendingRefreshResolve = null;
 		this.pendingRefreshToken = 0;
 		this.reconcileAttemptCount = 0;
+		this.reconcileSequence = 0;
 		this.destroyed = false;
 		this.ownerCount = 0;
 		this.owners = /* @__PURE__ */ new Map();
@@ -382,19 +366,24 @@ var QueryCell = class {
 			staleReason: null
 		});
 	}
-	queueStart() {
+	queueStart(reconcileSequence) {
 		if (this.destroyed) return;
+		const sequence = reconcileSequence ?? (() => {
+			this.reconcileAttemptCount = 0;
+			return ++this.reconcileSequence;
+		})();
 		this.startQueued = true;
 		const token = ++this.pendingRefreshToken;
 		this.pendingRefresh = new Promise((resolve) => {
 			this.pendingRefreshResolve = resolve;
 			enqueueRuntimeTask(() => {
+				if (token !== this.pendingRefreshToken) return;
 				this.startQueued = false;
 				if (this.destroyed) {
 					this.finishPendingRefresh(token);
 					return;
 				}
-				this.start().finally(() => {
+				this.start(sequence).finally(() => {
 					this.finishPendingRefresh(token);
 				});
 			});
@@ -415,7 +404,7 @@ var QueryCell = class {
 		};
 		notifySource(this.source);
 	}
-	async start() {
+	async start(reconcileSequence) {
 		if (this.destroyed) return;
 		this.generation += 1;
 		const generation = this.generation;
@@ -435,7 +424,7 @@ var QueryCell = class {
 		try {
 			nextData = await this.options.fetch({ signal: controller.signal });
 		} catch (error) {
-			if (this.destroyed || this.generation !== generation || this.controller !== controller) return;
+			if (this.destroyed || !isCurrentAsyncOperation(this.generation, generation, this.controller, controller)) return;
 			if (isAbortError(error, controller.signal)) {
 				this.setState(hasData ? {
 					loading: false,
@@ -464,7 +453,7 @@ var QueryCell = class {
 			});
 			return;
 		}
-		if (this.destroyed || this.generation !== generation || this.controller !== controller) return;
+		if (this.destroyed || !isCurrentAsyncOperation(this.generation, generation, this.controller, controller)) return;
 		let isConsistent;
 		try {
 			isConsistent = this.options.isConsistent?.(nextData) ?? true;
@@ -489,9 +478,9 @@ var QueryCell = class {
 				staleReason: "inconsistent"
 			});
 			try {
-				await this.reconcile(nextData);
+				await this.reconcile(nextData, generation, controller, reconcileSequence);
 			} catch (error) {
-				if (this.generation === generation && this.controller === controller) this.setState({
+				if (isCurrentAsyncOperation(this.generation, generation, this.controller, controller)) this.setState({
 					loading: false,
 					refreshing: false,
 					stale: true,
@@ -513,8 +502,8 @@ var QueryCell = class {
 			staleReason: null
 		});
 	}
-	async reconcile(data) {
-		if (!await (this.options.reconcile?.(data, { key: this.options.key }) ?? false) || this.destroyed) return;
+	async reconcile(data, generation, controller, reconcileSequence) {
+		if (!await (this.options.reconcile?.(data, { key: this.options.key }) ?? false) || this.destroyed || reconcileSequence !== this.reconcileSequence || !isCurrentAsyncOperation(this.generation, generation, this.controller, controller)) return;
 		this.reconcileAttemptCount += 1;
 		if (this.reconcileAttemptCount > RECONCILE_MAX_ATTEMPTS) {
 			this.setState({
@@ -525,8 +514,10 @@ var QueryCell = class {
 			return;
 		}
 		await new Promise((resolve) => setTimeout(resolve, RECONCILE_RETRY_DELAY_MS));
-		if (this.destroyed || this.state.consistency === "fresh") return;
-		this.invalidate();
+		if (this.destroyed || reconcileSequence !== this.reconcileSequence || this.state.consistency === "fresh" || !isCurrentAsyncOperation(this.generation, generation, this.controller, controller)) return;
+		this.controller?.abort();
+		this.finishPendingRefresh(this.pendingRefreshToken);
+		this.queueStart(reconcileSequence);
 	}
 };
 function createLegacyQuery(options) {
@@ -831,4 +822,4 @@ function createQueryCollection(options) {
 	return collection;
 }
 //#endregion
-export { normalizeAsyncDataError as a, invalidateOnInterval as c, createReadableSource as i, queryScope as l, createQuery as n, notifySource as o, createMutation as r, invalidate as s, createQueryCollection as t };
+export { invalidateOnInterval as a, invalidate as i, createQuery as n, queryScope as o, createMutation as r, createQueryCollection as t };

package/dist/{deferred-BRw0gbn5.js → deferred-BELyvMsC.js}

@@ -1,9 +1,9 @@
 import { d as getCurrentAppRenderRuntime, f as getCurrentComponentInstance } from "./component-scope-4I3yEMkb.js";
 import { i as getExecutionModel } from "./manifest-D6rfj_jC.js";
 import { n as getActiveRenderContext, r as getCurrentRenderData } from "./render-context-B7ohlh6t.js";
-import { t as resource } from "./resource-operation-4qFIM02d.js";
+import { t as resource } from "./resource-operation-B8q-QRUx.js";
 import { A as getDefaultRouteBasePath, C as getCurrentInheritedPolicies, D as getCurrentPathPrefix, E as getCurrentPageScope, F as insertRecordSorted, H as computeRank, L as pushRegistrationScope, N as hasActivePageScope, O as getCurrentScopeKind, S as getCurrentInheritedMeta, T as getCurrentPageChain, U as normalizeRouteSegmentName, W as parseSegments, g as assertRouteRegistrationUnlocked, h as addRouteToStores, w as getCurrentLayoutChain, x as getCurrentInheritedAuthRequirements } from "./route-matching-Bo6UqG-5.js";
-import { _ as createRouteHandler, d as DEFERRED_BOUNDARY, p as isDeferred, s as guardHydratedRouteData } from "./resolution-dVYwYXrI.js";
+import { _ as createRouteHandler, d as DEFERRED_BOUNDARY, p as isDeferred, s as guardHydratedRouteData } from "./resolution-t8J0yNaU.js";
 import { allOf } from "@askrjs/auth";
 //#region src/router/access.ts
 function compileNodePolicies(node) {

package/dist/{effect-BQP5o0Kx.js → effect-4LwBwV58.js}

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

package/dist/{fastlane-DUxiFV9S.js → fastlane-Buz1Rvlr.js}

@@ -1,6 +1,6 @@
-import { d as setRuntimeBulkCommitProbe, o as getRuntimeRenderer, u as runRuntimeWithSyncProgress, x as isDevelopmentEnvironment } from "./access-d_DCdwqn.js";
+import { d as setRuntimeBulkCommitProbe, o as getRuntimeRenderer, u as runRuntimeWithSyncProgress, x as isDevelopmentEnvironment } from "./access-Rr7CMa06.js";
 import { i as isFragmentType } from "./jsx-DRS-qjiN.js";
-import { i as finalizeReadableSubscriptions, l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty } from "./readable-D-JIKCg2.js";
+import { i as finalizeReadableSubscriptions, l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty } from "./readable-CEcteIDE.js";
 //#region src/runtime/dev-namespace.ts
 /**
 * Set a value in the dev namespace (no-op in production).