@askrjs/askr 0.0.68 → 0.0.70

package/dist/benchmark.js

@@ -1,10 +1,10 @@
 import { r as flushRuntimeScheduler } from "./access-ePqdQqkV.js";
-import { t as installRendererBridge } from "./renderer-bZ0315dE.js";
+import { t as installRendererBridge } from "./renderer-DF0hyjEr.js";
 import { t as state } from "./state-CVuQVjvK.js";
 import { t as selector } from "./selector-DueeR6Oz.js";
 import { jsx, jsxs } from "./jsx-runtime.js";
 import { i as For } from "./control-CA45Yvvu.js";
-import { t as createIsland } from "./boot-C8UOxI4f.js";
+import { t as createIsland } from "./boot-8gP6mB3c.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.0.68",
-	buildLabel: "0.0.68-local"
+	packageVersion: "0.0.70",
+	buildLabel: "0.0.70-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-C8UOxI4f.js";
+import { a as cleanupApp, i as hydrateSPA, n as createIslands, o as hasApp, r as createSPA, t as createIsland } from "../boot-8gP6mB3c.js";
 export { cleanupApp, createIsland, createIslands, createSPA, hasApp, hydrateSPA };

package/dist/{boot-C8UOxI4f.js → boot-8gP6mB3c.js}

@@ -3,8 +3,8 @@ import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-CUpRxrLH.js";
 import { n as createComponentInstance, r as executeComponent } from "./component-internal-CPjM4n8M.js";
 import { t as cleanupComponent } from "./component-cleanup-1ZFoLLHt.js";
 import { p as isPromiseLike } from "./lifecycle-batch-COgl8jMS.js";
-import { a as withIntrinsicHydrationAdoption, i as registerDeferredHydrationBoundary, n as activateHydrationBoundary$1, o as setStaticChildSlotsCacheEnabled, r as clearDeferredHydrationBoundaries, t as installRendererBridge } from "./renderer-bZ0315dE.js";
-import { _ as teardownNodeSubtree, d as removeAllListeners } from "./cleanup-UyStxIHG.js";
+import { a as withIntrinsicHydrationAdoption, c as beginHydrationListenerTransaction, d as setStaticChildSlotsCacheEnabled, i as registerDeferredHydrationBoundary, l as commitHydrationListenerTransaction, n as activateHydrationBoundary$1, o as beginHydrationDirectListenerMode, r as clearDeferredHydrationBoundaries, s as endHydrationDirectListenerMode, t as installRendererBridge, u as discardHydrationListenerTransaction } from "./renderer-DF0hyjEr.js";
+import { _ as teardownNodeSubtree, d as removeAllListeners } from "./cleanup-B4BiQHx-.js";
 import { c as _applyManifest, d as getRouteRenderContext, f as getRouteRenderData, m as resolveRouteRequest, o as reviveDeferredValue, p as hasRouteRenderData, v as pageRenderEnvelope, w as assertExecutionModel } from "./deferred-zHtUheIQ.js";
 import { a as startHydrationRenderPhase, s as stopHydrationRenderPhase } from "./render-context-Clw3rFiO.js";
 import { a as disposeDefaultPortalScope, t as DefaultPortal } from "./portal-D7TC986A.js";
