marko 6.1.7 → 6.1.8

package/dist/debug/dom.js

@@ -564,9 +564,8 @@ function enableBranches() {
 		skipDestroyedRenders();
 	}
 }
-function ready(readyId, runtimeId) {
+function ready(readyId) {
 	(readyIds ||= /* @__PURE__ */ new Set()).add(readyId);
-	init(runtimeId);
 	for (const renderId in curRenders) runResumeEffects(curRenders[renderId]);
 }
 function initEmbedded(readyId, runtimeId) {
@@ -583,7 +582,8 @@ function initEmbedded(readyId, runtimeId) {
 			subtree: true
 		});
 	}
-	ready(readyId, runtimeId);
+	ready(readyId);
+	init(runtimeId);
 }
 function init(runtimeId = "M") {
 	if (curRenders) {

package/dist/debug/dom.mjs

@@ -562,9 +562,8 @@ function enableBranches() {
 		skipDestroyedRenders();
 	}
 }
-function ready(readyId, runtimeId) {
+function ready(readyId) {
 	(readyIds ||= /* @__PURE__ */ new Set()).add(readyId);
-	init(runtimeId);
 	for (const renderId in curRenders) runResumeEffects(curRenders[renderId]);
 }
 function initEmbedded(readyId, runtimeId) {
@@ -581,7 +580,8 @@ function initEmbedded(readyId, runtimeId) {
 			subtree: true
 		});
 	}
-	ready(readyId, runtimeId);
+	ready(readyId);
+	init(runtimeId);
 }
 function init(runtimeId = "M") {
 	if (curRenders) {

package/dist/dom/resume.d.ts

@@ -24,7 +24,7 @@ export interface RenderData {
     p?: Record<string | number, AwaitCounter>;
 }
 export declare function enableBranches(): void;
-export declare function ready(readyId: string, runtimeId?: string): void;
+export declare function ready(readyId: string): void;
 export declare function initEmbedded(readyId: string, runtimeId?: string): void;
 export declare function init(runtimeId?: string): void;
 export declare let isResuming: undefined | 0 | 1;

package/dist/dom.js

@@ -415,8 +415,8 @@ function createCloneableHTML(html, ns) {
 function enableBranches() {
 	branchesEnabled || (branchesEnabled = 1, skipDestroyedRenders());
 }
-function ready(readyId, runtimeId) {
-	(readyIds ||= /* @__PURE__ */ new Set()).add(readyId), init(runtimeId);
+function ready(readyId) {
+	(readyIds ||= /* @__PURE__ */ new Set()).add(readyId);
 	for (let renderId in curRenders) runResumeEffects(curRenders[renderId]);
 }
 function initEmbedded(readyId, runtimeId) {
@@ -428,7 +428,7 @@ function initEmbedded(readyId, runtimeId) {
 	}).observe(document, {
 		childList: !0,
 		subtree: !0
-	})), ready(readyId, runtimeId);
+	})), ready(readyId), init(runtimeId);
 }
 function init(runtimeId = "M") {
 	if (curRenders) return;

package/dist/dom.mjs

@@ -414,8 +414,8 @@ function createCloneableHTML(html, ns) {
 function enableBranches() {
 	branchesEnabled || (branchesEnabled = 1, skipDestroyedRenders());
 }
-function ready(readyId, runtimeId) {
-	(readyIds ||= /* @__PURE__ */ new Set()).add(readyId), init(runtimeId);
+function ready(readyId) {
+	(readyIds ||= /* @__PURE__ */ new Set()).add(readyId);
 	for (let renderId in curRenders) runResumeEffects(curRenders[renderId]);
 }
 function initEmbedded(readyId, runtimeId) {
@@ -427,7 +427,7 @@ function initEmbedded(readyId, runtimeId) {
 	}).observe(document, {
 		childList: !0,
 		subtree: !0
-	})), ready(readyId, runtimeId);
+	})), ready(readyId), init(runtimeId);
 }
 function init(runtimeId = "M") {
 	if (curRenders) return;

package/dist/translator/index.js

@@ -940,35 +940,6 @@ function mapToString(data, sep, cb) {
 	}
 	return "";
 }
