marko 6.3.25 → 6.3.27

package/dist/translator/index.js

@@ -1906,7 +1906,8 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, seriali
 	return _textarea_value(value);
 }
 function _textarea_value(value) {
-	return _escape(normalizeStrAttrValue(value));
+	const escaped = _escape(normalizeStrAttrValue(value));
+	return escaped[0] === "\n" || escaped[0] === "\r" ? "\n" + escaped : escaped;
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
@@ -3484,7 +3485,14 @@ function replaceAssignedNode(node) {
 			switch (node.left.type) {
 				case "Identifier": {
 					const { extra } = node.left;
-					return isAssignedBindingExtra(extra) && getBuildAssignment(extra)?.(extra.section, node.operator === "=" ? node.right : _marko_compiler.types.binaryExpression(node.operator.slice(0, -1), createScopeReadExpression(extra.assignment, extra.section), node.right)) || extra?.assignment && withLeadingComment(node.right, getDebugName(extra.assignment));
+					if (isAssignedBindingExtra(extra)) {
+						const { operator } = node;
+						const shortCircuits = operator === "||=" || operator === "&&=" || operator === "??=";
+						const readAssigned = () => createScopeReadExpression(extra.assignment, extra.section);
+						const builtAssignment = getBuildAssignment(extra)?.(extra.section, operator === "=" || shortCircuits ? node.right : _marko_compiler.types.binaryExpression(operator.slice(0, -1), readAssigned(), node.right));
+						if (builtAssignment) return shortCircuits ? _marko_compiler.types.logicalExpression(operator.slice(0, -1), readAssigned(), builtAssignment) : builtAssignment;
+					}
+					return extra?.assignment && withLeadingComment(node.right, getDebugName(extra.assignment));
 				}
 				case "ArrayPattern":
 				case "ObjectPattern": {
@@ -4175,13 +4183,11 @@ function getBaseArgsInForTag(type, attrs) {
 }
 //#endregion
 //#region src/translator/util/nested-attribute-tags.ts
-const attrTagToIdentifierLookup = /* @__PURE__ */ new WeakMap();
+const [getAttrTagIdentifiers] = createProgramState(() => /* @__PURE__ */ new WeakMap());
 function getAttrTagIdentifier(meta) {
-	let name = attrTagToIdentifierLookup.get(meta);
-	if (!name) {
-		name = generateUid(meta.name);
-		attrTagToIdentifierLookup.set(meta, name);
-	}
+	const identifiers = getAttrTagIdentifiers();
+	let name = identifiers.get(meta);
+	if (!name) identifiers.set(meta, name = generateUid(meta.name));
 	return _marko_compiler.types.identifier(name);
 }
 function getAttrTagPaths(tag) {
@@ -4298,8 +4304,8 @@ function translateAttrs(tag, propTree = true, skip, statements = [], contentKey
 				else {
 					const translatedAttrTag = translateAttrs(child, getKnownFromPropTree(propTree, attrTagMeta.name), void 0, statements, contentKey);
 					const prevProp = attrTagMeta.repeated ? findObjectProperty(attrTagMeta.name, contentProperties) : void 0;
-					if (prevProp) prevProp.value = callRuntime("attrTags", prevProp.value, propsToExpression(translatedAttrTag.properties));
-					else contentProperties.push(toObjectProperty(attrTagMeta.name, callRuntime("attrTag", propsToExpression(translatedAttrTag.properties))));
+					if (prevProp) prevProp.value = callRuntime("attrTags", prevProp.value, _marko_compiler.types.objectExpression(translatedAttrTag.properties));
+					else contentProperties.push(toObjectProperty(attrTagMeta.name, callRuntime("attrTag", _marko_compiler.types.objectExpression(translatedAttrTag.properties))));
 				}
 			} else i = addDynamicAttrTagStatements(attrTags, i, attrTagLookup, statements, propTree, contentKey);
 		}
@@ -4339,8 +4345,8 @@ function addDynamicAttrTagStatements(attrTags, index, attrTagLookup, statements,
 		const attrTagExport = getKnownFromPropTree(propTree, attrTagMeta.name);
 		if (attrTagExport && attrTagMeta.dynamic) {
 			const translatedAttrTag = translateAttrs(tag, attrTagExport, void 0, statements, contentKey);
-			if (attrTagMeta.repeated) statements.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("=", getAttrTagIdentifier(attrTagMeta), callRuntime("attrTags", getAttrTagIdentifier(attrTagMeta), propsToExpression(translatedAttrTag.properties)))));
-			else statements.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("=", getAttrTagIdentifier(attrTagMeta), callRuntime("attrTag", propsToExpression(translatedAttrTag.properties)))));
+			if (attrTagMeta.repeated) statements.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("=", getAttrTagIdentifier(attrTagMeta), callRuntime("attrTags", getAttrTagIdentifier(attrTagMeta), _marko_compiler.types.objectExpression(translatedAttrTag.properties)))));
+			else statements.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("=", getAttrTagIdentifier(attrTagMeta), callRuntime("attrTag", _marko_compiler.types.objectExpression(translatedAttrTag.properties)))));
 		}
 	} else switch (getTagName(tag)) {
 		case "if": return translateIfAttrTag(attrTags, index, attrTagLookup, statements, propTree, contentKey);
@@ -4348,6 +4354,8 @@ function addDynamicAttrTagStatements(attrTags, index, attrTagLookup, statements,
 	}
 	return index;
 }
