marko 6.1.21 → 6.1.22

package/dist/debug/html.js

@@ -2526,6 +2526,15 @@ function _attr_nonce() {
 function _attr(name, value) {
 	return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
+function _attr_and(name, value, attr) {
+	return value ? attr : _attr(name, value);
+}
+function _attr_or(name, value, attr) {
+	return value ? _attr(name, value) : attr;
+}
+function _attr_nullish(name, value, attr) {
+	return value == null ? attr : _attr(name, value);
+}
 function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "";
 	let skip = /[\s/>"'=]/;
@@ -3153,6 +3162,7 @@ function NOOP() {}
 exports.$global = $global;
 exports._assert_hoist = _assert_hoist;
 exports._attr = _attr;
+exports._attr_and = _attr_and;
 exports._attr_class = _attr_class;
 exports._attr_content = _attr_content;
 exports._attr_details_open = _attr_details_or_dialog_open;
@@ -3161,7 +3171,9 @@ exports._attr_input_checked = _attr_input_checked;
 exports._attr_input_checkedValue = _attr_input_checkedValue;
 exports._attr_input_value = _attr_input_value;
 exports._attr_nonce = _attr_nonce;
+exports._attr_nullish = _attr_nullish;
 exports._attr_option_value = _attr_option_value;
+exports._attr_or = _attr_or;
 exports._attr_select_value = _attr_select_value;
 exports._attr_style = _attr_style;
 exports._attr_textarea_value = _attr_textarea_value;

package/dist/debug/html.mjs

@@ -2524,6 +2524,15 @@ function _attr_nonce() {
 function _attr(name, value) {
 	return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
+function _attr_and(name, value, attr) {
+	return value ? attr : _attr(name, value);
+}
+function _attr_or(name, value, attr) {
+	return value ? _attr(name, value) : attr;
+}
+function _attr_nullish(name, value, attr) {
+	return value == null ? attr : _attr(name, value);
+}
 function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "";
 	let skip = /[\s/>"'=]/;
@@ -3148,4 +3157,4 @@ const compat = {
 };
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_option_value, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _subscribe, _template, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _subscribe, _template, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };

package/dist/html/attrs.d.ts

@@ -10,6 +10,9 @@ export declare function _attr_input_checkedValue(scopeId: number, nodeAccessor:
 export declare function _attr_details_or_dialog_open(scopeId: number, nodeAccessor: Accessor, open: unknown, openChange: unknown, serializeType?: 1): "" | " open";
 export declare function _attr_nonce(): string;
 export declare function _attr(name: string, value: unknown): string;
+export declare function _attr_and(name: string, value: unknown, attr: string): string;
+export declare function _attr_or(name: string, value: unknown, attr: string): string;
+export declare function _attr_nullish(name: string, value: unknown, attr: string): string;
 export declare function _attrs(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string): string;
 export declare function _attrs_content(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string, serializeReason?: 1 | 0): void;
 export declare function _attrs_partial(data: Record<string, unknown>, skip: Record<string, 1>, nodeAccessor: Accessor, scopeId: number, tagName: string): string;

package/dist/html.d.ts

@@ -1,7 +1,7 @@
 export { attrTag, attrTags } from "./common/attr-tag";
 export { _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
 export { _flush_head, withLoadAssets, withPageAssets } from "./html/assets";
-export { _attr, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_option_value, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, } from "./html/attrs";
+export { _attr, _attr_and, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, } from "./html/attrs";
 export { compat } from "./html/compat";
 export { _escape, _escape_comment, _escape_script, _escape_style, _to_text, _unescaped, } from "./html/content";
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";

package/dist/html.js

@@ -1647,6 +1647,15 @@ function _attr_nonce() {
 function _attr(name, value) {
 	return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
+function _attr_and(name, value, attr) {
+	return value ? attr : _attr(name, value);
+}
+function _attr_or(name, value, attr) {
+	return value ? _attr(name, value) : attr;
+}
+function _attr_nullish(name, value, attr) {
+	return value == null ? attr : _attr(name, value);
+}
 function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "", skip = /[\s/>"'=]/, events;
 	switch (tagName) {
@@ -1970,7 +1979,7 @@ function toObjectExpression(options) {
 //#endregion
 //#region src/html/compat.ts
 function NOOP() {}
-exports.$global = $global, exports._assert_hoist = _assert_hoist, exports._attr = _attr, exports._attr_class = _attr_class, exports._attr_content = _attr_content, exports._attr_details_open = _attr_details_or_dialog_open, exports._attr_dialog_open = _attr_details_or_dialog_open, exports._attr_input_checked = _attr_input_checked, exports._attr_input_checkedValue = _attr_input_checkedValue, exports._attr_input_value = _attr_input_value, exports._attr_nonce = _attr_nonce, exports._attr_option_value = _attr_option_value, exports._attr_select_value = _attr_select_value, exports._attr_style = _attr_style, exports._attr_textarea_value = _attr_textarea_value, exports._attrs = _attrs, exports._attrs_content = _attrs_content, exports._attrs_partial = _attrs_partial, exports._attrs_partial_content = _attrs_partial_content, exports._await = _await, exports._content = _content, exports._content_resume = _content_resume, Object.defineProperty(exports, "_dynamic_tag", {
+exports.$global = $global, exports._assert_hoist = _assert_hoist, exports._attr = _attr, exports._attr_and = _attr_and, exports._attr_class = _attr_class, exports._attr_content = _attr_content, exports._attr_details_open = _attr_details_or_dialog_open, exports._attr_dialog_open = _attr_details_or_dialog_open, exports._attr_input_checked = _attr_input_checked, exports._attr_input_checkedValue = _attr_input_checkedValue, exports._attr_input_value = _attr_input_value, exports._attr_nonce = _attr_nonce, exports._attr_nullish = _attr_nullish, exports._attr_option_value = _attr_option_value, exports._attr_or = _attr_or, exports._attr_select_value = _attr_select_value, exports._attr_style = _attr_style, exports._attr_textarea_value = _attr_textarea_value, exports._attrs = _attrs, exports._attrs_content = _attrs_content, exports._attrs_partial = _attrs_partial, exports._attrs_partial_content = _attrs_partial_content, exports._await = _await, exports._content = _content, exports._content_resume = _content_resume, Object.defineProperty(exports, "_dynamic_tag", {
 	enumerable: !0,
 	get: function() {
 		return _dynamic_tag;

package/dist/html.mjs

@@ -1646,6 +1646,15 @@ function _attr_nonce() {
 function _attr(name, value) {
 	return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
+function _attr_and(name, value, attr) {
+	return value ? attr : _attr(name, value);
+}
+function _attr_or(name, value, attr) {
+	return value ? _attr(name, value) : attr;
+}
+function _attr_nullish(name, value, attr) {
+	return value == null ? attr : _attr(name, value);
+}
 function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "", skip = /[\s/>"'=]/, events;
 	switch (tagName) {
@@ -1970,4 +1979,4 @@ function toObjectExpression(options) {
 //#region src/html/compat.ts
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_option_value, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _subscribe, _template, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _subscribe, _template, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };

package/dist/translator/index.js

@@ -4459,13 +4459,19 @@ var native_tag_default = {
 						case "style": {
 							const helper = `_attr_${name}`;
 							if (confident) write`${getHTMLRuntime()[helper](computed)}`;
-							else write`${callRuntime(helper, value)}`;
+							else write`${factorAttrConditional(buildAttrExpression(value, (branch) => {
+								const { confident, computed } = evaluate(branch);
+								return confident ? getHTMLRuntime()[helper](computed) : void 0;
+							}, (branch) => buildStringAttrAnd(helper, branch) || name === "class" && buildClassAttrExpression(branch) || callRuntime(helper, branch)))}`;
 							break;
 						}
 						default:
 							if (confident) write`${getHTMLRuntime()._attr(name, computed)}`;
 							else if (isEventHandler(name)) addHTMLEffectCall(tagSection, valueReferences);
-							else write`${callRuntime("_attr", _marko_compiler.types.stringLiteral(name), value)}`;
+							else write`${factorAttrConditional(buildAttrExpression(value, (branch) => {
+								const { confident, computed } = evaluate(branch);
+								return confident ? getHTMLRuntime()._attr(name, computed) : void 0;
+							}, (branch) => buildLogicalAttr(name, branch) || callRuntime("_attr", _marko_compiler.types.stringLiteral(name), branch)))}`;
 							break;
 					}
 				}
@@ -4796,6 +4802,84 @@ function getTextOnlyEscapeHelper(tagName) {
 		default: return "_escape";
 	}
 }
+function buildAttrExpression(value, serialize, dynamic) {
+	if (value.type === "ConditionalExpression") return _marko_compiler.types.conditionalExpression(value.test, buildAttrExpression(value.consequent, serialize, dynamic), buildAttrExpression(value.alternate, serialize, dynamic));
+	const serialized = serialize(value);
+	return serialized === void 0 ? dynamic(value) : _marko_compiler.types.stringLiteral(serialized);
+}
+function factorAttrConditional(value) {
+	if (value.type !== "ConditionalExpression") return value;
+	const consequent = factorAttrConditional(value.consequent);
+	const alternate = factorAttrConditional(value.alternate);
+	if (consequent.type === "StringLiteral" && alternate.type === "StringLiteral") {
+		const a = consequent.value;
+		const b = alternate.value;
+		const end = commonAttrPrefixEnd([a, b]);
+		if (end) return normalizeStringExpression([a.slice(0, end), _marko_compiler.types.conditionalExpression(value.test, _marko_compiler.types.stringLiteral(a.slice(end)), _marko_compiler.types.stringLiteral(b.slice(end)))]);
+	}
+	return _marko_compiler.types.conditionalExpression(value.test, consequent, alternate);
+}
+function commonAttrPrefixEnd(strings) {
+	let prefix = strings[0];
+	for (let i = 1; i < strings.length && prefix; i++) {
+		const s = strings[i];
+		const len = Math.min(prefix.length, s.length);
+		let j = 0;
+		while (j < len && prefix[j] === s[j]) j++;
+		prefix = prefix.slice(0, j);
+	}
+	return prefix.lastIndexOf("=") + 1;
+}
+function buildLogicalAttr(name, value) {
+	if (value.type !== "LogicalExpression") return;
+	const { confident, computed } = evaluate(value.right);
+	if (!confident) return;
+	const attr = getHTMLRuntime()._attr(name, computed);
+	return callRuntime(value.operator === "&&" ? "_attr_and" : value.operator === "||" ? "_attr_or" : "_attr_nullish", _marko_compiler.types.stringLiteral(name), value.left, _marko_compiler.types.stringLiteral(attr));
+}
+function buildStringAttrAnd(helper, value) {
+	if (value.type === "LogicalExpression" && value.operator === "&&") {
+		const { confident, computed } = evaluate(value.right);
+		if (confident) return _marko_compiler.types.conditionalExpression(value.left, _marko_compiler.types.stringLiteral(getHTMLRuntime()[helper](computed)), _marko_compiler.types.stringLiteral(""));
+	}
+}
+const MAX_PRECOMPUTED_CLASS_TOGGLES = 4;
+function buildClassAttrExpression(value) {
+	if (value.type !== "ObjectExpression" && value.type !== "ArrayExpression") return;
+	const meta = {
+		staticItems: void 0,
+		dynamicItems: void 0,
+		dynamicValues: void 0
+	};
+	trackDelimitedAttrValue(value, meta);
+	if (meta.dynamicItems || !meta.staticItems || !meta.dynamicValues) return;
+	const base = toDelimitedString(meta.staticItems, " ", stringifyClassObject);
+	if (!base) return;
+	const { _attr_class } = getHTMLRuntime();
+	const keys = Object.keys(meta.dynamicValues);
+	if (keys.length === 1) {
+		const [key] = keys;
+		return _marko_compiler.types.conditionalExpression(meta.dynamicValues[key], _marko_compiler.types.stringLiteral(_attr_class(base + " " + key)), _marko_compiler.types.stringLiteral(_attr_class(base)));
+	}
+	if (keys.length <= MAX_PRECOMPUTED_CLASS_TOGGLES) {
+		const combos = [];
+		for (let mask = 0; mask < 1 << keys.length; mask++) {
+			let classes = base;
+			for (let i = 0; i < keys.length; i++) if (mask & 1 << i) classes += " " + keys[i];
+			combos.push(_attr_class(classes));
+		}
+		const end = commonAttrPrefixEnd(combos);
+		const table = generateUidIdentifier("class");
+		(0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.markoScriptlet([_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(table, _marko_compiler.types.arrayExpression(combos.map((combo) => _marko_compiler.types.stringLiteral(combo.slice(end)))))])], true));
+		let index = _marko_compiler.types.conditionalExpression(meta.dynamicValues[keys[0]], _marko_compiler.types.numericLiteral(1), _marko_compiler.types.numericLiteral(0));
+		for (let i = 1; i < keys.length; i++) index = _marko_compiler.types.binaryExpression("+", index, _marko_compiler.types.conditionalExpression(meta.dynamicValues[keys[i]], _marko_compiler.types.numericLiteral(1 << i), _marko_compiler.types.numericLiteral(0)));
+		const lookup = _marko_compiler.types.memberExpression(_marko_compiler.types.cloneNode(table), index, true);
+		return normalizeStringExpression([combos[0].slice(0, end), lookup]);
+	}
+	let classes = _marko_compiler.types.stringLiteral(base);
+	for (const key of keys) classes = _marko_compiler.types.binaryExpression("+", classes, _marko_compiler.types.conditionalExpression(meta.dynamicValues[key], _marko_compiler.types.stringLiteral(" " + key), _marko_compiler.types.stringLiteral("")));
+	return callRuntime("_attr_class", classes);
+}
 function trackDelimitedAttrValue(expr, meta) {
 	switch (expr.type) {
 		case "ObjectExpression":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.1.21",
+  "version": "6.1.22",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",