-function filterMap(data, cb) {
-	if (data !== void 0) {
-		if (Array.isArray(data)) {
-			const len = data.length;
-			let result;
-			let i = 0;
-			while (i < len) {
-				let item = cb(data[i++]);
-				if (item !== void 0) {
-					result = item;
-					while (i < len) {
-						item = cb(data[i++]);
-						if (item !== void 0) {
-							result = [result, item];
-							while (i < len) {
-								item = cb(data[i++]);
-								if (item !== void 0) result.push(item);
-							}
-							return result;
-						}
-					}
-					return result;
-				}
-			}
-			return result;
-		}
-		return cb(data);
-	}
-}
 function findSorted(compare, data, item) {
 	let max = data.length;
 	let pos = 0;
@@ -1018,9 +989,10 @@ function addSorted(compare, data, item) {
 function unionSortedRepeatable(compare, a, b) {
 	const aLen = a.length;
 	const bLen = b.length;
+	const result = [];
 	let aIndex = 0;
 	let bIndex = 0;
-	const result = [];
+	let same = true;
 	while (aIndex < aLen && bIndex < bLen) {
 		const aValue = a[aIndex];
 		const bValue = b[bIndex];
@@ -1030,14 +1002,16 @@ function unionSortedRepeatable(compare, a, b) {
 			bIndex++;
 			result.push(aValue);
 		} else if (delta < 0) {
+			same = false;
 			aIndex++;
 			result.push(aValue);
 		} else {
+			same = false;
 			bIndex++;
 			result.push(bValue);
 		}
 	}
-	if (aLen === bLen && aIndex === aLen) return a;
+	if (same && aLen === bLen) return a;
 	while (aIndex < aLen) result.push(a[aIndex++]);
 	while (bIndex < bLen) result.push(b[bIndex++]);
 	return result;
@@ -3763,7 +3737,7 @@ function getChangeHandler(tag, attr) {
 			const bindingIdentifierPath = binding.path.getOuterBindingIdentifierPaths()[binding.identifier.name];
 			let changeAttrExpr = bindingIdentifierPath ? bindingIdentifierPath.parentPath === binding.path ? buildChangeHandlerFunction(attr.value, modifier) : bindingIdentifierPath.parentPath.isObjectProperty() ? getChangeHandlerFromObjectPattern(bindingIdentifierPath.parentPath) : void 0 : void 0;
 			if (!changeAttrExpr) throw tag.hub.buildError(attr.value, "Unable to bind to value.");
-			if (modifier && _marko_compiler.types.isIdentifier(changeAttrExpr)) changeAttrExpr = _marko_compiler.types.logicalExpression("&&", changeAttrExpr, buildChangeHandlerFunction(attr.value, modifier));
+			if (modifier && _marko_compiler.types.isIdentifier(changeAttrExpr)) changeAttrExpr = _marko_compiler.types.logicalExpression("&&", changeAttrExpr, buildModifierForwarder(_marko_compiler.types.cloneNode(changeAttrExpr), modifier));
 			const changeHandlerAttr = _marko_compiler.types.markoAttribute(changeAttrName, changeAttrExpr);
 			BINDING_CHANGE_HANDLER.set(binding.identifier, changeHandlerAttr);
 			return changeHandlerAttr;
@@ -3781,18 +3755,19 @@ function getChangeHandler(tag, attr) {
 		const prop = attr.value.property;
 		if (!_marko_compiler.types.isPrivateName(attr.value.property)) {
 			const memberObj = _marko_compiler.types.cloneNode(attr.value.object);
-			const memberProp = prop.type === "Identifier" ? withPreviousLocation(_marko_compiler.types.identifier(prop.name + "Change"), prop) : _marko_compiler.types.binaryExpression("+", _marko_compiler.types.cloneNode(prop), _marko_compiler.types.stringLiteral("Change"));
+			const memberProp = !attr.value.computed && prop.type === "Identifier" ? withPreviousLocation(_marko_compiler.types.identifier(prop.name + "Change"), prop) : _marko_compiler.types.binaryExpression("+", _marko_compiler.types.cloneNode(prop), _marko_compiler.types.stringLiteral("Change"));
 			const computed = memberProp.type !== "Identifier";
 			let changeAttrExpr = attr.value.optional ? _marko_compiler.types.optionalMemberExpression(memberObj, memberProp, computed, true) : _marko_compiler.types.memberExpression(memberObj, memberProp, computed);
-			if (modifier) {
-				const newValueId = generateUid("next");
-				changeAttrExpr = _marko_compiler.types.logicalExpression("&&", changeAttrExpr, _marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.identifier(newValueId)], _marko_compiler.types.blockStatement([_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.memberExpression(memberObj, memberProp, computed), [_marko_compiler.types.callExpression(modifier, [_marko_compiler.types.identifier(newValueId)])]))])));
-			}
+			if (modifier) changeAttrExpr = _marko_compiler.types.logicalExpression("&&", changeAttrExpr, buildModifierForwarder(_marko_compiler.types.memberExpression(memberObj, memberProp, computed), modifier));
 			return _marko_compiler.types.markoAttribute(changeAttrName, changeAttrExpr);
 		}
 	}
 	throw tag.hub.buildError(attr.value, "Attributes may only be bound to identifiers or member expressions");
 }
