@marko/runtime-tags 6.3.14 → 6.3.15

package/dist/debug/html.js

@@ -1666,7 +1666,6 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
 //#endregion
 //#region src/html/writer.ts
 let $chunk;
-const NOOP$2 = () => {};
 function getChunk() {
 	return $chunk;
 }
@@ -1679,54 +1678,22 @@ function getState() {
 function getScopeId(scope) {
 	return scope[K_SCOPE_ID];
 }
-function _html(html) {
-	$chunk.writeHTML(html);
-}
-function writeScript(script) {
-	$chunk.writeScript(script);
+function getScopeById(scopeId) {
+	if (scopeId !== void 0) return $chunk.boundary.state.scopes.get(scopeId);
 }
-function writeWaitReady(readyId, renderer, input) {
-	const chunk = $chunk;
-	const { boundary } = chunk;
-	const body = new Chunk(boundary, null, chunk.context, {
-		readyId,
-		parent: chunk.serializeState,
-		resumes: "",
-		writeScopes: {},
-		flushScopes: false
-	});
-	const bodyEnd = body.render(renderer, input);
-	if (body === bodyEnd) {
-		chunk.writeHTML(body.html);
-		body.deferOwnReady();
-		chunk.deferredReady = push(chunk.deferredReady, body);
-	} else {
-		bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
-		chunk.next = body;
-	}
+function $global() {
+	return $chunk.boundary.state.$global;
 }
-function _script(scopeId, registryId) {
-	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
-	$chunk.boundary.state.needsMainRuntime = true;
-	$chunk.writeEffect(scopeId, registryId);
+function _id() {
+	const state = $chunk.boundary.state;
+	const { $global } = state;
+	return "s" + $global.runtimeId + $global.renderId + (state.tagId++).toString(36);
 }
-function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
-	const shouldResume = serializeReason !== 0;
-	const render = normalizeServerRender(content);
-	const branchId = _peek_scope_id();
-	if (render) if (shouldResume) withBranchId(branchId, render);
-	else render();
-	if (_peek_scope_id() !== branchId) {
-		if (shouldResume) writeScope(scopeId, {
-			["BranchScopes:" + nodeAccessor]: writeScope(branchId, {}),
-			["ConditionalRenderer:" + nodeAccessor]: render?.["id"]
-		});
-	} else _scope_id();
+function _scope_id() {
+	return $chunk.boundary.state.scopeId++;
 }
-function normalizeServerRender(value) {
-	const renderer = normalizeDynamicRenderer(value);
-	if (renderer) if (typeof renderer === "function") return renderer;
-	else throw new Error(`Invalid \`content\` attribute. Received ${typeof value}`);
+function _peek_scope_id() {
+	return $chunk.boundary.state.scopeId;
 }
 const kPendingContexts = Symbol("Pending Contexts");
 function withContext(key, value, cb, cbValue) {
@@ -1741,49 +1708,41 @@ function withContext(key, value, cb, cbValue) {
 		ctx[key] = prev;
 	}
 }
-function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId, nodeAccessor) {
-	writeScopePassive(parentScopeId, { [scopeOffsetAccessor]: _scope_id() });
-	const childScope = writeScopePassive(childScopeId, { ["#TagVariable"]: _resume({}, registryId, parentScopeId) });
-	if (nodeAccessor !== void 0) writeScope(parentScopeId, { ["BranchScopes:" + nodeAccessor]: childScope });
-}
-function writeScopePassive(scopeId, partialScope) {
-	const target = $chunk.serializeState;
-	const scope = _scope_with_id(scopeId);
-	const passive = target.passiveScopes ||= {};
-	Object.assign(scope, partialScope);
-	passive[scopeId] = Object.assign(passive[scopeId] || {}, partialScope);
-	return scope;
+const kBranchId = Symbol("Branch Id");
+const kIsAsync = Symbol("Is Async");
+function isInResumedBranch() {
+	return $chunk?.context?.[kBranchId] !== void 0;
 }
-function _resume(val, id, scopeId) {
-	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
+function withBranchId(branchId, cb) {
+	return withContext(kBranchId, branchId, cb);
 }
-function _id() {
-	const state = $chunk.boundary.state;
-	const { $global } = state;
-	return "s" + $global.runtimeId + $global.renderId + (state.tagId++).toString(36);
+function withIsAsync(cb, value) {
+	return withContext(kIsAsync, true, cb, value);
 }
-function _scope_id() {
-	return $chunk.boundary.state.scopeId++;
+function _html(html) {
+	$chunk.writeHTML(html);
 }
-function _peek_scope_id() {
-	return $chunk.boundary.state.scopeId;
+function writeScript(script) {
+	$chunk.writeScript(script);
 }
-function getScopeById(scopeId) {
-	if (scopeId !== void 0) return $chunk.boundary.state.scopes.get(scopeId);
+function _script(scopeId, registryId) {
+	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
+	$chunk.boundary.state.needsMainRuntime = true;
+	$chunk.writeEffect(scopeId, registryId);
 }
-function _set_serialize_reason(reason) {
-	$chunk.boundary.state.serializeReason = reason;
+function _trailers(html) {
+	$chunk.boundary.state.trailerHTML += html;
 }
-function _scope_reason() {
-	const reason = $chunk.boundary.state.serializeReason;
-	$chunk.boundary.state.serializeReason = void 0;
-	return reason;
+function _resume(val, id, scopeId) {
+	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
 }
-function _serialize_if(condition, key) {
-	return condition && (condition === 1 || (typeof condition === "number" ? condition >>> key + 1 & 1 : condition[key])) ? 1 : void 0;
+function _el(scopeId, id) {
+	return _resume(() => _el_read_error(), id, scopeId);
 }
-function _serialize_guard(condition, key) {
-	return _serialize_if(condition, key) || 0;
+function _hoist(scopeId, id) {
+	const getter = () => _hoist_read_error();
+	getter[Symbol.iterator] = _hoist_read_error;
+	return _resume(getter, id, scopeId);
 }
 function _el_resume(scopeId, accessor, shouldResume) {
 	if (shouldResume === 0) return "";
@@ -1794,28 +1753,51 @@ function _el_resume(scopeId, accessor, shouldResume) {
 function _sep(shouldResume) {
 	return shouldResume === 0 ? "" : "<!>";
 }
-function _el(scopeId, id) {
-	return _resume(() => _el_read_error(), id, scopeId);
-}
-function _hoist(scopeId, id) {
-	const getter = () => _hoist_read_error();
-	getter[Symbol.iterator] = _hoist_read_error;
-	return _resume(getter, id, scopeId);
-}
 function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
 	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { ["#ClosestBranchId"]: branchId });
 }
-const kBranchId = Symbol("Branch Id");
-const kIsAsync = Symbol("Is Async");
-function isInResumedBranch() {
-	return $chunk?.context?.[kBranchId] !== void 0;
+function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
+	const shouldResume = serializeReason !== 0;
+	const render = normalizeServerRender(content);
+	const branchId = _peek_scope_id();
+	if (render) if (shouldResume) withBranchId(branchId, render);
+	else render();
+	if (_peek_scope_id() !== branchId) {
+		if (shouldResume) writeScope(scopeId, {
+			["BranchScopes:" + nodeAccessor]: writeScope(branchId, {}),
+			["ConditionalRenderer:" + nodeAccessor]: render?.["id"]
+		});
+	} else _scope_id();
 }
-function withBranchId(branchId, cb) {
-	return withContext(kBranchId, branchId, cb);
+function normalizeServerRender(value) {
+	const renderer = normalizeDynamicRenderer(value);
+	if (renderer) if (typeof renderer === "function") return renderer;
+	else throw new Error(`Invalid \`content\` attribute. Received ${typeof value}`);
 }
-function withIsAsync(cb, value) {
-	return withContext(kIsAsync, true, cb, value);
+function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId, nodeAccessor) {
+	writeScopePassive(parentScopeId, { [scopeOffsetAccessor]: _scope_id() });
+	const childScope = writeScopePassive(childScopeId, { ["#TagVariable"]: _resume({}, registryId, parentScopeId) });
+	if (nodeAccessor !== void 0) writeScope(parentScopeId, { ["BranchScopes:" + nodeAccessor]: childScope });
+}
+function writeScopePassive(scopeId, partialScope) {
+	const target = $chunk.serializeState;
+	const scope = _scope_with_id(scopeId);
+	const passive = target.passiveScopes ||= {};
+	Object.assign(scope, partialScope);
+	passive[scopeId] = Object.assign(passive[scopeId] || {}, partialScope);
+	return scope;
+}
+function _show_start(display, mark) {
+	if (display) {
+		if (mark) $chunk.writeHTML($chunk.boundary.state.mark("[", ""));
+	} else $chunk.writeHTML("<t hidden>");
+}
+function _show_end(scopeId, accessor, display, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+	const branchId = _scope_id();
+	const wrap = !display;
+	if (wrap) $chunk.writeHTML("</t>");
+	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, wrap || singleNode ? 1 : void 0, " " + branchId);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
 	forBranches(by, (each) => each ? forOf(list, (item, index) => {
@@ -1902,17 +1884,6 @@ function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, p
 	} else $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
 	else $chunk.writeHTML(endTag);
 }
-function _show_start(display, mark) {
-	if (display) {
-		if (mark) $chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-	} else $chunk.writeHTML("<t hidden>");
-}
-function _show_end(scopeId, accessor, display, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	const branchId = _scope_id();
-	const wrap = !display;
-	if (wrap) $chunk.writeHTML("</t>");
-	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, wrap || singleNode ? 1 : void 0, " " + branchId);
-}
 let writeScope = (scopeId, partialScope) => {
 	const { state } = $chunk.boundary;
 	const target = $chunk.serializeState;
@@ -1942,8 +1913,47 @@ function scopeWithId(state, scopeId) {
 	if (!scope) scopes.set(scopeId, scope = { [K_SCOPE_ID]: scopeId });
 	return scope;
 }
-function $global() {
-	return $chunk.boundary.state.$global;
+function _subscribe(subscribers, scope) {
+	if (subscribers) {
+		const { serializer } = $chunk.boundary.state;
+		if (!$chunk.serializeState.readyId && !serializer.written(subscribers)) subscribers.add(scope);
+		else serializer.writeCall(scope, subscribers, "add", $chunk.serializeState);
+	}
+	return scope;
+}
+function _set_serialize_reason(reason) {
+	$chunk.boundary.state.serializeReason = reason;
+}
+function _scope_reason() {
+	const reason = $chunk.boundary.state.serializeReason;
+	$chunk.boundary.state.serializeReason = void 0;
+	return reason;
+}
+function _serialize_if(condition, key) {
+	return condition && (condition === 1 || (typeof condition === "number" ? condition >>> key + 1 & 1 : condition[key])) ? 1 : void 0;
+}
+function _serialize_guard(condition, key) {
+	return _serialize_if(condition, key) || 0;
+}
+function writeWaitReady(readyId, renderer, input) {
+	const chunk = $chunk;
+	const { boundary } = chunk;
+	const body = new Chunk(boundary, null, chunk.context, {
+		readyId,
+		parent: chunk.serializeState,
+		resumes: "",
+		writeScopes: {},
+		flushScopes: false
+	});
+	const bodyEnd = body.render(renderer, input);
+	if (body === bodyEnd) {
+		chunk.writeHTML(body.html);
+		body.deferOwnReady();
+		chunk.deferredReady = push(chunk.deferredReady, body);
+	} else {
+		bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
+		chunk.next = body;
+	}
 }
 function _await(scopeId, accessor, promise, content, serializeMarker) {
 	const resumeMarker = serializeMarker !== 0;
@@ -2067,6 +2077,7 @@ function tryCatch(content, catchContent) {
 		else boundary.onNext();
 	};
 }
+const NOOP$2 = () => {};
 var State = class {
 	$global;
 	tagId = 1;
@@ -2492,8 +2503,22 @@ function depsMarker(deps) {
 	}
 	return marker;
 }
-function _trailers(html) {
-	$chunk.boundary.state.trailerHTML += html;
+function getFilteredGlobals($global) {
+	if (!$global) return 0;
+	const serializedGlobals = $global.serializedGlobals;
+	if (!serializedGlobals) return 0;
+	let filtered = 0;
+	if (Array.isArray(serializedGlobals)) for (const key of serializedGlobals) {
+		const value = $global[key];
+		if (value !== void 0) if (filtered) filtered[key] = value;
+		else filtered = { [key]: value };
+	}
+	else for (const key in serializedGlobals) if (serializedGlobals[key]) {
+		const value = $global[key];
+		if (value !== void 0) if (filtered) filtered[key] = value;
+		else filtered = { [key]: value };
+	}
+	return filtered;
 }
 function concatEffects(a, b) {
 	return a ? b ? a + " " + b : a : b;
@@ -2521,31 +2546,6 @@ function flushTickQueue() {
 	tickQueue = void 0;
 	for (const cb of queue) cb(true);
 }
-function getFilteredGlobals($global) {
-	if (!$global) return 0;
-	const serializedGlobals = $global.serializedGlobals;
-	if (!serializedGlobals) return 0;
-	let filtered = 0;
-	if (Array.isArray(serializedGlobals)) for (const key of serializedGlobals) {
-		const value = $global[key];
-		if (value !== void 0) if (filtered) filtered[key] = value;
-		else filtered = { [key]: value };
-	}
-	else for (const key in serializedGlobals) if (serializedGlobals[key]) {
-		const value = $global[key];
-		if (value !== void 0) if (filtered) filtered[key] = value;
-		else filtered = { [key]: value };
-	}
-	return filtered;
-}
-function _subscribe(subscribers, scope) {
-	if (subscribers) {
-		const { serializer } = $chunk.boundary.state;
-		if (!$chunk.serializeState.readyId && !serializer.written(subscribers)) subscribers.add(scope);
-		else serializer.writeCall(scope, subscribers, "add", $chunk.serializeState);
-	}
-	return scope;
-}
 //#endregion
 //#region src/html/attrs.ts
 function _attr_class(value) {
@@ -2770,27 +2770,30 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		assertValidTagName(renderer);
 		const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
 		rendered = true;
-		_scope_id();
-		_html(`<${renderer}${_attrs(input, `#${renderer}/0`, branchId, renderer)}>`);
-		if (!voidElementsReg.test(renderer)) {
-			const renderContent = content || normalizeDynamicRenderer(input.content);
-			if (renderer === "textarea") {
-				if (renderContent) throw new Error("A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead.");
-				_html(_attr_textarea_value(branchId, `#${renderer}/0`, input.value, input.valueChange, 1));
-			} else if (renderContent) {
-				if (typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-				if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, `#${renderer}/0`, input.value, input.valueChange, renderContent, 1);
-				else _dynamic_tag(branchId, `#${renderer}/0`, renderContent, void 0, 0, void 0, serializeReason);
+		const renderNative = () => {
+			_scope_id();
+			_html(`<${renderer}${_attrs(input, `#${renderer}/0`, branchId, renderer)}>`);
+			if (!voidElementsReg.test(renderer)) {
+				const renderContent = content || normalizeDynamicRenderer(input.content);
+				if (renderer === "textarea") {
+					if (renderContent) throw new Error("A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead.");
+					_html(_attr_textarea_value(branchId, `#${renderer}/0`, input.value, input.valueChange, 1));
+				} else if (renderContent) {
+					if (typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
+					if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, `#${renderer}/0`, input.value, input.valueChange, renderContent, 1);
+					else _dynamic_tag(branchId, `#${renderer}/0`, renderContent, void 0, 0, void 0, serializeReason);
+				}
+				_html(`</${renderer}>`);
+			} else if (content) throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
+			const childScope = getScopeById(branchId);
+			const needsScript = childScope && (childScope[`EventAttributes:#${renderer}/0`] || childScope[`ControlledHandler:#${renderer}/0`]);
+			if (needsScript) {
+				writeScope(branchId, { ["#Renderer"]: renderer });
+				_script(branchId, DYNAMIC_TAG_SCRIPT_REGISTER_ID);
 			}
-			_html(`</${renderer}>`);
-		} else if (content) throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-		const childScope = getScopeById(branchId);
-		const needsScript = childScope && (childScope[`EventAttributes:#${renderer}/0`] || childScope[`ControlledHandler:#${renderer}/0`]);
-		if (needsScript) {
-			writeScope(branchId, { ["#Renderer"]: renderer });
-			_script(branchId, DYNAMIC_TAG_SCRIPT_REGISTER_ID);
-		}
-		if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
+			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
+		};
+		renderNative();
 	} else {
 		if (shouldResume) _html(state.mark("[", ""));
 		const render = () => {
@@ -3000,9 +3003,11 @@ var ServerRendered = class {
 						boundary.onNext = NOOP$1;
 						reject(boundary.signal.reason);
 						break;
-					case 0:
-						resolve(head.consume().flushHTML());
+					case 0: {
+						const consumed = head.consume();
+						if (!boundary.signal.aborted) resolve(consumed.flushHTML());
 						break;
+					}
 				}
 			})();
 		});