marko 6.1.9 → 6.1.11

package/dist/translator/index.js

@@ -239,6 +239,9 @@ function getEventHandlerName(name) {
 function isVoid(value) {
 	return value == null || value === false;
 }
+function isNotVoid(value) {
+	return value != null && value !== false;
+}
 function normalizeDynamicRenderer(value) {
 	if (value) {
 		if (typeof value === "string") return value;
@@ -1932,7 +1935,7 @@ function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
 }
 function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
 	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange);
-	return normalizeBoolAttrValue(checked) ? " checked" : "";
+	return isNotVoid(checked) ? " checked" : "";
 }
 function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
 	const valueAttr = _attr("value", value);
@@ -1951,8 +1954,8 @@ function getCheckedValueRef(checkedValue) {
 	}
 }
 function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
-	const normalizedOpen = normalizeBoolAttrValue(open);
-	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen, openChange);
+	const normalizedOpen = isNotVoid(open);
+	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange);
 	return normalizedOpen ? " open" : "";
 }
 function _attr(name, value) {
@@ -1965,17 +1968,17 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 	switch (tagName) {
 		case "input":
 			if (data.checkedChange) result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange);
-			else if (data.checkedValue || data.checkedValueChange) result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value);
+			else if ("checkedValue" in data || data.checkedValueChange) result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value);
 			else if (data.valueChange) result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange);
 			else break;
 			skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/;
 			break;
 		case "select":
 		case "textarea":
