marko 6.2.5 → 6.3.1

package/dist/translator/index.js

@@ -48,6 +48,15 @@ function assertNoSpreadAttrs(tag) {
 		throw attr.buildCodeFrameError(`The [\`<${tagName}>\`](https://markojs.com/docs/reference/core-tag#${tagName}) tag does not support \`...spread\` attributes.`);
 	}
 }
+function assertNoTagVarMutation(tag) {
+	const tagVar = tag.node.var;
+	if (tagVar?.type === "Identifier") {
+		const constantViolations = tag.scope.getBinding(tagVar.name)?.constantViolations;
+		if (constantViolations?.length) {
+			for (const assignment of constantViolations) if (assignment.type !== "MarkoTag") throw assignment.buildCodeFrameError(`${tagVar.name} is readonly and cannot be mutated.`);
+		}
+	}
+}
 function assertNoBodyContent(tag) {
 	if (tag.node.body.body.length) {
 		const tagName = tag.get("name");
@@ -1919,15 +1928,12 @@ function nonVoidAttr(name, value) {
 		case "string": return " " + name + attrAssignment(value);
 		case "boolean": return " " + name;
 		case "number": return " " + name + "=" + value;
-		case "object":
-			if (value instanceof RegExp) return " " + name + attrAssignment(value.source);
-			break;
 	}
 	return " " + name + attrAssignment(value + "");
 }
-const singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g;
-const doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g;
-const needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g;
+const singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g;
+const doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g;
+const needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g;
 function attrAssignment(value) {
 	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
 }
@@ -2128,6 +2134,9 @@ function sectionHasSetupStatements(section) {
 }
 //#endregion
 //#region src/translator/util/binding-has-prop.ts
+function isSectionRendererElided(section) {
+	return !!section.downstreamBinding && !bindingHasProperty(section.downstreamBinding.binding, section.downstreamBinding.properties);
+}
 function bindingHasProperty(binding, properties) {
 	if (binding.pruned) return false;
 	else if (binding.pruned === void 0) throw new Error("Binding must be pruned before checking properties");
@@ -2821,7 +2830,7 @@ function setSectionSerializedValue(section, prop, expression) {
 }
 function setBindingSerializedValue(section, binding, expression, prefix) {
 	const reason = getSerializeReason(section, binding, prefix);
-	if (reason) getSerializedAccessors(section).set((prefix || "") + getScopeAccessor(binding), {
+	if (reason) getSerializedAccessors(section).set(prefix === void 0 ? getScopeAccessor(binding) : getPrefixedScopeAccessor(binding, prefix), {
 		expression,
 		reason
 	});
@@ -2905,7 +2914,7 @@ function getSignal(section, referencedBindings, name) {
 			const render = getSignalFn(signal);
 			const closureSignalBuilder = getClosureSignalBuilder(section);
 			if (closureSignalBuilder && !isDynamicClosure(section, closure)) return closureSignalBuilder(closure, render);
-			return callRuntime("_closure_get", getScopeAccessorLiteral(closure, true), render, isImmediateOwner(section, closure) ? void 0 : _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], getScopeExpression(section, closure.section)), some(closure.closureSections, underTryPlaceholder) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")) : void 0);
+			return callRuntime("_closure_get", isOptimize() ? _marko_compiler.types.numericLiteral(getClosureAccessorId(closure)) : getScopeAccessorLiteral(closure, true), render, isImmediateOwner(section, closure) ? void 0 : _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], getScopeExpression(section, closure.section)), some(closure.closureSections, underTryPlaceholder) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")) : void 0);
 		};
 	}
 	return signal;
@@ -3507,7 +3516,7 @@ var dom_default = { translate: {
 				const setup = getSetup(childSection);
 				const written = writeSignals(childSection);
 				const setupIdentifier = setup && written.has(setup) ? setup.identifier : void 0;
-				if (!childSection.downstreamBinding || bindingHasProperty(childSection.downstreamBinding.binding, childSection.downstreamBinding.properties)) if (getSectionParentIsOwner(childSection)) setBranchRendererArgs(childSection, [
+				if (!isSectionRendererElided(childSection)) if (getSectionParentIsOwner(childSection)) setBranchRendererArgs(childSection, [
 					writes,
 					walks,
 					setupIdentifier,
@@ -4263,9 +4272,12 @@ function buildContent(body) {
 		if (dynamicSerializeReason) body.node.body.unshift(getScopeReasonDeclaration(bodySection));
 		else body.node.body.unshift(_marko_compiler.types.expressionStatement(callRuntime("_scope_reason")));
 		return callRuntime(serialized ? "_content_resume" : "_content", _marko_compiler.types.stringLiteral(getResumeRegisterId(bodySection, "content")), _marko_compiler.types.arrowFunctionExpression(body.node.params, _marko_compiler.types.blockStatement(body.node.body)), serialized ? getScopeIdIdentifier(getSection(getAttributeTagParent(body.parentPath))) : void 0);
-	} else return _marko_compiler.types.callExpression(_marko_compiler.types.identifier(bodySection.name), bodySection.referencedLocalClosures ? [scopeIdentifier, _marko_compiler.types.objectExpression(toArray(bodySection.referencedLocalClosures, (ref) => {
-		return toObjectProperty(getScopeAccessor(ref, true), getDeclaredBindingExpression(ref));
-	}))] : [scopeIdentifier]);
+	} else {
+		if (isSectionRendererElided(bodySection)) return;
+		return _marko_compiler.types.callExpression(_marko_compiler.types.identifier(bodySection.name), bodySection.referencedLocalClosures ? [scopeIdentifier, _marko_compiler.types.objectExpression(toArray(bodySection.referencedLocalClosures, (ref) => {
+			return toObjectProperty(getScopeAccessor(ref, true), getDeclaredBindingExpression(ref));
+		}))] : [scopeIdentifier]);
+	}
 }
 //#endregion
 //#region src/translator/visitors/tag/native-tag.ts
@@ -5243,7 +5255,11 @@ function preAnalyze$1(tag) {
 		for (const child of tag.node.body.body) if (child.type === "MarkoText" || child.type === "MarkoPlaceholder" && child.escape) parts.push(child.value);
 		else throw tag.hub.file.hub.buildError(child, "Unexpected content in textarea, only text and placeholders are supported.", SyntaxError);
 		const textValue = normalizeStringExpression(parts);
-		if (textValue) tag.node.attributes.push(_marko_compiler.types.markoAttribute("value", textValue));
+		if (textValue) {
+			const valueAttr = tag.node.attributes.find((attr) => _marko_compiler.types.isMarkoAttribute(attr) && attr.name === "value");
+			if (valueAttr) throw tag.hub.file.hub.buildError(valueAttr, "A textarea cannot have both a value attribute and body content.", SyntaxError);
+			tag.node.attributes.push(_marko_compiler.types.markoAttribute("value", textValue));
+		}
 		tag.node.body.body = [];
 	}
 }
@@ -6292,7 +6308,8 @@ function createBinding(name, type, refSection, upstreamAlias, property, excludeP
 		nullable: !sameSection || excludeProperties === void 0,
 		pruned: void 0,
 		exposed: false,
-		forcePersist: false
+		forcePersist: false,
+		reserveSize: 0
 	};
 	if (property) {
 		if (declared) upstreamAlias.nullable = false;
@@ -6436,6 +6453,7 @@ function trackAssignment(assignment, binding) {
 				fnExtra.section = idExtra.section = section;
 			}
 			if (binding.upstreamAlias && binding.property !== void 0) {
+				if (binding.upstreamAlias === binding.section.params) throw assignment.buildCodeFrameError(`\`${binding.name}\` is a tag parameter and cannot be assigned to.`);
 				const changePropName = binding.property + "Change";
 				const changeBinding = binding.upstreamAlias.propertyAliases.get(changePropName) || createBinding(generateUid(changePropName), binding.type, binding.section, binding.upstreamAlias, changePropName, void 0, id.node.loc, true);
 				idExtra.assignmentTo = changeBinding;
@@ -6758,22 +6776,30 @@ function finalizeReferences() {
 			});
 		}
 		let intersectionIndex = 0;
-		let lastBindingIndex = 0;
+		let nextId = 0;
 		let intersection;
-		forEach(filter(bindings, isOwnedBinding), (binding, bindingIndex) => {
-			binding.id = (lastBindingIndex = bindingIndex) + intersectionIndex;
-			while (intersectionIndex < intersections.length && (intersection = intersections[intersectionIndex]).filter(isOwnedBinding).at(-1) === binding) intersectionMeta.set(intersection, {
-				id: bindingIndex + ++intersectionIndex,
-				scopeOffset: getMaxOwnSourceOffset(intersection, section)
-			});
+		forEach(filter(bindings, isOwnedBinding), (binding) => {
+			binding.id = nextId++;
+			nextId += binding.reserveSize;
+			while (intersectionIndex < intersections.length && (intersection = intersections[intersectionIndex]).filter(isOwnedBinding).at(-1) === binding) {
+				intersectionIndex++;
+				intersectionMeta.set(intersection, {
+					id: nextId++,
+					scopeOffset: getMaxOwnSourceOffset(intersection, section)
+				});
+			}
 		});
 		while (intersectionIndex < intersections.length) {
 			intersection = intersections[intersectionIndex];
+			intersectionIndex++;
 			intersectionMeta.set(intersection, {
-				id: lastBindingIndex + ++intersectionIndex,
+				id: nextId++,
 				scopeOffset: getMaxOwnSourceOffset(intersection, section)
 			});
 		}
+		forEach(filter(bindings, isOwnedBinding), (binding) => {
+			if (binding.closureSections) closureAccessorIds.set(binding, nextId++);
+		});
 	});
 	const programSection = (0, _marko_compiler_babel_utils.getProgram)().node.extra.section;
 	if (programSection.returnValueExpr) programSection.returnSerializeReason = getSerializeSourcesForExpr(programSection.returnValueExpr);
@@ -6793,6 +6819,7 @@ function getMaxOwnSourceOffset(intersection, section) {
 	return scopeOffset;
 }
 const intersectionMeta = /* @__PURE__ */ new WeakMap();
+const closureAccessorIds = /* @__PURE__ */ new WeakMap();
 const collapsedIntersectionSource = /* @__PURE__ */ new WeakMap();
 function getCollapsibleIntersectionSource(intersection, section) {
 	let sources;
@@ -7009,6 +7036,20 @@ function getScopeAccessor(binding, encoded, includeId) {
 	else if (includeId || canonicalBinding.type === 0) return `${canonicalBinding.name}/${canonicalBinding.id}`;
 	return canonicalBinding.scopeAccessor ?? canonicalBinding.name;
 }
+function getPrefixedScopeAccessor(binding, prefix) {
+	const canonicalBinding = getCanonicalBinding(binding);
+	if (isOptimize()) switch (prefix) {
+		case getAccessorPrefix().TagVariableChange: return decodeAccessor(canonicalBinding.id + 1);
+		case getAccessorPrefix().ClosureScopes: return decodeAccessor(getClosureAccessorId(canonicalBinding));
+		case getAccessorPrefix().ClosureSignalIndex: return prefix + decodeAccessor(getClosureAccessorId(canonicalBinding));
+	}
+	return prefix + getScopeAccessor(binding);
+}
+function getClosureAccessorId(binding) {
+	const id = closureAccessorIds.get(getCanonicalBinding(binding));
+	if (id === void 0) throw new Error(`No closure accessor id was reserved for "${binding.name}".`);
+	return id;
+}
 function getDebugScopeAccess(binding) {
 	let root = binding;
 	let access = "";
@@ -7540,12 +7581,7 @@ var const_default = {
 		if (upstreamAlias) dropNodes(valueAttr.value);
 		const binding = trackVarReferences(tag, 5, upstreamAlias);
 		if (binding) {
-			if (node.var.type === "Identifier") {
-				const constantViolations = tag.scope.getBinding(node.var.name)?.constantViolations;
-				if (constantViolations?.length) {
-					for (const assignment of constantViolations) if (assignment.type !== "MarkoTag") throw assignment.buildCodeFrameError(`${node.var.name} is readonly and cannot be mutated.`);
-				}
-			}
+			assertNoTagVarMutation(tag);
 			if (!valueExtra.nullable) binding.nullable = false;
 			if (!upstreamAlias) {
 				setBindingDownstream(binding, valueExtra);
@@ -7617,6 +7653,7 @@ var define_default = {
 			dropNodes(getAllTagReferenceNodes(tag.node));
 			return;
 		}
+		assertNoTagVarMutation(tag);
 		const paramsBinding = trackParamsReferences(tagBody, 3);
 		setTagDownstream(tag, varBinding);
 		if (bodySection) {
@@ -7834,7 +7871,10 @@ var id_default = {
 		if (!_marko_compiler.types.isIdentifier(node.var)) throw tag.get("var").buildCodeFrameError("The [`<id>` tag](https://markojs.com/docs/reference/core-tag#id) cannot be destructured.");
 		if (tag.node.attributes.length > 1 || tag.node.attributes.length === 1 && (!_marko_compiler.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value")) throw tag.get("name").buildCodeFrameError("The [`<id>` tag](https://markojs.com/docs/reference/core-tag#id) only supports the [`value=` attribute](https://markojs.com/docs/reference/language#shorthand-value).");
 		const binding = trackVarReferences(tag, 5);
-		if (binding) setBindingDownstream(binding, !!valueAttr && evaluate(valueAttr.value));
+		if (binding) {
+			assertNoTagVarMutation(tag);
+			setBindingDownstream(binding, !!valueAttr && evaluate(valueAttr.value));
+		}
 		addSetupExpr(getOrCreateSection(tag), valueAttr?.value);
 	},
 	translate: { exit(tag) {
@@ -7888,9 +7928,13 @@ var let_default = {
 		const tagVar = node.var;
 		let valueAttr;
 		let valueChangeAttr;
-		for (const attr of node.attributes) if (_marko_compiler.types.isMarkoAttribute(attr)) if (attr.name === "value") valueAttr = attr;
-		else if (attr.name === "valueChange") valueChangeAttr = attr;
-		else {
+		for (const attr of node.attributes) if (_marko_compiler.types.isMarkoAttribute(attr)) if (attr.name === "value") {
+			if (valueAttr) throw tag.hub.buildError(attr, "Invalid duplicate value attribute.");
+			valueAttr = attr;
+		} else if (attr.name === "valueChange") {
+			if (valueChangeAttr) throw tag.hub.buildError(attr, "Invalid duplicate valueChange attribute.");
+			valueChangeAttr = attr;
+		} else {
 			const start = attr.loc?.start;
 			const end = attr.loc?.end;
 			const msg = "The [`<let>` tag](https://markojs.com/docs/reference/core-tag#let) only supports the [`value=` attribute](https://markojs.com/docs/reference/language#shorthand-value) and its change handler.";
@@ -7911,6 +7955,7 @@ var let_default = {
 		const binding = trackVarReferences(tag, 1);
 		const tagExtra = mergeReferences(tagSection, tag.node, [valueAttr?.value, valueChangeAttr?.value]);
 		if (valueChangeAttr) {
+			binding.reserveSize = 1;
 			setBindingDownstream(binding, tagExtra);
 			if (binding.assignmentSections) addSerializeReason(tagSection, true, binding, getAccessorPrefix().TagVariableChange);
 		} else setBindingDownstream(binding, false);
@@ -8914,12 +8959,13 @@ var placeholder_default = {
 			const siblingText = extra[kSiblingText];
 			const markerSerializeReason = nodeBinding && getSerializeReason(section, nodeBinding);
 			if (siblingText === 1) {
-				if (isHTML && markerSerializeReason) if (markerSerializeReason === true || markerSerializeReason.state) write`<!>`;
-				else write`${callRuntime("_sep", getSerializeGuard(section, markerSerializeReason, true))}`;
+				if (isHTML && markerSerializeReason) writeSeparator(write, section, markerSerializeReason);
 				visit(placeholder, 37);
 			} else if (siblingText === 2) visit(placeholder, 37);
 			else {
-				if (!isHTML) write` `;
+				if (isHTML) {
+					if (siblingText === 3 && markerSerializeReason) writeSeparator(write, section, markerSerializeReason);
+				} else write` `;
 				visit(placeholder, 32);
 			}
 			if (isHTML) {
@@ -8951,8 +8997,13 @@ function buildEscapedTextExpression(value) {
 		default: return callRuntime("_escape", value);
 	}
 }
+function writeSeparator(write, section, reason) {
+	if (reason === true || reason.state) write`<!>`;
+	else write`${callRuntime("_sep", getSerializeGuard(section, reason, true))}`;
+}
 function analyzeSiblingText(placeholder) {
 	const placeholderExtra = placeholder.node.extra;
+	let hasNodeBefore = false;
 	let prev = placeholder.getPrevSibling();
 	let prevParent = placeholder.parentPath;
 	for (;;) {
@@ -8968,7 +9019,10 @@ function analyzeSiblingText(placeholder) {
 		const contentType = getNodeContentType(prev, "endType");
 		if (contentType === null) prev = prev.getPrevSibling();
 		else if (contentType === 4 || contentType === 1 || contentType === 2) return placeholderExtra[kSiblingText] = 1;
-		else break;
+		else {
+			hasNodeBefore = true;
+			break;
+		}
 	}
 	if (!prev.node && prevParent.isProgram()) return placeholderExtra[kSiblingText] = 1;
 	let next = placeholder.getNextSibling();
@@ -8989,7 +9043,7 @@ function analyzeSiblingText(placeholder) {
 		else break;
 	}
 	if (!next.node && nextParent.isProgram()) return placeholderExtra[kSiblingText] = 2;
-	return placeholderExtra[kSiblingText] = 0;
+	return placeholderExtra[kSiblingText] = hasNodeBefore ? 3 : 0;
 }
 function getInlinedBodyTag(parent) {
 	if (parent.isMarkoTagBody()) {

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

@@ -1,3 +1,4 @@
 import type { types as t } from "@marko/compiler";
 export declare function assertNoSpreadAttrs(tag: t.NodePath<t.MarkoTag>): void;
+export declare function assertNoTagVarMutation(tag: t.NodePath<t.MarkoTag>): void;
 export declare function assertNoBodyContent(tag: t.NodePath<t.MarkoTag>): void;

package/dist/translator/util/binding-has-prop.d.ts

@@ -1,3 +1,5 @@
 import type { Opt } from "./optional";
 import type { Binding } from "./references";
+import type { Section } from "./sections";
+export declare function isSectionRendererElided(section: Section): boolean;
 export declare function bindingHasProperty(binding: Binding, properties: Opt<string>): boolean;

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

@@ -1,4 +1,5 @@
 import { types as t } from "@marko/compiler";
+import type { AccessorPrefix } from "../../common/accessor.debug";
 import { type Many, type Opt, Sorted } from "./optional";
 import { type Section } from "./sections";
 import { type SerializeReason } from "./serialize-reasons";
@@ -50,6 +51,7 @@ export interface Binding {
     pruned: boolean | undefined;
     exposed: boolean;
     forcePersist: boolean;
+    reserveSize: number;
 }
 export interface InputBinding extends Binding {
     type: BindingType.input;
@@ -142,6 +144,8 @@ export declare function getCanonicalBinding(binding: Binding): Binding;
 export declare function getAllTagReferenceNodes(tag: t.MarkoTag, referenceNodes?: t.Node[]): t.Node[];
 export declare function getScopeAccessorLiteral(binding: Binding, encoded?: boolean, includeId?: boolean): t.NumericLiteral | t.StringLiteral;
 export declare function getScopeAccessor(binding: Binding, encoded?: boolean, includeId?: boolean): string;
+export declare function getPrefixedScopeAccessor(binding: Binding, prefix: AccessorPrefix): string;
+export declare function getClosureAccessorId(binding: Binding): number;
 export declare function getDebugScopeAccess(binding: Binding): {
     root: Binding;
     access: string;

package/dist/translator/visitors/placeholder.d.ts

@@ -6,7 +6,8 @@ declare const kSharedText: unique symbol;
 declare enum SiblingText {
     None = 0,
     Before = 1,
-    After = 2
+    After = 2,
+    NodeBefore = 3
 }
 declare module "@marko/compiler/dist/types" {
     interface MarkoPlaceholderExtra {

package/package.json

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

package/tags/lifecycle.d.marko

@@ -1,7 +1,10 @@
 /** File for types only, not actual implementation **/
 
-export type Input<T extends object> = T & {
-  onMount?(): unknown;
-  onUpdate?(): unknown;
-  onDestroy?(): unknown;
+export type Input<
+  T extends object,
+  R extends object = {},
+> = T & ThisType<T & R> & {
+  onMount?: () => R | void;
+  onUpdate?: () => void;
+  onDestroy?: () => void;
 };