marko 6.3.20 → 6.3.22

package/dist/html/writer.d.ts

@@ -1,6 +1,8 @@
 import { _hoist_read_error } from "../common/errors";
 import { type Opt } from "../common/opt";
 import { type $Global, type Accessor, type Falsy, ResumeSymbol } from "../common/types";
+import * as FlushStatus from "./constants/flush-status";
+import * as Mark from "./constants/mark";
 import { K_SCOPE_ID, Serializer } from "./serializer";
 import type { ServerRenderer } from "./template";
 export type PartialScope = Record<Accessor, unknown>;
@@ -36,6 +38,7 @@ export declare function writeScript(script: string): void;
 export declare function _script(scopeId: number, registryId: string): void;
 export declare function _trailers(html: string): void;
 export declare function _resume<T extends WeakKey>(val: T, id: string, scopeId?: number): T;
+export declare function _resume_locals<T extends WeakKey>(val: T, id: string, locals: Record<string, unknown>, ownerScopeId?: number): T;
 export declare function _el(scopeId: number, id: string): () => void;
 export declare function _hoist(scopeId: number, id: string): {
     (): void;
@@ -73,16 +76,9 @@ export declare function _try(scopeId: number, accessor: Accessor, content: () =>
         content?(err: unknown): void;
     };
 }): void;
-declare enum Mark {
-    Placeholder = "!^",
-    PlaceholderEnd = "!",
-    ReorderMarker = "#"
-}
+declare const NOOP: () => void;
+type Mark = Mark.Value;
 export declare class State implements SerializeState {
-    $global: $Global & {
-        renderId: string;
-        runtimeId: string;
-    };
     tagId: number;
     scopeId: number;
     reorderId: number;
@@ -104,6 +100,10 @@ export declare class State implements SerializeState {
     writeScopes: Record<number, PartialScope>;
     readyIds: Set<string> | null;
     serializeReason: SerializeReasonValue;
+    $global: $Global & {
+        renderId: string;
+        runtimeId: string;
+    };
     constructor($global: $Global & {
         renderId: string;
         runtimeId: string;
@@ -116,26 +116,19 @@ export declare class State implements SerializeState {
     nextReorderId(): string;
     mark(code: ResumeSymbol | Mark, str: string): string;
 }
-export declare enum FlushStatus {
-    complete = 0,
-    continue = 1,
-    aborted = 2
-}
+type FlushStatus = FlushStatus.Value;
+export { FlushStatus };
 export declare class Boundary extends AbortController {
-    state: State;
-    parent?: Boundary | undefined;
-    onNext: () => void;
+    onNext: typeof NOOP;
     count: number;
-    constructor(state: State, signal?: AbortSignal, parent?: Boundary | undefined);
-    flush(): FlushStatus;
+    state: State;
+    parent?: Boundary;
+    constructor(state: State, signal?: AbortSignal, parent?: Boundary);
+    flush(): 0 | 1 | 2;
     startAsync(): void;
     endAsync(): void;
 }
 export declare class Chunk {
-    boundary: Boundary;
-    next: Chunk | null;
-    context: Record<string | symbol, unknown> | null;
-    serializeState: SerializeState;
     html: string;
     scripts: string;
     effects: string;
@@ -150,6 +143,10 @@ export declare class Chunk {
         render: () => void;
         branchId: number;
     } | null;
+    boundary: Boundary;
+    next: Chunk | null;
+    context: Record<string | symbol, unknown> | null;
+    serializeState: SerializeState;
     constructor(boundary: Boundary, next: Chunk | null, context: Record<string | symbol, unknown> | null, serializeState: SerializeState);
     fork(boundary: Boundary, next: Chunk | null): Chunk;
     writeHTML(html: string): void;

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, forInBy, forOf, forOfBy, forStepBy, 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, _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _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, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";

package/dist/html.js

@@ -455,14 +455,15 @@ var State$1 = class {
 	channelDeps = null;
 	mutated = [];
 }, 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, this.flush = flush, this.pos = pos, this.id = id;
 	}
@@ -527,9 +528,20 @@ function writeScopesRoot(state, flushes) {
 function writeAssigned(state) {
 	let sep = state.buf.length ? "," : "";
 	if (state.assigned.size) {
-		let buf = "";
-		for (let ref of state.assigned) buf += sep + assignsToString(ref.assigns, ref.id), ref.assigns = null, sep = ",";
-		state.buf.push(buf), state.assigned = /* @__PURE__ */ new Set();
+		let assigned = state.assigned;
+		state.assigned = /* @__PURE__ */ new Set();
+		let buf = "", hasCalls = !1;
+		for (let ref of assigned) ref.assigns && (buf += sep + assignsToString(ref.assigns, ref.id), ref.assigns = null, sep = ","), hasCalls ||= ref.calls !== null;
+		if (buf && state.buf.push(buf), hasCalls) {
+			for (let ref of assigned) if (ref.calls) {
+				for (let { method, args } of ref.calls) {
+					state.buf.push((state.buf.length ? "," : "") + ref.id + "." + method + "(");
+					for (let a = 0; a < args.length; a++) a && state.buf.push(","), writeCallArg(state, args[a]);
+					state.buf.push(")");
+				}
+				ref.calls = null;
+			}
+		}
 	}
 	if (hasChannelMutations(state)) {
 		let remaining = [];
@@ -550,8 +562,12 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			state.buf.push(")");
 		}
-		state.mutated = remaining, state.assigned.size && writeAssigned(state);
+		state.mutated = remaining;
 	}
+	state.assigned.size && writeAssigned(state);
+}
+function writeCallArg(state, val) {
+	val === void 0 ? (state.wroteUndefined = !0, state.buf.push("$")) : writeProp(state, val, null, "") || state.buf.push("void 0");
 }
 function hasChannelMutations(state) {
 	return hasMatchingMutations(state.mutated, state.channel?.readyId);
@@ -688,6 +704,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);
@@ -697,6 +714,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");
 	}
 	return !1;
 }
@@ -730,22 +765,51 @@ function newAsyncHandle(state, parent, id) {
 }
 function writeMap(state, val, ref) {
 	if (!val.size) return state.buf.push("new Map"), !0;
-	let items = [], assigns, needsId, i = 0;
+	let items = [], assigns, needsId, deferring = !1, i = 0;
 	if (val.size < 25) {
-		for (let [itemKey, itemValue] of val) itemKey === val && (itemKey = void 0, (assigns ||= []).push("a[" + i + "][0]")), itemValue === val && (itemValue = void 0, (assigns ||= []).push("a[" + i + "][1]")), needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue), i = items.push(itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]);
+		for (let [itemKey, itemValue] of val) {
+			if (!deferring && (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue)) && (deferring = !0), deferring) {
+				deferCall(state, ref, "set", [itemKey, itemValue]);
+				continue;
+			}
+			itemKey === val && (itemKey = void 0, (assigns ||= []).push("a[" + i + "][0]")), itemValue === val && (itemValue = void 0, (assigns ||= []).push("a[" + i + "][1]")), needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue), i = items.push(itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]);
+		}
 		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) itemKey === val && (itemKey = 0, (assigns ||= []).push("a[" + i + "]")), itemValue === val && (itemValue = 0, (assigns ||= []).push("a[" + (i + 1) + "]")), needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue), i = items.push(itemKey, itemValue);
