@marko/runtime-tags 6.2.1 → 6.2.3

package/dist/debug/html.js

@@ -1002,7 +1002,7 @@ function writeArrayBuffer(state, val) {
 	return true;
 }
 function writeTypedArray(state, val, ref) {
-	if (val.byteOffset || state.refs.has(val.buffer)) {
+	if (val.byteOffset || val.byteLength < val.buffer.byteLength || state.refs.has(val.buffer)) {
 		const needsLength = val.byteOffset + val.byteLength < val.buffer.byteLength;
 		state.buf.push("new " + val.constructor.name + "(");
 		writeProp(state, val.buffer, ref, "buffer");

package/dist/debug/html.mjs

@@ -1000,7 +1000,7 @@ function writeArrayBuffer(state, val) {
 	return true;
 }
 function writeTypedArray(state, val, ref) {
-	if (val.byteOffset || state.refs.has(val.buffer)) {
+	if (val.byteOffset || val.byteLength < val.buffer.byteLength || state.refs.has(val.buffer)) {
 		const needsLength = val.byteOffset + val.byteLength < val.buffer.byteLength;
 		state.buf.push("new " + val.constructor.name + "(");
 		writeProp(state, val.buffer, ref, "buffer");

package/dist/html.js

@@ -755,7 +755,7 @@ function writeArrayBuffer(state, val) {
 	return state.buf.push(result), !0;
 }
 function writeTypedArray(state, val, ref) {
-	if (val.byteOffset || state.refs.has(val.buffer)) {
+	if (val.byteOffset || val.byteLength < val.buffer.byteLength || state.refs.has(val.buffer)) {
 		let needsLength = val.byteOffset + val.byteLength < val.buffer.byteLength;
 		state.buf.push("new " + val.constructor.name + "("), writeProp(state, val.buffer, ref, "buffer"), state.buf.push((val.byteOffset || needsLength ? "," + val.byteOffset + (needsLength ? "," + val.length : "") : "") + ")");
 	} else state.refs.set(val.buffer, new Reference(ref, "buffer", state.flush, null)), state.buf.push("new " + val.constructor.name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));

package/dist/html.mjs

@@ -754,7 +754,7 @@ function writeArrayBuffer(state, val) {
 	return state.buf.push(result), !0;
 }
 function writeTypedArray(state, val, ref) {
-	if (val.byteOffset || state.refs.has(val.buffer)) {
+	if (val.byteOffset || val.byteLength < val.buffer.byteLength || state.refs.has(val.buffer)) {
 		let needsLength = val.byteOffset + val.byteLength < val.buffer.byteLength;
 		state.buf.push("new " + val.constructor.name + "("), writeProp(state, val.buffer, ref, "buffer"), state.buf.push((val.byteOffset || needsLength ? "," + val.byteOffset + (needsLength ? "," + val.length : "") : "") + ")");
 	} else state.refs.set(val.buffer, new Reference(ref, "buffer", state.flush, null)), state.buf.push("new " + val.constructor.name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));

package/dist/translator/index.js

@@ -2443,10 +2443,10 @@ function normalizeStringExpression(parts, useIife) {
 			const exprLen = content.expressions.length;
 			shiftItems(parts, nextIndex, content.quasis.length + exprLen);
 			for (let j = 0; j < exprLen; j++) {
-				parts[nextIndex++] = content.quasis[j].value.raw;
+				parts[nextIndex++] = content.quasis[j].value.cooked ?? "";
 				parts[nextIndex++] = content.expressions[j];
 			}
-			parts[nextIndex] = content.quasis[exprLen].value.raw;
+			parts[nextIndex] = content.quasis[exprLen].value.cooked ?? "";
 			continue;
 		} else {
 			exprs.push(content);
@@ -3834,7 +3834,7 @@ var html_default = { translate: {
 		else child.replaceWithMultiple(child.node.body);
 		const contentId = usedSharedUid("content") && getTemplateContentName();
 		const contentFn = _marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.identifier("input")], _marko_compiler.types.blockStatement(renderContent));
-		const exportDefault = _marko_compiler.types.exportDefaultDeclaration(callRuntime("_template", _marko_compiler.types.stringLiteral(program.hub.file.metadata.marko.id), contentId ? _marko_compiler.types.identifier(contentId) : contentFn, program.node.extra.page ? _marko_compiler.types.numericLiteral(1) : void 0));
+		const exportDefault = _marko_compiler.types.exportDefaultDeclaration(callRuntime("_template", _marko_compiler.types.stringLiteral(program.hub.file.metadata.marko.id), contentId ? _marko_compiler.types.identifier(contentId) : contentFn, program.node.extra.page || !getMarkoOpts().linkAssets ? _marko_compiler.types.numericLiteral(1) : void 0));
 		if (contentId) program.node.body.push(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(_marko_compiler.types.identifier(contentId), contentFn)]), exportDefault);
 		else program.node.body.push(exportDefault);
 	}
@@ -3862,15 +3862,15 @@ function replaceRegisteredFunctionNode(node) {
 	switch (node.type) {
 		case "ClassMethod": {
 			const replacement = getRegisteredFnExpression(node);
-			return replacement && _marko_compiler.types.classProperty(node.key, replacement);
+			return replacement && _marko_compiler.types.classProperty(node.key, replacement, void 0, void 0, node.computed, node.static);
 		}
 		case "ClassPrivateMethod": {
 			const replacement = getRegisteredFnExpression(node);
-			return replacement && _marko_compiler.types.classPrivateProperty(node.key, replacement);
+			return replacement && _marko_compiler.types.classPrivateProperty(node.key, replacement, void 0, node.static);
 		}
 		case "ObjectMethod": {
 			const replacement = getRegisteredFnExpression(node);
-			return replacement && _marko_compiler.types.objectProperty(node.key, replacement);
+			return replacement && _marko_compiler.types.objectProperty(node.key, replacement, node.computed);
 		}
 		case "ArrowFunctionExpression":
 		case "FunctionExpression": return getRegisteredFnExpression(node);
@@ -3983,6 +3983,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 bodySection = startSection(tagBody);
 		if (!bodySection) {
 			dropNodes(getAllTagReferenceNodes(tag.node));
@@ -6704,7 +6707,7 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
 				if (element) {
 					if (element.type === "RestElement") {
 						excludeProperties = i > 0 ? addNumericPropertiesUntil(excludeProperties, i) : void 0;
-						createBindingsAndTrackReferences(element.argument, type, scope, section, patternBinding, property, excludeProperties, i);
+						createBindingsAndTrackReferences(element.argument, type, scope, section, patternBinding, void 0, excludeProperties, i);
 					} else if (_marko_compiler.types.isLVal(element)) createBindingsAndTrackReferences(element, type, scope, section, patternBinding, `${i}`, void 0);
 				}
 			}
@@ -9070,10 +9073,32 @@ function parseTriggerType(type) {
 	}
 }
 //#endregion
+//#region src/translator/util/static-text.ts
+function isStaticText(node) {
+	switch (node?.type) {
+		case "MarkoText": return true;
+		case "MarkoPlaceholder":
+			if (node.escape) {
+				const { confident, computed } = evaluate(node.value);
+				return confident && isNotVoid(computed);
+			}
+			return false;
+	}
+}
+function getPrevStaticSibling(path) {
+	let prev = path.getPrevSibling();
+	while (prev.node && (prev.isMarkoComment() || prev.isMarkoPlaceholder() && isEmptyPlaceholder(prev.node))) prev = prev.getPrevSibling();
+	return prev.node;
+}
+function isEmptyPlaceholder(placeholder) {
+	const { confident, computed } = evaluate(placeholder.value);
+	return confident && isVoid(computed);
+}
+//#endregion
 //#region src/translator/visitors/placeholder.ts
 const kNodeBinding = Symbol("placeholder node binding");
 const kSiblingText = Symbol("placeholder has sibling text");
-const kSharedText = Symbol("placeholder will merge its visitor with a another node");
+const kSharedText$1 = Symbol("placeholder will merge its visitor with a another node");
 var placeholder_default = {
 	analyze(placeholder) {
 		if (isNonHTMLText(placeholder)) return;
@@ -9082,7 +9107,7 @@ var placeholder_default = {
 		const { confident, computed } = valueExtra;
 		if (confident && isVoid(computed)) return;
 		if (isStaticText(node)) {
-			if (isStaticText(getPrev(placeholder)) || isStaticText(getNext(placeholder))) (node.extra ??= {})[kSharedText] = true;
+			if (isStaticText(getPrevStaticSibling(placeholder))) (node.extra ??= {})[kSharedText$1] = true;
 		} else {
 			const section = getOrCreateSection(placeholder);
 			const nodeBinding = (node.extra ??= {})[kNodeBinding] = createBinding("#text", 0, section);
@@ -9126,7 +9151,7 @@ var placeholder_default = {
 				if (nodeBinding) markNode(placeholder, nodeBinding, markerSerializeReason);
 			} else addStatement("render", section, valueExtra.referencedBindings, _marko_compiler.types.expressionStatement(method === "_text" ? callRuntime("_text", createScopeReadExpression(nodeBinding), value) : callRuntime("_html", scopeIdentifier, value, getScopeAccessorLiteral(nodeBinding))), void 0, true);
 		}
-		if (!extra[kSharedText]) enterShallow(placeholder);
+		if (!extra[kSharedText$1]) enterShallow(placeholder);
 		placeholder.remove();
 	} }
 };
@@ -9196,29 +9221,6 @@ function getInlinedBodyTag(parent) {
 		if (tag.isMarkoTag() && isCoreTagName(tag, "show")) return tag;
 	}
 }
-function isStaticText(node) {
-	switch (node?.type) {
-		case "MarkoText": return true;
-		case "MarkoPlaceholder": if (node.escape) {
-			const { confident, computed } = evaluate(node.value);
-			return confident && isNotVoid(computed);
-		} else return false;
-	}
-}
-function getPrev(path) {
-	let prev = path.getPrevSibling();
-	while (prev.node && (prev.isMarkoComment() || prev.isMarkoPlaceholder() && isEmptyPlaceholder(prev.node))) prev = prev.getPrevSibling();
-	return prev.node;
-}
-function getNext(path) {
-	let next = path.getNextSibling();
-	while (next.node && (next.isMarkoComment() || next.isMarkoPlaceholder() && isEmptyPlaceholder(next.node))) next = next.getNextSibling();
-	return next.node;
-}
-function isEmptyPlaceholder(placeholder) {
-	const { confident, computed } = evaluate(placeholder.value);
-	return confident && isVoid(computed);
-}
 //#endregion
 //#region src/translator/visitors/referenced-identifier.ts
 const abortIdsByExpressionForSection = /* @__PURE__ */ new WeakMap();
@@ -9728,12 +9730,19 @@ var tag_default = {
 };
 //#endregion
 //#region src/translator/visitors/text.ts
-var text_default = { translate: { exit(text) {
-	if (isNonHTMLText(text)) return;
-	writeTo(text)`${text.node.value}`;
-	enterShallow(text);
-	text.remove();
-} } };
+const kSharedText = Symbol("text merges its walk step with a sibling node");
+var text_default = {
+	analyze(text) {
+		if (isNonHTMLText(text)) return;
+		if (isStaticText(getPrevStaticSibling(text))) (text.node.extra ??= {})[kSharedText] = true;
+	},
+	translate: { exit(text) {
+		if (isNonHTMLText(text)) return;
+		writeTo(text)`${text.node.value}`;
+		if (!text.node.extra?.[kSharedText]) enterShallow(text);
+		text.remove();
+	} }
+};
 //#endregion
 //#region src/translator/interop/build-aggregate-error.ts
 function buildAggregateError(file, rootMsg, ...paths) {

package/dist/translator/util/static-text.d.ts

@@ -0,0 +1,3 @@
+import { types as t } from "@marko/compiler";
+export declare function isStaticText(node?: t.Node): boolean | undefined;
+export declare function getPrevStaticSibling(path: t.NodePath): t.Node;

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

@@ -1,5 +1,12 @@
 import { types as t } from "@marko/compiler";
+declare const kSharedText: unique symbol;
+declare module "@marko/compiler/dist/types" {
+    interface NodeExtra {
+        [kSharedText]?: true;
+    }
+}
 declare const _default: {
+    analyze(this: unknown, text: t.NodePath<t.MarkoText>): void;
     translate: {
         exit(this: unknown, text: t.NodePath<t.MarkoText>): void;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",