marko 6.3.2 → 6.3.4

package/dist/translator/index.js

@@ -104,7 +104,6 @@ let AccessorPrefix$1 = /* @__PURE__ */ function(AccessorPrefix) {
 	AccessorPrefix["ControlledValue"] = "ControlledValue:";
 	AccessorPrefix["DynamicHTMLLastChild"] = "DynamicHTMLLastChild:";
 	AccessorPrefix["EventAttributes"] = "EventAttributes:";
-	AccessorPrefix["Getter"] = "Getter:";
 	AccessorPrefix["KeyedScopes"] = "KeyedScopes:";
 	AccessorPrefix["Lifecycle"] = "Lifecycle:";
 	AccessorPrefix["Promise"] = "Promise:";
@@ -302,6 +301,7 @@ const decodeAccessor = (num) => (num + (num < 26 ? 10 : num < 962 ? 334 : 11998)
 const K_SCOPE_ID = Symbol("Scope ID");
 const kTouchedIterator = Symbol.for("marko.touchedIterator");
 const { hasOwnProperty: hasOwnProperty$1 } = {};
+Array.prototype;
 const Generator = (function* () {})().constructor;
 const AsyncGenerator = (async function* () {})().constructor;
 patchIteratorNext(Generator.prototype);
@@ -856,7 +856,6 @@ let AccessorPrefix = /* @__PURE__ */ function(AccessorPrefix) {
 	AccessorPrefix["ControlledValue"] = "G";
 	AccessorPrefix["DynamicHTMLLastChild"] = "H";
 	AccessorPrefix["EventAttributes"] = "I";
-	AccessorPrefix["Getter"] = "J";
 	AccessorPrefix["KeyedScopes"] = "O";
 	AccessorPrefix["Lifecycle"] = "K";
 	AccessorPrefix["Promise"] = "L";
@@ -1249,6 +1248,7 @@ function startSection(path) {
 			upstreamExpression: void 0,
 			downstreamBinding: void 0,
 			hasAbortSignal: false,
+			abortSignalExprs: 0,
 			readsOwner: false,
 			isBranch: false
 		};
@@ -1539,6 +1539,21 @@ function isStaticRoot(path) {
 	}
 }
 //#endregion
+//#region src/translator/util/analyze-errors.ts
+const [getHasAnalyzeErrors, setHasAnalyzeErrors] = createProgramState(() => false);
+function reportAnalyzeError(path, error) {
+	if (!(error instanceof Error)) throw error;
+	const { label = error.message, loc } = error;
+	setHasAnalyzeErrors(true);
+	(0, _marko_compiler_babel_utils.diagnosticError)(path, {
+		label,
+		loc: loc ?? path.node.loc ?? void 0
+	});
+}
+function hasAnalyzeErrors() {
+	return getHasAnalyzeErrors();
+}
+//#endregion
 //#region src/translator/util/asset-imports.ts
 function addAssetImport(file, request) {
 	(file.metadata.marko.assetImports ??= /* @__PURE__ */ new Set()).add(request);
@@ -2062,6 +2077,7 @@ const pureDOMFunctions = /* @__PURE__ */ new Set([
 	"_load_race_trigger"
 ]);
 function importRuntime(name) {
+	if (!isTranslate()) throw new Error(`\`importRuntime(${JSON.stringify(name)})\` may only be called during the translate stage.`);
 	const { output } = getMarkoOpts();
 	return (0, _marko_compiler_babel_utils.importNamed)((0, _marko_compiler_babel_utils.getFile)(), getRuntimePath(output), name);
 }
@@ -3676,7 +3692,28 @@ function getRegisteredFnExpression(node) {
 }
 //#endregion
 //#region src/translator/util/body-to-text-literal.ts
+const kRawText = Symbol("raw text placeholder");
 function bodyToTextLiteral(body) {
+	return buildTextLiteral(body, toText, false);
+}
+function bodyToRawTextLiteral(body) {
+	return buildTextLiteral(body, (value) => value, true);
+}
+function injectTextCoercion(expr) {
+	switch (expr.type) {
+		case "ConditionalExpression":
+			injectTextCoercion(expr.consequent);
+			injectTextCoercion(expr.alternate);
+			break;
+		case "TemplateLiteral":
+			expr.expressions = expr.expressions.map((child) => toText(child));
+			break;
+	}
+}
+function toText(value) {
+	return callRuntime("_to_text", value);
+}
+function buildTextLiteral(body, coerce, bareSingle) {
 	const templateQuasis = [];
 	const templateExpressions = [];
 	let currentQuasi = "";
@@ -3685,10 +3722,11 @@ function bodyToTextLiteral(body) {
 	else if (_marko_compiler.types.isMarkoPlaceholder(child)) {
 		placeholderExtra ||= child.value.extra;
 		templateQuasis.push(templateElement(currentQuasi, false));
-		templateExpressions.push(callRuntime("_to_text", child.value));
+		templateExpressions.push(coerce(child.value));
 		currentQuasi = "";
 	}
 	if (templateExpressions.length) {
+		if (bareSingle && templateExpressions.length === 1 && !currentQuasi && !templateQuasis[0].value.cooked) return templateExpressions[0];
 		templateQuasis.push(templateElement(currentQuasi, true));
 		const literal = _marko_compiler.types.templateLiteral(templateQuasis, templateExpressions);
 		literal.extra = placeholderExtra;
@@ -3766,9 +3804,9 @@ var for_default = {
 		if (!isAttrTag) allowAttrs.push("by");
 		(0, _marko_compiler_babel_utils.assertAllowedAttributes)(tag, allowAttrs);
 		if (isAttrTag) return;
-		if (forType !== "of") {
-			if (getKnownAttrValues(tag.node).by?.type === "StringLiteral") throw (tag.get("attributes").find((attr) => attr.isMarkoAttribute() && attr.node.name === "by") || tag).buildCodeFrameError(`The [\`<for>\` tag](https://markojs.com/docs/reference/core-tag#for) only supports a string \`by\` key with \`of\`; use a \`by=(${forType === "in" ? "key, value" : "index"}) => ...\` function for \`<for ${forType}>\`.`);
-		}
+		const byAttr = getKnownAttrValues(tag.node).by;
+		if (forType !== "of" && byAttr?.type === "StringLiteral") throw tag.hub.buildError(byAttr, `The [\`<for>\` tag](https://markojs.com/docs/reference/core-tag#for) only supports a string \`by\` key with \`of\`; use a \`by=(${forType === "in" ? "key, value" : "index"}) => ...\` function for \`<for ${forType}>\`.`);
+		if (byAttr?.type === "Identifier" && !tag.scope.getBinding(byAttr.name) && tag.node.body.params.some((param) => Object.hasOwn(_marko_compiler.types.getBindingIdentifiers(param), byAttr.name))) throw tag.hub.buildError(byAttr, `The \`by=\` attribute is evaluated before the loop runs, so \`${byAttr.name}\` is not in scope. Key with a property name string (\`by="id"\`) or a function (\`by=(${byAttr.name}) => key\`).`);
 		const bodySection = startSection(tagBody);
 		if (!bodySection) {
 			dropNodes(getAllTagReferenceNodes(tag.node));
@@ -4773,6 +4811,7 @@ function assertNativeAttrValueType(tag, attr) {
 	if (_marko_compiler.types.isObjectExpression(attr.value)) throw tag.hub.buildError(attr, `The \`${name}\` attribute cannot be a plain object (it would render as \`[object Object]\`).`, Error);
 }
 function assertNativeHandlerAttr(tag, attr) {
+	if (_marko_compiler.types.isObjectExpression(attr.value)) throw tag.hub.buildError(attr.value, `The \`${attr.name}\` ${isEventHandler(attr.name) ? "event handler" : "change handler"} on a [native tag](https://markojs.com/docs/reference/native-tag) must be a function. Attribute values in Marko are plain JavaScript expressions, not JSX; remove the wrapping \`{ }\` (e.g. \`${attr.name}=myHandler\` or \`${attr.name}() { ... }\`).`, Error);
 	if ((0, _marko_compiler_babel_utils.computeNode)(attr.value)?.value) throw tag.hub.buildError(attr.value, `The \`${attr.name}\` ${isEventHandler(attr.name) ? "event handler" : "change handler"} on a [native tag](https://markojs.com/docs/reference/native-tag) must be a function or a falsey value (\`null\`, \`undefined\`, \`false\`, \`0\`, …).`, Error);
 }
 const lowercaseEventHandlerReg = /^on[a-z]/;
@@ -5188,17 +5227,22 @@ function flattenTextOnlyConditional(rootTag) {
 	} while (cur.node && (isCoreTagName(cur, "else-if") || isCoreTagName(cur, "else")));
 	for (const branchTag of branches) assertValidCondition(branchTag);
 	let expr = _marko_compiler.types.stringLiteral("");
+	let rawText = false;
 	for (let i = branches.length; i--;) {
 		const branchTag = branches[i];
-		const text = bodyToTextLiteral(branchTag.node.body);
+		const text = bodyToRawTextLiteral(branchTag.node.body);
+		rawText ||= _marko_compiler.types.isTemplateLiteral(text);
 		expr = isCoreTagName(branchTag, "else") ? text : _marko_compiler.types.conditionalExpression(branchTag.node.attributes[0].value, text, expr);
 	}
 	for (let i = branches.length; i-- > 1;) branches[i].remove();
-	rootTag.replaceWith(_marko_compiler.types.markoPlaceholder(expr, true));
+	const placeholder = _marko_compiler.types.markoPlaceholder(expr, true);
+	if (rawText) (placeholder.extra ??= {})[kRawText] = true;
+	rootTag.replaceWith(placeholder);
 }
 function assertValidCondition(tag) {
+	const conditionTagName = getTagName(tag);
 	(0, _marko_compiler_babel_utils.assertNoVar)(tag);
-	(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
+	(0, _marko_compiler_babel_utils.assertNoArgs)(tag, conditionTagName === "else" ? "Write the condition as an attribute instead: `<else if=condition>`." : `Write the condition as a value attribute instead: \`<${conditionTagName}=condition>\`.`);
 	(0, _marko_compiler_babel_utils.assertNoParams)(tag);
 	assertHasBody$1(tag);
 	assertNoSpreadAttrs(tag);
@@ -5550,6 +5594,7 @@ var program_default = {
 			}
 		},
 		exit(program) {
+			if (hasAnalyzeErrors()) return;
 			finalizeReferences();
 			const programExtra = program.node.extra;
 			const paramsBinding = programExtra.binding;
@@ -5806,7 +5851,7 @@ function knownTagTranslateDOM(tag, propTree, getBindingIdentifier, callSetup) {
 	if (node.var) {
 		const varBinding = node.var.extra.binding;
 		const source = initValue(varBinding);
-		source.register = true;
+		source.register = !!getSerializeReason(tagSection, childScopeBinding) || !signalHasStatements(source);
 		source.buildAssignment = (valueSection, value) => {
 			const changeArgs = [createScopeReadExpression(childScopeBinding, valueSection), value];
 			if (!isOptimize()) changeArgs.push(_marko_compiler.types.stringLiteral(varBinding.name));
@@ -7011,7 +7056,7 @@ function addReadToExpression(root, binding, getter) {
 	const fnRoot = getFnRoot(root);
 	const exprRoot = getExprRoot(fnRoot || root);
 	const section = getOrCreateSection(exprRoot);
-	const exprExtra = exprRoot.node.extra ??= { section };
+	const exprExtra = getCanonicalExtra(exprRoot.node.extra ??= { section });
 	const read = addRead(exprExtra, node.extra ??= {}, binding, section, getter);
 	const { parent } = root;
 	if (parent.type === "BinaryExpression" && (parent.operator === "===" || parent.operator === "!==")) read.comparedTo = parent.left === node ? parent.right : parent.left;
@@ -7488,9 +7533,9 @@ const kDOMBinding$2 = Symbol("await tag dom binding");
 var await_default = {
 	analyze(tag) {
 		(0, _marko_compiler_babel_utils.assertNoVar)(tag);
-		(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
+		(0, _marko_compiler_babel_utils.assertNoArgs)(tag, "Write the promise as a value attribute and receive the result as a tag parameter instead: `<await|result|=promise>`.");
 		assertNoSpreadAttrs(tag);
-		(0, _marko_compiler_babel_utils.assertNoAttributeTags)(tag);
+		(0, _marko_compiler_babel_utils.assertNoAttributeTags)(tag, "For pending and error UI, wrap the `<await>` in a [`<try>` tag](https://markojs.com/docs/reference/core-tag#try) with `<@placeholder>` and `<@catch|err|>` attribute tags.");
 		const { node } = tag;
 		const tagBody = tag.get("body");
 		const section = getOrCreateSection(tag);
@@ -7599,7 +7644,10 @@ var const_default = {
 		assertNoBodyContent(tag);
 		const { node } = tag;
 		const [valueAttr] = node.attributes;
-		if (!node.var) throw tag.get("name").buildCodeFrameError("The [`<const>` tag](https://markojs.com/docs/reference/core-tag#const) requires a [tag variable](https://markojs.com/docs/reference/language#tag-variables).");
+		if (!node.var) {
+			const looksLikeDeclaration = !node.attributes.some((attr) => _marko_compiler.types.isMarkoAttribute(attr) && (attr.default || attr.name === "value")) && node.attributes.length === 1 && _marko_compiler.types.isMarkoAttribute(node.attributes[0]) && /^[A-Za-z_$][\w$]*$/.test(node.attributes[0].name);
+			throw tag.get("name").buildCodeFrameError(`The [\`<const>\` tag](https://markojs.com/docs/reference/core-tag#const) requires a [tag variable](https://markojs.com/docs/reference/language#tag-variables)${looksLikeDeclaration ? `; the variable goes after a slash: \`<const/${node.attributes[0].name}=...>\`. For a one time module level value, prefix a plain JavaScript statement with \`static\`.` : ", e.g. `<const/doubled=count * 2>`."}`);
+		}
 		if (!valueAttr) throw tag.get("name").buildCodeFrameError("The [`<const>` tag](https://markojs.com/docs/reference/core-tag#const) requires a [`value=` attribute](https://markojs.com/docs/reference/language#shorthand-value).");
 		if (node.attributes.length > 1 || !_marko_compiler.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value") throw tag.get("name").buildCodeFrameError("The [`<const>` tag](https://markojs.com/docs/reference/core-tag#const) only supports the [`value=` attribute](https://markojs.com/docs/reference/language#shorthand-value).");
 		const valueExtra = evaluate(valueAttr.value);
@@ -7964,7 +8012,8 @@ var let_default = {
 		} 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.";
+			let 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.";
+			if (!tagVar && /^[A-Za-z_$][\w$]*$/.test(attr.name)) msg += ` To declare reactive state, the variable goes after a slash: \`<let/${attr.name}=...>\`. For a one time module level value, prefix a plain JavaScript statement with \`static\`.`;
 			if (start == null || end == null) throw tag.get("name").buildCodeFrameError(msg);
 			else throw tag.hub.buildError({ loc: {
 				start,
@@ -7975,7 +8024,7 @@ var let_default = {
 		(0, _marko_compiler_babel_utils.assertNoParams)(tag);
 		assertNoBodyContent(tag);
 		assertNoSpreadAttrs(tag);
-		if (!tagVar) throw tag.get("name").buildCodeFrameError("The [`<let>` tag](https://markojs.com/docs/reference/core-tag#let) requires a [tag variable](https://markojs.com/docs/reference/language#tag-variables).");
+		if (!tagVar) throw tag.get("name").buildCodeFrameError("The [`<let>` tag](https://markojs.com/docs/reference/core-tag#let) requires a [tag variable](https://markojs.com/docs/reference/language#tag-variables), e.g. `<let/count=0>`.");
 		if (!_marko_compiler.types.isIdentifier(tagVar)) throw tag.get("var").buildCodeFrameError("The [`<let>` tag](https://markojs.com/docs/reference/core-tag#let) variable cannot be destructured.");
 		if (valueChangeAttr && (0, _marko_compiler_babel_utils.computeNode)(valueChangeAttr.value)?.value) throw tag.get("attributes").find((attr) => attr.node === valueChangeAttr).get("value").buildCodeFrameError("The [`<let>` tag](https://markojs.com/docs/reference/core-tag#let) [`valueChange=` attribute](https://markojs.com/docs/reference/core-tag#controllable-let) must be a function.");
 		const tagSection = getOrCreateSection(tag);
@@ -8339,7 +8388,7 @@ function isLiteral(expr) {
 }
 function assertValidShow(tag) {
 	(0, _marko_compiler_babel_utils.assertNoVar)(tag);
-	(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
+	(0, _marko_compiler_babel_utils.assertNoArgs)(tag, "Write the condition as a value attribute instead: `<show=condition>`.");
 	(0, _marko_compiler_babel_utils.assertNoParams)(tag);
 	assertNoSpreadAttrs(tag);
 	assertHasBody(tag);
@@ -8968,6 +9017,7 @@ var placeholder_default = {
 		if (isNonHTMLText(placeholder)) return;
 		const { node } = placeholder;
 		const { value } = node;
+		if (node.extra?.[kRawText]) injectTextCoercion(value);
 		const valueExtra = evaluate(value);
 		const { confident, computed } = valueExtra;
 		if (confident && isVoid(computed)) {
@@ -9080,7 +9130,7 @@ function getInlinedBodyTag(parent) {
 }
 //#endregion
 //#region src/translator/visitors/referenced-identifier.ts
-const abortIdsByExpressionForSection = /* @__PURE__ */ new WeakMap();
+const [getAbortResetEmitted] = createSectionState("abortResetEmitted", () => /* @__PURE__ */ new Set());
 var referenced_identifier_default = {
 	migrate(identifier) {
 		const { name } = identifier.node;
@@ -9100,6 +9150,9 @@ var referenced_identifier_default = {
 			const section = getOrCreateSection(identifier);
 			section.hasAbortSignal = true;
 			setReferencesScope(identifier);
+			const exprRoot = getExprRoot(identifier);
+			const rootExtra = exprRoot.node.extra ??= { section };
+			if (rootExtra.abortId === void 0) rootExtra.abortId = section.abortSignalExprs++;
 		}
 	},
 	translate(identifier) {
@@ -9114,16 +9167,10 @@ var referenced_identifier_default = {
 			else {
 				const section = getSection(identifier);
 				const exprRoot = getExprRoot(identifier);
-				let abortIdsByExpression = abortIdsByExpressionForSection.get(section);
-				let exprId;
-				if (abortIdsByExpression) exprId = abortIdsByExpression.get(exprRoot);
-				else {
-					abortIdsByExpression = /* @__PURE__ */ new Map();
-					abortIdsByExpressionForSection.set(section, abortIdsByExpression);
-				}
-				if (exprId === void 0) {
-					exprId = abortIdsByExpression.size;
-					abortIdsByExpression.set(exprRoot, exprId);
+				const exprId = exprRoot.node.extra.abortId;
+				const resetEmitted = getAbortResetEmitted(section);
+				if (!resetEmitted.has(exprRoot)) {
+					resetEmitted.add(exprRoot);
 					addStatement("render", section, exprRoot.node.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(importRuntime("$signalReset"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)])), false);
 				}
 				identifier.replaceWith(_marko_compiler.types.callExpression(importRuntime("$signal"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)]));
@@ -9135,7 +9182,11 @@ var referenced_identifier_default = {
 //#region src/translator/visitors/scriptlet.ts
 var scriptlet_default = {
 	analyze(scriptlet) {
-		if (!scriptlet.node.static) throw scriptlet.buildCodeFrameError("Scriptlets are not supported when using the tags api.");
+		if (!scriptlet.node.static) {
+			reportAnalyzeError(scriptlet, scriptlet.buildCodeFrameError("Scriptlets are not supported when using the tags api."));
+			scriptlet.skip();
+			return;
+		}
 		mergeReferences(getOrCreateSection(scriptlet), scriptlet.node, scriptlet.node.body);
 		if (scriptlet.node.target === "client") (0, _marko_compiler_babel_utils.getProgram)().node.extra.isInteractive = true;
 	},
@@ -9294,11 +9345,18 @@ function getTagRelativePath(tag) {
 	if (!relativePath) throw tagNotFoundError(tag);
 	return relativePath;
 }
+const knownWrongTags = /* @__PURE__ */ new Map([
+	["slot", "To render content passed to this tag, use a [dynamic tag](https://markojs.com/docs/reference/language#dynamic-tags): `<${input.content}/>`."],
+	["state", "Reactive state is declared with the [`<let>` tag](https://markojs.com/docs/reference/core-tag#let): `<let/name=initialValue>`."],
+	["fragment", "Marko templates and tag bodies may have multiple root nodes; no fragment wrapper is needed."]
+]);
 function tagNotFoundError(tag) {
 	const tagName = getTagName(tag);
 	if (tagName && tag.scope.hasBinding(tagName)) return tag.get("name").buildCodeFrameError(`Local variables must be in a [dynamic tag](https://markojs.com/docs/reference/language#dynamic-tags) unless they are PascalCase. Use \`<\${${tagName}}/>\` or rename to \`${tagName.charAt(0).toUpperCase() + tagName.slice(1)}\`.`);
 	let didYouMean = "";
-	if (tagName) {
+	const knownWrongTagHint = tagName && knownWrongTags.get(tagName);
+	if (knownWrongTagHint) didYouMean = ` ${knownWrongTagHint}`;
+	else if (tagName) {
 		const closestTag = (0, fastest_levenshtein.closest)(tagName, Object.keys((0, _marko_compiler_babel_utils.getTaglibLookup)(tag.hub.file).merged.tags));
 		if ((0, fastest_levenshtein.distance)(tagName, closestTag) < 4) didYouMean = ` Did you mean \`<${closestTag}>\`?`;
 	}
@@ -9505,33 +9563,46 @@ function enableDynamicTagResume(tag) {
 var tag_default = {
 	analyze: {
 		enter(tag) {
-			const tagDef = (0, _marko_compiler_babel_utils.getTagDef)(tag);
-			const type = analyzeTagNameType(tag);
-			const hook = tagDef?.analyzer?.hook;
-			if (hook) {
-				enter$1(hook, tag);
-				return;
-			}
-			if (type === 0) {
-				native_tag_default.analyze.enter(tag);
-				return;
-			}
-			switch (type) {
-				case 1:
-					custom_tag_default.analyze.enter(tag);
-					break;
-				case 3:
-					attribute_tag_default.analyze.enter(tag);
-					break;
-				case 2:
-					dynamic_tag_default.analyze.enter(tag);
-					break;
+			try {
+				const tagDef = (0, _marko_compiler_babel_utils.getTagDef)(tag);
+				const type = analyzeTagNameType(tag);
+				const hook = tagDef?.analyzer?.hook;
+				if (hook) {
+					enter$1(hook, tag);
+					return;
+				}
+				if (type === 0) {
+					native_tag_default.analyze.enter(tag);
+					return;
+				}
+				switch (type) {
+					case 1:
+						custom_tag_default.analyze.enter(tag);
+						break;
+					case 3:
+						attribute_tag_default.analyze.enter(tag);
+						break;
+					case 2:
+						dynamic_tag_default.analyze.enter(tag);
+						break;
+				}
+			} catch (err) {
+				(tag.node.extra ??= {}).analyzeFailed = true;
+				reportAnalyzeError(tag, err);
+				tag.skip();
 			}
 		},
 		exit(tag) {
-			const hook = (0, _marko_compiler_babel_utils.getTagDef)(tag)?.analyzer?.hook;
-			if (hook) {
-				exit$1(hook, tag);
+			if (tag.node.extra?.analyzeFailed) return;
+			try {
+				const hook = (0, _marko_compiler_babel_utils.getTagDef)(tag)?.analyzer?.hook;
+				if (hook) {
+					exit$1(hook, tag);
+					return;
+				}
+			} catch (err) {
+				(tag.node.extra ??= {}).analyzeFailed = true;
+				reportAnalyzeError(tag, err);
 				return;
 			}
 		}

package/dist/translator/util/analyze-errors.d.ts

@@ -0,0 +1,3 @@
+import type { types as t } from "@marko/compiler";
+export declare function reportAnalyzeError(path: t.NodePath<t.Node>, error: unknown): void;
+export declare function hasAnalyzeErrors(): boolean;

package/dist/translator/util/body-to-text-literal.d.ts

@@ -1,2 +1,10 @@
 import { types as t } from "@marko/compiler";
-export declare function bodyToTextLiteral(body: t.MarkoTagBody): t.StringLiteral | t.TemplateLiteral;
+export declare const kRawText: unique symbol;
+declare module "@marko/compiler/dist/types" {
+    interface MarkoPlaceholderExtra {
+        [kRawText]?: true;
+    }
+}
+export declare function bodyToTextLiteral(body: t.MarkoTagBody): t.Expression;
+export declare function bodyToRawTextLiteral(body: t.MarkoTagBody): t.Expression;
+export declare function injectTextCoercion(expr: t.Expression): void;

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

@@ -47,6 +47,9 @@ export interface Section {
         properties: Opt<string>;
     } | false | undefined;
     hasAbortSignal: boolean;
+    /** Count of distinct `$signal` expression roots; analyze allocates each
+     * root's `abortId` from this so translates read, never re-derive. */
+    abortSignalExprs: number;
     readsOwner: boolean;
     isBranch: boolean;
     content: null | {

package/dist/translator/visitors/referenced-identifier.d.ts

@@ -1,4 +1,11 @@
 import { types as t } from "@marko/compiler";
+declare module "@marko/compiler/dist/types" {
+    interface NodeExtra {
+        /** `$signal` abort id for this expression root, allocated in analyze
+         * (see below) so every translate reads the same id. */
+        abortId?: number;
+    }
+}
 declare const _default: {
     migrate(this: unknown, identifier: t.NodePath<t.Identifier>): void;
     analyze(this: unknown, identifier: t.NodePath<t.Identifier>): void;

package/dist/translator/visitors/tag/index.d.ts

@@ -1,4 +1,9 @@
 import { types as t } from "@marko/compiler";
+declare module "@marko/compiler/dist/types" {
+    interface MarkoTagExtra {
+        analyzeFailed?: boolean;
+    }
+}
 declare const _default: {
     analyze: {
         enter(this: unknown, tag: t.NodePath<t.MarkoTag>): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.2",
+  "version": "6.3.4",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -20,6 +20,7 @@
     ".": {
       "types": "./index.d.ts"
     },
+    "./cheatsheet.md": "./cheatsheet.md",
     "./package.json": "./package.json",
     "./translator": "./dist/translator/index.js",
     "./tags/*": "./tags/*",
@@ -43,13 +44,14 @@
     "tags-html.d.ts",
     "!**/meta.*.json",
     "!**/__tests__",
-    "!**/*.tsbuildinfo"
+    "!**/*.tsbuildinfo",
+    "cheatsheet.md"
   ],
   "scripts": {
     "build": "node -r ~ts ./scripts/bundle.mts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.66",
+    "@marko/compiler": "^5.40.2",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
@@ -61,6 +63,7 @@
     ".": {
       "types": "./index.d.ts"
     },
+    "./cheatsheet.md": "./cheatsheet.md",
     "./translator": "./src/translator/index.ts",
     "./tags/*": "./tags/*",
     "./debug/*": "./src/*.ts",