@askrjs/askr 0.0.81 → 0.0.83

package/dist/benchmark.js

@@ -1,10 +1,10 @@
 import { r as flushRuntimeScheduler } from "./access-ePqdQqkV.js";
-import { t as installRendererBridge } from "./renderer-BU9TOqrA.js";
+import { t as installRendererBridge } from "./renderer-VSw0KKDG.js";
 import { t as state } from "./state-BCl9DeiN.js";
 import { t as selector } from "./selector-DVwvof1M.js";
 import { i as For } from "./control-C0X1zgrM.js";
 import { jsx, jsxs } from "./jsx-runtime.js";
-import { t as createIsland } from "./boot-CrpQQNAt.js";
+import { t as createIsland } from "./boot-uK1hzONI.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.81",
-	buildLabel: "0.0.81-local"
+	packageVersion: "0.0.83",
+	buildLabel: "0.0.83-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-CrpQQNAt.js";
+import { a as cleanupApp, i as hydrateSPA, n as createIslands, o as hasApp, r as createSPA, t as createIsland } from "../boot-uK1hzONI.js";
 export { cleanupApp, createIsland, createIslands, createSPA, hasApp, hydrateSPA };

package/dist/{boot-CrpQQNAt.js → boot-uK1hzONI.js}

@@ -3,7 +3,7 @@ import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-C3IECePB.js";
 import { n as createComponentInstance, r as executeComponent } from "./component-internal-DsM75Gl1.js";
 import { t as cleanupComponent } from "./component-cleanup-oWN45rfa.js";
 import { p as isPromiseLike } from "./lifecycle-batch-CwHCDseR.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-BU9TOqrA.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-VSw0KKDG.js";
 import { _ as teardownNodeSubtree, d as removeAllListeners } from "./cleanup-CEF-cX49.js";
 import { T as assertExecutionModel, c as _applyManifest, d as getRouteRenderContext, f as getRouteRenderData, m as resolveRouteRequest, o as reviveDeferredValue, p as hasRouteRenderData, v as pageRenderEnvelope } from "./deferred-rdHAgyKe.js";
 import { c as stopHydrationRenderPhase, o as startHydrationRenderPhase } from "./render-context-D-DFk2WN.js";

package/dist/index.js

@@ -4,7 +4,7 @@ import { g as readScope, u as defineScope } from "./component-internal-DsM75Gl1.
 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 { g as getSignal, i as claimHookIndex, p as getCurrentInstance } from "./component-scope-DzJEbYGE.js";
 import { n as isSnapshotSource } from "./snapshot-source-BB42xgwb.js";
-import { t as installRendererBridge } from "./renderer-BU9TOqrA.js";
+import { t as installRendererBridge } from "./renderer-VSw0KKDG.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";

package/dist/{renderer-BU9TOqrA.js → renderer-VSw0KKDG.js}

