marko 6.3.20 → 6.3.22

package/dist/debug/html.js

@@ -21,6 +21,22 @@ function* attrTagIterator() {
 	yield* this[rest];
 }
 //#endregion
+//#region src/common/constants/accessor-prefix.debug.ts
+const BranchScopes = "BranchScopes:";
+const ConditionalRenderer = "ConditionalRenderer:";
+const ControlledHandler = "ControlledHandler:";
+const ControlledType = "ControlledType:";
+const ControlledValue = "ControlledValue:";
+const EventAttributes = "EventAttributes:";
+const BranchAccessor = "#BranchAccessor";
+const CatchContent = "#CatchContent";
+const ClosestBranchId = "#ClosestBranchId";
+const LoopKey = "#LoopKey";
+const PlaceholderContent = "#PlaceholderContent";
+const Renderer = "#Renderer";
+const TagVariable = "#TagVariable";
+const Embed = "embed";
+//#endregion
 //#region src/common/helpers.ts
 const htmlAttrNameReg = /^[^a-z_]|[^a-z0-9._:-]/i;
 const knownWrongAttrs = {
@@ -523,14 +539,15 @@ var State$1 = class {
 	mutated = [];
 };
 var Reference = class {
+	assigns = null;
+	calls = null;
+	scopeId = void 0;
+	channel = void 0;
 	parent;
 	accessor;
 	flush;
 	pos;
 	id;
-	assigns = null;
-	scopeId = void 0;
-	channel = void 0;
 	constructor(parent, accessor, flush, pos = null, id = null) {
 		this.parent = parent;
 		this.accessor = accessor;
@@ -635,14 +652,31 @@ function writeScopesRoot(state, flushes) {
 function writeAssigned(state) {
 	let sep = state.buf.length ? "," : "";
 	if (state.assigned.size) {
+		const assigned = state.assigned;
+		state.assigned = /* @__PURE__ */ new Set();
 		let buf = "";
-		for (const ref of state.assigned) {
-			buf += sep + assignsToString(ref.assigns, ref.id);
-			ref.assigns = null;
-			sep = ",";
+		let hasCalls = false;
+		for (const ref of assigned) {
+			if (ref.assigns) {
+				buf += sep + assignsToString(ref.assigns, ref.id);
+				ref.assigns = null;
+				sep = ",";
+			}
+			hasCalls ||= ref.calls !== null;
+		}
+		if (buf) state.buf.push(buf);
+		if (hasCalls) for (const ref of assigned) {
+			if (!ref.calls) continue;
+			for (const { method, args } of ref.calls) {
+				state.buf.push((state.buf.length ? "," : "") + ref.id + "." + method + "(");
+				for (let a = 0; a < args.length; a++) {
+					if (a) state.buf.push(",");
+					writeCallArg(state, args[a]);
+				}
+				state.buf.push(")");
+			}
+			ref.calls = null;
 		}
-		state.buf.push(buf);
-		state.assigned = /* @__PURE__ */ new Set();
 	}
 	if (hasChannelMutations(state)) {
 		const remaining = [];
@@ -677,8 +711,14 @@ function writeAssigned(state) {
 			state.buf.push(")");
 		}
 		state.mutated = remaining;
-		if (state.assigned.size) writeAssigned(state);
 	}
+	if (state.assigned.size) writeAssigned(state);
+}
+function writeCallArg(state, val) {
+	if (val === void 0) {
+		state.wroteUndefined = true;
+		state.buf.push("$");
+	} else if (!writeProp(state, val, null, "")) state.buf.push("void 0");
 }
 function hasChannelMutations(state) {
 	return hasMatchingMutations(state.mutated, state.channel?.readyId);
@@ -873,6 +913,7 @@ function writeUnknownObject(state, val, ref) {
 		case Float64Array:
 		case BigInt64Array:
 		case BigUint64Array: return writeTypedArray(state, val, ref);
+		case DataView: return writeDataView(state, val, ref);
 		case WeakSet: return writeWeakSet(state);
 		case WeakMap: return writeWeakMap(state);
 		case globalThis.URL: return writeURL(state, val);
@@ -882,6 +923,24 @@ function writeUnknownObject(state, val, ref) {
 		case globalThis.ReadableStream: return writeReadableStream(state, val, ref);
 		case globalThis.Request: return writeRequest(state, val, ref);
 		case globalThis.Response: return writeResponse(state, val, ref);
+		case globalThis.Intl?.NumberFormat: return writeIntl(state, val, "NumberFormat", ref);
+		case globalThis.Intl?.DateTimeFormat: return writeIntl(state, val, "DateTimeFormat", ref);
+		case globalThis.Intl?.Collator: return writeIntl(state, val, "Collator", ref);
+		case globalThis.Intl?.PluralRules: return writeIntl(state, val, "PluralRules", ref);
+		case globalThis.Intl?.RelativeTimeFormat: return writeIntl(state, val, "RelativeTimeFormat", ref);
+		case globalThis.Intl?.ListFormat: return writeIntl(state, val, "ListFormat", ref);
+		case globalThis.Intl?.DisplayNames: return writeIntl(state, val, "DisplayNames", ref);
+		case globalThis.Intl?.Segmenter: return writeIntl(state, val, "Segmenter", ref);
+		case globalThis.Intl?.DurationFormat: return writeIntl(state, val, "DurationFormat", ref);
+		case globalThis.Intl?.Locale: return writeIntlLocale(state, val);
+		case globalThis.Temporal?.Instant: return writeTemporal(state, val, "Instant");
+		case globalThis.Temporal?.Duration: return writeTemporal(state, val, "Duration");
+		case globalThis.Temporal?.PlainDate: return writeTemporal(state, val, "PlainDate");
+		case globalThis.Temporal?.PlainDateTime: return writeTemporal(state, val, "PlainDateTime");
+		case globalThis.Temporal?.PlainMonthDay: return writeTemporal(state, val, "PlainMonthDay");
+		case globalThis.Temporal?.PlainTime: return writeTemporal(state, val, "PlainTime");
+		case globalThis.Temporal?.PlainYearMonth: return writeTemporal(state, val, "PlainYearMonth");
+		case globalThis.Temporal?.ZonedDateTime: return writeTemporal(state, val, "ZonedDateTime");
 	}
 	throwUnserializable(state, val, ref);
 	return false;
@@ -950,9 +1009,15 @@ function writeMap(state, val, ref) {
 	const items = [];
 	let assigns;
 	let needsId;
+	let deferring = false;
 	let i = 0;
 	if (val.size < 25) {
 		for (let [itemKey, itemValue] of val) {
+			if (!deferring && (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue))) deferring = true;
+			if (deferring) {
+				deferCall(state, ref, "set", [itemKey, itemValue]);
+				continue;
+			}
 			if (itemKey === val) {
 				itemKey = void 0;
 				(assigns ||= []).push("a[" + i + "][0]");
@@ -967,6 +1032,11 @@ function writeMap(state, val, ref) {
 		writeArrayArg(state, ref, items, assigns && "((m,a)=>(" + assignsToString(assigns, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map,", "new Map(", needsId);
 	} else {
 		for (let [itemKey, itemValue] of val) {
+			if (!deferring && (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue))) deferring = true;
+			if (deferring) {
+				deferCall(state, ref, "set", [itemKey, itemValue]);
+				continue;
+			}
 			if (itemKey === val) {
 				itemKey = 0;
 				(assigns ||= []).push("a[" + i + "]");
@@ -990,8 +1060,14 @@ function writeSet(state, val, ref) {
 	const items = [];
 	let assigns;
 	let needsId;
+	let deferring = false;
 	let i = 0;
 	for (let item of val) {
+		if (!deferring && item !== val && isAncestorMember(state, ref, item)) deferring = true;
+		if (deferring) {
+			deferCall(state, ref, "add", [item]);
+			continue;
+		}
 		if (item === val) {
 			item = 0;
 			(assigns ||= []).push("i[" + i + "]");
@@ -1001,6 +1077,19 @@ function writeSet(state, val, ref) {
 	writeArrayArg(state, ref, items, assigns && "((s,i)=>(" + assignsToString(assigns, "s") + ",i.forEach(i=>s.add(i)),s))(new Set,", "new Set(", needsId);
 	return true;
 }
+function isAncestorMember(state, container, member) {
+	if (member === null || typeof member !== "object" && typeof member !== "function") return false;
+	const ref = state.refs.get(member);
+	return ref !== void 0 && isCircular(container, ref);
+}
+function deferCall(state, ref, method, args) {
+	ensureId(state, ref);
+	(ref.calls ||= []).push({
+		method,
+		args
+	});
+	state.assigned.add(ref);
+}
 function writeArrayArg(state, ref, items, assignsPrefix, plainPrefix, needsId) {
 	if (assignsPrefix || needsId) {
 		const arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
@@ -1021,6 +1110,20 @@ function isDedupedMember(val) {
 		default: return false;
 	}
 }
+function canWriteBuffer(state, buffer, ref) {
+	if (Object.getPrototypeOf(buffer)?.constructor === ArrayBuffer) return true;
+	throwUnserializable(state, buffer, ref, "buffer");
+	return false;
+}
+function writeDataView(state, val, ref) {
+	const { buffer } = val;
+	if (!canWriteBuffer(state, buffer, ref)) return false;
+	const needsLength = val.byteOffset + val.byteLength < buffer.byteLength;
+	state.buf.push("new DataView(");
+	writeProp(state, buffer, ref, "buffer");
+	state.buf.push((val.byteOffset || needsLength ? "," + val.byteOffset + (needsLength ? "," + val.byteLength : "") : "") + ")");
+	return true;
+}
 function writeArrayBuffer(state, val) {
 	let result;
 	if (val.byteLength) {
@@ -1032,6 +1135,7 @@ function writeArrayBuffer(state, val) {
 }
 function writeTypedArray(state, val, ref) {
 	if (val.byteOffset || val.byteLength < val.buffer.byteLength || state.refs.has(val.buffer)) {
+		if (!canWriteBuffer(state, val.buffer, ref)) return false;
 		const needsLength = val.byteOffset + val.byteLength < val.buffer.byteLength;
 		state.buf.push("new " + val.constructor.name + "(");
 		writeProp(state, val.buffer, ref, "buffer");
@@ -1191,6 +1295,34 @@ function writeResponse(state, val, ref) {
 	}
 	return true;
 }
+function writeIntl(state, val, name, ref) {
+	const { locale, ...options } = val.resolvedOptions();
+	let needsId = false;
+	for (const key in options) if (isDedupedMember(options[key])) {
+		needsId = true;
+		break;
+	}
+	state.buf.push("new Intl." + name + "(" + quote(locale, 0) + ",");
+	let optionsRef;
+	if (needsId) {
+		optionsRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		state.buf.push(optionsRef.id + "={");
+	} else {
+		optionsRef = new Reference(ref, null, state.flush, state.buf.length);
+		state.buf.push("{");
+	}
+	writeObjectProps(state, options, optionsRef);
+	state.buf.push("})");
+	return true;
+}
+function writeIntlLocale(state, val) {
+	state.buf.push("new Intl.Locale(" + quote(val.toString(), 0) + ")");
+	return true;
+}
+function writeTemporal(state, val, name) {
+	state.buf.push("Temporal." + name + ".from(" + quote(val.toString(), 0) + ")");
+	return true;
+}
 function writeReadableStream(state, val, ref) {
 	const { boundary, channel } = state;
 	if (!boundary || val.locked) return false;
@@ -1345,6 +1477,7 @@ function throwUnserializable(state, cause, ref = null, accessor = "") {
 		if (accessor) access = toAccess(accessor) + access;
 		if (access[0] === ".") access = access.slice(1);
 		if (access) message += ` (reading ${access})`;
+		message += ". Values referenced in the browser must be serializable.";
 		const err = new TypeError(message, { cause });
 		err.stack = void 0;
 		state.boundary.abort(err);
@@ -1778,6 +1911,10 @@ function _trailers(html) {
 function _resume(val, id, scopeId) {
 	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
 }
+function _resume_locals(val, id, locals, ownerScopeId) {
+	if (ownerScopeId !== void 0) locals["_"] = _scope_with_id(ownerScopeId);
+	return register(id, val, writeScope(_scope_id(), locals));
+}
 function _el(scopeId, id) {
 	return _resume(() => _el_read_error(), id, scopeId);
 }
@@ -1797,7 +1934,7 @@ function _sep(shouldResume) {
 }
 function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
-	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { ["#ClosestBranchId"]: branchId });
+	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { [ClosestBranchId]: branchId });
 }
 function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
 	const shouldResume = serializeReason !== 0;
@@ -1807,8 +1944,8 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
 	else render();
 	if (_peek_scope_id() !== branchId) {
 		if (shouldResume) writeScope(scopeId, {
-			["BranchScopes:" + nodeAccessor]: writeScope(branchId, {}),
-			["ConditionalRenderer:" + nodeAccessor]: render?.["id"]
+			[BranchScopes + nodeAccessor]: writeScope(branchId, {}),
+			[ConditionalRenderer + nodeAccessor]: render?.["id"]
 		});
 	} else _scope_id();
 }
@@ -1819,8 +1956,8 @@ function normalizeServerRender(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 });
+	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;
@@ -1896,11 +2033,11 @@ function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeM
 		}
 		withBranchId(branchId, () => {
 			render();
-			const branchScope = writeScope(branchId, resumeKeys && !sameAsIndex ? { ["#LoopKey"]: itemKey } : {});
+			const branchScope = writeScope(branchId, resumeKeys && !sameAsIndex ? { [LoopKey]: itemKey } : {});
 			if (!resumeMarker) loopScopes = push(loopScopes, branchScope);
 		});
 	});
-	if (loopScopes) writeScope(scopeId, { ["BranchScopes:" + accessor]: loopScopes });
+	if (loopScopes) writeScope(scopeId, { [BranchScopes + accessor]: loopScopes });
 	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
@@ -1912,8 +2049,8 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
 	const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
 	const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
 	if (shouldWriteBranch && (branchIndex || !resumeMarker)) writeScope(scopeId, {
-		["ConditionalRenderer:" + accessor]: branchIndex || void 0,
-		["BranchScopes:" + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
+		[ConditionalRenderer + accessor]: branchIndex || void 0,
+		[BranchScopes + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
 	});
 	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, shouldWriteBranch ? " " + branchId : "");
 }
@@ -2046,9 +2183,9 @@ function _try(scopeId, accessor, content, input) {
 	else if (placeholderContent) tryPlaceholder(content, placeholderContent, branchId);
 	else content();
 	writeScope(branchId, {
-		["#BranchAccessor"]: accessor,
-		["#CatchContent"]: catchContent,
-		["#PlaceholderContent"]: placeholderContent
+		[BranchAccessor]: accessor,
+		[CatchContent]: catchContent,
+		[PlaceholderContent]: placeholderContent
 	});
 	$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 }
@@ -2121,7 +2258,6 @@ function tryCatch(content, catchContent) {
 }
 const NOOP$2 = () => {};
 var State = class {
-	$global;
 	tagId = 1;
 	scopeId = 1;
 	reorderId = 1;
@@ -2143,6 +2279,7 @@ var State = class {
 	writeScopes = {};
 	readyIds = null;
 	serializeReason;
+	$global;
 	constructor($global) {
 		this.$global = $global;
 		if ($global.cspNonce) this.nonceAttr = " nonce" + attrAssignment($global.cspNonce);
@@ -2185,10 +2322,10 @@ var State = class {
 	}
 };
 var Boundary = class extends AbortController {
-	state;
-	parent;
 	onNext = NOOP$2;
 	count = 0;
+	state;
+	parent;
 	constructor(state, signal, parent) {
 		super();
 		this.state = state;
@@ -2218,10 +2355,6 @@ var Boundary = class extends AbortController {
 	}
 };
 var Chunk = class Chunk {
-	boundary;
-	next;
-	context;
-	serializeState;
 	html = "";
 	scripts = "";
 	effects = "";
@@ -2232,6 +2365,10 @@ var Chunk = class Chunk {
 	reorderId = null;
 	deferredReady = null;
 	placeholder = null;
+	boundary;
+	next;
+	context;
+	serializeState;
 	constructor(boundary, next, context, serializeState) {
 		this.boundary = boundary;
 		this.next = next;
@@ -2727,7 +2864,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 					if (isEventHandler(name)) {
 						if (!events) {
 							events = {};
-							writeScope(scopeId, { ["EventAttributes:" + nodeAccessor]: events });
+							writeScope(scopeId, { [EventAttributes + nodeAccessor]: events });
 						}
 						events[getEventHandlerName(name)] = value;
 					} else result += nonVoidAttr(name, value);
@@ -2756,12 +2893,12 @@ function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, seri
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
 	assertHandlerIsFunction("valueChange", valueChange);
 	writeScope(scopeId, serializeType ? {
-		["ControlledType:" + nodeAccessor]: type,
-		["ControlledValue:" + nodeAccessor]: value,
-		["ControlledHandler:" + nodeAccessor]: valueChange
+		[ControlledType + nodeAccessor]: type,
+		[ControlledValue + nodeAccessor]: value,
+		[ControlledHandler + nodeAccessor]: valueChange
 	} : {
-		["ControlledValue:" + nodeAccessor]: value,
-		["ControlledHandler:" + nodeAccessor]: valueChange
+		[ControlledValue + nodeAccessor]: value,
+		[ControlledHandler + nodeAccessor]: valueChange
 	});
 }
 function stringAttr(name, value) {
@@ -2836,7 +2973,7 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			const childScope = getScopeById(branchId);
 			const needsScript = childScope && (childScope[`EventAttributes:#${renderer}/0`] || childScope[`ControlledHandler:#${renderer}/0`]);
 			if (needsScript) {
-				writeScope(branchId, { ["#Renderer"]: renderer });
+				writeScope(branchId, { [Renderer]: renderer });
 				_script(branchId, DYNAMIC_TAG_SCRIPT_REGISTER_ID);
 			}
 			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
@@ -2861,7 +2998,7 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		if (shouldResume) _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
 	}
 	if (rendered) {
-		if (shouldResume) writeScope(scopeId, { ["ConditionalRenderer:" + accessor]: renderer?.["id"] || renderer });
+		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer + accessor]: renderer?.["id"] || renderer });
 	} else _scope_id();
 	return result;
 };
@@ -2884,7 +3021,7 @@ const patchDynamicTag = ((originalDynamicTag) => (patch) => {
 const CONSUMED_RESULT_MESSAGE = "Cannot read from a consumed render result";
 const _template = (templateId, renderer, page) => {
 	renderer.render = render;
-	renderer["embed"] = !page;
+	renderer[Embed] = !page;
 	renderer._ = renderer;
 	renderer.mount = () => {
 		throw new Error(`mount() is not implemented for the HTML compilation of a Marko template`);
@@ -2938,7 +3075,9 @@ var ServerRendered = class {
 		const boundary = this.#read((html) => {
 			value += html;
 			if (resolve) {
-				resolve({
+				const settle = resolve;
+				resolve = reject = void 0;
+				settle({
 					value,
 					done
 				});
@@ -2947,11 +3086,17 @@ var ServerRendered = class {
 		}, (err) => {
 			aborted = true;
 			reason = err;
-			if (reject) reject(err);
+			if (reject) {
+				const settle = reject;
+				resolve = reject = void 0;
+				settle(err);
+			}
 		}, () => {
 			done = true;
 			if (resolve) {
-				resolve({
+				const settle = resolve;
+				resolve = reject = void 0;
+				settle({
 					value,
 					done: !value
 				});
@@ -3365,6 +3510,7 @@ exports._if = _if;
 exports._peek_scope_id = _peek_scope_id;
 exports._resume = _resume;
 exports._resume_branch = _resume_branch;
+exports._resume_locals = _resume_locals;
 Object.defineProperty(exports, "_scope", {
 	enumerable: true,
 	get: function() {