+function buildModifierForwarder(changeHandler, modifier) {
+	const newValueId = generateUid("next");
+	return _marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.identifier(newValueId)], _marko_compiler.types.blockStatement([_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(changeHandler, [_marko_compiler.types.callExpression(_marko_compiler.types.cloneNode(modifier), [_marko_compiler.types.identifier(newValueId)])]))]));
+}
 function buildChangeHandlerFunction(id, modifier) {
 	const newId = "_new_" + id.name;
 	let newValue = withPreviousLocation(_marko_compiler.types.identifier(newId), id);
@@ -3915,9 +3890,7 @@ var program_default = {
 				if (isLoadEntry) {
 					const entryFile = program.hub.file;
 					const { filename } = entryFile.opts;
-					const readyArgs = [_marko_compiler.types.stringLiteral(getReadyId(entryFile))];
-					if (runtimeId) readyArgs.push(_marko_compiler.types.stringLiteral(runtimeId));
-					program.node.body = [_marko_compiler.types.importDeclaration([_marko_compiler.types.importSpecifier(_marko_compiler.types.identifier("ready"), _marko_compiler.types.identifier("ready"))], _marko_compiler.types.stringLiteral(getRuntimePath("dom"))), _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.memberExpression(_marko_compiler.types.callExpression(_marko_compiler.types.import(), [_marko_compiler.types.stringLiteral((0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, filename))]), _marko_compiler.types.identifier("then")), [_marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.callExpression(_marko_compiler.types.identifier("ready"), readyArgs))]))];
+					program.node.body = [_marko_compiler.types.importDeclaration([_marko_compiler.types.importSpecifier(_marko_compiler.types.identifier("ready"), _marko_compiler.types.identifier("ready"))], _marko_compiler.types.stringLiteral(getRuntimePath("dom"))), _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.memberExpression(_marko_compiler.types.callExpression(_marko_compiler.types.import(), [_marko_compiler.types.stringLiteral((0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, filename))]), _marko_compiler.types.identifier("then")), [_marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.callExpression(_marko_compiler.types.identifier("ready"), [_marko_compiler.types.stringLiteral(getReadyId(entryFile))]))]))];
 					program.skip();
 					return;
 				}
@@ -4213,7 +4186,9 @@ var native_tag_default = {
 			for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoPlaceholder(child)) (textPlaceholders ||= []).push(child.value);
 			else if (!_marko_compiler.types.isMarkoText(child)) throw tag.hub.buildError(child, `Only text is allowed inside a \`<${tagName}>\`.`);
 		}