-			if (data.value || data.valueChange) skip = /^value(?:Change)?$|[\s/>"'=]/;
+			if ("value" in data || data.valueChange) skip = /^value(?:Change)?$|[\s/>"'=]/;
 			break;
 		case "option":
-			if (data.value) {
+			if ("value" in data) {
 				result += _attr_option_value(data.value);
 				skip = /^value$|[\s/>"'=]/;
 			}
@@ -2059,9 +2062,6 @@ function normalizedValueMatches(a, b) {
 function normalizeStrAttrValue(value) {
 	return value && value !== true || value === 0 ? value + "" : "";
 }
-function normalizeBoolAttrValue(value) {
-	if (value != null && value !== false) return true;
-}
 //#endregion
 //#region src/html/dynamic-tag.ts
 const voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
@@ -3249,9 +3249,21 @@ function writeHTMLResumeStatements(path) {
 	const writeSerializedBinding = (binding) => {
 		const reason = getSerializeReason(section, binding);
 		if (!reason) return;
+		if (binding.noSerialize) {
+			serializedLookup.delete(getScopeAccessor(binding));
+			return;
+		}
 		const accessor = getScopeAccessor(binding);
 		serializedLookup.delete(accessor);
-		serializedProperties.push(toObjectProperty(accessor, ifSerialized(reason, getDeclaredBindingExpression(binding))));
+		let expr = getDeclaredBindingExpression(binding);
+		if (binding.noSerializeProperties) {
+			const props = [_marko_compiler.types.spreadElement(expr)];
+			forEach(binding.noSerializeProperties, (prop) => {
+				props.push(toObjectProperty(prop, _marko_compiler.types.identifier("undefined")));
+			});
+			expr = _marko_compiler.types.objectExpression(props);
+		}
+		serializedProperties.push(toObjectProperty(accessor, ifSerialized(reason, expr)));
 		if (debug) {
 			const { root, access } = getDebugScopeAccess(binding);
 			const locExpr = root.loc && _marko_compiler.types.stringLiteral(`${root.loc.start.line}:${root.loc.start.column + 1}`);
@@ -4064,10 +4076,16 @@ function finalizeTagDownstreams(section) {
 function crawlSectionsAndSetBinding(tag, binding, properties, skip) {
 	if (!skip) {
 		const contentSection = getSectionForBody(tag.get("body"));
-		if (contentSection) contentSection.downstreamBinding = {
-			binding,
-			properties: concat(properties, "content")
-		};
+		if (contentSection) {
+			let target = binding;
+			forEach(properties, (property) => {
+				target = target?.propertyAliases.get(property);
+			});
+			contentSection.downstreamBinding = target && (target.noSerialize || includes(target.noSerializeProperties, "content")) ? false : {
+				binding,
+				properties: concat(properties, "content")
+			};
+		}
 	}
 	const attrTagLookup = analyzeAttributeTags(tag);
 	if (!attrTagLookup) return;
@@ -4194,11 +4212,26 @@ var native_tag_default = {
 			const nodeBinding = tagExtra[kNativeTagBinding] = createBinding("#" + getCanonicalTagName(tag), 0, tagSection, void 0, void 0, void 0, void 0, !!node.var);
 			if (hasEventHandlers) (0, _marko_compiler_babel_utils.getProgram)().node.extra.isInteractive = true;
 			if (spreadReferenceNodes) {
+				const isMergedSpread = !!relatedControllable;
 				if (relatedControllable && !relatedControllable.attrs.every(Boolean)) {
 					for (const attr of relatedControllable.attrs) if (attr) spreadReferenceNodes.push(attr.value);
 					relatedControllable = void 0;
 				}
-				mergeReferences(tagSection, tag.node, spreadReferenceNodes);
+				const spreadExtra = mergeReferences(tagSection, tag.node, spreadReferenceNodes);
+				spreadExtra.nativeTagSpread = true;
+				if (isMergedSpread) spreadExtra.nativeTagSpreadMerged = true;
+				let carveProperties = getSpreadControllableValueProps(tagName);
+				if (!tag.node.body.body.length && !isTextOnly && !(0, _marko_compiler_babel_utils.getTagDef)(tag)?.parseOptions?.openTagOnly && !seen.content) if (carveProperties) carveProperties.push("content");
+				else carveProperties = ["content"];
+				for (const node of spreadReferenceNodes) {
+					const spreadBinding = node.extra?.spreadFrom;
+					if (spreadBinding) {
+						spreadBinding.noSerialize = true;
+						if (carveProperties) {
+							for (const property of carveProperties) if (!includes(spreadBinding.noSerializeProperties, property)) spreadBinding.noSerializeProperties = push(spreadBinding.noSerializeProperties, property);
+						}
+					}
+				}
 			} else relatedControllable = getRelatedControllable(tagName, seen);
 			if (relatedControllable) mergeReferences(tagSection, relatedControllable.attrs.find(Boolean).value, relatedControllable.attrs.map((it) => it?.value));
 			if (textPlaceholders) exprExtras = push(exprExtras, textPlaceholders.length === 1 ? textPlaceholders[0].extra ??= {} : mergeReferences(tagSection, textPlaceholders[0], textPlaceholders.slice(1)));
@@ -4428,6 +4461,19 @@ var native_tag_default = {
 		}
 	})
 };
+function getSpreadControllableValueProps(tagName) {
+	switch (tagName) {
+		case "input": return [
+			"value",
+			"checked",
+			"checkedValue"
+		];
+		case "select":
+		case "textarea": return ["value"];
+		case "details":
+		case "dialog": return ["open"];
+	}
+}
 function getRelatedControllable(tagName, attrs) {
 	switch (tagName) {
 		case "input":
@@ -5687,6 +5733,8 @@ function createBinding(name, type, refSection, upstreamAlias, property, excludeP
 		closureSections: void 0,
 		assignmentSections: void 0,
 		excludeProperties,
+		noSerialize: false,
+		noSerializeProperties: void 0,
 		sources: void 0,
 		reads: /* @__PURE__ */ new Set(),
 		aliases: /* @__PURE__ */ new Set(),
@@ -5993,8 +6041,22 @@ function finalizeReferences() {
 			}
 		}
 	}
-	for (const binding of bindings) if (binding.type !== 0) {
-		if (pruneBinding(binding)) bindings.delete(binding);
+	for (const binding of bindings) {
+		if (binding.type !== 0) {
+			if (pruneBinding(binding)) bindings.delete(binding);
+		}
+		if (binding.noSerialize) if (isPureSpreadResolved(binding)) if (hasAnyMemberAccess(binding)) {
+			let kept = void 0;
+			binding.noSerialize = false;
+			forEach(binding.noSerializeProperties, (property) => {
+				if (!isPropertyMemberAccessed(binding, property)) kept = push(kept, property);
+			});
+			binding.noSerializeProperties = kept;
+		} else binding.noSerializeProperties = void 0;
+		else {
+			binding.noSerialize = false;
+			binding.noSerializeProperties = void 0;
+		}
 	}
 	forEachSection(finalizeTagDownstreams);
 	for (const binding of bindings) {
@@ -6722,6 +6784,21 @@ function getAllSerializeReasonsForBinding(binding, properties) {
 	}
 	return reason;
 }
+function isPureSpreadResolved(binding) {
+	for (const read of binding.reads) if (!read.nativeTagSpread || read.nativeTagSpreadMerged) return false;
+	for (const alias of binding.aliases) if (!isPureSpreadResolved(alias)) return false;
+	return true;
+}
+function hasAnyMemberAccess(binding) {
+	if (binding.propertyAliases.size) return true;
+	for (const alias of binding.aliases) if (hasAnyMemberAccess(alias)) return true;
+	return false;
+}
+function isPropertyMemberAccessed(binding, property) {
+	if (binding.propertyAliases.has(property)) return true;
+	for (const alias of binding.aliases) if (isPropertyMemberAccessed(alias, property)) return true;
+	return false;
+}
 function addNumericPropertiesUntil(props, len) {
 	let result = props;
 	for (let i = len; i--;) result = propsUtil.add(result, i + "");
@@ -8117,7 +8194,7 @@ function isStaticText(node) {
 		case "MarkoText": return true;
 		case "MarkoPlaceholder": if (node.escape) {
 			const { confident, computed } = evaluate(node.value);
-			return confident && !isVoid(computed);
+			return confident && isNotVoid(computed);
 		} else return false;
 	}
 }

package/dist/translator/util/references.d.ts

@@ -37,6 +37,8 @@ export interface Binding {
     property: string | undefined;
     propertyAliases: Map<string, Binding>;
     excludeProperties: Opt<string>;
+    noSerialize: boolean;
+    noSerializeProperties: Opt<string>;
     upstreamAlias: Binding | undefined;
     restOffset: number | undefined;
     scopeOffset: Binding | undefined;
@@ -84,6 +86,8 @@ declare module "@marko/compiler/dist/types" {
         pruned?: true;
         isEffect?: true;
         spreadFrom?: Binding;
+        nativeTagSpread?: true;
+        nativeTagSpreadMerged?: true;
         merged?: NodeExtra;
     }
     interface FunctionExtra {

package/dist/translator/util/sections.d.ts

@@ -45,7 +45,7 @@ export interface Section {
     downstreamBinding: {
         binding: Binding;
         properties: Opt<string>;
-    } | undefined;
+    } | false | undefined;
     hasAbortSignal: boolean;
     readsOwner: boolean;
     isBranch: boolean;

package/package.json

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