@marko/runtime-tags 6.3.6 → 6.3.8

package/dist/debug/dom.js

@@ -974,10 +974,11 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 	syncControllableFormInput(el, hasCheckboxChanged, () => {
 		const checkedValueChange = scope["ControlledHandler:" + nodeAccessor];
 		if (checkedValueChange) {
-			const oldValue = scope["ControlledValue:" + nodeAccessor];
+			const controlledValueKey = "ControlledValue:" + nodeAccessor;
+			const oldValue = scope[controlledValueKey];
 			const newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
 			if (el.name && el.type[0] === "r") {
-				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : oldValue === radio.value;
+				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
 			} else el.checked = !el.checked;
 			checkedValueChange(newValue);
 			run();

package/dist/debug/dom.mjs

@@ -972,10 +972,11 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 	syncControllableFormInput(el, hasCheckboxChanged, () => {
 		const checkedValueChange = scope["ControlledHandler:" + nodeAccessor];
 		if (checkedValueChange) {
-			const oldValue = scope["ControlledValue:" + nodeAccessor];
+			const controlledValueKey = "ControlledValue:" + nodeAccessor;
+			const oldValue = scope[controlledValueKey];
 			const newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
 			if (el.name && el.type[0] === "r") {
-				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : oldValue === radio.value;
+				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
 			} else el.checked = !el.checked;
 			checkedValueChange(newValue);
 			run();

package/dist/debug/html.js

@@ -1174,25 +1174,39 @@ function writeGenerator(state, iter, ref) {
 		state.buf.push("(function*(){}())");
 		return true;
 	}
-	let sep = "";
-	state.buf.push("(function*(){");
+	const yields = [];
+	let returnValue;
+	let needsId;
 	while (true) {
 		const { value, done } = iter.next();
 		if (done) {
-			if (value !== void 0) {
-				state.buf.push(sep + "return ");
-				writeProp(state, value, ref, "");
-			}
+			returnValue = value;
 			break;
 		}
-		if (value === void 0) state.buf.push(sep + "yield");
-		else {
-			state.buf.push(sep + "yield ");
-			writeProp(state, value, ref, "");
+		needsId ||= isDedupedMember(value);
+		yields.push(value);
+	}
+	if (returnValue === void 0 && !yields.length) {
+		state.buf.push("(function*(){})()");
+		return true;
+	}
+	state.buf.push(returnValue === void 0 ? "(function*(a){yield*a})(" : "(function*(a,r){yield*a;return r})(");
+	if (needsId) {
+		const arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		state.buf.push(arrayRef.id + "=");
+		writeArray(state, yields, arrayRef);
+	} else writeArray(state, yields, new Reference(ref, null, state.flush, state.buf.length));
+	if (returnValue !== void 0) {
+		const sepIndex = state.buf.push(",") - 1;
+		if (writeProp(state, returnValue, ref, "") && isDedupedMember(returnValue)) {
+			const retRef = typeof returnValue === "string" ? state.strs.get(returnValue) : state.refs.get(returnValue);
+			if (retRef && !retRef.id && retRef.scopeId === void 0) {
+				retRef.id = nextRefAccess(state);
+				state.buf[sepIndex] = "," + retRef.id + "=";
+			}
 		}
-		sep = ";";
 	}
-	state.buf.push("})()");
+	state.buf.push(")");
 	return true;
 }
 function writeAsyncGenerator(state, iter, ref) {
@@ -1327,9 +1341,12 @@ function toObjectKey(name) {
 	const 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++) {
-		const c = name.charCodeAt(i);
-		if (c < 48 || c > 57) return quote(name, i);
+	} else {
+		for (let i = 1; i < len; i++) {
+			const c = name.charCodeAt(i);
+			if (c < 48 || c > 57) return quote(name, i);
+		}
+		if (len > 15 && "" + +name !== name) return quote(name, 0);
 	}
 	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
 		const c = name.charCodeAt(i);

package/dist/debug/html.mjs

@@ -1172,25 +1172,39 @@ function writeGenerator(state, iter, ref) {
 		state.buf.push("(function*(){}())");
 		return true;
 	}
-	let sep = "";
-	state.buf.push("(function*(){");
+	const yields = [];
+	let returnValue;
+	let needsId;
 	while (true) {
 		const { value, done } = iter.next();
 		if (done) {
-			if (value !== void 0) {
-				state.buf.push(sep + "return ");
-				writeProp(state, value, ref, "");
-			}
+			returnValue = value;
 			break;
 		}
-		if (value === void 0) state.buf.push(sep + "yield");
-		else {
-			state.buf.push(sep + "yield ");
-			writeProp(state, value, ref, "");
+		needsId ||= isDedupedMember(value);
+		yields.push(value);
+	}
+	if (returnValue === void 0 && !yields.length) {
+		state.buf.push("(function*(){})()");
+		return true;
+	}
+	state.buf.push(returnValue === void 0 ? "(function*(a){yield*a})(" : "(function*(a,r){yield*a;return r})(");
+	if (needsId) {
+		const arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		state.buf.push(arrayRef.id + "=");
+		writeArray(state, yields, arrayRef);
+	} else writeArray(state, yields, new Reference(ref, null, state.flush, state.buf.length));
+	if (returnValue !== void 0) {
+		const sepIndex = state.buf.push(",") - 1;
+		if (writeProp(state, returnValue, ref, "") && isDedupedMember(returnValue)) {
+			const retRef = typeof returnValue === "string" ? state.strs.get(returnValue) : state.refs.get(returnValue);
+			if (retRef && !retRef.id && retRef.scopeId === void 0) {
+				retRef.id = nextRefAccess(state);
+				state.buf[sepIndex] = "," + retRef.id + "=";
+			}
 		}
-		sep = ";";
 	}
-	state.buf.push("})()");
+	state.buf.push(")");
 	return true;
 }
 function writeAsyncGenerator(state, iter, ref) {
@@ -1325,9 +1339,12 @@ function toObjectKey(name) {
 	const 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++) {
-		const c = name.charCodeAt(i);
-		if (c < 48 || c > 57) return quote(name, i);
+	} else {
+		for (let i = 1; i < len; i++) {
+			const c = name.charCodeAt(i);
+			if (c < 48 || c > 57) return quote(name, i);
+		}
+		if (len > 15 && "" + +name !== name) return quote(name, 0);
 	}
 	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
 		const c = name.charCodeAt(i);

package/dist/dom.js

@@ -618,8 +618,8 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 	isResuming && el.defaultChecked && (scope["G" + nodeAccessor] ? scope["G" + nodeAccessor].push(el.value) : scope["G" + nodeAccessor] = el.value), syncControllableFormInput(el, hasCheckboxChanged, () => {
 		let checkedValueChange = scope["E" + nodeAccessor];
 		if (checkedValueChange) {
-			let oldValue = scope["G" + nodeAccessor], newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
-			if (el.name && el.type[0] === "r") for (let radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) radio.form === el.form && (radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : oldValue === radio.value);
+			let controlledValueKey = "G" + nodeAccessor, oldValue = scope[controlledValueKey], newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
+			if (el.name && el.type[0] === "r") for (let radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) radio.form === el.form && (radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked);
 			else el.checked = !el.checked;
 			checkedValueChange(newValue), run();
 		}

package/dist/dom.mjs

@@ -617,8 +617,8 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 	isResuming && el.defaultChecked && (scope["G" + nodeAccessor] ? scope["G" + nodeAccessor].push(el.value) : scope["G" + nodeAccessor] = el.value), syncControllableFormInput(el, hasCheckboxChanged, () => {
 		let checkedValueChange = scope["E" + nodeAccessor];
 		if (checkedValueChange) {
-			let oldValue = scope["G" + nodeAccessor], newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
-			if (el.name && el.type[0] === "r") for (let radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) radio.form === el.form && (radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : oldValue === radio.value);
+			let controlledValueKey = "G" + nodeAccessor, oldValue = scope[controlledValueKey], newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
+			if (el.name && el.type[0] === "r") for (let radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) radio.form === el.form && (radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked);
 			else el.checked = !el.checked;
 			checkedValueChange(newValue), run();
 		}

package/dist/html.js

@@ -823,16 +823,28 @@ function writeReadableStream(state, val, ref) {
 }
 function writeGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) return state.buf.push("(function*(){}())"), !0;
-	let sep = "";
-	for (state.buf.push("(function*(){");;) {
+	let yields = [], returnValue, needsId;
+	for (;;) {
 		let { value, done } = iter.next();
 		if (done) {
-			value !== void 0 && (state.buf.push(sep + "return "), writeProp(state, value, ref, ""));
+			returnValue = value;
 			break;
 		}
-		value === void 0 ? state.buf.push(sep + "yield") : (state.buf.push(sep + "yield "), writeProp(state, value, ref, "")), sep = ";";
+		needsId ||= isDedupedMember(value), yields.push(value);
+	}
+	if (returnValue === void 0 && !yields.length) return state.buf.push("(function*(){})()"), !0;
+	if (state.buf.push(returnValue === void 0 ? "(function*(a){yield*a})(" : "(function*(a,r){yield*a;return r})("), needsId) {
+		let arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		state.buf.push(arrayRef.id + "="), writeArray(state, yields, arrayRef);
+	} else writeArray(state, yields, new Reference(ref, null, state.flush, state.buf.length));
+	if (returnValue !== void 0) {
+		let sepIndex = state.buf.push(",") - 1;
+		if (writeProp(state, returnValue, ref, "") && isDedupedMember(returnValue)) {
+			let retRef = typeof returnValue == "string" ? state.strs.get(returnValue) : state.refs.get(returnValue);
+			retRef && !retRef.id && retRef.scopeId === void 0 && (retRef.id = nextRefAccess(state), state.buf[sepIndex] = "," + retRef.id + "=");
+		}
 	}
-	return state.buf.push("})()"), !0;
+	return state.buf.push(")"), !0;
 }
 function writeAsyncGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) return state.buf.push("(async function*(){}())"), !0;
@@ -902,9 +914,12 @@ function toObjectKey(name) {
 	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 {
+		for (let i = 1; i < len; i++) {
+			let c = name.charCodeAt(i);
+			if (c < 48 || c > 57) return quote(name, i);
+		}
+		if (len > 15 && "" + +name !== name) return quote(name, 0);
 	}
 	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);

package/dist/html.mjs

@@ -822,16 +822,28 @@ function writeReadableStream(state, val, ref) {
 }
 function writeGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) return state.buf.push("(function*(){}())"), !0;
-	let sep = "";
-	for (state.buf.push("(function*(){");;) {
+	let yields = [], returnValue, needsId;
+	for (;;) {
 		let { value, done } = iter.next();
 		if (done) {
-			value !== void 0 && (state.buf.push(sep + "return "), writeProp(state, value, ref, ""));
+			returnValue = value;
 			break;
 		}
-		value === void 0 ? state.buf.push(sep + "yield") : (state.buf.push(sep + "yield "), writeProp(state, value, ref, "")), sep = ";";
+		needsId ||= isDedupedMember(value), yields.push(value);
+	}
+	if (returnValue === void 0 && !yields.length) return state.buf.push("(function*(){})()"), !0;
+	if (state.buf.push(returnValue === void 0 ? "(function*(a){yield*a})(" : "(function*(a,r){yield*a;return r})("), needsId) {
+		let arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		state.buf.push(arrayRef.id + "="), writeArray(state, yields, arrayRef);
+	} else writeArray(state, yields, new Reference(ref, null, state.flush, state.buf.length));
+	if (returnValue !== void 0) {
+		let sepIndex = state.buf.push(",") - 1;
+		if (writeProp(state, returnValue, ref, "") && isDedupedMember(returnValue)) {
+			let retRef = typeof returnValue == "string" ? state.strs.get(returnValue) : state.refs.get(returnValue);
+			retRef && !retRef.id && retRef.scopeId === void 0 && (retRef.id = nextRefAccess(state), state.buf[sepIndex] = "," + retRef.id + "=");
+		}
 	}
-	return state.buf.push("})()"), !0;
+	return state.buf.push(")"), !0;
 }
 function writeAsyncGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) return state.buf.push("(async function*(){}())"), !0;
@@ -901,9 +913,12 @@ function toObjectKey(name) {
 	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 {
+		for (let i = 1; i < len; i++) {
+			let c = name.charCodeAt(i);
+			if (c < 48 || c > 57) return quote(name, i);
+		}
+		if (len > 15 && "" + +name !== name) return quote(name, 0);
 	}
 	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);

package/dist/translator/index.js

@@ -8676,9 +8676,9 @@ function buildStyleDecls(node) {
 * `resolveVirtualDependency` hook.
 */
 function getStyleImportPath(file, node, names) {
-	const { resolveVirtualDependency } = file.markoOpts;
+	const { resolveVirtualDependency, sourceMaps } = file.markoOpts;
 	if (!resolveVirtualDependency) return;
-	const { filename, sourceMaps } = file.opts;
+	const { filename } = file.opts;
 	let ext = STYLE_EXT_REG.exec(node.rawValue || "")?.[1] || ".css";
 	if (node.var && !/\.module\./.test(ext)) ext = ".module" + ext;
 	const program = (0, _marko_compiler_babel_utils.getProgram)().node;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.3.6",
+  "version": "6.3.8",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -51,7 +51,7 @@
     "build": "node -r ~ts ./scripts/bundle.mts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.41.1",
+    "@marko/compiler": "^5.41.2",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"