marko 6.4.0 → 6.4.1

package/dist/dom/catch.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-BSsI9OPC.js"), handlePendingTry = (fn, scope, branch) => {
+let require_control_flow = require("../dom-CNglVi8P.js"), handlePendingTry = (fn, scope, branch) => {
 	for (; branch;) {
 		if (branch.O?.i) return (scope.J ||= ((branch.JS ||= (branch.O.m && ((complete) => branch.O.c = () => complete() || require_control_flow.an(branch, require_control_flow.on, require_control_flow.b))(branch.O.c), [])).push(scope), /* @__PURE__ */ new Set())).add(fn);
 		branch = branch.N;

package/dist/dom/catch.feat.mjs

@@ -4,7 +4,7 @@ let handlePendingTry = (fn, scope, branch) => {
 		branch = branch.N;
 	}
 };
-import { an as queueAsyncRender, b as runPendingEffects, on as queueEffect, rn as installCatch, y as renderCatch } from "../dom-B-v8Gw6T.mjs";
+import { an as queueAsyncRender, b as runPendingEffects, on as queueEffect, rn as installCatch, y as renderCatch } from "../dom-DfP3MCo0.mjs";
 //#region src/dom/catch.feat.ts
 installCatch((effects) => {
 	let i = 0, fn, scope, branch;

package/dist/dom/controllable-input.feat.js

@@ -1,4 +1,4 @@
 "use strict";
-let require_control_flow = require("../dom-BSsI9OPC.js");
+let require_control_flow = require("../dom-CNglVi8P.js");
 require_control_flow.U[0] = require_control_flow.k, require_control_flow.U[1] = require_control_flow.D, require_control_flow.U[2] = require_control_flow.P;
 //#endregion

package/dist/dom/controllable-input.feat.mjs

@@ -1,3 +1,3 @@
-import { D as _attr_input_checkedValue_script, P as _attr_input_value_script, U as controllableScripts, k as _attr_input_checked_script } from "../dom-B-v8Gw6T.mjs";
+import { D as _attr_input_checkedValue_script, P as _attr_input_value_script, U as controllableScripts, k as _attr_input_checked_script } from "../dom-DfP3MCo0.mjs";
 controllableScripts[0] = _attr_input_checked_script, controllableScripts[1] = _attr_input_checkedValue_script, controllableScripts[2] = _attr_input_value_script;
 //#endregion

package/dist/dom/controllable-open.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-BSsI9OPC.js");
+let require_control_flow = require("../dom-CNglVi8P.js");
 //#region src/dom/controllable-open.feat.ts
 require_control_flow.U[4] = require_control_flow.C;
 //#endregion

package/dist/dom/controllable-open.feat.mjs

@@ -1,4 +1,4 @@
-import { C as _attr_details_or_dialog_open_script, U as controllableScripts } from "../dom-B-v8Gw6T.mjs";
+import { C as _attr_details_or_dialog_open_script, U as controllableScripts } from "../dom-DfP3MCo0.mjs";
 //#region src/dom/controllable-open.feat.ts
 controllableScripts[4] = _attr_details_or_dialog_open_script;
 //#endregion

package/dist/dom/controllable-select.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-BSsI9OPC.js");
+let require_control_flow = require("../dom-CNglVi8P.js");
 //#region src/dom/controllable-select.feat.ts
 require_control_flow.U[3] = require_control_flow.L;
 //#endregion

package/dist/dom/controllable-select.feat.mjs

@@ -1,4 +1,4 @@
-import { L as _attr_select_value_script, U as controllableScripts } from "../dom-B-v8Gw6T.mjs";
+import { L as _attr_select_value_script, U as controllableScripts } from "../dom-DfP3MCo0.mjs";
 //#region src/dom/controllable-select.feat.ts
 controllableScripts[3] = _attr_select_value_script;
 //#endregion

package/dist/dom/controllable-textarea.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-BSsI9OPC.js");
+let require_control_flow = require("../dom-CNglVi8P.js");
 //#region src/dom/controllable-textarea.feat.ts
 require_control_flow.U[2] = require_control_flow.P;
 //#endregion

package/dist/dom/controllable-textarea.feat.mjs

@@ -1,4 +1,4 @@
-import { P as _attr_input_value_script, U as controllableScripts } from "../dom-B-v8Gw6T.mjs";
+import { P as _attr_input_value_script, U as controllableScripts } from "../dom-DfP3MCo0.mjs";
 //#region src/dom/controllable-textarea.feat.ts
 controllableScripts[2] = _attr_input_value_script;
 //#endregion

package/dist/dom/controllable.feat.js

@@ -1,4 +1,4 @@
 "use strict";
-let require_control_flow = require("../dom-BSsI9OPC.js");
+let require_control_flow = require("../dom-CNglVi8P.js");
 require("./controllable-input.feat.js"), require("./controllable-open.feat.js"), require("./controllable-select.feat.js"), require_control_flow.H.INPUT = require_control_flow.R, require_control_flow.H.TEXTAREA = require_control_flow.V, require_control_flow.H.SELECT = require_control_flow.B, require_control_flow.H.DETAILS = require_control_flow.H.DIALOG = require_control_flow.z;
 //#endregion

package/dist/dom/controllable.feat.mjs

@@ -1,4 +1,4 @@
-import { B as _controllable_select, H as controllableRenders, R as _controllable_input, V as _controllable_textarea, z as _controllable_open } from "../dom-B-v8Gw6T.mjs";
+import { B as _controllable_select, H as controllableRenders, R as _controllable_input, V as _controllable_textarea, z as _controllable_open } from "../dom-DfP3MCo0.mjs";
 import "./controllable-input.feat.mjs";
 import "./controllable-open.feat.mjs";
 import "./controllable-select.feat.mjs";

package/dist/dom/dynamic-tag-script.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-BSsI9OPC.js");
+let require_control_flow = require("../dom-CNglVi8P.js");
 //#region src/dom/dynamic-tag-script.feat.ts
 require_control_flow.xt._d = require_control_flow.yn(require_control_flow.g);
 //#endregion

package/dist/dom/dynamic-tag-script.feat.mjs

@@ -1,4 +1,4 @@
-import { g as dynamicTagScript, xt as _resumed, yn as withBranches } from "../dom-B-v8Gw6T.mjs";
+import { g as dynamicTagScript, xt as _resumed, yn as withBranches } from "../dom-DfP3MCo0.mjs";
 //#region src/dom/dynamic-tag-script.feat.ts
 _resumed._d = withBranches(dynamicTagScript);
 //#endregion

package/dist/dom/dynamic-tag-var.feat.js

@@ -1,4 +1,4 @@
 "use strict";
 //#region src/dom/dynamic-tag-var.feat.ts
-require("../dom-BSsI9OPC.js")._((branch) => branch.T(() => branch.S));
+require("../dom-CNglVi8P.js")._((branch) => branch.T(() => branch.S));
 //#endregion

package/dist/dom/dynamic-tag-var.feat.mjs

@@ -1,4 +1,4 @@
-import { _ as installDynamicTagVar } from "../dom-B-v8Gw6T.mjs";
+import { _ as installDynamicTagVar } from "../dom-DfP3MCo0.mjs";
 //#region src/dom/dynamic-tag-var.feat.ts
 installDynamicTagVar((branch) => branch.T(() => branch.S));
 //#endregion

package/dist/dom/lazy.feat.js

@@ -1,4 +1,4 @@
 "use strict";
 //#region src/dom/lazy.feat.ts
-require("../dom-BSsI9OPC.js").Ot();
+require("../dom-CNglVi8P.js").Ot();
 //#endregion

package/dist/dom/lazy.feat.mjs

@@ -1,4 +1,4 @@
-import { Ot as withLazy } from "../dom-B-v8Gw6T.mjs";
+import { Ot as withLazy } from "../dom-DfP3MCo0.mjs";
 //#region src/dom/lazy.feat.ts
 withLazy();
 //#endregion

package/dist/dom/placeholder.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-BSsI9OPC.js");
+let require_control_flow = require("../dom-CNglVi8P.js");
 //#region src/dom/placeholder.feat.ts
 require_control_flow.xt._f = (tryBranch) => {
 	tryBranch.P &&= (require_control_flow.Xt(tryBranch.P), 0);

package/dist/dom/placeholder.feat.mjs

@@ -1,4 +1,4 @@
-import { Xt as destroyBranch, xt as _resumed } from "../dom-B-v8Gw6T.mjs";
+import { Xt as destroyBranch, xt as _resumed } from "../dom-DfP3MCo0.mjs";
 //#region src/dom/placeholder.feat.ts
 _resumed._f = (tryBranch) => {
 	tryBranch.P &&= (destroyBranch(tryBranch.P), 0);

package/dist/dom/signals.d.ts

@@ -30,6 +30,7 @@ export declare function _global_read($global: Record<string, unknown>, key: stri
 export declare function _el_read<T>(value: T): T;
 type Hoistable<T> = (...args: unknown[]) => T;
 type Hoisted<T> = Hoistable<T> & Iterable<T>;
-export declare function _hoist<T>(...path: Accessor[]): (scope: Scope) => Hoisted<T>;
-export declare function _hoist_resume<T>(id: string, ...path: Accessor[]): (scope: Scope) => Hoisted<T>;
+type HoistStep = Accessor | [Accessor, Accessor, number];
+export declare function _hoist<T>(...path: HoistStep[]): (scope: Scope) => Hoisted<T>;
+export declare function _hoist_resume<T>(id: string, ...path: HoistStep[]): (scope: Scope) => Hoisted<T>;
 export {};

package/dist/{dom-BSsI9OPC.js → dom-CNglVi8P.js}

@@ -30,8 +30,17 @@ let unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "
 	for (; !currentNode.nextSibling && currentNode.parentNode;) currentNode = currentNode.parentNode;
 	walkNextSibling();
 }, walkNextSibling = () => currentNode = currentNode.nextSibling || currentNode, _resumed = {}, curRenders, embedRenders, readyIds, lazyEnabled, isResuming, cloneCache = {}, _html = /*@__PURE__*/ withDynamicHtml(function(scope, value, accessor) {
-	let firstChild = scope[accessor], parentNode = firstChild.parentNode, lastChild = scope["H" + accessor] || firstChild, newContent = parseHTML(_to_text(value), parentNode.namespaceURI), newFirstChild = scope[accessor] = newContent.firstChild || newContent.appendChild(new Text()), newLastChild = scope["H" + accessor] = newContent.lastChild, branch = scope.F;
-	branch?.S === firstChild && (branch.S = newFirstChild), branch?.K === lastChild && (branch.K = newLastChild), insertChildNodes(parentNode, firstChild, newFirstChild, newLastChild), removeChildNodes(firstChild, lastChild);
+	let prevValue = scope["R" + accessor];
+	if (prevValue !== (scope["R" + accessor] = _to_text(value))) {
+		let firstChild = scope[accessor], parentNode = firstChild.parentNode, lastChild = scope["H" + accessor] || firstChild, newContent = parseHTML(scope["R" + accessor], parentNode.namespaceURI);
+		if (prevValue === void 0 && lastChild !== firstChild) {
+			let node = firstChild, newNode = newContent.firstChild;
+			for (; (node = node.nextSibling) !== lastChild && node.isEqualNode(newNode);) newNode = newNode.nextSibling;
+			if (node === lastChild && !newNode) return;
+		}
+		let newFirstChild = scope[accessor] = newContent.firstChild || newContent.appendChild(new Text()), newLastChild = scope["H" + accessor] = newContent.lastChild, branch = scope.F;
+		branch?.S === firstChild && (branch.S = newFirstChild), branch?.K === lastChild && (branch.K = newLastChild), insertChildNodes(parentNode, firstChild, newFirstChild, newLastChild), removeChildNodes(firstChild, lastChild);
+	}
 }), R = /[\p{L}\p{N}]/gu, inputType = "", controllableScripts = {}, controllableRenders = {}, _if = /*@__PURE__*/ withBranches((nodeAccessor, ...branchesArgs) => {
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let branchAccessor = "D" + nodeAccessor, branches = [], i = 0;
@@ -494,13 +503,13 @@ function* traverse(scope, path, args, i = path.length - 1) {
 	if (scope) {
 		if (Symbol.iterator in scope) for (let childScope of scope.values()) childScope.H !== 0 && (yield* traverse(childScope, path, args, i));
 		else {
-			let item = scope[path[i]];
+			let step = path[i], item = Array.isArray(step) ? (scope[step[1]] || 0) === step[2] && scope[step[0]] : scope[step];
 			i ? yield* traverse(item, path, args, i - 1) : yield typeof item == "function" ? item(...args) : item;
 		}
 	}
 }
 function _hoist(...path) {
-	return path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (scope) => {
+	return path = path.map((p) => typeof p == "number" ? decodeAccessor(p) : p), (scope) => {
 		let fn = (...args) => traverse(scope, path, args).next().value;
 		return fn[Symbol.iterator] = () => traverse(scope, path, []), fn;
 	};

package/dist/{dom-B-v8Gw6T.mjs → dom-DfP3MCo0.mjs}

@@ -29,8 +29,17 @@ let unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "
 	for (; !currentNode.nextSibling && currentNode.parentNode;) currentNode = currentNode.parentNode;
 	walkNextSibling();
 }, walkNextSibling = () => currentNode = currentNode.nextSibling || currentNode, _resumed = {}, curRenders, embedRenders, readyIds, lazyEnabled, isResuming, cloneCache = {}, _html = /*@__PURE__*/ withDynamicHtml(function(scope, value, accessor) {
-	let firstChild = scope[accessor], parentNode = firstChild.parentNode, lastChild = scope["H" + accessor] || firstChild, newContent = parseHTML(_to_text(value), parentNode.namespaceURI), newFirstChild = scope[accessor] = newContent.firstChild || newContent.appendChild(new Text()), newLastChild = scope["H" + accessor] = newContent.lastChild, branch = scope.F;
-	branch?.S === firstChild && (branch.S = newFirstChild), branch?.K === lastChild && (branch.K = newLastChild), insertChildNodes(parentNode, firstChild, newFirstChild, newLastChild), removeChildNodes(firstChild, lastChild);
+	let prevValue = scope["R" + accessor];
+	if (prevValue !== (scope["R" + accessor] = _to_text(value))) {
+		let firstChild = scope[accessor], parentNode = firstChild.parentNode, lastChild = scope["H" + accessor] || firstChild, newContent = parseHTML(scope["R" + accessor], parentNode.namespaceURI);
+		if (prevValue === void 0 && lastChild !== firstChild) {
+			let node = firstChild, newNode = newContent.firstChild;
+			for (; (node = node.nextSibling) !== lastChild && node.isEqualNode(newNode);) newNode = newNode.nextSibling;
+			if (node === lastChild && !newNode) return;
+		}
+		let newFirstChild = scope[accessor] = newContent.firstChild || newContent.appendChild(new Text()), newLastChild = scope["H" + accessor] = newContent.lastChild, branch = scope.F;
+		branch?.S === firstChild && (branch.S = newFirstChild), branch?.K === lastChild && (branch.K = newLastChild), insertChildNodes(parentNode, firstChild, newFirstChild, newLastChild), removeChildNodes(firstChild, lastChild);
+	}
 }), R = /[\p{L}\p{N}]/gu, inputType = "", controllableScripts = {}, controllableRenders = {}, _if = /*@__PURE__*/ withBranches((nodeAccessor, ...branchesArgs) => {
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let branchAccessor = "D" + nodeAccessor, branches = [], i = 0;
@@ -493,13 +502,13 @@ function* traverse(scope, path, args, i = path.length - 1) {
 	if (scope) {
 		if (Symbol.iterator in scope) for (let childScope of scope.values()) childScope.H !== 0 && (yield* traverse(childScope, path, args, i));
 		else {
-			let item = scope[path[i]];
+			let step = path[i], item = Array.isArray(step) ? (scope[step[1]] || 0) === step[2] && scope[step[0]] : scope[step];
 			i ? yield* traverse(item, path, args, i - 1) : yield typeof item == "function" ? item(...args) : item;
 		}
 	}
 }
 function _hoist(...path) {
-	return path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (scope) => {
+	return path = path.map((p) => typeof p == "number" ? decodeAccessor(p) : p), (scope) => {
 		let fn = (...args) => traverse(scope, path, args).next().value;
 		return fn[Symbol.iterator] = () => traverse(scope, path, []), fn;
 	};

package/dist/dom.js

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("./dom-BSsI9OPC.js"), empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), classEventResolver, scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
+let require_control_flow = require("./dom-CNglVi8P.js"), empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), classEventResolver, scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
 	require_control_flow.wt($global.runtimeId);
 	let render = self[$global.runtimeId]?.[$global.renderId], scopes = render && scopesByRender.get(render);
 	return render && !scopes && scopesByRender.set(render, scopes = {}), scopes;

package/dist/dom.mjs

@@ -69,7 +69,7 @@ let empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), cl
 	let renderer = _content(id, template, walks, setup, inputSignal)();
 	return renderer.mount = mount, renderer._ = renderer, _resumed[id] = renderer;
 }, noop = (_) => 0;
-import { $ as _attrs, $t as syncGen, A as _attr_input_value, At as _closure, B as _controllable_select, Bt as _if_closure, C as _attr_details_or_dialog_open_script, Ct as getRegisteredWithScope, D as _attr_input_checkedValue_script, Dt as readyFailed, E as _attr_input_checkedValue_default, Et as ready, F as _attr_select_value, Ft as _for_selector, G as _attr_class, Gt as _return_change, Ht as _let_change, I as _attr_select_value_default, It as _global_read, J as _attr_content, Jt as _var_change, K as _attr_class_item, Kt as _script, L as _attr_select_value_script, Lt as _hoist, M as _attr_input_value_default, Mt as _const, N as _attr_input_value_dynamic_default, Nt as _el_read, O as _attr_input_checked_default, P as _attr_input_value_script, Pt as _for_closure, Q as _attr_style_items, Qt as removeAndDestroyBranch, R as _controllable_input, Rt as _hoist_resume, S as _attr_details_or_dialog_open_default, St as _var_resume, T as _attr_input_checkedValue, Tt as initEmbedded, Ut as _or, V as _controllable_textarea, Vt as _let, W as _attr, Wt as _return, X as _attr_style, Xt as destroyBranch, Y as _attr_nonce, Yt as _assert_init, Z as _attr_style_item, Zt as insertBranchBefore, _n as _hoist_read_error, _t as createBranch, a as _for_in, an as queueAsyncRender, at as _lifecycle, bt as _el, c as _for_to, cn as rendering, ct as _text, d as _for_until_unkeyed, dn as runId, dt as insertChildNodes, en as _on, et as _attrs_content, f as _if, fn as forIn, ft as toInsertNode, gn as _assert_hoist, gt as createAndSetupBranch, h as addAwaitCounter, hn as forUntil, ht as _content_resume, i as _dynamic_tag_content, in as prepareEffects, it as _html, j as _attr_input_value_attribute_default, jt as _closure_get, k as _attr_input_checked_script, kt as _child_setup, l as _for_to_unkeyed, ln as run, lt as _text_content, m as _try, mn as forTo, mt as _content_closures, n as _await_promise, nn as $signalReset, nt as _attrs_partial_content, o as _for_of, on as queueEffect, ot as _style_rule_item, p as _show, pn as forOf, pt as _content, q as _attr_class_items, qt as _var, r as _dynamic_tag, rt as _attrs_script, s as _for_of_unkeyed, sn as queueRender, st as _style_shell, t as _await_content, tn as $signal, tt as _attrs_partial, u as _for_until, un as runEffects, ut as _to_text, v as patchDynamicTag, vn as _call, vt as setupBranch, w as _attr_input_checked, wt as init, x as _attr_details_or_dialog_open, xt as _resumed, y as renderCatch, yt as _dynamic_tag_var_resume, z as _controllable_open, zt as _id } from "./dom-B-v8Gw6T.mjs";
+import { $ as _attrs, $t as syncGen, A as _attr_input_value, At as _closure, B as _controllable_select, Bt as _if_closure, C as _attr_details_or_dialog_open_script, Ct as getRegisteredWithScope, D as _attr_input_checkedValue_script, Dt as readyFailed, E as _attr_input_checkedValue_default, Et as ready, F as _attr_select_value, Ft as _for_selector, G as _attr_class, Gt as _return_change, Ht as _let_change, I as _attr_select_value_default, It as _global_read, J as _attr_content, Jt as _var_change, K as _attr_class_item, Kt as _script, L as _attr_select_value_script, Lt as _hoist, M as _attr_input_value_default, Mt as _const, N as _attr_input_value_dynamic_default, Nt as _el_read, O as _attr_input_checked_default, P as _attr_input_value_script, Pt as _for_closure, Q as _attr_style_items, Qt as removeAndDestroyBranch, R as _controllable_input, Rt as _hoist_resume, S as _attr_details_or_dialog_open_default, St as _var_resume, T as _attr_input_checkedValue, Tt as initEmbedded, Ut as _or, V as _controllable_textarea, Vt as _let, W as _attr, Wt as _return, X as _attr_style, Xt as destroyBranch, Y as _attr_nonce, Yt as _assert_init, Z as _attr_style_item, Zt as insertBranchBefore, _n as _hoist_read_error, _t as createBranch, a as _for_in, an as queueAsyncRender, at as _lifecycle, bt as _el, c as _for_to, cn as rendering, ct as _text, d as _for_until_unkeyed, dn as runId, dt as insertChildNodes, en as _on, et as _attrs_content, f as _if, fn as forIn, ft as toInsertNode, gn as _assert_hoist, gt as createAndSetupBranch, h as addAwaitCounter, hn as forUntil, ht as _content_resume, i as _dynamic_tag_content, in as prepareEffects, it as _html, j as _attr_input_value_attribute_default, jt as _closure_get, k as _attr_input_checked_script, kt as _child_setup, l as _for_to_unkeyed, ln as run, lt as _text_content, m as _try, mn as forTo, mt as _content_closures, n as _await_promise, nn as $signalReset, nt as _attrs_partial_content, o as _for_of, on as queueEffect, ot as _style_rule_item, p as _show, pn as forOf, pt as _content, q as _attr_class_items, qt as _var, r as _dynamic_tag, rt as _attrs_script, s as _for_of_unkeyed, sn as queueRender, st as _style_shell, t as _await_content, tn as $signal, tt as _attrs_partial, u as _for_until, un as runEffects, ut as _to_text, v as patchDynamicTag, vn as _call, vt as setupBranch, w as _attr_input_checked, wt as init, x as _attr_details_or_dialog_open, xt as _resumed, y as renderCatch, yt as _dynamic_tag_var_resume, z as _controllable_open, zt as _id } from "./dom-DfP3MCo0.mjs";
 //#region src/common/attr-tag.ts
 function attrTag(attrs) {
 	return attrs[Symbol.iterator] = attrTagIterator, attrs[rest] = empty, attrs;

package/dist/html/attrs.d.ts

@@ -18,7 +18,7 @@ export declare function _attr_and(name: string, value: unknown, attr: string): s
 export declare function _attr_or(name: string, value: unknown, attr: string): string;
 export declare function _attr_nullish(name: string, value: unknown, attr: string): string;
 export declare function _attrs(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string): string;
-export declare function _attrs_content(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string, serializeReason?: 1 | 0): void;
+export declare function _attrs_content(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string, markerGuard?: 1 | 0): void;
 export declare function _attrs_partial(data: Record<string, unknown>, skip: Record<string, 1>, nodeAccessor: Accessor, scopeId: number, tagName: string): string;
-export declare function _attrs_partial_content(data: Record<string, unknown>, skip: Record<string, 1>, nodeAccessor: Accessor, scopeId: number, tagName: string, serializeReason?: 1 | 0): void;
+export declare function _attrs_partial_content(data: Record<string, unknown>, skip: Record<string, 1>, nodeAccessor: Accessor, scopeId: number, tagName: string, markerGuard?: 1 | 0): void;
 export declare function attrAssignment(value: string): string;

package/dist/html/dynamic-tag.d.ts

@@ -5,7 +5,7 @@ interface BodyContentObject {
     [x: PropertyKey]: unknown;
     content: ServerRenderer;
 }
-export declare let _dynamic_tag: (scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, inputOrArgs: unknown, content?: (() => void) | 0, inputIsArgs?: 1, serializeReason?: 1 | 0) => unknown;
+export declare let _dynamic_tag: (scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, inputOrArgs: unknown, content?: (() => void) | 0, inputIsArgs?: 1, markerGuard?: 1 | 0) => unknown;
 export declare function _content(id: string, fn: ServerRenderer, scopeId?: number): ServerRenderer;
 export declare function _content_resume(id: string, fn: ServerRenderer, scopeId?: number, locals?: Locals): ServerRenderer;
 export declare const patchDynamicTag: (patch: (tag: unknown, scopeId: number, accessor: Accessor) => unknown) => void;

package/dist/html/inlined-runtimes.d.ts

@@ -1,2 +1,2 @@
 export declare const WALKER_RUNTIME_CODE = "(e=>(self[e]||=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(r=l.slice(s+1),(l=l[s])>\"#\"||(a[r]=e),l),r,e),l>\"#\"&&d.push(e)}},self[e]))";
-export declare const REORDER_RUNTIME_CODE = "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"!\"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,r:a,c(i=e.l[\"^\"+a],f=d.cloneNode()){if(--o.i)return 1;for(;f.prepend(r=e.l[a].previousSibling||i),i!=r;);c(a,d)}}),e.v.push({data:e.i+\"*\"+l.r}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})";
+export declare const REORDER_RUNTIME_CODE = "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:1,r:a,c(i=e.l[\"^\"+a],f=d.cloneNode()){if(--o.i)return 1;for(;f.prepend(r=e.l[a].previousSibling||i),i!=r;);c(a,d)}}),e.v.push({data:e.i+\"*\"+l.r}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})";

package/dist/html/inlined-runtimes.debug.d.ts

@@ -1,2 +1,2 @@
 export declare const WALKER_RUNTIME_CODE = "((runtimeId) => (self[runtimeId] ||= (\n  renderId,\n  prefix = runtimeId + renderId,\n  prefixLen = prefix.length,\n  lookup = {},\n  visits = [],\n  doc = document,\n  walker = doc.createTreeWalker(\n    doc,\n    129 /* NodeFilter.SHOW_COMMENT | NodeFilter.SHOW_ELEMENT */,\n  ),\n) =>\n  doc = (self[runtimeId][renderId] = {\n    i: prefix,\n    d: doc,\n    l: lookup,\n    v: visits,\n    x() {},\n    w(node, op, id) {\n      while ((node = walker.nextNode())) {\n        // Only reorder markers (\"#\", \"!\") are ever looked up, so only they are\n        // kept: the lookup lives as long as the page, and every node marker\n        // would otherwise stay referenced in it after resume consumed it.\n        doc.x(\n          (op =\n            (op = node.data) &&\n            !op.indexOf(prefix) &&\n            ((id = op.slice(prefixLen + 1)),\n            (op = op[prefixLen]) > \"#\" || (lookup[id] = node),\n            op)),\n          id,\n          node,\n        );\n\n        if (op > \"#\") {\n          visits.push(node);\n        }\n      }\n    },\n  })\n, self[runtimeId]))";
-export declare const REORDER_RUNTIME_CODE = "((runtime) => {\n  if (runtime.j) return;\n  let onNextSibling,\n    placeholder,\n    nextSibling,\n    placeholders = runtime.p = {},\n    replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);\n  runtime.j = {};\n  runtime.x = (op, id, node, placeholderRoot, placeholderCb) => {\n    if (node == nextSibling) {\n      onNextSibling();\n    }\n\n    if (op == \"#\") {\n      (placeholders[id] = placeholder).i++;\n    } else if (op == \"!\") {\n      if (runtime.l[id] && placeholders[id]) {\n        nextSibling = node.nextSibling;\n        onNextSibling = () => placeholders[id].c();\n      }\n    } else if (node.tagName == \"T\" && (id = node.getAttribute(runtime.i))) {\n      nextSibling = node.nextSibling;\n      onNextSibling = () => {\n        node.remove();\n        placeholderRoot || replace(id, node);\n        placeholder.c();\n      };\n      placeholder =\n        placeholders[id] ||\n        (placeholderRoot = placeholders[id] =\n          {\n            i: runtime.l[id] ? 1 : 2,\n            r: id,\n            // Resume may still walk markers inside the dropped placeholder, so\n            // park it in any detached parent (a bare <t> clone is the cheapest).\n            c(start = runtime.l[\"^\" + id], removed = node.cloneNode()) {\n              if (--placeholderRoot.i) return 1;\n              for (\n                ;\n                removed.prepend(\n                  (nextSibling = runtime.l[id].previousSibling || start),\n                ),\n                  start != nextSibling;\n\n              );\n              replace(id, node);\n            },\n          });\n      // Opens the chunk's visits for resume to parent to the root's branch; the\n      // walk that this chunk's own script triggers closes it.\n      runtime.v.push({ data: runtime.i + \"*\" + placeholder.r });\n      // repurpose \"op\" for callbacks ...carefully\n      if ((op = runtime.j[id])) {\n        placeholderCb = placeholder.c;\n        placeholder.c = () => placeholderCb() || op(runtime.r);\n      }\n    }\n  };\n})";
+export declare const REORDER_RUNTIME_CODE = "((runtime) => {\n  if (runtime.j) return;\n  let onNextSibling,\n    placeholder,\n    nextSibling,\n    placeholders = runtime.p = {},\n    replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);\n  runtime.j = {};\n  runtime.x = (op, id, node, placeholderRoot, placeholderCb) => {\n    if (node == nextSibling) {\n      onNextSibling();\n    }\n\n    if (op == \"#\") {\n      (placeholders[id] = placeholder).i++;\n    } else if (node.tagName == \"T\" && (id = node.getAttribute(runtime.i))) {\n      nextSibling = node.nextSibling;\n      onNextSibling = () => {\n        node.remove();\n        placeholderRoot || replace(id, node);\n        placeholder.c();\n      };\n      placeholder =\n        placeholders[id] ||\n        (placeholderRoot = placeholders[id] =\n          {\n            // The writer streams a reorder only after its markers.\n            i: 1,\n            r: id,\n            // Resume may still walk markers inside the dropped placeholder, so\n            // park it in any detached parent (a bare <t> clone is the cheapest).\n            c(start = runtime.l[\"^\" + id], removed = node.cloneNode()) {\n              if (--placeholderRoot.i) return 1;\n              for (\n                ;\n                removed.prepend(\n                  (nextSibling = runtime.l[id].previousSibling || start),\n                ),\n                  start != nextSibling;\n\n              );\n              replace(id, node);\n            },\n          });\n      // Opens the chunk's visits for resume to parent to the root's branch; the\n      // walk that this chunk's own script triggers closes it.\n      runtime.v.push({ data: runtime.i + \"*\" + placeholder.r });\n      // repurpose \"op\" for callbacks ...carefully\n      if ((op = runtime.j[id])) {\n        placeholderCb = placeholder.c;\n        placeholder.c = () => placeholderCb() || op(runtime.r);\n      }\n    }\n  };\n})";

package/dist/html/serializer.d.ts

@@ -1,6 +1,6 @@
 import type { Boundary, PartialScope } from "./writer";
 export declare const K_SCOPE_ID: unique symbol;
-export type Locals = (scope: (scopeId: number) => PartialScope) => (PartialScope | 0)[];
+export type Locals = (scope: (scopeId: number) => PartialScope) => PartialScope[];
 export type ScopeFlush = [scopeId: number, scope: object, props: object];
 export interface SerializeChannel {
     readyId?: string;

package/dist/html/writer.d.ts

@@ -38,7 +38,7 @@ export declare function withBranchId<T>(branchId: number, cb: () => T): T;
 export declare function withBranchId<T, U>(branchId: number, cb: (value: U) => T, cbValue: U): T;
 export declare function _html(html: string): void;
 export declare function writeScript(script: string): void;
-export declare function _script(scopeId: number, registryId: string, serializeMarker?: number): void;
+export declare function _script(scopeId: number, registryId: string, markerGuard?: number): void;
 export declare function _trailers(html: string): void;
 export declare function _resume<T extends WeakKey>(val: T, id: string, scopeId?: number, locals?: Locals): T;
 export declare function _resume_locals<T extends WeakKey>(val: T, id: string, locals: Record<string, unknown>, ownerScopeId?: number): T;
@@ -51,31 +51,31 @@ export declare function _el_resume(scopeId: number, accessor: Accessor, shouldRe
 export declare function _text_resume(scopeId: number, accessor: Accessor, val: unknown, shouldResume?: number): string;
 export declare function _html_resume(scopeId: number, accessor: Accessor, val: unknown, shouldResume?: number): string;
 export declare function _resume_branch(scopeId: number): void;
-export declare function _attr_content(nodeAccessor: Accessor, scopeId: number, content: unknown, serializeReason?: number): void;
+export declare function _attr_content(nodeAccessor: Accessor, scopeId: number, content: unknown, markerGuard?: number): void;
 export declare function _var(parentScopeId: number, scopeOffsetAccessor: Accessor, childScopeId: number, registryId: string, nodeAccessor?: Accessor): void;
-export declare function _show_start(display: unknown, mark?: unknown): void;
-export declare function _show_end(scopeId: number, accessor: Accessor, display: unknown, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1 | 0): void;
-export declare function _for_of(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, by: Falsy | ((item: unknown, index: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _for_in(obj: Falsy | {}, cb: (key: string, value: unknown) => void, by: Falsy | ((key: string, v: unknown) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _for_to(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _for_until(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _if(cb: () => void | number, scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function _show_start(display: unknown, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0): void;
+export declare function _show_end(scopeId: number, accessor: Accessor, display: unknown, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1 | 0): void;
+export declare function _for_of(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, by: Falsy | ((item: unknown, index: number) => unknown), scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function _for_in(obj: Falsy | {}, cb: (key: string, value: unknown) => void, by: Falsy | ((key: string, v: unknown) => unknown), scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function _for_to(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function _for_until(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function _if(cb: () => void | number, scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
 export declare function deferBranchStart(chunk: Chunk): string;
 export declare function applyBranchStart(chunk: Chunk, beforeBranch: string, rendered: boolean): void;
 declare let writeScope: (scopeId: number, partialScope: PartialScope) => ScopeInternals;
 export { writeScope as _scope };
 export declare function _existing_scope(scopeId: number): ScopeInternals;
 export declare function _scope_with_id(scopeId: number): ScopeInternals;
-export declare function _subscribe(subscribers: Set<ScopeInternals> | undefined, scope: ScopeInternals, resumeId?: string, serializeMarker?: number): ScopeInternals;
-export type SerializeReasonValue = undefined | number | Partial<Record<string, number>>;
+export declare function _subscribe(subscribers: Set<ScopeInternals> | undefined, scope: ScopeInternals, resumeId?: string, markerGuard?: number): ScopeInternals;
+export type GroupMask = undefined | number | Partial<Record<string, number>>;
 export declare const CLIENT_ALL = 715827883;
-export declare function maskGroup(mask: SerializeReasonValue, group: number): number;
-export declare function _set_serialize_reason(reason: SerializeReasonValue): void;
-export declare function _scope_reason(): SerializeReasonValue;
-export declare function _serialize_if(condition: SerializeReasonValue, key: number): 1 | undefined;
-export declare function _serialize_guard(condition: SerializeReasonValue, key: number): 0 | 1;
+export declare function maskGroup(mask: GroupMask, group: number): number;
+export declare function _set_scope_reason(reason: GroupMask): void;
+export declare function _scope_reason(): GroupMask;
+export declare function _write_if(condition: GroupMask, key: number): 1 | undefined;
+export declare function _write_guard(condition: GroupMask, key: number): 0 | 1;
 export declare function writeWaitReady(readyId: string, renderer: ServerRenderer, input: unknown): void;
-export declare function _await<T>(scopeId: number, accessor: Accessor, promise: Promise<T> | T, content: (value: T) => void, serializeMarker?: number): void;
+export declare function _await<T>(scopeId: number, accessor: Accessor, promise: Promise<T> | T, content: (value: T) => void, markerGuard?: number): void;
 export declare function _try(scopeId: number, accessor: Accessor, content: () => void, placeholderContent?: ServerRenderer, catchContent?: ServerRenderer, placeholderId?: string, catchId?: string): void;
 declare const NOOP: () => void;
 type Mark = Mark.Value;
@@ -101,7 +101,7 @@ export declare class State implements SerializeState {
     flushScopes: boolean;
     writeScopes: Record<number, PartialScope>;
     readyIds: Set<string> | null;
-    serializeReason: SerializeReasonValue;
+    scopeReason: GroupMask;
     $global: $Global & {
         renderId: string;
         runtimeId: string;
@@ -123,13 +123,18 @@ export declare class State implements SerializeState {
 }
 type FlushStatus = FlushStatus.Value;
 export { FlushStatus };
-export declare class Boundary extends AbortController {
+export declare class Boundary {
     onNext: typeof NOOP;
     count: number;
     resumeWrites: number;
     state: State;
     parent?: Boundary;
+    aborted: boolean;
+    reason: unknown;
+    pendingReorders?: Set<Chunk>;
+    children?: Boundary[];
     constructor(state: State, signal?: AbortSignal, parent?: Boundary);
+    abort(reason: unknown): void;
     handleEvent(event: Event): void;
     flush(): 0 | 1 | 2;
     startAsync(): void;
@@ -142,9 +147,13 @@ export declare class Chunk {
     lastEffect: string;
     async: boolean;
     consumed: boolean;
-    needsWalk: boolean;
     reorderId: string | null;
     deferredReady: Opt<Chunk>;
+    deferredReorder: Chunk | null;
+    catchRange: {
+        id: string;
+        end: Chunk;
+    } | null;
     placeholder: {
         body: Chunk;
         render: () => void;
@@ -164,8 +173,11 @@ export declare class Chunk {
     append(chunk: Chunk): void;
     takeDeferredReady(): Opt<Chunk>;
     deferOwnReady(): void;
-    flushPlaceholder(): void;
-    consume(): Chunk;
+    renderPlaceholders(boundary: Boundary): void;
+    renderPlaceholder(state: State): boolean;
+    markCatchRange(): void;
+    queueDeferredReorder(): void;
+    consume(boundary: Boundary): Chunk;
     render(content: () => void): Chunk;
     render<T>(content: (val: T) => void, val: T): Chunk;
     flushReadyScripts(boundary: Boundary, reservations?: string[], holdEffects?: boolean): string;

package/dist/html.d.ts

@@ -7,4 +7,4 @@ export { _escape, _escape_comment, _escape_script, _escape_style, _escape_style_
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
 export { forIn, forOf, forTo, forUntil } from "./html/for";
 export { _template } from "./html/template";
-export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, _scope, _scope_id, _scope_reason, _html_resume, _scope_with_id, _script, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _text_resume, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";
+export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, _scope, _scope_id, _scope_reason, _html_resume, _scope_with_id, _script, _write_guard, _write_if, _set_scope_reason, _show_end, _show_start, _text_resume, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";