@askrjs/askr 0.4.0 → 0.4.2

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

package/dist/{instance-BAnfmXOR.js → instance-DL-YKrj6.js}

@@ -251,6 +251,10 @@ function runWithOwner(owner, fn) {
 		currentOwner = previous;
 	}
 }
+function throwCollected(errors, message) {
+	if (errors.length === 1) throw errors[0];
+	if (errors.length > 1) throw new AggregateError(errors, message);
+}
 //#endregion
 //#region src/core/reactive/graph.ts
 /**
@@ -476,7 +480,7 @@ var Computation = class Computation extends Owner {
 		if (!wasClean && !dropped) return;
 		this._dropped = false;
 		if (this._schedule) this._schedule(this);
-		if (!wasClean) return;
+		if (!wasClean && !dropped) return;
 		const observers = this._observers;
 		if (observers) for (const observer of observers) observer._mark(CHECK);
 	}
@@ -985,4 +989,4 @@ function getRenderHost() {
 	return renderHost;
 }
 //#endregion
-export { untrack as A, schedule as C, isTracking as D, getTrackingComputation as E, logger as F, isDevelopmentEnvironment as I, isProductionEnvironment as L, getOwner as M, runWithOwner as N, notifySource as O, configureRenderDiagnostics as P, queueTask as S, Signal as T, batch as _, getCurrentInstance as a, getFlushVersion as b, setRenderHost as c, recordUndo as d, rewindJournal as f, outsideRendering as g, isRendering as h, getContextEpoch as i, Owner as j, trackSource as k, createRenderJournal as l, withRenderJournal as m, HookOrderChangeError as n, getRenderHost as o, settleJournal as p, claimHook as r, requireInstance as s, ComponentInstance as t, journalMark as u, effectScheduler as v, Computation as w, isFlushing as x, flushSync as y };
+export { untrack as A, schedule as C, isTracking as D, getTrackingComputation as E, configureRenderDiagnostics as F, logger as I, isDevelopmentEnvironment as L, getOwner as M, runWithOwner as N, notifySource as O, throwCollected as P, isProductionEnvironment as R, queueTask as S, Signal as T, batch as _, getCurrentInstance as a, getFlushVersion as b, setRenderHost as c, recordUndo as d, rewindJournal as f, outsideRendering as g, isRendering as h, getContextEpoch as i, Owner as j, trackSource as k, createRenderJournal as l, withRenderJournal as m, HookOrderChangeError as n, getRenderHost as o, settleJournal as p, claimHook as r, requireInstance as s, ComponentInstance as t, journalMark as u, effectScheduler as v, Computation as w, isFlushing as x, flushSync as y };

package/dist/{interactions-D2BoREb-.js → interactions-B_wfsDQg.js}

@@ -1,4 +1,4 @@
-import { o as mergeProps, r as ariaDisabled, s as composeHandlers, t as composeRefs } from "./compose-ref-DWzdbxsD.js";
+import { o as mergeProps, r as ariaDisabled, s as composeHandlers, t as composeRefs } from "./compose-ref-ccRU59BM.js";
 //#region src/foundations/interactions/pressable.ts
 /** Produce click/keyboard props implementing 'press' semantics for an element. */
 function pressable({ disabled, onPress, isNativeButton = false }) {
@@ -8,6 +8,7 @@ function pressable({ disabled, onPress, isNativeButton = false }) {
 			e.stopPropagation?.();
 			return;
 		}
+		if (e.defaultPrevented) return;
 		onPress?.(e);
 	} };
 	if (isNativeButton) {
@@ -25,6 +26,7 @@ function pressable({ disabled, onPress, isNativeButton = false }) {
 			e.stopPropagation?.();
 			return;
 		}
+		if (e.defaultPrevented) return;
 		if (e.key === "Enter") {
 			e.preventDefault?.();
 			onPress?.(e);
@@ -38,6 +40,7 @@ function pressable({ disabled, onPress, isNativeButton = false }) {
 			e.stopPropagation?.();
 			return;
 		}
+		if (e.defaultPrevented) return;
 		if (e.key === " ") {
 			e.preventDefault?.();
 			onPress?.(e);
@@ -118,6 +121,7 @@ function rovingFocus(options) {
 		}
 	}
 	function handleKeyDown(e) {
+		if (e.defaultPrevented) return;
 		const { key } = e;
 		let direction;
 		if (orientation === "horizontal" || orientation === "both") {

package/dist/{manifest-CW9gyNBY.js → manifest-BNupb86f.js}

@@ -1,4 +1,4 @@
-import { $ as withRouteTable, G as getRouteRecords, H as getDefaultRouteAuthOptions, J as insertRecordSorted, O as addRouteToStores, Q as setDefaultRouteBasePath, S as normalizeRouteBasePath, U as getDefaultRouteBasePath, W as getRouteList, Z as setDefaultRouteAuthOptions, j as createRouteTable } from "./resolution-Cx82-xjW.js";
+import { $ as withRouteTable, G as getRouteRecords, H as getDefaultRouteAuthOptions, J as insertRecordSorted, O as addRouteToStores, Q as setDefaultRouteBasePath, S as normalizeRouteBasePath, U as getDefaultRouteBasePath, W as getRouteList, Z as setDefaultRouteAuthOptions, j as createRouteTable } from "./resolution-CF1BqHLm.js";
 //#region src/common/execution-model.ts
 const EXECUTION_MODEL_KEY = Symbol.for("__ASKR_EXECUTION_MODEL__");
 function getExecutionModel() {

package/dist/{navigate-CP_0Zy5U.js → navigate-DsfO12hB.js}

@@ -1,10 +1,10 @@
-import { F as logger, I as isDevelopmentEnvironment, L as isProductionEnvironment, x as isFlushing, y as flushSync } from "./instance-BAnfmXOR.js";
-import { b as reportUncaughtErrorLater, c as onCommit, i as currentComponent, n as createSource, o as hookSlot, r as currentAppRuntime, s as notify, u as readSource } from "./hooks-BimKStr4.js";
+import { I as logger, L as isDevelopmentEnvironment, R as isProductionEnvironment, x as isFlushing, y as flushSync } from "./instance-DL-YKrj6.js";
+import { b as reportUncaughtErrorLater, c as onCommit, i as currentComponent, n as createSource, o as hookSlot, r as currentAppRuntime, s as notify, u as readSource } from "./hooks-kjLigwDJ.js";
 import { n as getActiveRenderContext } from "./render-context-DGHnEveC.js";
 import { n as isPromiseLike } from "./promise-Dz8iIHAm.js";
-import { C as removeRouteBasePath, E as parseLocation, M as getActiveRouteBasePath, N as getActiveRoutes, T as makeQuery, Y as lockRouteRegistration, a as resolveRouteRequest, b as addLogicalRouteBasePath, g as computeRouteActivityMatches, h as computeMatchesFromRoutes, i as hasRouteRenderData, n as getRouteRenderContext, r as getRouteRenderData, w as deepFreeze } from "./resolution-Cx82-xjW.js";
+import { C as removeRouteBasePath, E as parseLocation, M as getActiveRouteBasePath, N as getActiveRoutes, T as makeQuery, Y as lockRouteRegistration, a as resolveRouteRequest, b as addLogicalRouteBasePath, g as computeRouteActivityMatches, h as computeMatchesFromRoutes, i as hasRouteRenderData, n as getRouteRenderContext, r as getRouteRenderData, w as deepFreeze } from "./resolution-CF1BqHLm.js";
 import { n as syncRouteActivitySnapshot } from "./route-activity-CNJfpwx-.js";
-import { c as resolveNavigationUrl } from "./url-CnbfpX0K.js";
+import { c as resolveNavigationUrl } from "./url-C9xMpMMv.js";
 //#region src/common/app-render-runtime.ts
 const stagedRouteLocations = /* @__PURE__ */ new WeakMap();
 function createAppRenderRuntime(input = {}) {
@@ -19,11 +19,17 @@ function createAppRenderRuntime(input = {}) {
 		lifetime: input.lifetime
 	};
 }
-function stageAppRenderRouteLocation(runtime, href) {
-	stagedRouteLocations.set(runtime, href);
+function stageAppRenderRouteLocation(runtime, href, state) {
+	stagedRouteLocations.set(runtime, {
+		href,
+		state
+	});
 }
 function getStagedAppRenderRouteLocation(runtime) {
-	return runtime ? stagedRouteLocations.get(runtime) : void 0;
+	return runtime ? stagedRouteLocations.get(runtime)?.href : void 0;
+}
+function getStagedAppRenderRouteState(runtime) {
+	return runtime ? stagedRouteLocations.get(runtime)?.state : void 0;
 }
 function clearStagedAppRenderRouteLocation(runtime) {
 	if (runtime) stagedRouteLocations.delete(runtime);
@@ -53,15 +59,10 @@ function onRouteChange(fn, options = {}) {
 	const slot = hookSlot(instance, "onRouteChange", () => ({
 		kind: "route-change",
 		previous: null,
-		pending: null,
 		cleanup: null,
-		cleanupRegistered: false,
-		callback: fn,
-		immediate: options.immediate === true
+		cleanupRegistered: false
 	}));
-	slot.pending = route;
-	slot.callback = fn;
-	slot.immediate = options.immediate === true;
+	const immediate = options.immediate === true;
 	if (!slot.cleanupRegistered) {
 		instance.onCleanup(() => {
 			slot.cleanup?.();
@@ -69,27 +70,27 @@ function onRouteChange(fn, options = {}) {
 		});
 		slot.cleanupRegistered = true;
 	}
-	if (!slot.previous) {
-		onCommit(instance, () => {
-			const committed = slot.pending;
-			if (!committed) return;
-			if (slot.immediate) slot.cleanup = slot.callback(committed, null) ?? null;
-			slot.previous = committed;
-		});
-		return;
-	}
-	if (routeSignature(slot.previous) === routeSignature(route)) return;
 	onCommit(instance, () => {
 		const previous = slot.previous;
-		const committed = slot.pending;
-		if (!previous || !committed || routeSignature(previous) === routeSignature(committed)) return;
+		if (!previous) {
+			if (immediate) slot.cleanup = fn(route, null) ?? null;
+			slot.previous = route;
+			return;
+		}
+		if (routeSignature(previous) === routeSignature(route)) return;
 		slot.cleanup?.();
-		slot.cleanup = slot.callback(committed, previous) ?? null;
-		slot.previous = committed;
+		slot.cleanup = fn(route, previous) ?? null;
+		slot.previous = route;
 	});
 }
 let serverLocation = null;
 function readLocationState() {
+	if (getActiveRenderContext()?.mode === "ssr") return {
+		hasState: false,
+		state: void 0
+	};
+	const staged = getStagedAppRenderRouteState(currentAppRuntime());
+	if (staged) return staged;
 	const historyState = typeof window !== "undefined" && window.history?.state ? window.history.state : null;
 	const hasState = historyState?.askrHasState === true;
 	return {
@@ -863,11 +864,12 @@ function getResolvedRouteHandler(resolved) {
 		params: resolved.params
 	};
 }
-function prepareNavigationRoot(target, href, replaceLifetime) {
+function prepareNavigationRoot(target, href, replaceLifetime, locationState) {
 	const resolved = target.resolved;
 	return prepareRootUpdate(target.app.instance, {
 		handler: bindResolvedRouteHandler(getResolvedRouteHandler(resolved)),
 		href,
+		locationState,
 		routeData: isRenderResult(resolved) ? getRouteRenderData(resolved) : void 0,
 		hasRouteData: isRenderResult(resolved) && hasRouteRenderData(resolved),
 		replaceLifetime
@@ -927,14 +929,19 @@ function applyNavigationTargets(requestId, path, options, redirectState, pathnam
 		return;
 	}
 	if (isStaleRouteRequest(requestId)) return;
-	commitNavigationRoots(requestId, pathname, href, matchedTargets, () => {
+	const hasState = Object.prototype.hasOwnProperty.call(options, "state");
+	const locationState = {
+		hasState,
+		state: hasState ? options.state : void 0
+	};
+	commitNavigationRoots(requestId, pathname, href, matchedTargets, locationState, () => {
 		saveScrollPosition(previousHref);
 		const historyMode = getNavigationHistoryMode(options);
 		const historyIndex = nextHistoryIndex(historyMode);
 		window.history[historyMode === "replace" ? "replaceState" : "pushState"]({
 			path: href,
-			askrHasState: Object.prototype.hasOwnProperty.call(options, "state"),
-			askrState: options.state,
+			askrHasState: locationState.hasState,
+			askrState: locationState.state,
 			askrIndex: historyIndex
 		}, "", toDocumentUrl(href));
 		commitHistoryIndex(historyIndex);
@@ -961,7 +968,12 @@ function applyPopStateNavigationTargets(requestId, previousHref, historyIndex, p
 		return;
 	}
 	saveScrollPosition(previousHref);
-	commitNavigationRoots(requestId, pathname, href, matchedTargets, () => commitHistoryIndex(historyIndex), () => applyHistoryScroll(href, state), () => {
+	const historyState = state;
+	const hasState = historyState?.askrHasState === true;
+	commitNavigationRoots(requestId, pathname, href, matchedTargets, {
+		hasState,
+		state: hasState ? historyState?.askrState : void 0
+	}, () => commitHistoryIndex(historyIndex), () => applyHistoryScroll(href, state), () => {
 		if (isStaleRouteRequest(requestId)) return;
 		if (!returnToRenderedHistoryEntry()) reloadDocument();
 	});
@@ -971,7 +983,7 @@ function applyPopStateNavigationTargets(requestId, previousHref, historyIndex, p
 * work of the committed destination runs before history is updated, so a
 * navigation it starts supersedes this one.
 */
-function commitNavigationRoots(requestId, pathname, href, targets, updateHistory, updateScroll, restoreHistory) {
+function commitNavigationRoots(requestId, pathname, href, targets, locationState, updateHistory, updateScroll, restoreHistory) {
 	const previousPathname = getCurrentPathname();
 	const previousHref = getCurrentHref();
 	const roots = targets.map((target) => {
@@ -979,58 +991,62 @@ function commitNavigationRoots(requestId, pathname, href, targets, updateHistory
 		return {
 			target,
 			replaceLifetime,
-			prepared: prepareNavigationRoot(target, href, replaceLifetime)
+			prepared: prepareNavigationRoot(target, href, replaceLifetime, locationState)
 		};
 	});
-	const rollback = () => {
-		const errors = [];
-		for (let index = roots.length - 1; index >= 0; index--) errors.push(...roots[index].prepared.rollback());
-		setCurrentRouteLocation(previousPathname, previousHref);
+	try {
+		const rollback = () => {
+			const errors = [];
+			for (let index = roots.length - 1; index >= 0; index--) errors.push(...roots[index].prepared.rollback());
+			setCurrentRouteLocation(previousPathname, previousHref);
+			try {
+				restoreHistory?.();
+			} catch (error) {
+				errors.push(error);
+			}
+			reportRouteCleanupErrors(errors);
+		};
 		try {
-			restoreHistory?.();
+			for (const replaceLifetime of [true, false]) for (const root of roots) if (root.replaceLifetime === replaceLifetime) root.prepared.apply();
 		} catch (error) {
-			errors.push(error);
+			rollback();
+			logger.error("[Askr] navigation failed:", error);
+			throw error;
 		}
-		reportRouteCleanupErrors(errors);
-	};
-	try {
-		for (const replaceLifetime of [true, false]) for (const root of roots) if (root.replaceLifetime === replaceLifetime) root.prepared.apply();
-	} catch (error) {
-		rollback();
-		logger.error("[Askr] navigation failed:", error);
-		throw error;
-	}
-	if (isStaleRouteRequest(requestId)) {
-		rollback();
-		return;
-	}
-	const committedFailures = [];
-	for (const root of roots) {
-		const result = root.prepared.publish();
-		if (result.aborted) {
+		if (isStaleRouteRequest(requestId)) {
 			rollback();
-			const failure = result.errors[0];
-			logger.error("[Askr] navigation failed:", failure);
-			throw failure;
+			return;
 		}
-		committedFailures.push(...result.errors);
-		syncAppRegistrationLocation(root.target.app, pathname, href);
-	}
-	for (const failure of committedFailures) reportUncaughtErrorLater(failure);
-	const retired = [];
-	for (const root of roots) retired.push(...root.prepared.retire());
-	if (retired.length) reportUncaughtErrorLater(retired.length === 1 ? retired[0] : new AggregateError(retired, "Route cleanup failed"));
-	flushSync();
-	if (isStaleRouteRequest(requestId)) return;
-	try {
-		updateHistory();
-		setCurrentRouteLocation(pathname, href);
-		syncRegisteredRouteSnapshot();
-		reconcileNavigationMetadata(targets);
-		updateScroll();
-	} catch (error) {
-		logger.error("[Askr] navigation failed:", error);
-		throw error;
+		const committedFailures = [];
+		for (const root of roots) {
+			const result = root.prepared.publish();
+			if (result.aborted) {
+				rollback();
+				const failure = result.errors[0];
+				logger.error("[Askr] navigation failed:", failure);
+				throw failure;
+			}
+			committedFailures.push(...result.errors);
+			syncAppRegistrationLocation(root.target.app, pathname, href);
+		}
+		for (const failure of committedFailures) reportUncaughtErrorLater(failure);
+		const retired = [];
+		for (const root of roots) retired.push(...root.prepared.retire());
+		if (retired.length) reportUncaughtErrorLater(retired.length === 1 ? retired[0] : new AggregateError(retired, "Route cleanup failed"));
+		flushSync();
+		if (isStaleRouteRequest(requestId)) return;
+		try {
+			updateHistory();
+			setCurrentRouteLocation(pathname, href);
+			syncRegisteredRouteSnapshot();
+			reconcileNavigationMetadata(targets);
+			updateScroll();
+		} catch (error) {
+			logger.error("[Askr] navigation failed:", error);
+			throw error;
+		}
+	} finally {
+		for (const root of roots) root.prepared.complete();
 	}
 }
 //#endregion

package/dist/{portal-DuOKfnLa.js → portal-LYf4cbHd.js}

@@ -1,8 +1,8 @@
-import { M as getOwner, T as Signal, d as recordUndo, o as getRenderHost } from "./instance-BAnfmXOR.js";
+import { M as getOwner, T as Signal, d as recordUndo, o as getRenderHost } from "./instance-DL-YKrj6.js";
 import { t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { i as currentComponent, m as deliverToBoundary } from "./hooks-BimKStr4.js";
+import { i as currentComponent, m as deliverToBoundary } from "./hooks-kjLigwDJ.js";
 import { n as getActiveRenderContext } from "./render-context-DGHnEveC.js";
-import { i as OWNED_TYPE, n as holdUntilBoundaryRecovers, r as nearestErrorBoundary, t as ErrorBoundary } from "./error-boundary-Bpwofwps.js";
+import { i as OWNED_TYPE, n as holdUntilBoundaryRecovers, r as nearestErrorBoundary, t as ErrorBoundary } from "./error-boundary-ChXoIFVl.js";
 //#region src/common/portal.ts
 /**
 * Internal marker used to defer server portal host output until all writes in

package/dist/{query-registry-WMCN0BJL.js → query-registry-tzSiVrV_.js}

@@ -1,4 +1,4 @@
-import { a as getDefaultDataRuntime, d as writePrefetchedQueryData, i as findDataRuntimeState, t as createDataRuntime } from "./data-runtime-C1bFAlba.js";
+import { a as getDefaultDataRuntime, d as writePrefetchedQueryData, i as findDataRuntimeState, t as createDataRuntime } from "./data-runtime-i-RD0Ffm.js";
 //#region src/common/deferred-value.ts
 const DEFERRED_VALUE = Symbol.for("@askrjs/askr/deferred-value");
 const DEFERRED_BOUNDARY = Symbol.for("@askrjs/askr/deferred-boundary");
@@ -303,7 +303,12 @@ function dehydrateDataRuntime(runtime) {
 	const result = {};
 	for (const [key, value] of runtime.queryData) {
 		assertQueryDataTransportSafe(key, value);
-		result[key] = value;
+		Object.defineProperty(result, key, {
+			value,
+			enumerable: true,
+			configurable: true,
+			writable: true
+		});
 	}
 	return result;
 }