@marko/runtime-tags 6.3.1 → 6.3.2

package/dist/debug/html.js

@@ -220,8 +220,8 @@ function _escape(val) {
 	assertValidTextValue(val);
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeScriptReg = /<\/script/gi;
-const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+const unsafeScriptReg = /<(\/?script|!--)/gi;
+const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str;
 function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
@@ -648,7 +648,7 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			const valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value === void 0) {} else if (writeProp(state, mutation.value, null, "")) {
-				const valueRef = state.refs.get(mutation.value);
+				const valueRef = typeof mutation.value === "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
 				if (valueRef && !valueRef.id && valueRef.scopeId === void 0) {
 					valueRef.id = mutation.valueId || nextRefAccess(state);
 					state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex];
@@ -1161,7 +1161,7 @@ function writeReadableStream(state, val, ref) {
 }
 function writeGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) {
-		state.buf.push("(async function*(){}())");
+		state.buf.push("(function*(){}())");
 		return true;
 	}
 	let sep = "";

package/dist/debug/html.mjs

@@ -218,8 +218,8 @@ function _escape(val) {
 	assertValidTextValue(val);
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeScriptReg = /<\/script/gi;
-const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+const unsafeScriptReg = /<(\/?script|!--)/gi;
+const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str;
 function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
@@ -646,7 +646,7 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			const valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value === void 0) {} else if (writeProp(state, mutation.value, null, "")) {
-				const valueRef = state.refs.get(mutation.value);
+				const valueRef = typeof mutation.value === "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
 				if (valueRef && !valueRef.id && valueRef.scopeId === void 0) {
 					valueRef.id = mutation.valueId || nextRefAccess(state);
 					state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex];
@@ -1159,7 +1159,7 @@ function writeReadableStream(state, val, ref) {
 }
 function writeGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) {
-		state.buf.push("(async function*(){}())");
+		state.buf.push("(function*(){}())");
 		return true;
 	}
 	let sep = "";

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/script") : 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 } = {}, 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];
@@ -534,7 +534,7 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			let valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value !== void 0) if (writeProp(state, mutation.value, null, "")) {
-				let valueRef = state.refs.get(mutation.value);
+				let valueRef = typeof mutation.value == "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
 				valueRef && !valueRef.id && valueRef.scopeId === void 0 && (valueRef.id = mutation.valueId || nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
 			} else state.buf.push("void 0");
 			state.buf.push(")");
@@ -819,7 +819,7 @@ function writeReadableStream(state, val, ref) {
 	return state.buf.push("new ReadableStream({start(c){(async(_,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?c.close():c.enqueue(v)})(" + iterId + "={}).catch(e=>c.error(e))}})"), reader.read().then(onFulfilled, onRejected), boundary.startAsync(), !0;
 }
 function writeGenerator(state, iter, ref) {
-	if (iter[kTouchedIterator]) return state.buf.push("(async function*(){}())"), !0;
+	if (iter[kTouchedIterator]) return state.buf.push("(function*(){}())"), !0;
 	let sep = "";
 	for (state.buf.push("(function*(){");;) {
 		let { value, done } = iter.next();

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/script") : 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 } = {}, 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];
@@ -533,7 +533,7 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			let valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value !== void 0) if (writeProp(state, mutation.value, null, "")) {
-				let valueRef = state.refs.get(mutation.value);
+				let valueRef = typeof mutation.value == "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
 				valueRef && !valueRef.id && valueRef.scopeId === void 0 && (valueRef.id = mutation.valueId || nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
 			} else state.buf.push("void 0");
 			state.buf.push(")");
@@ -818,7 +818,7 @@ function writeReadableStream(state, val, ref) {
 	return state.buf.push("new ReadableStream({start(c){(async(_,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?c.close():c.enqueue(v)})(" + iterId + "={}).catch(e=>c.error(e))}})"), reader.read().then(onFulfilled, onRejected), boundary.startAsync(), !0;
 }
 function writeGenerator(state, iter, ref) {
-	if (iter[kTouchedIterator]) return state.buf.push("(async function*(){}())"), !0;
+	if (iter[kTouchedIterator]) return state.buf.push("(function*(){}())"), !0;
 	let sep = "";
 	for (state.buf.push("(function*(){");;) {
 		let { value, done } = iter.next();

package/dist/translator/index.js

@@ -1713,8 +1713,8 @@ const escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg,
 function _escape(val) {
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeScriptReg = /<\/script/gi;
-const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+const unsafeScriptReg = /<(\/?script|!--)/gi;
+const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str;
 function _escape_script(val) {
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
@@ -4300,6 +4300,7 @@ var native_tag_default = {
 				(0, _marko_compiler_babel_utils.getProgram)().node.extra.page ??= true;
 				break;
 		}
+		if (tagName === "option") assertOptionInSelectWithValue(tag);
 		const isTextOnly = isTextOnlyNativeTag(tag);
 		const seen = {};
 		const { attributes } = tag.node;
@@ -4796,6 +4797,31 @@ function getCanonicalTagName(tag) {
 		default: return tagName;
 	}
 }
+function assertOptionInSelectWithValue(tag) {
+	let parent = tag.parentPath;
+	while (parent) {
+		if (parent.isMarkoTag()) {
+			if (analyzeTagNameType(parent) === 0) {
+				const parentName = getCanonicalTagName(parent);
+				if (parentName === "select") {
+					if (parent.node.attributes.some((attr) => _marko_compiler.types.isMarkoAttribute(attr) && (attr.name === "value" || attr.name === "valueChange"))) {
+						let hasValue = false;
+						const attributes = tag.get("attributes");
+						for (let i = 0; i < attributes.length; i++) {
+							const attr = attributes[i].node;
+							if (!_marko_compiler.types.isMarkoAttribute(attr) || attr.name === "value") hasValue = true;
+							else if (attr.name === "selected") throw attributes[i].buildCodeFrameError("The `selected` attribute is not supported on an `<option>` within a `<select>` that has a `value` attribute; include the option's `value` in the select's `value` instead.");
+						}
+						if (!hasValue) throw tag.buildCodeFrameError("An `<option>` within a `<select>` that has a `value` attribute must also have a `value` attribute.");
+					}
+					return;
+				}
+				if (parentName !== "optgroup") return;
+			} else if (!isControlFlowTag(parent)) return;
+		} else if (parent.isProgram()) return;
+		parent = parent.parentPath;
+	}
+}
 function getTextOnlyEscapeHelper(tagName) {
 	switch (tagName) {
 		case "script": return "_escape_script";
@@ -7772,6 +7798,7 @@ var export_default = {
 //#endregion
 //#region src/translator/core/html-comment.ts
 const kNodeBinding$1 = Symbol("comment tag binding");
+const escapeCommentText = (text) => text.replace(/>/g, "&gt;");
 var html_comment_default = {
 	analyze(tag) {
 		(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
@@ -7809,11 +7836,11 @@ var html_comment_default = {
 			const nodeBinding = tagExtra[kNodeBinding$1];
 			const write = writeTo(tag);
 			if (isOutputHTML()) {
-				for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${child.value}`;
+				for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${escapeCommentText(child.value)}`;
 				else if (_marko_compiler.types.isMarkoPlaceholder(child)) write`${callRuntime(child.escape ? "_escape_comment" : "_unescaped", child.value)}`;
 			} else {
 				const textLiteral = bodyToTextLiteral(tag.node.body);
-				if (_marko_compiler.types.isStringLiteral(textLiteral)) write`${textLiteral}`;
+				if (_marko_compiler.types.isStringLiteral(textLiteral)) write`${escapeCommentText(textLiteral.value)}`;
 				else addStatement("render", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_text", createScopeReadExpression(nodeBinding), textLiteral)));
 			}
 			exit(tag);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",