@@ -3466,10 +3466,9 @@ function updateMixedControlChildren(parent, children, forceUpdate) {
 			if (!controlState) throw new Error("[updateElementChildren] Control boundary missing internal state");
 			const childVNodes = evaluateControlBoundaryState(controlState);
 			const cursorAfterBoundary = cursor ? isRangeStart(cursor) ? findRangeEnd(cursor)?.nextSibling ?? cursor.nextSibling : cursor.nextSibling : null;
-			const ranges = syncControlBoundaryInMixedParent(parent, controlState, childVNodes, cursor);
+			const [ranges, postBoundaryCursor] = syncControlBoundaryInMixedParent(parent, controlState, childVNodes, cursor);
 			if (controlState.kind === "for") {
-				const last = ranges[ranges.length - 1];
-				cursor = last ? last.end.nextSibling : cursorAfterBoundary?.parentNode === parent ? cursorAfterBoundary : cursor?.parentNode === parent ? cursor : null;
+				cursor = postBoundaryCursor;
 				continue;
 			}
 			for (const range of ranges) if (range.start.parentNode !== parent) moveRange(parent, range, cursor?.parentNode === parent ? cursor : null);
@@ -4433,7 +4432,12 @@ function adoptHydratedRange(parent, scope, before, vnode) {
 	return range;
 }
 function getScopeRange(scope) {
-	if (scope.range) return scope.range;
+	if (scope.range) {
+		const host = scope.range.start;
+		const ownedRange = host.__ASKR_INSTANCE ? getOwnedRange(host.__ASKR_INSTANCE) : void 0;
+		if (ownedRange?.start === scope.range.start) scope.range = ownedRange;
+		return scope.range;
+	}
 	if (!scope.dom) return null;
 	const range = {
 		start: scope.dom,
@@ -4443,6 +4447,10 @@ function getScopeRange(scope) {
 	scope.range = range;
 	return range;
 }
+function getRangeComponentFunction(range) {
+	if (!range) return void 0;
+	return range.start.__ASKR_INSTANCE?.fn;
+}
 function materializeChildScopeRange(vnode, parentNamespace, scope, scopeAlreadyActive = false) {
 	const previousInstance = scope && !scopeAlreadyActive ? enterDomCommitScope(scope.componentInstance) : null;
 	let dom;
@@ -4480,8 +4488,10 @@ function syncControlBoundaryScopeDom(parent, scope, vnode, before = null, allowH
 			return resolvedRange;
 		}
 		if (_isDOMElement(vnode) && typeof vnode.type === "function") {
-			const synced = host.syncComponentElement(dom, vnode, vnode.type, (vnode.props ?? {}) || {}, getBoundaryParentNamespace(parent));
+			if (resolvedRange && !resolvedRange.single && getRangeComponentFunction(resolvedRange) === vnode.type) return resolvedRange;
+			const synced = host.syncComponentElement(resolvedRange?.start ?? dom, vnode, vnode.type, (vnode.props ?? {}) || {}, getBoundaryParentNamespace(parent));
 			if (synced) {
+				if (resolvedRange && !resolvedRange.single) return getScopeRange(scope);
 				const nextRange = {
 					start: synced,
 					end: synced,
@@ -4531,10 +4541,6 @@ function teardownBoundaryRangeNode(node) {
 	teardownNodeSubtree(node);
 	node.parentNode?.removeChild(node);
 }
-function syncControlBoundaryScopeNode(parent, scope, vnode) {
-	const range = syncControlBoundaryScopeDom(parent, scope, vnode, null, true, false);
-	return range?.single ? range.start : null;
-}
 function syncControlBoundaryInMixedParent(parent, controlState, childrenVNodes, before) {
 	if (controlState.kind === "for") {
 		const ownedNodes = /* @__PURE__ */ new Set();
@@ -4606,7 +4612,7 @@ function syncControlBoundaryInMixedParent(parent, controlState, childrenVNodes,
 			anchor = range.start;
 		}
 		clearBoundaryState(controlState);
-		return nextRanges;
+		return [nextRanges, afterBoundary?.parentNode === parent ? afterBoundary : null];
 	}
 	const activeScope = controlState.activeScope;
 	const activeVNode = childrenVNodes[0];
@@ -4622,7 +4628,7 @@ function syncControlBoundaryInMixedParent(parent, controlState, childrenVNodes,
 	for (const range of controlState.lastRemovedRanges) if (range !== nextRange) removeRange(range, teardownBoundaryRangeNode);
 	for (const node of controlState.lastRemovedNodes) if (node.parentNode === parent) teardownBoundaryRangeNode(node);
 	clearBoundaryState(controlState);
-	return nextRange ? [nextRange] : [];
+	return [nextRange ? [nextRange] : [], nextRange?.end.nextSibling ?? null];
 }
 //#endregion
 //#region src/renderer/boundary-commit-owner.ts
@@ -4755,6 +4761,10 @@ function createForBoundary(node, props, parentNamespace) {
 }
 //#endregion
 //#region src/renderer/boundaries.ts
+function syncControlBoundaryScopeNode(parent, scope, vnode) {
+	const range = syncControlBoundaryScopeDom(parent, scope, vnode, null, true, false);
+	return range?.single ? range.start : null;
+}
 let boundaryDOMHost = null;
 function configureBoundaryDOMHost(host) {
 	boundaryDOMHost = host;

package/dist/testing/index.js

@@ -1,7 +1,7 @@
 import { r as flushRuntimeScheduler } from "../access-ePqdQqkV.js";
 import { r as computeRouteActivityMatches } from "../route-matching-BUwz4kfl.js";
 import { l as addInvalidationListener } from "../data-runtime-D68YOo9L.js";
-import { a as cleanupApp, r as createSPA, t as createIsland } from "../boot-CrpQQNAt.js";
+import { a as cleanupApp, r as createSPA, t as createIsland } from "../boot-uK1hzONI.js";
 //#region src/testing/render.ts
 const renderStates = /* @__PURE__ */ new WeakMap();
 const eventConstructorNames = {

package/package.json

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