marko 6.3.2 → 6.3.4

package/dist/html.js

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty: hasOwnProperty$1 } = {}, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty: hasOwnProperty$1 } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -323,14 +323,14 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 		if (boundary.flush() === 1) throw Error("Cannot serialize promise across tags/class compat layer.");
 		return new Chunk(boundary, null, null, state).flushScript().scripts;
 	},
-	render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
 		let state = this.ensureState(classAPIOut.global), boundary = new Boundary(state), head = new Chunk(boundary, null, null, state), normalizedInput = input;
 		if ("renderBody" in input) {
 			normalizedInput = {};
 			for (let key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
 		}
 		head.render(() => {
-			if (willRerender) {
+			if (willRerender || registerChildScope) {
 				let scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
@@ -565,8 +565,6 @@ function writeProp(state, val, parent, accessor) {
 	}
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
-	let scopeId = val[K_SCOPE_ID];
-	if (scopeId !== void 0) return trackScope(state, val, scopeId), state.buf.push("_(" + scopeId + ")"), !0;
 	let ref = state.refs.get(val);
 	if (ref) {
 		if (!trackChannel(state, ref)) return !1;
@@ -639,11 +637,16 @@ function writeNull(state) {
 }
 function writeObject(state, val, parent, accessor) {
 	if (val === null) return writeNull(state);
+	let scopeId = val[K_SCOPE_ID];
+	if (scopeId !== void 0) return trackScope(state, val, scopeId), state.buf.push("_(" + scopeId + ")"), !0;
 	let wellKnownObject = KNOWN_OBJECTS.get(val);
 	return wellKnownObject ? (state.buf.push(wellKnownObject), !0) : writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (Object.getPrototypeOf(val)?.constructor) {
+	let proto = Object.getPrototypeOf(val);
+	if (proto === objectProto) return writePlainObject(state, val, ref);
+	if (proto === arrayProto) return writeArray(state, val, ref);
+	switch (proto?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -685,7 +688,7 @@ function writeUnknownObject(state, val, ref) {
 	return !1;
 }
 function writePlainObject(state, val, ref) {
-	return state.buf.push("{"), writeObjectProps(state, val, ref), state.buf.push("}"), !0;
+	return state.buf.push("{"), writeMaybeIterableProps(state, val, ref), state.buf.push("}"), !0;
 }
 function writeArray(state, val, ref) {
 	let sep = "[";
@@ -843,7 +846,7 @@ function writeAsyncGenerator(state, iter, ref) {
 	return state.buf.push("(async function*(_,f,v,l,i,p=a=>l=new Promise((r,j)=>{f=_.r=r;_.j=j}),a=((_.f=v=>{f(v);a.push(p())}),[p()])){for(i of a)v=await i,i!=l&&(yield v);return v})(" + iterId + "={})"), iter.next().then(onFulfilled, onRejected), boundary.startAsync(), !0;
 }
 function writeNullObject(state, val, ref) {
-	return state.buf.push("{"), state.buf.push(writeObjectProps(state, val, ref) + "__proto__:null}"), !0;
+	return state.buf.push("{"), state.buf.push(writeMaybeIterableProps(state, val, ref) + "__proto__:null}"), !0;
 }
 function writeObjectProps(state, val, ref) {
 	let sep = "";
@@ -851,6 +854,10 @@ function writeObjectProps(state, val, ref) {
 		let escapedKey = toObjectKey(key);
 		state.buf.push(sep + escapedKey + ":"), writeProp(state, val[key], ref, escapedKey) ? sep = "," : state.buf.pop();
 	}
+	return sep;
+}
+function writeMaybeIterableProps(state, val, ref) {
+	let sep = writeObjectProps(state, val, ref);
 	if (hasSymbolIterator(val)) {
 		let yieldSelf = "", iterArr = [];
 		for (let item of val) item === val && !(yieldSelf || iterArr.length) ? yieldSelf = "yield this;" : iterArr.push(item);
@@ -892,14 +899,18 @@ function isCircular(parent, ref) {
 function toObjectKey(name) {
 	if (name === "") return "\"\"";
 	if (name === "__proto__") return "[\"__proto__\"]";
-	let startChar = name[0];
-	if (isDigit(startChar)) {
-		if (startChar === "0") {
-			if (name !== "0") return quote(name, 1);
-		} else for (let i = 1; i < name.length; i++) if (!isDigit(name[i])) return quote(name, i);
-	} else if (isWord(startChar)) {
-		for (let i = 1; i < name.length; i++) if (!isWordOrDigit(name[i])) return quote(name, i);
-	} else return quote(name, 0);
+	let len = name.length, c0 = name.charCodeAt(0);
+	if (c0 >= 48 && c0 <= 57) if (c0 === 48) {
+		if (len !== 1) return quote(name, 1);
+	} else for (let i = 1; i < len; i++) {
+		let c = name.charCodeAt(i);
+		if (c < 48 || c > 57) return quote(name, i);
+	}
+	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
+		let c = name.charCodeAt(i);
+		if (!(c >= 97 && c <= 122 || c >= 65 && c <= 90 || c >= 48 && c <= 57 || c === 95 || c === 36)) return quote(name, i);
+	}
+	else return quote(name, 0);
 	return name;
 }
 function toAccess(accessor) {
@@ -1009,15 +1020,6 @@ function hasOnlyZeros(typedArray) {
 	for (let i = 0; i < typedArray.length; i++) if (typedArray[i] !== 0) return !1;
 	return !0;
 }
-function isWordOrDigit(char) {
-	return isWord(char) || isDigit(char);
-}
-function isDigit(char) {
-	return char >= "0" && char <= "9";
-}
-function isWord(char) {
-	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
-}
 function patchIteratorNext(proto) {
 	if (proto.next[kTouchedIterator]) return;
 	let { next } = proto;
@@ -1885,7 +1887,7 @@ var ServerRendered = class {
 	}
 	pipe(stream) {
 		this.#read((html) => {
-			stream.write(html);
+			stream.write(html), stream.flush?.();
 		}, (err) => {
 			let socket = "socket" in stream && stream.socket;
 			if (socket && typeof socket.destroySoon == "function" && socket.destroySoon(), !stream.emit?.("error", err)) throw err;
@@ -1894,21 +1896,21 @@ var ServerRendered = class {
 		});
 	}
 	toReadable() {
-		let cancelled = !1, boundary, encoder = new TextEncoder();
+		let cancelled = !1, started = !1, boundary, encoder = new TextEncoder();
 		return new ReadableStream({
-			start: (ctrl) => {
-				boundary = this.#read((html) => {
+			pull: (ctrl) => {
+				started || (started = !0, boundary = this.#read((html) => {
 					ctrl.enqueue(encoder.encode(html));
 				}, (err) => {
 					boundary = void 0, cancelled || ctrl.error(err);
 				}, () => {
 					boundary = void 0, ctrl.close();
-				});
+				}));
 			},
 			cancel: (reason) => {
 				cancelled = !0, boundary?.abort(reason);
 			}
-		});
+		}, { highWaterMark: 0 });
 	}
 	then(onfulfilled, onrejected) {
 		return this.#promise().then(onfulfilled, onrejected);

package/dist/html.mjs

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty: hasOwnProperty$1 } = {}, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty: hasOwnProperty$1 } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -323,14 +323,14 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 		if (boundary.flush() === 1) throw Error("Cannot serialize promise across tags/class compat layer.");
 		return new Chunk(boundary, null, null, state).flushScript().scripts;
 	},
-	render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
 		let state = this.ensureState(classAPIOut.global), boundary = new Boundary(state), head = new Chunk(boundary, null, null, state), normalizedInput = input;
 		if ("renderBody" in input) {
 			normalizedInput = {};
 			for (let key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
 		}
 		head.render(() => {
-			if (willRerender) {
+			if (willRerender || registerChildScope) {
 				let scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
@@ -564,8 +564,6 @@ function writeProp(state, val, parent, accessor) {
 	}
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
-	let scopeId = val[K_SCOPE_ID];
-	if (scopeId !== void 0) return trackScope(state, val, scopeId), state.buf.push("_(" + scopeId + ")"), !0;
 	let ref = state.refs.get(val);
 	if (ref) {
 		if (!trackChannel(state, ref)) return !1;
@@ -638,11 +636,16 @@ function writeNull(state) {
 }
 function writeObject(state, val, parent, accessor) {
 	if (val === null) return writeNull(state);
+	let scopeId = val[K_SCOPE_ID];
+	if (scopeId !== void 0) return trackScope(state, val, scopeId), state.buf.push("_(" + scopeId + ")"), !0;
 	let wellKnownObject = KNOWN_OBJECTS.get(val);
 	return wellKnownObject ? (state.buf.push(wellKnownObject), !0) : writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (Object.getPrototypeOf(val)?.constructor) {
+	let proto = Object.getPrototypeOf(val);
+	if (proto === objectProto) return writePlainObject(state, val, ref);
+	if (proto === arrayProto) return writeArray(state, val, ref);
+	switch (proto?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -684,7 +687,7 @@ function writeUnknownObject(state, val, ref) {
 	return !1;
 }
 function writePlainObject(state, val, ref) {
-	return state.buf.push("{"), writeObjectProps(state, val, ref), state.buf.push("}"), !0;
+	return state.buf.push("{"), writeMaybeIterableProps(state, val, ref), state.buf.push("}"), !0;
 }
 function writeArray(state, val, ref) {
 	let sep = "[";
@@ -842,7 +845,7 @@ function writeAsyncGenerator(state, iter, ref) {
 	return state.buf.push("(async function*(_,f,v,l,i,p=a=>l=new Promise((r,j)=>{f=_.r=r;_.j=j}),a=((_.f=v=>{f(v);a.push(p())}),[p()])){for(i of a)v=await i,i!=l&&(yield v);return v})(" + iterId + "={})"), iter.next().then(onFulfilled, onRejected), boundary.startAsync(), !0;
 }
 function writeNullObject(state, val, ref) {
-	return state.buf.push("{"), state.buf.push(writeObjectProps(state, val, ref) + "__proto__:null}"), !0;
+	return state.buf.push("{"), state.buf.push(writeMaybeIterableProps(state, val, ref) + "__proto__:null}"), !0;
 }
 function writeObjectProps(state, val, ref) {
 	let sep = "";
@@ -850,6 +853,10 @@ function writeObjectProps(state, val, ref) {
 		let escapedKey = toObjectKey(key);
 		state.buf.push(sep + escapedKey + ":"), writeProp(state, val[key], ref, escapedKey) ? sep = "," : state.buf.pop();
 	}
+	return sep;
+}
+function writeMaybeIterableProps(state, val, ref) {
+	let sep = writeObjectProps(state, val, ref);
 	if (hasSymbolIterator(val)) {
 		let yieldSelf = "", iterArr = [];
 		for (let item of val) item === val && !(yieldSelf || iterArr.length) ? yieldSelf = "yield this;" : iterArr.push(item);
@@ -891,14 +898,18 @@ function isCircular(parent, ref) {
 function toObjectKey(name) {
 	if (name === "") return "\"\"";
 	if (name === "__proto__") return "[\"__proto__\"]";
-	let startChar = name[0];
-	if (isDigit(startChar)) {
-		if (startChar === "0") {
-			if (name !== "0") return quote(name, 1);
-		} else for (let i = 1; i < name.length; i++) if (!isDigit(name[i])) return quote(name, i);
-	} else if (isWord(startChar)) {
-		for (let i = 1; i < name.length; i++) if (!isWordOrDigit(name[i])) return quote(name, i);
-	} else return quote(name, 0);
+	let len = name.length, c0 = name.charCodeAt(0);
+	if (c0 >= 48 && c0 <= 57) if (c0 === 48) {
+		if (len !== 1) return quote(name, 1);
+	} else for (let i = 1; i < len; i++) {
+		let c = name.charCodeAt(i);
+		if (c < 48 || c > 57) return quote(name, i);
+	}
+	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
+		let c = name.charCodeAt(i);
+		if (!(c >= 97 && c <= 122 || c >= 65 && c <= 90 || c >= 48 && c <= 57 || c === 95 || c === 36)) return quote(name, i);
+	}
+	else return quote(name, 0);
 	return name;
 }
 function toAccess(accessor) {
@@ -1008,15 +1019,6 @@ function hasOnlyZeros(typedArray) {
 	for (let i = 0; i < typedArray.length; i++) if (typedArray[i] !== 0) return !1;
 	return !0;
 }
-function isWordOrDigit(char) {
-	return isWord(char) || isDigit(char);
-}
-function isDigit(char) {
-	return char >= "0" && char <= "9";
-}
-function isWord(char) {
-	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
-}
 function patchIteratorNext(proto) {
 	if (proto.next[kTouchedIterator]) return;
 	let { next } = proto;
@@ -1884,7 +1886,7 @@ var ServerRendered = class {
 	}
 	pipe(stream) {
 		this.#read((html) => {
-			stream.write(html);
+			stream.write(html), stream.flush?.();
 		}, (err) => {
 			let socket = "socket" in stream && stream.socket;
 			if (socket && typeof socket.destroySoon == "function" && socket.destroySoon(), !stream.emit?.("error", err)) throw err;
@@ -1893,21 +1895,21 @@ var ServerRendered = class {
 		});
 	}
 	toReadable() {
-		let cancelled = !1, boundary, encoder = new TextEncoder();
+		let cancelled = !1, started = !1, boundary, encoder = new TextEncoder();
 		return new ReadableStream({
-			start: (ctrl) => {
-				boundary = this.#read((html) => {
+			pull: (ctrl) => {
+				started || (started = !0, boundary = this.#read((html) => {
 					ctrl.enqueue(encoder.encode(html));
 				}, (err) => {
 					boundary = void 0, cancelled || ctrl.error(err);
 				}, () => {
 					boundary = void 0, ctrl.close();
-				});
+				}));
 			},
 			cancel: (reason) => {
 				cancelled = !0, boundary?.abort(reason);
 			}
-		});
+		}, { highWaterMark: 0 });
 	}
 	then(onfulfilled, onrejected) {
 		return this.#promise().then(onfulfilled, onrejected);