@askrjs/askr 0.0.83 → 0.0.85

package/dist/{index-ho0Htetw.d.ts → index-r-nt13FE.d.ts}

@@ -1,4 +1,4 @@
-import { c as RenderableChild, l as VNode, t as ForEachSource } from "./control-Cix3yjVf.js";
+import { d as VNode, t as ForEachSource, u as RenderableChild } from "./control-DhUZU4_V.js";
 import { r as JSXElement } from "./jsx-Dvr2SGRG.js";
 //#region src/control/shared.d.ts
 type BoundaryChild = RenderableChild;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { _ as StateTuple, a as defineScope, g as StateSetter, h as State, i as Scope, o as readScope, v as state } from "./control-Cix3yjVf.js";
+import { b as StateTuple, c as readScope, o as Scope, s as defineScope, v as State, x as state, y as StateSetter } from "./control-DhUZU4_V.js";
 import { s as Props, t as Fragment } from "./jsx-Dvr2SGRG.js";
-import { $ as cspNonce, Q as CspNonceScope, at as AskrRuntimeOptions, c as createRef, ct as createRuntime, d as registerSSRStyle, et as Selector, it as AskrRuntime, lt as getDefaultRuntime, nt as Derived, ot as RuntimeKeyedReorderDecision, rt as derive, s as Ref, st as RuntimeRendererHost, tt as selector, ut as getSignal } from "./index-TlEvex-C.js";
-import { a as Show, c as ForProps, i as MatchProps, n as CaseProps, o as ShowProps, r as Match, s as For, t as Case } from "./index-ho0Htetw.js";
+import { $ as cspNonce, Q as CspNonceScope, at as AskrRuntimeOptions, c as createRef, ct as createRuntime, d as registerSSRStyle, et as Selector, it as AskrRuntime, lt as getDefaultRuntime, nt as Derived, ot as RuntimeKeyedReorderDecision, rt as derive, s as Ref, st as RuntimeRendererHost, tt as selector, ut as getSignal } from "./index-pIgGaXvS.js";
+import { a as Show, c as ForProps, i as MatchProps, n as CaseProps, o as ShowProps, r as Match, s as For, t as Case } from "./index-r-nt13FE.js";
 import { A as ServerQueryHandler, D as QueryPrefetchContext, T as QueryDefinition, a as defineServerQueries, c as prefetchQuery, h as createQuery, i as defineQuery, l as serveQuery, o as dehydrateDataRuntime, s as hydrateDataRuntime, v as DataRuntime } from "./index-5S-fi2xy.js";
 import { i as jsxs, n as jsx } from "./jsx-runtime-Cr1jspx9.js";
 export { AskrRuntime, type AskrRuntimeOptions, Case, type CaseProps, CspNonceScope, type DataRuntime, type Derived, For, type ForProps, Fragment, Match, type MatchProps, type Props, type QueryDefinition, type QueryPrefetchContext, type Ref, type RuntimeKeyedReorderDecision, type RuntimeRendererHost, type Scope, type Selector, type ServerQueryHandler, Show, type ShowProps, type State, type StateSetter, type StateTuple, createQuery, createRef, createRuntime, cspNonce, defineQuery, defineScope, defineServerQueries, dehydrateDataRuntime, derive, getDefaultRuntime, getSignal, hydrateDataRuntime, jsx, jsxs, prefetchQuery, readScope, registerSSRStyle, selector, serveQuery, state };

package/dist/index.js