+		for (let [itemKey, itemValue] of val) {
+			if (!deferring && (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue)) && (deferring = !0), deferring) {
+				deferCall(state, ref, "set", [itemKey, itemValue]);
+				continue;
+			}
+			itemKey === val && (itemKey = 0, (assigns ||= []).push("a[" + i + "]")), itemValue === val && (itemValue = 0, (assigns ||= []).push("a[" + (i + 1) + "]")), needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue), i = items.push(itemKey, itemValue);
+		}
 		writeArrayArg(state, ref, items, assigns && "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1])," + assignsToString(assigns, "new Map") + "))(", "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1]),new Map))(", needsId);
 	}
 	return !0;
 }
 function writeSet(state, val, ref) {
 	if (!val.size) return state.buf.push("new Set"), !0;
-	let items = [], assigns, needsId, i = 0;
-	for (let item of val) item === val ? (item = 0, (assigns ||= []).push("i[" + i + "]")) : needsId ||= isDedupedMember(item), i = items.push(item);
+	let items = [], assigns, needsId, deferring = !1, i = 0;
+	for (let item of val) {
+		if (!deferring && item !== val && isAncestorMember(state, ref, item) && (deferring = !0), deferring) {
+			deferCall(state, ref, "add", [item]);
+			continue;
+		}
+		item === val ? (item = 0, (assigns ||= []).push("i[" + i + "]")) : needsId ||= isDedupedMember(item), i = items.push(item);
+	}
 	return writeArrayArg(state, ref, items, assigns && "((s,i)=>(" + assignsToString(assigns, "s") + ",i.forEach(i=>s.add(i)),s))(new Set,", "new Set(", needsId), !0;
 }
+function isAncestorMember(state, container, member) {
+	if (member === null || typeof member != "object" && typeof member != "function") return !1;
+	let 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) {
 		let arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
@@ -762,6 +826,15 @@ function isDedupedMember(val) {
 		default: return !1;
 	}
 }
