marko 6.2.5 → 6.3.1

package/dist/html.js

@@ -238,10 +238,10 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	[JSON, "JSON"],
 	[Math, "Math"],
 	[Reflect, "Reflect"]
-]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, $chunk, NOOP$2 = () => {}, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
+]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, NOOP$2 = () => {}, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
 	let { state } = $chunk.boundary, target = $chunk.serializeState, scope = scopeWithId(state, scopeId), pending = target.writeScopes[scopeId];
 	return state.needsMainRuntime = !0, Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
-}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g, doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g, needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
+}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
 	let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
 	if (typeof renderer == "string") {
 		let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
@@ -643,7 +643,7 @@ function writeObject(state, val, parent, accessor) {
 	return wellKnownObject ? (state.buf.push(wellKnownObject), !0) : writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (val.constructor) {
+	switch (Object.getPrototypeOf(val)?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -769,10 +769,14 @@ function writeWeakMap(state) {
 }
 function writeError(state, val, ref) {
 	let result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
-	return val.cause === void 0 ? state.buf.push(result + ")") : (state.buf.push(result + ",{cause:"), writeProp(state, val.cause, ref, "cause"), state.buf.push("})")), !0;
+	if (val.cause !== void 0) {
+		let pos = state.buf.push(result + ",{cause:") - 1;
+		writeProp(state, val.cause, ref, "cause") ? state.buf.push("})") : state.buf[pos] = state.buf[pos].slice(0, -8) + ")";
+	} else state.buf.push(result + ")");
+	return !0;
 }
 function writeAggregateError(state, val, ref) {
-	return state.buf.push("new AggregateError("), writeProp(state, val.errors, ref, "errors"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), !0;
+	return state.buf.push("new AggregateError("), writeProp(state, val.errors, ref, "errors") || state.buf.push("[]"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), !0;
 }
 function writeURL(state, val) {
 	return state.buf.push("new URL(" + quote(val.toString(), 0) + ")"), !0;
@@ -903,32 +907,45 @@ function toAccess(accessor) {
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
 function quote(str, startPos) {
+	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
 	let result = "", lastPos = 0;
 	for (let i = startPos; i < str.length; i++) {
-		let replacement;
-		switch (str[i]) {
-			case "\"":
+		let replacement, code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
 				replacement = "\\\"";
 				break;
-			case "\\":
+			case 92:
 				replacement = "\\\\";
 				break;
-			case "<":
+			case 60:
 				replacement = "\\x3C";
 				break;
-			case "\n":
+			case 10:
 				replacement = "\\n";
 				break;
-			case "\r":
+			case 13:
 				replacement = "\\r";
 				break;
-			case "\u2028":
+			case 8232:
 				replacement = "\\u2028";
 				break;
-			case "\u2029":
+			case 8233:
 				replacement = "\\u2029";
 				break;
-			default: continue;
+			case 0:
+				replacement = "\\x00";
+				break;
+			default:
+				if (code < 55296 || code > 57343) continue;
+				if (code < 56320) {
+					let next = str.charCodeAt(i + 1);
+					if (next >= 56320 && next <= 57343) {
+						i++;
+						continue;
+					}
+				}
+				replacement = "\\u" + code.toString(16);
 		}
 		result += str.slice(lastPos, i) + replacement, lastPos = i + 1;
 	}
@@ -1278,7 +1295,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 				let branchId = _peek_scope_id();
 				$chunk.writeHTML($chunk.boundary.state.mark("[", "")), withIsAsync(content, value), $chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 			} else withIsAsync(content, value);
-		}), boundary.endAsync(chunk)));
+		}), boundary.endAsync()));
 	}, (err) => {
 		chunk.async = !1, boundary.abort(err);
 	});