-		if (node.var || hasDynamicAttributes || hasEventHandlers || textPlaceholders || injectNonce || isDynamicControllable(getRelatedControllable(tagName, seen))) {
+		relatedControllable ||= getRelatedControllable(tagName, seen);
+		if (relatedControllable && relatedControllable.attrs[1]) hasEventHandlers = true;
+		if (node.var || hasDynamicAttributes || hasEventHandlers || textPlaceholders || injectNonce || isDynamicControllable(relatedControllable)) {
 			const tagExtra = node.extra ??= {};
 			const tagSection = getOrCreateSection(tag);
 			const nodeBinding = tagExtra[kNativeTagBinding] = createBinding("#" + getCanonicalTagName(tag), 0, tagSection, void 0, void 0, void 0, void 0, !!node.var);
@@ -4314,16 +4289,7 @@ var native_tag_default = {
 					if (isTextOnly || isOpenOnly || hasChildren || staticContentAttr) if (skipExpression) write`${callRuntime("_attrs_partial", spreadExpression, skipExpression, visitAccessor, getScopeIdIdentifier(tagSection), _marko_compiler.types.stringLiteral(tagName))}`;
 					else write`${callRuntime("_attrs", spreadExpression, visitAccessor, getScopeIdIdentifier(tagSection), _marko_compiler.types.stringLiteral(tagName))}`;
 				}
-				if (isOpenOnly) switch (tagDef.htmlType) {
-					case "svg":
-					case "math":
-						write`/>`;
-						break;
-					default:
-						write`>`;
-						break;
-				}
-				else if (isTextOnly) write`>`;
+				if (isOpenOnly || isTextOnly) write`>`;
 				else if (staticContentAttr) {
 					write`>`;
 					tagExtra[kTagContentAttr] = true;
@@ -4440,16 +4406,7 @@ var native_tag_default = {
 					addStatement("effect", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attrs_script", scopeIdentifier, visitAccessor)), false);
 				}
 				if (staticContentAttr) addStatement("render", tagSection, staticContentAttr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attr_content", scopeIdentifier, visitAccessor, staticContentAttr.value)), void 0, true);
-				if (isOpenOnly) switch (tagDef.htmlType) {
-					case "svg":
-					case "math":
-						write`/>`;
-						break;
-					default:
-						write`>`;
-						break;
-				}
-				else write`>`;
+				write`>`;
 				enter(tag);
 			},
 			exit(tag) {
@@ -4946,7 +4903,7 @@ function getBaseArgsInForTag(type, attrs) {
 //#region src/translator/util/translate-attrs.ts
 const contentProps = /* @__PURE__ */ new WeakSet();
 function translateAttrs(tag, propTree = true, skip, statements = [], contentKey = "content") {
-	const properties = [];
+	const contentProperties = [];
 	const attrTagLookup = tag.node.extra?.attributeTags;
 	const seen = new Set(skip);
 	if (attrTagLookup) {
@@ -4956,7 +4913,7 @@ function translateAttrs(tag, propTree = true, skip, statements = [], contentKey
 				seen.add(attrTagMeta.name);
 				if (attrTagMeta.dynamic) {
 					statements.push(_marko_compiler.types.variableDeclaration("let", [_marko_compiler.types.variableDeclarator(getAttrTagIdentifier(attrTagMeta))]));
-					properties.push(toObjectProperty(attrTagMeta.name, getAttrTagIdentifier(attrTagMeta)));
+					contentProperties.push(toObjectProperty(attrTagMeta.name, getAttrTagIdentifier(attrTagMeta)));
 				}
 			}
 		}
@@ -4970,10 +4927,10 @@ function translateAttrs(tag, propTree = true, skip, statements = [], contentKey
 				else {
 					const translatedAttrTag = translateAttrs(child, getKnownFromPropTree(propTree, attrTagMeta.name), void 0, statements, contentKey);
 					if (attrTagMeta.repeated) {
-						const prevProp = findObjectProperty(attrTagMeta.name, properties);
+						const prevProp = findObjectProperty(attrTagMeta.name, contentProperties);
 						if (prevProp) prevProp.value = callRuntime("attrTags", prevProp.value, propsToExpression(translatedAttrTag.properties));
-						else properties.push(toObjectProperty(attrTagMeta.name, callRuntime("attrTag", propsToExpression(translatedAttrTag.properties))));
-					} else properties.push(toObjectProperty(attrTagMeta.name, callRuntime("attrTag", propsToExpression(translatedAttrTag.properties))));
+						else contentProperties.push(toObjectProperty(attrTagMeta.name, callRuntime("attrTag", propsToExpression(translatedAttrTag.properties))));
+					} else contentProperties.push(toObjectProperty(attrTagMeta.name, callRuntime("attrTag", propsToExpression(translatedAttrTag.properties))));
 				}
 			} else i = addDynamicAttrTagStatements(attrTags, i, attrTagLookup, statements, propTree, contentKey);
 		}
@@ -4984,22 +4941,22 @@ function translateAttrs(tag, propTree = true, skip, statements = [], contentKey
 			const contentProp = _marko_compiler.types.objectProperty(_marko_compiler.types.identifier(contentKey), contentExpression);
 			seen.add(contentKey);
 			contentProps.add(contentProp);
-			properties.push(contentProp);
+			contentProperties.push(contentProp);
 		}
 	}
 	const { attributes } = tag.node;
+	const attrProperties = [];
 	for (let i = attributes.length; i--;) {
 		const attr = attributes[i];
 		const { value } = attr;
-		if (_marko_compiler.types.isMarkoSpreadAttribute(attr)) properties.push(_marko_compiler.types.spreadElement(value));
+		if (_marko_compiler.types.isMarkoSpreadAttribute(attr)) attrProperties.push(_marko_compiler.types.spreadElement(value));
 		else if (!seen.has(attr.name) && getKnownFromPropTree(propTree, attr.name)) {
 			seen.add(attr.name);
-			properties.push(toObjectProperty(attr.name, value));
+			attrProperties.push(toObjectProperty(attr.name, value));
 		}
 	}
-	properties.reverse();
 	return {
-		properties,
+		properties: attrProperties.reverse().concat(contentProperties),
 		statements
 	};
 }
@@ -5449,10 +5406,9 @@ function writeParamsToSignals(tag, propTree, importAlias, info) {
 		const tagInputIdentifier = info.getBindingIdentifier(propTree.binding, `${importAlias}_params`);
 		const translatedAttrs = translateAttrs(tag);
 		if (translatedAttrs.statements.length) addStatement("render", info.tagSection, referencedBindings, translatedAttrs.statements);
-		let renderArgs = [createScopeReadExpression(info.childScopeBinding, info.tagSection)];
-		if (tag.node.arguments) renderArgs = [...renderArgs, ...tag.node.arguments];
-		if (!tag.node.arguments?.length || translatedAttrs.properties.length) renderArgs.push(propsToExpression(translatedAttrs.properties));
-		addStatement("render", info.tagSection, referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(tagInputIdentifier, [_marko_compiler.types.arrayExpression(renderArgs)])));
+		const renderParams = tag.node.arguments ? [...tag.node.arguments] : [];
+		if (!tag.node.arguments?.length || translatedAttrs.properties.length) renderParams.push(propsToExpression(translatedAttrs.properties));
+		addStatement("render", info.tagSection, referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(tagInputIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.arrayExpression(renderParams)])));
 		return;
 	}
 	let i = 0;