+function canWriteBuffer(state, buffer, ref) {
+	return Object.getPrototypeOf(buffer)?.constructor === ArrayBuffer;
+}
+function writeDataView(state, val, ref) {
+	let { buffer } = val;
+	if (!canWriteBuffer(state, buffer, ref)) return !1;
+	let needsLength = val.byteOffset + val.byteLength < buffer.byteLength;
+	return state.buf.push("new DataView("), writeProp(state, buffer, ref, "buffer"), state.buf.push((val.byteOffset || needsLength ? "," + val.byteOffset + (needsLength ? "," + val.byteLength : "") : "") + ")"), !0;
+}
 function writeArrayBuffer(state, val) {
 	let result;
 	if (val.byteLength) {
@@ -772,6 +845,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 !1;
 		let needsLength = val.byteOffset + val.byteLength < val.buffer.byteLength;
 		state.buf.push("new " + val.constructor.name + "("), writeProp(state, val.buffer, ref, "buffer"), state.buf.push((val.byteOffset || needsLength ? "," + val.byteOffset + (needsLength ? "," + val.length : "") : "") + ")");
 	} else state.refs.set(val.buffer, new Reference(ref, "buffer", state.flush, null)), state.buf.push("new " + val.constructor.name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));
@@ -845,6 +919,22 @@ function writeResponse(state, val, ref) {
 	}
 	return !val.body || val.bodyUsed ? state.buf.push("new Response" + (options ? "(null,{" + options + "})" : "")) : (state.buf.push("new Response("), state.buf.push((writeProp(state, val.body, ref, "body") ? "" : "null") + (options ? ",{" + options + "})" : ")"))), !0;
 }
+function writeIntl(state, val, name, ref) {
+	let { locale, ...options } = val.resolvedOptions(), needsId = !1;
+	for (let key in options) if (isDedupedMember(options[key])) {
+		needsId = !0;
+		break;
+	}
+	state.buf.push("new Intl." + name + "(" + quote(locale, 0) + ",");
+	let optionsRef;
+	return needsId ? (optionsRef = new Reference(ref, null, state.flush, null, nextRefAccess(state)), state.buf.push(optionsRef.id + "={")) : (optionsRef = new Reference(ref, null, state.flush, state.buf.length), state.buf.push("{")), writeObjectProps(state, options, optionsRef), state.buf.push("})"), !0;
+}
+function writeIntlLocale(state, val) {
+	return state.buf.push("new Intl.Locale(" + quote(val.toString(), 0) + ")"), !0;
+}
+function writeTemporal(state, val, name) {
+	return state.buf.push("Temporal." + name + ".from(" + quote(val.toString(), 0) + ")"), !0;
+}
 function writeReadableStream(state, val, ref) {
 	let { boundary, channel } = state;
 	if (!boundary || val.locked) return !1;
@@ -1201,6 +1291,9 @@ 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) {
+	return ownerScopeId !== void 0 && (locals._ = _scope_with_id(ownerScopeId)), register(id, val, writeScope(_scope_id(), locals));
+}
 function _el(scopeId, id) {
 	return _resume(() => void 0, id, scopeId);
 }