@@ -12,7 +12,7 @@ import { r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-HGZ0vbqT.
 import { i as getDefaultDataRuntime } from "./data-runtime-SJ1BSUvk.js";
 import { a as hydrateDataRuntime } from "./query-registry-CQIT4mXr.js";
 import { d as _setActiveRouteAuthOptions, j as lockRouteRegistration, k as hasRegisteredRoutes, m as clearRouteState } from "./route-matching-DLBWDeXX.js";
-import { f as registerAppInstance, g as unregisterAppInstance, i as resolveRouteMeta, o as configureScrollRestoration, r as reconcileRouteMeta, t as initializeNavigation, v as setServerLocation, y as createAppRenderRuntime } from "./navigate-DpR-cML9.js";
+import { f as registerAppInstance, g as unregisterAppInstance, i as resolveRouteMeta, o as configureScrollRestoration, r as reconcileRouteMeta, t as initializeNavigation, v as setServerLocation, y as createAppRenderRuntime } from "./navigate-BTPrVhqI.js";
 import "./ssr-CbQO5xd3.js";
 //#region src/boot/hydration.ts
 const DEFERRED_PAYLOAD = "__askr_deferred__";
@@ -617,12 +617,19 @@ async function hydrateSPA(config) {
 		if (hydrateOptions.skipSelectors?.length) markSkippedElements(rootElement, hydrateOptions.skipSelectors);
 	}
 	if (hydrationRenderDataForApp) startHydrationRenderPhase(hydrationRenderDataForApp);
+	const listenerTransaction = beginHydrationListenerTransaction();
+	beginHydrationDirectListenerMode();
 	try {
 		mountHydratedRoot(rootElement, resolved.kind === "deny" ? bindDeniedStatus(resolved.status) : bindResolvedRouteHandler(hydrationResolved), {
 			cleanupStrict: config.cleanupStrict,
 			appRuntime: appRouteSource.runtime
 		});
+		commitHydrationListenerTransaction(listenerTransaction);
+	} catch (error) {
+		discardHydrationListenerTransaction(listenerTransaction);
+		throw error;
 	} finally {
+		endHydrationDirectListenerMode();
 		if (hydrationRenderDataForApp) stopHydrationRenderPhase();
 	}
 	await registerAppNavigation(rootElement, path, { ...appRouteSource });

package/dist/{cleanup-UyStxIHG.js → cleanup-B4BiQHx-.js}

@@ -94,13 +94,20 @@ function attachDelegatedListener(container, element, eventName, handler, origina
 		const delegatedHandler = (e) => {
 			runRuntimeHandlerScope(() => {
 				const path = [];
-				if (typeof e.composedPath === "function") path.push(...e.composedPath());
-				else {
-					let node = e.target;
-					while (node) {
+				const seenPathNodes = /* @__PURE__ */ new Set();
+				let node = e.target;
+				while (node) {
+					if (!seenPathNodes.has(node)) {
+						seenPathNodes.add(node);
 						path.push(node);
-						if (node === container) break;
-						node = isElementNode(node) ? node.parentNode : node.parentNode;
+					}
+					if (node === container) break;
+					node = isElementNode(node) ? node.parentNode : node.parentNode;
+				}
+				if (typeof e.composedPath === "function") {
+					for (const composedNode of e.composedPath()) if (!seenPathNodes.has(composedNode)) {
+						seenPathNodes.add(composedNode);
+						path.push(composedNode);
 					}
 				}
 				for (const node of path) {

package/dist/index.js

@@ -4,7 +4,7 @@ import { h as readScope, u as defineScope } from "./component-internal-CPjM4n8M.
 import { f as syncDerivedDependencySubscriptions, l as notifyReadableReaders, o as markReactivePropsDirtySource, p as withDerivedReadTracking, r as clearDerivedDependencySubscriptions, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-BYSoWJSv.js";
 import { g as getSignal, i as claimHookIndex, p as getCurrentInstance } from "./component-scope-CC3cojX9.js";
 import { n as isSnapshotSource } from "./snapshot-source-BB42xgwb.js";
-import { t as installRendererBridge } from "./renderer-bZ0315dE.js";
+import { t as installRendererBridge } from "./renderer-DF0hyjEr.js";
 import { t as state } from "./state-CVuQVjvK.js";
 import { t as selector } from "./selector-DueeR6Oz.js";
 import { jsx, jsxs } from "./jsx-runtime.js";

package/dist/{navigate-DpR-cML9.js → navigate-BTPrVhqI.js}

@@ -5,7 +5,7 @@ import { l as notifyReadableReaders, o as markReactivePropsDirtySource, s as mar
 import { d as getCurrentAppRenderRuntime, f as getCurrentComponentInstance } from "./component-scope-CC3cojX9.js";
 import { n as cleanupComponentGeneration, t as cleanupComponent } from "./component-cleanup-1ZFoLLHt.js";
 import { i as drainLifecycleCommitErrors, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch } from "./lifecycle-batch-COgl8jMS.js";
-import { _ as teardownNodeSubtree } from "./cleanup-UyStxIHG.js";
+import { _ as teardownNodeSubtree } from "./cleanup-B4BiQHx-.js";
 import { d as getRouteRenderContext, f as getRouteRenderData, m as resolveRouteRequest, p as hasRouteRenderData } from "./deferred-zHtUheIQ.js";
 import { n as getActiveRenderContext } from "./render-context-Clw3rFiO.js";
 import { n as syncRouteActivitySnapshot } from "./route-activity-CNJfpwx-.js";

package/dist/{renderer-bZ0315dE.js → renderer-DF0hyjEr.js}

@@ -9,7 +9,7 @@ import { t as cleanupComponent } from "./component-cleanup-1ZFoLLHt.js";
 import { c as getCurrentLifecycleCommitBatch, l as registerLifecycleRollback, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch, u as registerLifecycleTransaction } from "./lifecycle-batch-COgl8jMS.js";
 import { _ as createChildScope, a as registerForStateTransaction, c as captureForFallbackTransactionSnapshot, d as clearCaseDomUpdateState, f as clearShowDomUpdateState, g as evaluateShowState, h as evaluateCaseState, i as evaluateForState, l as captureForItemTransactionSnapshot, n as clearForDomUpdateState, o as rollbackForStateTransaction, t as beginForStateTransaction, v as disposeChildScope, y as rerenderChildScope } from "./for-internal-BtK9Htl0.js";
 import { n as createOwnedFineGrainedEffect, r as markFineGrainedEffectsDirtySource, t as createFineGrainedEffect } from "./effect-CFUzIpqX.js";
-import { C as getDelegatedHandlersForElement, D as updateDelegatedListener, E as removeDelegatedListener, S as getDelegatedHandlerForElement, T as isEventDelegationEnabled, _ as teardownNodeSubtree, a as elementReactivePropsCleanup, b as addFreshDelegatedListener, c as forEachElementReactivePropCleanup, d as removeAllListeners, f as removeElementReactiveProps, g as setFreshElementReactivePropCleanup, h as setDirectElementReactivePropCleanup, i as elementListeners, l as getElementReactivePropCleanupSize, m as replaceElementRefBookkeeping, n as cleanupInstanceIfPresent, o as elementRefs, p as removeElementRef, r as cleanupInstancesUnder, s as forEachDescendantNode, t as REACTIVE_CHILDREN_KEY, u as getElementReactivePropsCleanupMap, v as updateElementRef, w as isDelegatedEvent, x as clearDelegatedHandlersForElement, y as addDelegatedListener } from "./cleanup-UyStxIHG.js";
+import { C as getDelegatedHandlersForElement, D as updateDelegatedListener, E as removeDelegatedListener, S as getDelegatedHandlerForElement, T as isEventDelegationEnabled, _ as teardownNodeSubtree, a as elementReactivePropsCleanup, b as addFreshDelegatedListener, c as forEachElementReactivePropCleanup, d as removeAllListeners, f as removeElementReactiveProps, g as setFreshElementReactivePropCleanup, h as setDirectElementReactivePropCleanup, i as elementListeners, l as getElementReactivePropCleanupSize, m as replaceElementRefBookkeeping, n as cleanupInstanceIfPresent, o as elementRefs, p as removeElementRef, r as cleanupInstancesUnder, s as forEachDescendantNode, t as REACTIVE_CHILDREN_KEY, u as getElementReactivePropsCleanupMap, v as updateElementRef, w as isDelegatedEvent, x as clearDelegatedHandlersForElement, y as addDelegatedListener } from "./cleanup-B4BiQHx-.js";
 import { t as getPublicAttributeName } from "./attr-names-CjhzmHOn.js";
 import { i as ROUTE_ROOT_COMPONENT } from "./csp-nonce-HGZ0vbqT.js";
 //#region src/runtime/error-boundary.ts
@@ -3149,6 +3149,9 @@ function stageHydrationListener(stage) {
 	currentTransaction.stages.push(stage);
 	return true;
 }
+function hasStagedHydrationListener(target, eventName, capture) {
+	return !!currentTransaction?.stages.some((stage) => stage.target === target && stage.eventName === eventName && stage.capture === capture);
+}
 function closeTransaction(transaction) {
 	if (!transaction.active) return false;
 	transaction.active = false;
@@ -3186,14 +3189,52 @@ function getCurrentHydrationListenerTransaction() {
 //#endregion
 //#region src/renderer/prop-bindings.ts
 const reactivePropRegistry = /* @__PURE__ */ new Set();
+const hydrationDirectListeners = /* @__PURE__ */ new WeakMap();
+let hydrationDirectListenerDepth = 0;
+function beginHydrationDirectListenerMode() {
+	hydrationDirectListenerDepth += 1;
+}
+function endHydrationDirectListenerMode() {
+	hydrationDirectListenerDepth = Math.max(0, hydrationDirectListenerDepth - 1);
+}
+function markHydrationDirectListener(element, listenerKey) {
+	let listeners = hydrationDirectListeners.get(element);
+	if (!listeners) {
+		listeners = /* @__PURE__ */ new Set();
+		hydrationDirectListeners.set(element, listeners);
+	}
+	listeners.add(listenerKey);
+}
+function isHydrationDirectListener(element, listenerKey) {
+	return hydrationDirectListeners.get(element)?.has(listenerKey) ?? false;
+}
+function clearHydrationDirectListener(element, listenerKey) {
+	const listeners = hydrationDirectListeners.get(element);
+	listeners?.delete(listenerKey);
+	if (listeners?.size === 0) hydrationDirectListeners.delete(element);
+}
 function addTrackedListener(el, eventName, handler, capture = false, fresh = false, forceDirect = false) {
-	const useDelegation = !forceDirect && !capture && isEventDelegationEnabled() && isDelegatedEvent(eventName);
+	const effectiveForceDirect = forceDirect || hydrationDirectListenerDepth > 0;
+	const useDelegation = !effectiveForceDirect && !capture && isEventDelegationEnabled() && isDelegatedEvent(eventName);
 	const listenerKey = getEventListenerKey(eventName, capture);
-	if (!forceDirect && stageHydrationListener({
+	if (effectiveForceDirect && isHydrationDirectListener(el, listenerKey)) {
+		const existing = elementListeners.get(el)?.get(listenerKey);
+		if (existing) {
+			existing.updateHandler?.(handler);
+			existing.original = handler;
+			return;
+		}
+	}
+	if (!effectiveForceDirect && !hasStagedHydrationListener(el, eventName, capture) && stageHydrationListener({
 		kind: "direct",
+		target: el,
 		eventName,
+		capture,
 		publish: () => addTrackedListener(el, eventName, handler, capture, fresh, true),
-		rollback: () => removeTrackedListener(el, eventName, capture)
+		rollback: () => {
+			removeTrackedListener(el, eventName, capture);
+			clearHydrationDirectListener(el, listenerKey);
+		}
 	})) return;
 	if (useDelegation) {
 		if (fresh) addFreshDelegatedListener(el, eventName, handler, handler, void 0);
@@ -3205,6 +3246,10 @@ function addTrackedListener(el, eventName, handler, capture = false, fresh = fal
 	const trackedHandler = mutableHandler.handler;
 	if (options !== void 0) el.addEventListener(eventName, trackedHandler, options);
 	else el.addEventListener(eventName, trackedHandler);
+	if (effectiveForceDirect) {
+		if (!capture && getDelegatedHandlerForElement(el, eventName)) removeDelegatedListener(el, eventName);
+		markHydrationDirectListener(el, listenerKey);
+	}
 	if (!elementListeners.has(el)) elementListeners.set(el, /* @__PURE__ */ new Map());
 	elementListeners.get(el).set(listenerKey, {
 		handler: trackedHandler,
@@ -3391,16 +3436,26 @@ function syncElementPropBindings(el, domVNode, props, usesReactiveChildren) {
 		if (eventProp && listenerKey) {
 			const eventName = eventProp.eventName;
 			const eventCapture = eventProp.capture;
-			if (getCurrentHydrationListenerTransaction() && !existingListeners?.has(listenerKey) && !getDelegatedHandlerForElement(el, eventName)) {
-				stageHydrationListener({
+			const preserveHydrationDirect = existingListeners?.get(listenerKey)?.isDelegated === false && isHydrationDirectListener(el, listenerKey);
+			if (getCurrentHydrationListenerTransaction() && !existingListeners?.has(listenerKey) && !getDelegatedHandlerForElement(el, eventName) && !isHydrationDirectListener(el, listenerKey)) {
+				if (!hasStagedHydrationListener(el, eventName, eventCapture)) stageHydrationListener({
 					kind: "direct",
+					target: el,
 					eventName,
+					capture: eventCapture,
 					publish: () => addTrackedListener(el, eventName, value, eventCapture, false, true),
-					rollback: () => removeTrackedListener(el, eventName, eventCapture)
+					rollback: () => {
+						removeTrackedListener(el, eventName, eventCapture);
+						clearHydrationDirectListener(el, listenerKey);
+					}
 				});
 				continue;
 			}
-			const useDelegation = !eventCapture && isEventDelegationEnabled() && isDelegatedEvent(eventName);
+			if (hydrationDirectListenerDepth > 0 && !existingListeners?.has(listenerKey) && !getDelegatedHandlerForElement(el, eventName)) {
+				addTrackedListener(el, eventName, value, eventCapture, false, true);
+				continue;
+			}
+			const useDelegation = !preserveHydrationDirect && !eventCapture && isEventDelegationEnabled() && isDelegatedEvent(eventName);
 			if (useDelegation) (desiredDelegatedEventNames ??= /* @__PURE__ */ new Set()).add(eventName);
 			if (useDelegation) {
 				const existingDelegated = getDelegatedHandlerForElement(el, eventName);
@@ -6339,4 +6394,4 @@ function installRendererBridge(runtime = getDefaultRuntimeInstance()) {
 	return true;
 }
 //#endregion
-export { withIntrinsicHydrationAdoption as a, registerDeferredHydrationBoundary as i, activateHydrationBoundary as n, setStaticChildSlotsCacheEnabled as o, clearDeferredHydrationBoundaries as r, installRendererBridge as t };
+export { withIntrinsicHydrationAdoption as a, beginHydrationListenerTransaction as c, setStaticChildSlotsCacheEnabled as d, registerDeferredHydrationBoundary as i, commitHydrationListenerTransaction as l, activateHydrationBoundary as n, beginHydrationDirectListenerMode as o, clearDeferredHydrationBoundaries as r, endHydrationDirectListenerMode as s, installRendererBridge as t, discardHydrationListenerTransaction as u };

package/dist/router/index.js

@@ -1,7 +1,7 @@
 import { C as lazy, a as resolveDeferredValues, b as Outlet, i as isDeferred, l as createRouteRegistry, m as resolveRouteRequest, n as Resolve, r as defer, s as routeData, y as currentAuth } from "../deferred-zHtUheIQ.js";
 import { jsx } from "../jsx-runtime.js";
 import { a as route, i as page, n as group, r as index, t as fallback } from "../authoring-uaJ556aG.js";
-import { _ as currentRoute, a as serializeRouteMeta, c as getCurrentHref, d as parseTargetUrl, h as syncRegisteredRouteSnapshot, i as resolveRouteMeta, l as getRegisteredAppsSnapshot, m as syncAppRegistrationLocation, n as navigate, p as setCurrentRouteLocation, r as reconcileRouteMeta, s as saveScrollPosition, u as getWindowHref } from "../navigate-DpR-cML9.js";
+import { _ as currentRoute, a as serializeRouteMeta, c as getCurrentHref, d as parseTargetUrl, h as syncRegisteredRouteSnapshot, i as resolveRouteMeta, l as getRegisteredAppsSnapshot, m as syncAppRegistrationLocation, n as navigate, p as setCurrentRouteLocation, r as reconcileRouteMeta, s as saveScrollPosition, u as getWindowHref } from "../navigate-BTPrVhqI.js";
 import { o as mergeProps } from "../compose-ref-Cc_YkUpM.js";
 import { t as applyInteractionPolicy } from "../interactions-w7gQN4ha.js";
 //#region src/router/route-query.ts

package/package.json

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