@@ -1306,7 +1323,7 @@ function tryPlaceholder(content, placeholder, branchId) {
 	};
 }
 function tryCatch(content, catchContent) {
-	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(content);
+	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, void 0, boundary), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(content);
 	if (catchBoundary.signal.aborted) {
 		catchContent(catchBoundary.signal.reason);
 		return;
@@ -1384,13 +1401,14 @@ var State = class {
 	}
 }, Boundary = class extends AbortController {
 	state;
+	parent;
 	onNext = NOOP$2;
 	count = 0;
-	constructor(state, parent) {
-		super(), this.state = state, this.signal.addEventListener("abort", () => {
+	constructor(state, signal, parent) {
+		super(), this.state = state, this.parent = parent, this.signal.addEventListener("abort", () => {
 			this.count = 0, this.state = new State(this.state.$global), this.onNext();
-		}), parent && (parent.aborted ? this.abort(parent.reason) : parent.addEventListener("abort", () => {
-			this.abort(parent.reason);
+		}), signal && (signal.aborted ? this.abort(signal.reason) : signal.addEventListener("abort", () => {
+			this.abort(signal.reason);
 		}));
 	}
 	flush() {
@@ -1399,8 +1417,8 @@ var State = class {
 	startAsync() {
 		this.signal.aborted || this.count++;
 	}
-	endAsync(chunk) {
-		!this.signal.aborted && this.count && (this.count--, chunk?.reorderId && this.state.reorder(chunk), this.onNext());
+	endAsync() {
+		!this.signal.aborted && this.count && (this.count--, this.onNext());
 	}
 }, Chunk = class Chunk {
 	boundary;
@@ -1505,20 +1523,30 @@ var State = class {
 		readyResumeScripts && (needsWalk = !0);
 		let effects = this.async ? "" : this.effects, { html, scripts } = this;
 		if (state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(scripts, "(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)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>\"#\"&&d.push(e)}},self[e]))(\"" + $global.runtimeId + "\")(\"" + $global.renderId + "\")")), scripts = concatScripts(scripts, readyResumeScripts), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\""), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(scripts, runtimePrefix + ".r.push(" + state.resumes + ")") : (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]"))), state.writeReorders) {
-			needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(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,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
+			let carried = null;
 			for (let reorderedChunk of state.writeReorders) {
+				if (reorderedChunk.async && reorderedChunk.consumed) {
+					let aborted = reorderedChunk.boundary;
+					for (; aborted && !aborted.signal.aborted;) aborted = aborted.parent;
+					if (!aborted) {
+						(carried ||= []).push(reorderedChunk);
+						continue;
+					}
+					reorderedChunk.async = !1;
+				}
+				needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(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,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
 				let { reorderId } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
 				for (reorderedChunk.reorderId = null;;) {
 					cur.flushPlaceholder(), cur.deferOwnReady();
 					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(readyReservations);
-					if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
+					if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), state.reorder(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
 					else break;
 				}
 				reorderEffects && (state.hasWrittenResume || (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[]")), reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")"));
 				for (let reservation of readyReservations) scripts = concatScripts(scripts, reservation);
 				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = null;
+			state.writeReorders = carried;
 		}
 		return needsWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
 	}
@@ -1744,9 +1772,6 @@ function nonVoidAttr(name, value) {
 		case "string": return " " + name + attrAssignment(value);
 		case "boolean": return " " + name;
 		case "number": return " " + name + "=" + value;
-		case "object":
-			if (value instanceof RegExp) return " " + name + attrAssignment(value.source);
-			break;
 	}
 	return " " + name + attrAssignment(value + "");
 }

package/dist/html.mjs

@@ -238,10 +238,10 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	[JSON, "JSON"],
 	[Math, "Math"],
 	[Reflect, "Reflect"]
-]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, $chunk, NOOP$2 = () => {}, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
+]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, NOOP$2 = () => {}, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
 	let { state } = $chunk.boundary, target = $chunk.serializeState, scope = scopeWithId(state, scopeId), pending = target.writeScopes[scopeId];
 	return state.needsMainRuntime = !0, Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
-}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g, doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g, needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
+}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
 	let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
 	if (typeof renderer == "string") {
 		let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
@@ -642,7 +642,7 @@ function writeObject(state, val, parent, accessor) {
 	return wellKnownObject ? (state.buf.push(wellKnownObject), !0) : writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (val.constructor) {
+	switch (Object.getPrototypeOf(val)?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -768,10 +768,14 @@ function writeWeakMap(state) {
 }
 function writeError(state, val, ref) {
 	let result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
-	return val.cause === void 0 ? state.buf.push(result + ")") : (state.buf.push(result + ",{cause:"), writeProp(state, val.cause, ref, "cause"), state.buf.push("})")), !0;
+	if (val.cause !== void 0) {
+		let pos = state.buf.push(result + ",{cause:") - 1;
+		writeProp(state, val.cause, ref, "cause") ? state.buf.push("})") : state.buf[pos] = state.buf[pos].slice(0, -8) + ")";
+	} else state.buf.push(result + ")");
+	return !0;
 }
 function writeAggregateError(state, val, ref) {
-	return state.buf.push("new AggregateError("), writeProp(state, val.errors, ref, "errors"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), !0;
+	return state.buf.push("new AggregateError("), writeProp(state, val.errors, ref, "errors") || state.buf.push("[]"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), !0;
 }
 function writeURL(state, val) {
 	return state.buf.push("new URL(" + quote(val.toString(), 0) + ")"), !0;
@@ -902,32 +906,45 @@ function toAccess(accessor) {
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
 function quote(str, startPos) {
+	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
 	let result = "", lastPos = 0;
 	for (let i = startPos; i < str.length; i++) {
-		let replacement;
-		switch (str[i]) {
-			case "\"":
+		let replacement, code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
 				replacement = "\\\"";
 				break;
-			case "\\":
+			case 92:
 				replacement = "\\\\";
 				break;
-			case "<":
+			case 60:
 				replacement = "\\x3C";
 				break;
-			case "\n":
+			case 10:
 				replacement = "\\n";
 				break;
-			case "\r":
+			case 13:
 				replacement = "\\r";
 				break;
-			case "\u2028":
+			case 8232:
 				replacement = "\\u2028";
 				break;
-			case "\u2029":
+			case 8233:
 				replacement = "\\u2029";
 				break;
-			default: continue;
+			case 0:
+				replacement = "\\x00";
+				break;
+			default:
+				if (code < 55296 || code > 57343) continue;
+				if (code < 56320) {
+					let next = str.charCodeAt(i + 1);
+					if (next >= 56320 && next <= 57343) {
+						i++;
+						continue;
+					}
+				}
+				replacement = "\\u" + code.toString(16);
 		}
 		result += str.slice(lastPos, i) + replacement, lastPos = i + 1;
 	}
@@ -1277,7 +1294,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 				let branchId = _peek_scope_id();
 				$chunk.writeHTML($chunk.boundary.state.mark("[", "")), withIsAsync(content, value), $chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 			} else withIsAsync(content, value);
-		}), boundary.endAsync(chunk)));
+		}), boundary.endAsync()));
 	}, (err) => {
 		chunk.async = !1, boundary.abort(err);
 	});
@@ -1305,7 +1322,7 @@ function tryPlaceholder(content, placeholder, branchId) {
 	};
 }
 function tryCatch(content, catchContent) {
-	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(content);
+	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, void 0, boundary), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(content);
 	if (catchBoundary.signal.aborted) {
 		catchContent(catchBoundary.signal.reason);
 		return;
@@ -1383,13 +1400,14 @@ var State = class {
 	}
 }, Boundary = class extends AbortController {
 	state;
+	parent;
 	onNext = NOOP$2;
 	count = 0;
-	constructor(state, parent) {
-		super(), this.state = state, this.signal.addEventListener("abort", () => {
+	constructor(state, signal, parent) {
+		super(), this.state = state, this.parent = parent, this.signal.addEventListener("abort", () => {
 			this.count = 0, this.state = new State(this.state.$global), this.onNext();
-		}), parent && (parent.aborted ? this.abort(parent.reason) : parent.addEventListener("abort", () => {
-			this.abort(parent.reason);
+		}), signal && (signal.aborted ? this.abort(signal.reason) : signal.addEventListener("abort", () => {
+			this.abort(signal.reason);
 		}));
 	}
 	flush() {
@@ -1398,8 +1416,8 @@ var State = class {
 	startAsync() {
 		this.signal.aborted || this.count++;
 	}
-	endAsync(chunk) {
-		!this.signal.aborted && this.count && (this.count--, chunk?.reorderId && this.state.reorder(chunk), this.onNext());
+	endAsync() {
+		!this.signal.aborted && this.count && (this.count--, this.onNext());
 	}
 }, Chunk = class Chunk {
 	boundary;
@@ -1504,20 +1522,30 @@ var State = class {
 		readyResumeScripts && (needsWalk = !0);
 		let effects = this.async ? "" : this.effects, { html, scripts } = this;
 		if (state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(scripts, "(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)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>\"#\"&&d.push(e)}},self[e]))(\"" + $global.runtimeId + "\")(\"" + $global.renderId + "\")")), scripts = concatScripts(scripts, readyResumeScripts), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\""), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(scripts, runtimePrefix + ".r.push(" + state.resumes + ")") : (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]"))), state.writeReorders) {
-			needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(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,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
+			let carried = null;
 			for (let reorderedChunk of state.writeReorders) {
+				if (reorderedChunk.async && reorderedChunk.consumed) {
+					let aborted = reorderedChunk.boundary;
+					for (; aborted && !aborted.signal.aborted;) aborted = aborted.parent;
+					if (!aborted) {
+						(carried ||= []).push(reorderedChunk);
+						continue;
+					}
+					reorderedChunk.async = !1;
+				}
+				needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(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,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
 				let { reorderId } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
 				for (reorderedChunk.reorderId = null;;) {
 					cur.flushPlaceholder(), cur.deferOwnReady();
 					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(readyReservations);
-					if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
+					if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), state.reorder(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
 					else break;
 				}
 				reorderEffects && (state.hasWrittenResume || (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[]")), reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")"));
 				for (let reservation of readyReservations) scripts = concatScripts(scripts, reservation);
 				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = null;
+			state.writeReorders = carried;
 		}
 		return needsWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
 	}
@@ -1743,9 +1771,6 @@ function nonVoidAttr(name, value) {
 		case "string": return " " + name + attrAssignment(value);
 		case "boolean": return " " + name;
 		case "number": return " " + name + "=" + value;
-		case "object":
-			if (value instanceof RegExp) return " " + name + attrAssignment(value.source);
-			break;
 	}
 	return " " + name + attrAssignment(value + "");
 }