@@ -1,17 +1,17 @@
-import { a as getRuntimeFlushVersion, d as AskrRuntime, m as getDefaultRuntime, p as createRuntime, t as enqueueRuntimeLane } from "./access-ePqdQqkV.js";
-import { n as Fragment } from "./jsx-C3IECePB.js";
-import { g as readScope, u as defineScope } from "./component-internal-DsM75Gl1.js";
-import { f as syncDerivedDependencySubscriptions, l as notifyReadableReaders, o as markReactivePropsDirtySource, p as withDerivedReadTracking, r as clearDerivedDependencySubscriptions, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-B3VIOfd7.js";
+import { a as getRuntimeFlushVersion, d as AskrRuntime, m as getDefaultRuntime, p as createRuntime, t as enqueueRuntimeLane } from "./access-Dpfoi4cA.js";
 import { g as getSignal, i as claimHookIndex, p as getCurrentInstance } from "./component-scope-DzJEbYGE.js";
+import { n as Fragment } from "./jsx-C3IECePB.js";
+import { g as readScope, u as defineScope } from "./component-internal-DcrLymUJ.js";
+import { f as syncDerivedDependencySubscriptions, l as notifyReadableReaders, o as markReactivePropsDirtySource, p as withDerivedReadTracking, r as clearDerivedDependencySubscriptions, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-B5NtV7V0.js";
 import { n as isSnapshotSource } from "./snapshot-source-BB42xgwb.js";
-import { t as installRendererBridge } from "./renderer-VSw0KKDG.js";
+import { t as installRendererBridge } from "./renderer-CZzNtoj2.js";
 import { a as registerSSRStyle } from "./render-context-D-DFk2WN.js";
-import { t as state } from "./state-BCl9DeiN.js";
-import { t as selector } from "./selector-DVwvof1M.js";
-import { n as cspNonce, t as CspNonceScope } from "./csp-nonce-DDt0UNdt.js";
-import { i as For, n as Match, r as Show, t as Case } from "./control-C0X1zgrM.js";
+import { t as state } from "./state-DCjONcHK.js";
+import { t as selector } from "./selector-Ck_Pp9av.js";
+import { n as cspNonce, t as CspNonceScope } from "./csp-nonce-Bc52OIVc.js";
+import { i as For, n as Match, r as Show, t as Case } from "./control-oLADku43.js";
 import { jsx, jsxs } from "./jsx-runtime.js";
-import { t as createQuery } from "./data-G0hURNm_.js";
+import { t as createQuery } from "./data-Dkqb8_QP.js";
 import { a as hydrateDataRuntime, i as dehydrateDataRuntime, n as defineQuery, o as prefetchQuery, r as defineServerQueries, s as serveQuery } from "./query-registry-BL6rjGsO.js";
 //#region src/runtime/derive.ts
 const deriveCells = /* @__PURE__ */ new WeakMap();

package/dist/{lifecycle-batch-CwHCDseR.js → lifecycle-batch-Dfpid9-A.js}

@@ -1,5 +1,5 @@
-import { v as logger } from "./access-ePqdQqkV.js";
-import { a as finalizeReadableSubscriptionsFromSnapshot } from "./readable-B3VIOfd7.js";
+import { v as logger } from "./access-Dpfoi4cA.js";
+import { a as finalizeReadableSubscriptionsFromSnapshot } from "./readable-B5NtV7V0.js";
 //#region src/common/promise.ts
 function isPromiseLike(value) {
 	return value !== null && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
@@ -53,6 +53,41 @@ function executeCommittedLifecycleOperations(instance, wasFirstMount) {
 	if (errors.length > 0) throw new AggregateError(errors, `Committed lifecycle operations failed for ${instance.id}`);
 }
 //#endregion
+//#region src/runtime/inline-render-snapshot.ts
+function createInlineRenderSnapshot(instance) {
+	return {
+		instance,
+		props: instance.props,
+		ownerFrame: instance.ownerFrame,
+		portalScope: instance.portalScope,
+		parentInstance: instance.parentInstance,
+		isRoot: instance.isRoot,
+		vnodeParentGeneration: instance._vnodeParentGeneration,
+		vnodeOwner: instance._vnodeOwner,
+		vnodeParent: instance._vnodeParent,
+		hasVNodeKey: "_vnodeKey" in instance,
+		vnodeKey: instance._vnodeKey,
+		vnodePosition: instance._vnodePosition,
+		wrapperDepth: instance._wrapperDepth,
+		cleanupStrict: instance.cleanupStrict
+	};
+}
+function restoreInlineRenderSnapshot(snapshot) {
+	snapshot.instance.props = snapshot.props;
+	snapshot.instance.ownerFrame = snapshot.ownerFrame;
+	snapshot.instance.portalScope = snapshot.portalScope;
+	snapshot.instance.parentInstance = snapshot.parentInstance;
+	snapshot.instance.isRoot = snapshot.isRoot;
+	snapshot.instance._vnodeParentGeneration = snapshot.vnodeParentGeneration;
+	snapshot.instance._vnodeOwner = snapshot.vnodeOwner;
+	snapshot.instance._vnodeParent = snapshot.vnodeParent;
+	if (snapshot.hasVNodeKey) snapshot.instance._vnodeKey = snapshot.vnodeKey;
+	else delete snapshot.instance._vnodeKey;
+	snapshot.instance._vnodePosition = snapshot.vnodePosition;
+	snapshot.instance._wrapperDepth = snapshot.wrapperDepth;
+	snapshot.instance.cleanupStrict = snapshot.cleanupStrict;
+}
+//#endregion
 //#region src/runtime/lifecycle-batch.ts
 let currentLifecycleCommitBatch = null;
 const pendingLifecycleCommitErrors = [];
@@ -125,14 +160,16 @@ function enqueueLifecycleCommitForInstance(instance, wasFirstMount) {
 	enqueueLifecycleCommit(currentLifecycleCommitBatch, instance, wasFirstMount);
 	return true;
 }
-function enqueueReadSubscriptionCommit(batch, instance, token, pendingReadSources, pendingReadSourceVersions) {
+function enqueueReadSubscriptionCommit(batch, instance, token, pendingReadSources, pendingReadSourceVersions, ownershipGeneration = instance._ownershipGeneration) {
 	const existing = batch.readCommitsByInstance.get(instance);
 	const commit = existing ?? {
 		instance,
+		ownershipGeneration,
 		token,
 		pendingReadSources,
 		pendingReadSourceVersions
 	};
+	commit.ownershipGeneration = ownershipGeneration;
 	commit.token = token;
 	commit.pendingReadSources = pendingReadSources ? new Set(pendingReadSources) : void 0;
 	commit.pendingReadSourceVersions = pendingReadSourceVersions ? new Map(pendingReadSourceVersions) : void 0;
@@ -148,15 +185,7 @@ function enqueueInlineRenderSnapshot(batch, snapshot) {
 }
 function captureInlineRenderSnapshot(instance) {
 	if (!currentLifecycleCommitBatch?.active) return;
-	enqueueInlineRenderSnapshot(currentLifecycleCommitBatch, {
-		instance,
-		props: instance.props,
-		ownerFrame: instance.ownerFrame,
-		portalScope: instance.portalScope,
-		parentInstance: instance.parentInstance,
-		isRoot: instance.isRoot,
-		vnodeParentGeneration: instance._vnodeParentGeneration
-	});
+	enqueueInlineRenderSnapshot(currentLifecycleCommitBatch, createInlineRenderSnapshot(instance));
 }
 function finalizeInlineReadSubscriptions(instance, token, pendingReadSources, pendingReadSourceVersions) {
 	if ((!pendingReadSources || pendingReadSources.size === 0) && (!instance._lastReadSources || instance._lastReadSources.size === 0)) return;
@@ -164,7 +193,7 @@ function finalizeInlineReadSubscriptions(instance, token, pendingReadSources, pe
 		enqueueReadSubscriptionCommit(currentLifecycleCommitBatch, instance, token, pendingReadSources, pendingReadSourceVersions);
 		return;
 	}
-	finalizeReadableSubscriptionsFromSnapshot(instance, token, pendingReadSources, pendingReadSourceVersions);
+	finalizeReadableSubscriptionsFromSnapshot(instance, token, pendingReadSources, pendingReadSourceVersions, instance._ownershipGeneration);
 }
 function flushLifecycleCommitBatch(batch) {
 	if (!closeLifecycleCommitBatch(batch)) return;
@@ -177,13 +206,13 @@ function flushLifecycleCommitBatch(batch) {
 			else enqueueLifecycleTransaction(batch.parent, entry);
 		}
 		for (const snapshot of batch.renderSnapshots) enqueueInlineRenderSnapshot(batch.parent, snapshot);
-		for (const commit of batch.readCommits) enqueueReadSubscriptionCommit(batch.parent, commit.instance, commit.token, commit.pendingReadSources, commit.pendingReadSourceVersions);
+		for (const commit of batch.readCommits) enqueueReadSubscriptionCommit(batch.parent, commit.instance, commit.token, commit.pendingReadSources, commit.pendingReadSourceVersions, commit.ownershipGeneration);
 		for (const entry of batch.entries) enqueueLifecycleCommit(batch.parent, entry.instance, entry.wasFirstMount);
 		return;
 	}
 	const commitErrors = [];
 	for (const commit of batch.readCommits) try {
-		finalizeReadableSubscriptionsFromSnapshot(commit.instance, commit.token, commit.pendingReadSources, commit.pendingReadSourceVersions);
+		finalizeReadableSubscriptionsFromSnapshot(commit.instance, commit.token, commit.pendingReadSources, commit.pendingReadSourceVersions, commit.ownershipGeneration);
 	} catch (error) {
 		commitErrors.push(error);
 	}
@@ -214,15 +243,7 @@ function discardLifecycleCommitBatch(batch) {
 	} catch (error) {
 		logger.error("[Askr] transaction rollback failed:", error);
 	}
-	for (let index = batch.renderSnapshots.length - 1; index >= 0; index -= 1) {
-		const snapshot = batch.renderSnapshots[index];
-		snapshot.instance.props = snapshot.props;
-		snapshot.instance.ownerFrame = snapshot.ownerFrame;
-		snapshot.instance.portalScope = snapshot.portalScope;
-		snapshot.instance.parentInstance = snapshot.parentInstance;
-		snapshot.instance.isRoot = snapshot.isRoot;
-		snapshot.instance._vnodeParentGeneration = snapshot.vnodeParentGeneration;
-	}
+	for (let index = batch.renderSnapshots.length - 1; index >= 0; index -= 1) restoreInlineRenderSnapshot(batch.renderSnapshots[index]);
 	for (const entry of batch.entries) {
 		if (entry.wasFirstMount) entry.instance.mountOperations = void 0;
 		discardCommitOperations(entry.instance);

package/dist/{lifecycle-operations-BJfxWUJr.js → lifecycle-operations-BrYrBsXY.js}

@@ -1,5 +1,5 @@
-import { a as registerCommitOperation } from "./component-internal-DsM75Gl1.js";
 import { f as getCurrentComponentInstance, i as claimHookIndex } from "./component-scope-DzJEbYGE.js";
+import { a as registerCommitOperation } from "./component-internal-DcrLymUJ.js";
 import { t as isRouteActivityActive } from "./route-activity-CNJfpwx-.js";
 //#region src/runtime/lifecycle-operations.ts
 function normalizePredicates(predicates) {

package/dist/{navigate-DfY1BUYc.d.ts → navigate-NyIjQUwI.d.ts}

@@ -1,4 +1,4 @@
-import "./index-TlEvex-C.js";
+import "./index-pIgGaXvS.js";
 //#region src/router/navigation-scroll.d.ts
 type NavigationScrollBehavior = 'top' | 'preserve';
 type HistoryScrollBehavior = 'restore' | 'top' | 'preserve';

package/dist/{navigate-Crvd5gUG.js → navigate-b4GGxO_l.js}

@@ -1,15 +1,15 @@
-import { b as isDevelopmentEnvironment, r as flushRuntimeScheduler, v as logger, x as isProductionEnvironment } from "./access-ePqdQqkV.js";
+import { b as isDevelopmentEnvironment, r as flushRuntimeScheduler, v as logger, x as isProductionEnvironment } from "./access-Dpfoi4cA.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-C3IECePB.js";
-import { r as executeComponent } from "./component-internal-DsM75Gl1.js";
-import { t as cleanupReadableSubscriptionSources } from "./readable-B3VIOfd7.js";
-import { n as cleanupComponentGeneration, t as cleanupComponent } from "./component-cleanup-oWN45rfa.js";
-import { i as drainLifecycleCommitErrors, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch } from "./lifecycle-batch-CwHCDseR.js";
-import { _ as teardownNodeSubtree } from "./cleanup-CEF-cX49.js";
-import { d as getRouteRenderContext, f as getRouteRenderData, m as resolveRouteRequest, p as hasRouteRenderData } from "./deferred-rdHAgyKe.js";
-import { j as lockRouteRegistration, r as computeRouteActivityMatches } from "./route-matching-BUwz4kfl.js";
-import { r as clearDefaultPortalForInstance, t as DefaultPortal } from "./portal-BZ_rN17v.js";
-import { t as CspNonceScope } from "./csp-nonce-DDt0UNdt.js";
-import { a as clearStagedAppRenderRouteLocation, i as syncCurrentRouteSnapshot, o as createAppRenderRuntime, s as stageAppRenderRouteLocation } from "./activity-CnSRFO3d.js";
+import { r as executeComponent } from "./component-internal-DcrLymUJ.js";
+import { t as cleanupReadableSubscriptionSources } from "./readable-B5NtV7V0.js";
+import { n as cleanupComponentGeneration, t as cleanupComponent } from "./component-cleanup-BUfUleGZ.js";
+import { i as drainLifecycleCommitErrors, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch } from "./lifecycle-batch-Dfpid9-A.js";
+import { _ as teardownNodeSubtree } from "./cleanup-c837KVij.js";
+import { d as getRouteRenderContext, f as getRouteRenderData, m as resolveRouteRequest, p as hasRouteRenderData, v as withoutRouteHydrationMetadata } from "./deferred-vUOy-awa.js";
+import { I as lockRouteRegistration, o as addRouteBasePath, r as computeRouteActivityMatches, y as getActiveRouteBasePath } from "./route-matching-DHduNiGk.js";
+import { r as clearDefaultPortalForInstance, t as DefaultPortal } from "./portal-BVWjAhNQ.js";
+import { t as CspNonceScope } from "./csp-nonce-Bc52OIVc.js";
+import { a as clearStagedAppRenderRouteLocation, i as syncCurrentRouteSnapshot, o as createAppRenderRuntime, s as stageAppRenderRouteLocation } from "./activity-Jd9CgEa3.js";
 //#region src/router/navigation-registry.ts
 let currentInstance = null;
 let currentPathname = "/";
@@ -722,7 +722,7 @@ function getResolvedRouteHandler(resolved) {
 function updateRouteRuntime(instance, resolved, href) {
 	const current = instance._appRenderRuntime;
 	const runtime = createAppRenderRuntime({
-		framework: current?.framework,
+		framework: withoutRouteHydrationMetadata(current?.framework),
 		route: resolved?.kind === "render" ? getRouteRenderData(resolved) : void 0,
 		hasRoute: resolved?.kind === "render" && hasRouteRenderData(resolved)
 	});
@@ -992,8 +992,9 @@ let navigationInitialized = false;
 configureNavigationRegistryHost({ cancelRouteRequests });
 function navigate(path, options = {}) {
 	if (typeof window === "undefined") return;
-	const initialTarget = parseTargetUrl(path);
-	navigateWithRedirectState(path, options, {
+	const targetPath = addRouteBasePath(path, getActiveRouteBasePath());
+	const initialTarget = parseTargetUrl(targetPath);
+	navigateWithRedirectState(targetPath, options, {
 		redirects: 0,
 		visited: /* @__PURE__ */ new Set([`${initialTarget.pathname}${initialTarget.search}${initialTarget.hash}`])
 	});

package/dist/{portal-BZ_rN17v.js → portal-BVWjAhNQ.js}

@@ -1,9 +1,9 @@
-import { o as getRuntimeRenderer } from "./access-ePqdQqkV.js";
-import { t as ELEMENT_TYPE } from "./jsx-C3IECePB.js";
-import { l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-B3VIOfd7.js";
+import { o as getRuntimeRenderer } from "./access-Dpfoi4cA.js";
 import { f as getCurrentComponentInstance, m as getCurrentPortalScope } from "./component-scope-DzJEbYGE.js";
-import { t as cleanupComponent } from "./component-cleanup-oWN45rfa.js";
-import { c as getCurrentLifecycleCommitBatch, u as registerLifecycleTransaction } from "./lifecycle-batch-CwHCDseR.js";
+import { t as ELEMENT_TYPE } from "./jsx-C3IECePB.js";
+import { l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-B5NtV7V0.js";
+import { t as cleanupComponent } from "./component-cleanup-BUfUleGZ.js";
+import { c as getCurrentLifecycleCommitBatch, u as registerLifecycleTransaction } from "./lifecycle-batch-Dfpid9-A.js";
 import { n as getActiveRenderContext } from "./render-context-D-DFk2WN.js";
 import { i as createSSRPortalHostToken, n as SSR_PORTAL_HOST, r as createSSRPortalAnchorToken, t as SSR_PORTAL_ANCHOR } from "./portal-w3oQ6oQU.js";
 //#region src/runtime/portal.ts

package/dist/{readable-B3VIOfd7.js → readable-B5NtV7V0.js}

@@ -1,4 +1,4 @@
-import { n as enqueueRuntimeTask, s as markRuntimeReactivePropsDirtySource } from "./access-ePqdQqkV.js";
+import { n as enqueueRuntimeTask, s as markRuntimeReactivePropsDirtySource } from "./access-Dpfoi4cA.js";
 import { p as getCurrentInstance } from "./component-scope-DzJEbYGE.js";
 //#region src/runtime/readable.ts
 const DEVELOPMENT_BUILD_ENABLED = false;
@@ -81,8 +81,8 @@ function finalizeReadableSubscriptions(instance) {
 	instance._currentRenderToken = void 0;
 	instance._pendingReadSourceVersions = void 0;
 }
-function finalizeReadableSubscriptionsFromSnapshot(instance, token, newSet, pendingReadSourceVersions = instance._pendingReadSourceVersions) {
-	if (token === void 0) return;
+function finalizeReadableSubscriptionsFromSnapshot(instance, token, newSet, pendingReadSourceVersions = instance._pendingReadSourceVersions, ownershipGeneration = instance._ownershipGeneration) {
+	if (token === void 0 || instance._ownershipGeneration !== ownershipGeneration || !instance.mounted && instance.notifyUpdate === null) return;
 	const oldSet = instance._lastReadSources;
 	const pendingVersions = pendingReadSourceVersions;
 	let needsFollowUpUpdate = false;