+/** Unwraps a lone spread to the spread argument itself, so the result may alias
+* a caller binding; anything the runtime writes to needs its own object. */
 function propsToExpression(props) {
 	return props.length === 1 && _marko_compiler.types.isSpreadElement(props[0]) ? props[0].argument : _marko_compiler.types.objectExpression(props);
 }
@@ -4501,6 +4509,10 @@ var native_tag_default = {
 		assertExclusiveAttrs(seen, (msg) => {
 			throw tag.get("name").buildCodeFrameError(msg);
 		});
+		if (seen.content) {
+			if ((0, _marko_compiler_babel_utils.getTagDef)(tag)?.parseOptions?.openTagOnly) throw tag.hub.buildError(seen.content, `The \`<${tagName}>\` tag cannot have content, so it does not support the \`content\` attribute.`);
+			if (isTextOnly) throw tag.hub.buildError(seen.content, `The \`<${tagName}>\` tag takes its content from its body as text, so it does not support the \`content\` attribute.`);
+		}
 		let textPlaceholders;
 		if (isTextOnly) {
 			for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoPlaceholder(child)) (textPlaceholders ||= []).push(child.value);
@@ -4562,10 +4574,11 @@ var native_tag_default = {
 				const write = writeTo(tag);
 				const tagSection = getSection(tag);
 				const visitAccessor = nodeBinding && getScopeAccessorLiteral(nodeBinding);
-				write`<${tagName}`;
 				const usedAttrs = getUsedAttrs(tagName, tag.node);
 				const { staticAttrs, staticControllable, staticContentAttr, skipExpression, injectNonce } = usedAttrs;
 				let { spreadExpression } = usedAttrs;
+				if (tagName === "select" && (staticControllable || spreadExpression)) flushBefore(tag);
+				write`<${tagName}`;
 				if (injectNonce) write`${callRuntime("_attr_nonce")}`;
 				if (staticControllable) {
 					const hasChangeHandler = !!staticControllable.attrs[1];
@@ -4761,7 +4774,7 @@ var native_tag_default = {
 					const canHaveAttrContent = !(isTextOnly || isOpenOnly || hasChildren || staticContentAttr);
 					const name = tag.get("name");
 					const staticName = name.isStringLiteral() ? name.node.value : void 0;
-					const controllable = controllableClaimFor(staticName);
+					const controllable = !staticControllable && controllableClaimFor(staticName);
 					if (skipExpression) addStatement("render", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime(canHaveAttrContent ? "_attrs_partial_content" : "_attrs_partial", scopeIdentifier, visitAccessor, spreadExpression, skipExpression, controllable && importRuntime(controllable))));
 					else addStatement("render", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime(canHaveAttrContent ? "_attrs_content" : "_attrs", scopeIdentifier, visitAccessor, spreadExpression, controllable && importRuntime(controllable))));
 					enableControllable(controllableScriptLatchFor(staticName));
@@ -5174,8 +5187,9 @@ function isDynamicControllable(controllable) {
 function buildUndefined$1() {
 	return _marko_compiler.types.unaryExpression("void", _marko_compiler.types.numericLiteral(0));
 }
-/** How a statically named tag claims its controlled attrs during render;
-* nothing for the many tags that control nothing. */
+/** How a spread claims its controlled attrs during render; nothing for the many
+* tags that control nothing, and nothing when a static attr owns the
+* controllable, since then the spread must leave the slots it wrote alone. */
 function controllableClaimFor(tagName) {
 	switch (tagName) {
 		case "input": return "_controllable_input";
@@ -6298,6 +6312,7 @@ function applyAttrObject(tag, propTree, tagInputIdentifier, info) {
 	let translatedProps = propsToExpression(translatedAttrs.properties);
 	if (translatedAttrs.statements.length) addStatement("render", info.tagSection, referencedBindings, translatedAttrs.statements);
 	if ((0, _marko_compiler_babel_utils.isAttributeTag)(tag)) {
+		translatedProps = _marko_compiler.types.objectExpression(translatedAttrs.properties);
 		const attrTagName = getTagName(tag);
 		const parentTag = tag.parentPath;
 		if (analyzeAttributeTags(parentTag)?.[attrTagName]?.repeated) {
@@ -6313,7 +6328,8 @@ function applyAttrObject(tag, propTree, tagInputIdentifier, info) {
 	addStatement("render", info.tagSection, referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(tagInputIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), translatedProps])), void 0, true);
 }
 function translateAttrTag(tag, attrTagMeta, info, statements) {
-	let translatedProps = propsToExpression(translateAttrs(tag, true, void 0, statements).properties);
+	const translatedAttrs = translateAttrs(tag, true, void 0, statements);
+	let translatedProps = _marko_compiler.types.objectExpression(translatedAttrs.properties);
 	const attrTagName = getTagName(tag);
 	const parentTag = tag.parentPath;
 	if (attrTagMeta.repeated) {
@@ -8022,17 +8038,17 @@ var define_default = {
 					let allDirectReferences = true;
 					for (const ref of babelBinding.referencePaths) if (ref.parent.type === "MarkoTag" && ref.parent.name === ref.node) hasDirectReferences = true;
 					else allDirectReferences = false;
-					if (hasDirectReferences) {
+					if (allDirectReferences) {
 						const bodySection = getSectionForBody(tag.get("body"));
 						if (bodySection) {
-							const signal = getSignal(bodySection, void 0);
-							signal.build = () => {
-								if (signalHasStatements(signal)) return callRuntime("_child_setup", getSignalFn(signal));
-							};
-							if (allDirectReferences) {
-								tag.remove();
-								return;
+							if (hasDirectReferences) {
+								const signal = getSignal(bodySection, void 0);
+								signal.build = () => {
+									if (signalHasStatements(signal)) return callRuntime("_child_setup", getSignalFn(signal));
+								};
 							}
+							tag.remove();
+							return;
 						}
 					}
 				}
@@ -8077,7 +8093,9 @@ var effect_default = {
 var export_default = {
 	parse(tag) {
 		const { node } = tag;
-		tag.replaceWith((0, _marko_compiler_babel_utils.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end)[0]);
+		const statements = (0, _marko_compiler_babel_utils.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end);
+		if (statements.length > 1) throw tag.hub.buildError(statements[1], "The `<export>` tag takes a single export statement.");
+		tag.replaceWith(statements[0]);
 	},
 	parseOptions: {
 		statement: true,
@@ -8242,7 +8260,9 @@ var id_default = {
 var import_default = {
 	parse(tag) {
 		const { node } = tag;
-		tag.replaceWith((0, _marko_compiler_babel_utils.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end)[0]);
+		const statements = (0, _marko_compiler_babel_utils.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end);
+		if (statements.length > 1) throw tag.hub.buildError(statements[1], "The [`<import>` tag](https://markojs.com/docs/syntax/#importing-external-files) takes a single import statement.");
+		tag.replaceWith(statements[0]);
 	},
 	parseOptions: {
 		statement: true,
@@ -9572,7 +9592,6 @@ function translateDOM(tag) {
 			(0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.variableDeclaration("let", [_marko_compiler.types.variableDeclarator(setupIdent, callRuntime("_load_setup", getScopeAccessorLiteral(node.extra[kLoadTagBinding], true), getScopeAccessorLiteral(childBinding, true), triggerIdent ? _marko_compiler.types.addComment(_marko_compiler.types.callExpression(triggerIdent, [setupLoadExpr]), "leading", "@__PURE__") : setupLoadExpr))]));
 			addStatement("render", section, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(setupIdent, [scopeIdentifier])));
 		});
-		write`<!>`;
 		visit(tag, 37);
 		injectWalks(tag, tagName);
 		enterShallow(tag);
@@ -9685,12 +9704,13 @@ const kDOMBinding = Symbol("dynamic tag dom binding");
 const kChildOffsetScopeBinding = Symbol("custom tag scope offset");
 const importedDynamicTagResume = /* @__PURE__ */ new WeakSet();
 const [getCompatRegistrations] = createProgramState(() => /* @__PURE__ */ new Set());
+const [getCompatBoundaryCalls] = createProgramState(() => /* @__PURE__ */ new Map());
 function pushCompatRegistration(key, statement) {
 	const keys = getCompatRegistrations();
-	if (!keys.has(key)) {
-		keys.add(key);
-		(0, _marko_compiler_babel_utils.getProgram)().node.body.push(statement);
-	}
+	if (keys.has(key)) return false;
+	keys.add(key);
+	(0, _marko_compiler_babel_utils.getProgram)().node.body.push(statement);
+	return true;
 }
 var dynamic_tag_default = {
 	analyze: { enter(tag) {
@@ -9772,11 +9792,19 @@ var dynamic_tag_default = {
 				if (_marko_compiler.types.isStringLiteral(tagExpression)) tagExpression = (0, _marko_compiler_babel_utils.importDefault)(tag.hub.file, getTagRelativePath(tag), tagExpression.value);
 				if (classTagTemplate) {
 					const preserveBoundary = !tagsSerializeReason && (classHydration === "descendant" || classHydration === "self" && !!classFile?.metadata.marko.hasComponentBrowser);
-					if (isOutputHTML() ? serializeReason || classHydration : serializeReason) pushCompatRegistration(classFile.metadata.marko.id, isOutputHTML() ? _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression((0, _marko_compiler_babel_utils.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"), [
-						_marko_compiler.types.stringLiteral(classFile.metadata.marko.id),
+					const classId = classFile.metadata.marko.id;
+					const registration = isOutputHTML() ? _marko_compiler.types.callExpression((0, _marko_compiler_babel_utils.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"), [
+						_marko_compiler.types.stringLiteral(classId),
 						_marko_compiler.types.identifier(tagExpression.name),
 						...preserveBoundary ? [_marko_compiler.types.stringLiteral("preserve")] : []
-					]))], true) : _marko_compiler.types.expressionStatement(callRuntime("_resume", _marko_compiler.types.stringLiteral(classFile.metadata.marko.id), _marko_compiler.types.identifier(tagExpression.name))));
+					]) : void 0;
+					if (isOutputHTML() ? serializeReason || classHydration : serializeReason) {
+						if (pushCompatRegistration(classId, registration ? _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(registration)], true) : _marko_compiler.types.expressionStatement(callRuntime("_resume", _marko_compiler.types.stringLiteral(classId), _marko_compiler.types.identifier(tagExpression.name)))) && registration) getCompatBoundaryCalls().set(classId, registration);
+					}
+					if (!preserveBoundary) {
+						const emitted = getCompatBoundaryCalls().get(classId);
+						if (emitted) emitted.arguments.length = 2;
+					}
 				} else {
 					const rendererName = tagExpression.name;
 					pushCompatRegistration(rendererName, _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("??=", _marko_compiler.types.memberExpression(_marko_compiler.types.identifier(rendererName), _marko_compiler.types.identifier("_")), _marko_compiler.types.identifier(rendererName)))], true));
@@ -9977,7 +10005,7 @@ var text_default = {
 function buildAggregateError(file, rootMsg, ...paths) {
 	const err = /* @__PURE__ */ new SyntaxError();
 	const fileName = path.default.relative(_marko_compiler_modules.cwd, file.opts.filename);
-	const finalMsg = `${rootMsg}:\n\n${paths.map(([msg, path$10]) => `\x1b[90m${msg} at ${getFileNameWithLoc(fileName, path$10)}:\x1b[0m\n${getFrame(file, path$10)}`).join("\n\n")}`;
+	const finalMsg = `${rootMsg}:\n\n${paths.map(([msg, path$12]) => `\x1b[90m${msg} at ${getFileNameWithLoc(fileName, path$12)}:\x1b[0m\n${getFrame(file, path$12)}`).join("\n\n")}`;
 	if (!("MARKO_DEBUG" in process.env)) err.stack = finalMsg;
 	Object.defineProperty(err, "message", {
 		get() {
@@ -10094,9 +10122,11 @@ function getFeatureTypeFromCoreTagName(tagName) {
 		case "macro":
 		case "module-code":
 		case "while": return Class;
+		case "attrs":
 		case "const":
 		case "debug":
 		case "define":
+		case "effect":
 		case "id":
 		case "let":
 		case "lifecycle":
@@ -10249,11 +10279,15 @@ function mergeTagDef(def5, def6) {
 }
 function mergeObjects(a, b, cb) {
 	const merged = {};
+	const assign = (key, aValue, bValue) => {
+		const value = cb(key, aValue, bValue);
+		if (value !== void 0) merged[key] = value;
+	};
 	if (a) if (b) {
-		for (const key in a) merged[key] = cb(key, a[key], b[key]);
-		for (const key in b) if (!(key in a)) merged[key] = cb(key, void 0, b[key]);
-	} else for (const key in a) merged[key] = cb(key, a[key], void 0);
-	else if (b) for (const key in b) merged[key] = cb(key, void 0, b[key]);
+		for (const key in a) assign(key, a[key], b[key]);
+		for (const key in b) if (!(key in a)) assign(key, void 0, b[key]);
+	} else for (const key in a) assign(key, a[key], void 0);
+	else if (b) for (const key in b) assign(key, void 0, b[key]);
 	return merged;
 }
 function normalizeTagDef(tagDef) {
@@ -10279,8 +10313,34 @@ function normalizeVisitor(visitor) {
 	return visitor?.default ?? visitor;
 }
 function normalizeVisit(visitor) {
+	if (Array.isArray(visitor)) {
+		let merged;
+		for (const entry of visitor) merged = sequenceVisit(merged, normalizeVisit(entry));
+		return merged;
+	}
 	return typeof visitor === "function" ? visitor : normalizeVisitor(visitor);
 }
+function sequenceVisit(first, second) {
+	if (!first || !second) return first || second;
+	const enterFirst = getVisitorEnter(first);
+	const enterSecond = getVisitorEnter(second);
+	const enter = (enterFirst || enterSecond) && function enter(path$10, state) {
+		const { node } = path$10;
+		enterFirst?.call(this, path$10, state);
+		if (path$10.node === node) enterSecond?.call(this, path$10, state);
+	};
+	const exitFirst = getVisitorExit(first);
+	const exitSecond = getVisitorExit(second);
+	const exit = (exitFirst || exitSecond) && function exit(path$11, state) {
+		const { node } = path$11;
+		exitFirst?.call(this, path$11, state);
+		if (path$11.node === node) exitSecond?.call(this, path$11, state);
+	};
+	return exit ? enter ? {
+		enter,
+		exit
+	} : { exit } : enter;
+}
 function getVisitorEnter(visit) {
 	return typeof visit === "function" ? visit : visit?.enter;
 }

package/dist/translator/util/translate-attrs.d.ts

@@ -10,5 +10,7 @@ export declare function getTranslatedBodyContentProperty(props: t.ObjectExpressi
     value: t.Expression;
 }) | undefined;
 export declare function addDynamicAttrTagStatements(attrTags: t.NodePath<t.MarkoTag["attributeTags"][number]>[], index: number, attrTagLookup: AttrTagLookup, statements: t.Statement[], propTree: BindingPropTree | true, contentKey?: ContentKey): number;
+/** Unwraps a lone spread to the spread argument itself, so the result may alias
+ * a caller binding; anything the runtime writes to needs its own object. */
 export declare function propsToExpression(props: t.ObjectExpression["properties"]): t.Expression;
 export {};

package/dist/translator/visitors/tag/native-tag.d.ts

@@ -21,8 +21,9 @@ declare const _default: {
     };
 };
 export default _default;
-/** How a statically named tag claims its controlled attrs during render;
- * nothing for the many tags that control nothing. */
+/** How a spread claims its controlled attrs during render; nothing for the many
+ * tags that control nothing, and nothing when a static attr owns the
+ * controllable, since then the spread must leave the slots it wrote alone. */
 export declare function controllableClaimFor(tagName: string | undefined): "_controllable_input" | "_controllable_open" | "_controllable_select" | "_controllable_textarea" | undefined;
 /** The resume-pass latch for a tag: `_attrs_script` resolves the control kind
  * at run time, and a run-time tag name can be any of them. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.25",
+  "version": "6.3.27",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,14 +48,14 @@
     }
   },
   "dependencies": {
-    "@marko/compiler": "^5.41.9",
+    "@marko/compiler": "^5.41.11",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "marko": "5.39.29",
-    "@marko/runtime-tags": "npm:marko@6.3.25"
+    "@marko/runtime-tags": "npm:marko@6.3.27",
+    "marko": "5.39.30"
   },
   "engines": {
     "node": ">=22"