@@ -1420,7 +1513,6 @@ function tryCatch(content, catchContent) {
 	};
 }
 var State = class {
-	$global;
 	tagId = 1;
 	scopeId = 1;
 	reorderId = 1;
@@ -1442,6 +1534,7 @@ var State = class {
 	writeScopes = {};
 	readyIds = null;
 	serializeReason;
+	$global;
 	constructor($global) {
 		this.$global = $global, $global.cspNonce && (this.nonceAttr = " nonce" + attrAssignment($global.cspNonce));
 	}
@@ -1472,10 +1565,10 @@ var State = class {
 		return "<!--" + this.commentPrefix + code + str + "-->";
 	}
 }, Boundary = class extends AbortController {
-	state;
-	parent;
 	onNext = NOOP$2;
 	count = 0;
+	state;
+	parent;
 	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();
@@ -1493,10 +1586,6 @@ var State = class {
 		!this.signal.aborted && this.count && (this.count--, this.onNext());
 	}
 }, Chunk = class Chunk {
-	boundary;
-	next;
-	context;
-	serializeState;
 	html = "";
 	scripts = "";
 	effects = "";
@@ -1507,6 +1596,10 @@ var State = class {
 	reorderId = null;
 	deferredReady = null;
 	placeholder = null;
+	boundary;
+	next;
+	context;
+	serializeState;
 	constructor(boundary, next, context, serializeState) {
 		this.boundary = boundary, this.next = next, this.context = context, this.serializeState = serializeState;
 	}
@@ -1901,17 +1994,26 @@ var ServerRendered = class {
 	}
 	[Symbol.asyncIterator]() {
 		let resolve, reject, value = "", done = !1, aborted = !1, reason, boundary = this.#read((html) => {
-			value += html, resolve && (resolve({
-				value,
-				done
-			}), value = "");
+			if (value += html, resolve) {
+				let settle = resolve;
+				resolve = reject = void 0, settle({
+					value,
+					done
+				}), value = "";
+			}
 		}, (err) => {
-			aborted = !0, reason = err, reject && reject(err);
+			if (aborted = !0, reason = err, reject) {
+				let settle = reject;
+				resolve = reject = void 0, settle(err);
+			}
 		}, () => {
-			done = !0, resolve && (resolve({
-				value,
-				done: !value
-			}), value = "");
+			if (done = !0, resolve) {
+				let settle = resolve;
+				resolve = reject = void 0, settle({
+					value,
+					done: !value
+				}), value = "";
+			}
 		});
 		return {
 			next() {
@@ -2093,4 +2195,4 @@ exports.$global = $global, exports._assert_hoist = _assert_hoist, exports._attr
 	get: function() {
 		return _dynamic_tag;
 	}
-}), exports._el = _el, exports._el_read_error = _el_read_error, exports._el_resume = _el_resume, exports._escape = _escape, exports._escape_comment = _escape_comment, exports._escape_script = _escape_script, exports._escape_style = _escape_style, exports._escape_style_value = _escape_style_value, exports._existing_scope = _existing_scope, exports._flush_head = _flush_head, exports._for_in = _for_in, exports._for_of = _for_of, exports._for_to = _for_to, exports._for_until = _for_until, exports._hoist = _hoist, exports._hoist_read_error = _hoist_read_error, exports._html = _html, exports._id = _id, exports._if = _if, exports._peek_scope_id = _peek_scope_id, exports._resume = _resume, exports._resume_branch = _resume_branch, exports._scope = writeScope, exports._scope_id = _scope_id, exports._scope_reason = _scope_reason, exports._scope_with_id = _scope_with_id, exports._script = _script, exports._sep = _sep, exports._serialize_guard = _serialize_guard, exports._serialize_if = _serialize_if, exports._set_serialize_reason = _set_serialize_reason, exports._show_end = _show_end, exports._show_start = _show_start, exports._style_html = _style_html, exports._subscribe = _subscribe, exports._template = _template, exports._textarea_value = _textarea_value, exports._to_text = _to_text, exports._trailers = _trailers, exports._try = _try, exports._unescaped = _unescaped, exports._var = _var, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forInBy = forInBy, exports.forOf = forOf, exports.forOfBy = forOfBy, exports.forStepBy = forStepBy, exports.forTo = forTo, exports.forUntil = forUntil, exports.withLoadAssets = withLoadAssets, exports.withPageAssets = withPageAssets;
+}), exports._el = _el, exports._el_read_error = _el_read_error, exports._el_resume = _el_resume, exports._escape = _escape, exports._escape_comment = _escape_comment, exports._escape_script = _escape_script, exports._escape_style = _escape_style, exports._escape_style_value = _escape_style_value, exports._existing_scope = _existing_scope, exports._flush_head = _flush_head, exports._for_in = _for_in, exports._for_of = _for_of, exports._for_to = _for_to, exports._for_until = _for_until, exports._hoist = _hoist, exports._hoist_read_error = _hoist_read_error, exports._html = _html, exports._id = _id, exports._if = _if, exports._peek_scope_id = _peek_scope_id, exports._resume = _resume, exports._resume_branch = _resume_branch, exports._resume_locals = _resume_locals, exports._scope = writeScope, exports._scope_id = _scope_id, exports._scope_reason = _scope_reason, exports._scope_with_id = _scope_with_id, exports._script = _script, exports._sep = _sep, exports._serialize_guard = _serialize_guard, exports._serialize_if = _serialize_if, exports._set_serialize_reason = _set_serialize_reason, exports._show_end = _show_end, exports._show_start = _show_start, exports._style_html = _style_html, exports._subscribe = _subscribe, exports._template = _template, exports._textarea_value = _textarea_value, exports._to_text = _to_text, exports._trailers = _trailers, exports._try = _try, exports._unescaped = _unescaped, exports._var = _var, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forInBy = forInBy, exports.forOf = forOf, exports.forOfBy = forOfBy, exports.forStepBy = forStepBy, exports.forTo = forTo, exports.forUntil = forUntil, exports.withLoadAssets = withLoadAssets, exports.withPageAssets = withPageAssets;