marko 6.3.53 → 6.3.54

package/dist/html.mjs

@@ -247,7 +247,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 }, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, 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, countResumeWrite($chunk.boundary), Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
-}, CLIENT_ALL = 715827882, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /["\r]|&(?=[#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) => {
+}, CLIENT_ALL = 715827883, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /["\r]|&(?=[#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) || {};
@@ -428,6 +428,10 @@ function isEventHandler(name) {
 function getEventHandlerName(name) {
 	return name[2] === "-" ? name.slice(3) : name.slice(2).toLowerCase();
 }
+function hasKeys(obj) {
+	for (let _ in obj) return !0;
+	return !1;
+}
 function isVoid(value) {
 	return value == null || value === !1;
 }
@@ -530,10 +534,11 @@ var State$1 = class {
 		});
 	}
 };
-function register(id, val, scope) {
+function register(id, val, scope, locals) {
 	return REGISTRY.set(val, {
 		id,
 		scope,
+		locals,
 		access: "_._" + toAccess(toObjectKey(id))
 	}), val;
 }
@@ -641,13 +646,22 @@ function newScopeReference(state, val, scopeId) {
 	let ref = new Reference(null, null, state.flushId);
 	return ref.scopeId = scopeId, ref.channel = state.channel, state.refs.set(val, ref), ref;
 }
+function quoteRegisterId(id) {
+	return "\"" + id + "\"";
+}
 function writeRegistered(state, val, parent, accessor, registered) {
 	let { scope } = registered;
 	if (scope) {
 		let ref = new Reference(parent, accessor, state.flushId, state.buf.length);
 		ref.channel = state.channel, state.refs.set(val, ref);
 		let scopeId = scope[K_SCOPE_ID];
-		trackScope(state, scope, scopeId), state.buf.push("_(" + scopeId + "," + quote(registered.id, 0) + ")");
+		trackScope(state, scope, scopeId);
+		let locals = registered.locals?.(state.boundary.state.scope);
+		if (locals) {
+			state.buf.push(registered.access + "(_(" + scopeId + ")");
+			for (let local of locals) state.buf.push(","), local ? writePlainObject(state, local, new Reference(ref, null, state.flushId, state.buf.length)) : state.buf.push("0");
+		} else state.buf.push("_(" + scopeId + "," + quoteRegisterId(registered.id));
+		state.buf.push(")");
 	} else state.buf.push(registered.access);
 	return !0;
 }
@@ -1331,8 +1345,8 @@ function _script(scopeId, registryId, serializeMarker) {
 function _trailers(html) {
 	$chunk.boundary.state.trailerHTML += html;
 }
-function _resume(val, id, scopeId) {
-	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
+function _resume(val, id, scopeId, locals) {
+	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId), locals);
 }
 function _resume_locals(val, id, locals, ownerScopeId) {
 	return ownerScopeId !== void 0 && (locals._ = _scope_with_id(ownerScopeId)), register(id, val, writeScope(_scope_id(), locals));
@@ -1470,15 +1484,15 @@ function scopeWithId(state, scopeId) {
 	let { scopes } = state, scope = scopes.get(scopeId);
 	return scope || scopes.set(scopeId, scope = { [K_SCOPE_ID]: scopeId }), scope;
 }
-function _subscribe(subscribers, scope) {
+function _subscribe(subscribers, scope, resumeId, serializeMarker) {
 	if (subscribers) {
 		let { serializer } = $chunk.boundary.state;
-		!$chunk.serializeState.readyId && !serializer.written(subscribers) ? subscribers.add(scope) : serializer.writeCall(scope, subscribers, "add", $chunk.serializeState);
+		!$chunk.serializeState.readyId && !serializer.written(subscribers) ? subscribers.add(scope) : resumeId ? _script(scope[K_SCOPE_ID], resumeId, serializeMarker) : serializer.writeCall(scope, subscribers, "add", $chunk.serializeState);
 	}
 	return scope;
 }
 function maskGroup(mask, group) {
-	return mask === 715827882 ? 1 : typeof mask == "number" ? mask >>> 1 + 2 * group & 3 : mask[group] ?? 0;
+	return mask === 715827883 ? 1 : typeof mask == "number" ? group < 15 ? mask >>> 1 + 2 * group & 3 : 0 : mask[group] ?? 0;
 }
 function _set_serialize_reason(reason) {
 	$chunk.boundary.state.serializeReason = reason;
@@ -1599,6 +1613,7 @@ var State = class {
 	serializer = new Serializer();
 	writeReorders = null;
 	scopes = /* @__PURE__ */ new Map();
+	scope = (scopeId) => scopeWithId(this, scopeId);
 	flushScopes = !1;
 	writeScopes = {};
 	readyIds = null;
@@ -1737,15 +1752,15 @@ var State = class {
 			$chunk = prev;
 		}
 	}
-	flushReadyScripts(reservations) {
+	flushReadyScripts(reservations, holdEffects) {
 		let { boundary, serializeState } = this, { readyId } = serializeState, scripts = "";
 		if (forEach(this.takeDeferredReady(), (chunk) => {
-			scripts = concatScripts(scripts, chunk.flushReadyScripts(reservations));
+			scripts = concatScripts(scripts, chunk.flushReadyScripts(reservations, holdEffects)), (chunk.effects || chunk.deferredReady) && (this.deferredReady = push(this.deferredReady, chunk));
 		}), readyId && !this.async) {
 			let { state } = boundary;
 			flushSerializer(boundary, serializeState);
-			let deps = state.serializer.takeChannelDeps(), { effects } = this, { resumes } = serializeState, chunkScripts = this.scripts;
-			if (serializeState.resumes = "", this.effects = this.scripts = "", this.lastEffect = "", resumes || effects) {
+			let deps = state.serializer.takeChannelDeps(), effects = holdEffects ? "" : this.effects, { resumes } = serializeState, chunkScripts = this.scripts;
+			if (serializeState.resumes = this.scripts = "", effects && (this.effects = this.lastEffect = ""), resumes || effects) {
 				state.needsMainRuntime = !0;
 				let batch = concatSequence(depsMarker(deps), concatSequence(resumes, effects && `"${effects}"`));
 				if (reservations) {
@@ -1760,7 +1775,7 @@ var State = class {
 	flushScript() {
 		let { boundary } = this, { state } = boundary, { $global, runtimePrefix } = state, needsWalk = state.walkOnNextFlush;
 		needsWalk && (state.walkOnNextFlush = !1);
-		let readyResumeScripts = this.flushReadyScripts();
+		let readyResumeScripts = this.flushReadyScripts(void 0, this.async);
 		for (let channel; channel = state.serializer.pendingReadyChannel();) {
 			let resumes = state.serializer.stringifyScopes([], boundary, channel), deps = state.serializer.takeChannelDeps();
 			state.needsMainRuntime = !0, readyResumeScripts = concatScripts(readyResumeScripts, state.writeReady(channel.readyId, concatSequence(depsMarker(deps), resumes)));
@@ -1785,11 +1800,11 @@ var State = class {
 				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()), state.reorder(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
+					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(readyReservations, this.async);
+					if (this.deferredReady = concat(this.deferredReady, cur.takeDeferredReady()), 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 && (needsResumeArray = !0, reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")"));
+				reorderEffects && (this.async ? (this.effects = concatEffects(this.effects, reorderEffects), this.lastEffect = "") : (needsResumeArray = !0, reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")")));
 				for (let reservation of readyReservations) reordered = concatScripts(reordered, reservation);
 				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
@@ -1823,7 +1838,7 @@ function flushSerializer(boundary, serializeState) {
 		}
 		for (let key in writeScopes) {
 			let scopeId = +key, props = writeScopes[scopeId];
-			Object.getOwnPropertyNames(props).length && flushes.push([
+			hasKeys(props) && flushes.push([
 				scopeId,
 				state.scopes.get(scopeId),
 				props
@@ -2049,8 +2064,8 @@ function normalizeStrAttrValue(value) {
 function _content(id, fn, scopeId) {
 	return fn.a = id, fn.e = scopeId, fn;
 }
-function _content_resume(id, fn, scopeId) {
-	return _resume(_content(id, fn, scopeId), id, scopeId);
+function _content_resume(id, fn, scopeId, locals) {
+	return _resume(_content(id, fn, scopeId), id, scopeId, locals);
 }
 //#endregion
 //#region src/html/template.ts