@@ -5629,7 +5585,7 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 		const propBinding = knownSpread.binding.propertyAliases.get(prop);
 		addStatement("render", info.tagSection, propBinding, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), createScopeReadExpression(propBinding, info.tagSection)])), void 0, true);
 	}
-	else if (spreadProps) {
+	else if (spreadProps && (remaining.size || propTree.rest && !propTree.rest.props)) {
 		const spreadExpr = propsToExpression(spreadProps.reverse());
 		let spreadId = spreadExpr;
 		if (!isSimpleReference(spreadExpr)) {
@@ -5664,25 +5620,37 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 function mapParamReasonToExpr(exprs, reason) {
 	if (reason) {
 		if (reason === true) return true;
-		return filterMap(reason, (prop) => {
-			if (exprs) {
-				let curExpr = exprs;
-				let curBinding = prop;
-				if (curBinding.property) {
-					const props = [];
-					do
-						props.push(curBinding.property);
-					while ((curBinding = curBinding.upstreamAlias) && curBinding.property);
-					for (let i = props.length; i--;) {
-						const nestedExpr = curExpr.known?.[props[i]];
-						if (nestedExpr) curExpr = nestedExpr;
-						else break;
-					}
-				}
-				return curExpr.value;
-			}
+		const result = /* @__PURE__ */ new Set();
+		forEach(reason, (prop) => {
+			forEach(mapParamBindingToExpr(exprs, prop), (expr) => {
+				result.add(expr);
+			});
 		});
+		return fromIter(result);
+	}
+}
+function mapParamBindingToExpr(exprs, binding) {
+	const isRest = binding.property === void 0 && binding.excludeProperties !== void 0;
+	const props = [];
+	let curBinding = isRest ? binding.upstreamAlias : binding;
+	while (curBinding && curBinding.property !== void 0) {
+		props.push(curBinding.property);
+		curBinding = curBinding.upstreamAlias;
+	}
+	let curExpr = exprs;
+	for (let i = props.length; i--;) {
+		const nestedExpr = curExpr.known?.[props[i]];
+		if (!nestedExpr) return curExpr.value;
+		curExpr = nestedExpr;
+	}
+	if (isRest) {
+		let result = curExpr.value;
+		if (curExpr.known) {
+			for (const key in curExpr.known) if (!includes(binding.excludeProperties, key)) result = concat(result, curExpr.known[key].value);
+		}
+		return result;
 	}
+	return curExpr.value;
 }
 function callStatement(id, ...args) {
 	return _marko_compiler.types.expressionStatement(callExpression(id, ...args));
@@ -5756,7 +5724,7 @@ function trackDomVarReferences(tag, binding) {
 	const babelBinding = tag.scope.getBinding(tagVar.name);
 	const section = getOrCreateSection(tag);
 	binding.originalName = tagVar.name;
-	if (babelBinding.constantViolations.length) for (const ref of babelBinding.constantViolations) throw ref.type === "MarkoTag" ? ref.get("var").buildCodeFrameError(`Duplicate declaration ${JSON.stringify(binding.name)}`) : ref.buildCodeFrameError("Tag variables on native elements cannot be assigned to.");
+	if (babelBinding.constantViolations.length) for (const ref of babelBinding.constantViolations) throw ref.type === "MarkoTag" ? ref.get("var").buildCodeFrameError(`Duplicate declaration ${JSON.stringify(binding.originalName)}`) : ref.buildCodeFrameError("Tag variables on native elements cannot be assigned to.");
 	for (const ref of babelBinding.referencePaths) {
 		const refSection = getOrCreateSection(ref);
 		const invoked = isInvokedFunction(ref);

package/package.json

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