marko 6.3.42 → 6.3.44

package/dist/translator/index.js

@@ -784,6 +784,7 @@ function isInvokedFunction(expr) {
 //#endregion
 //#region src/translator/util/constants/structure-kind.ts
 const Visit = "visit";
+const Text = "text";
 const Child = "child";
 const SectionRef = "sectionRef";
 const ExportRef = "exportRef";
@@ -1322,6 +1323,7 @@ function createSectionState(key, init) {
 //#endregion
 //#region src/translator/util/tag-name-type.ts
 const MARKO_FILE_REG = /^<.*>$|\.marko$/;
+const TAG_NAME_IDENTIFIER_REG$1 = /^[A-Z][a-zA-Z0-9_$]*$/;
 function analyzeTagNameType(tag, allowDynamic) {
 	const extra = tag.node.extra ??= {};
 	if (extra.tagNameType === void 0) {
@@ -1348,6 +1350,8 @@ function analyzeTagNameType(tag, allowDynamic) {
 			} else if (!childFile) {
 				extra.tagNameType = 2;
 				extra.tagNameDynamic = true;
+				const tagName = name.node.value;
+				extra.tagNameUnresolved = !(TAG_NAME_IDENTIFIER_REG$1.test(tagName) && tag.scope.hasBinding(tagName));
 			}
 		}
 	}
@@ -2373,11 +2377,11 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			}
 			const childScope = getScopeById(branchId);
 			const needsScript = childScope && (childScope["EventAttributes:a"] || childScope["ControlledHandler:a"]);
-			if (needsScript) _script(branchId, "d");
+			if (needsScript) _script(branchId, "_d");
 			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
 		};
 		renderNative();
-		result = _el(branchId, "e");
+		result = _el(branchId, "_e");
 	} else {
 		const chunk = void 0;
 		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
@@ -3898,6 +3902,12 @@ function writeTo(path) {
 		}
 	};
 }
+function writeTextTo(path, value) {
+	if (value) getSection(path).structure?.push({
+		kind: Text,
+		value
+	});
+}
 function pushMarkup(structure, str) {
 	if (!str) return;
 	const last = structure.length - 1;
@@ -3923,17 +3933,31 @@ function resolveStructure(section) {
 		walkComment: [],
 		steps: startDynamic ? [0, 1] : []
 	};
-	for (const op of section.structure) if (typeof op === "string") appendLiteral(resolved.writes, op);
-	else if (typeof op === "number") resolved.steps.push(op);
+	let textEdge;
+	for (const op of section.structure) if (typeof op === "string") {
+		appendLiteral(resolved.writes, op);
+		textEdge = void 0;
+	} else if (typeof op === "number") resolved.steps.push(op);
 	else switch (op.kind) {
+		case Text:
+			if (textEdge === "child") separate(resolved);
+			appendLiteral(resolved.writes, op.value);
+			textEdge = "own";
+			break;
 		case Visit:
 			if (!op.claimed) continue;
 			flushSteps(resolved);
 			resolved.walkComment.push(walkCodeToName[op.code]);
 			appendLiteral(resolved.walks, String.fromCharCode(op.code));
-			if (op.code !== 32) appendLiteral(resolved.writes, "<!>");
+			if (op.code !== 32) {
+				appendLiteral(resolved.writes, "<!>");
+				textEdge = void 0;
+			}
 			break;
 		case Child: {
+			const content = refContent(op.renderer);
+			if (textEdge && content?.startType === 4) separate(resolved);
+			textEdge = content?.endType === 4 ? "child" : void 0;
 			flushSteps(resolved);
 			const template = op.renderer && resolveRef(op.renderer, "template");
 			if (template) resolved.writes.push(template, "");
@@ -3952,6 +3976,13 @@ function resolveStructure(section) {
 	flushSteps(resolved);
 	return resolved;
 }
+function separate(resolved) {
+	appendLiteral(resolved.writes, "<!>");
+	resolved.steps.push(0, 1);
+}
+function refContent(ref) {
+	return (ref && (ref.kind === "sectionRef" ? ref.section : ref.program.section))?.content;
+}
 function resolveRef(ref, part) {
 	if (ref.kind === "sectionRef") return getSectionMetaIdentifiers(ref.section)[part === "template" ? "writes" : "walks"];
 	const name = ref.program.domExports[part];
@@ -6057,7 +6088,8 @@ function preAnalyze$1(tag) {
 		const [firstChild] = tag.node.body.body;
 		if (firstChild.type === "MarkoText") firstChild.value = firstChild.value.replace(/^\r?\n/, "");
 		const parts = [];
-		for (const child of tag.node.body.body) if (child.type === "MarkoText" || child.type === "MarkoPlaceholder" && child.escape) parts.push(child.value);
+		for (const child of tag.node.body.body) if (child.type === "MarkoText") parts.push((0, _marko_compiler_babel_utils.decodeHTML)(child.value));
+		else if (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) {
@@ -9777,7 +9809,9 @@ var import_declaration_default = {
 			}
 			(node.extra ??= {}).loadImport = loadImport;
 			const { file } = importDecl.hub;
-			if (!(tagImport && (0, _marko_compiler_babel_utils.loadFileForImport)(file, value))) throw importDecl.buildCodeFrameError("Unable to resolve marko file for load import.");
+			const loadFile = tagImport && (0, _marko_compiler_babel_utils.loadFileForImport)(file, value);
+			if (!loadFile) throw importDecl.buildCodeFrameError("Unable to resolve marko file for load import.");
+			if (loadFile.ast.program.extra?.featureType === "class") throw importDecl.buildCodeFrameError(`The [\`load\` import attribute](https://markojs.com/docs/reference/lazy-loading) is not supported for the Marko 5 (class API) tag \`${value}\`. Import it without \`load\`, or migrate the tag to the tags API.`);
 		}
 	},
 	translate: { exit(importDecl) {
@@ -9942,12 +9976,12 @@ var placeholder_default = {
 			const staticText = confident ? getHTMLRuntime()[node.escape ? "_escape" : "_unescaped"](computed) : void 0;
 			if (staticText === "") return;
 			const extra = node.extra || {};
-			if (confident && node.escape) writeTo(placeholder)`${staticText}`;
+			if (confident && node.escape) writeTextTo(placeholder, staticText);
 			else {
 				const siblingText = extra[kSiblingText];
 				if (siblingText === 1 || siblingText === 2) visit(placeholder, 37);
 				else {
-					writeTo(placeholder)` `;
+					writeTextTo(placeholder, " ");
 					visit(placeholder, 32);
 				}
 			}
@@ -10099,9 +10133,14 @@ var referenced_identifier_default = {
 		const { name } = identifier.node;
 		if (identifier.scope.hasBinding(name)) return;
 		switch (name) {
-			case "$global":
-				if (!isOutputHTML()) identifier.replaceWith(_marko_compiler.types.memberExpression(scopeIdentifier, _marko_compiler.types.identifier(getAccessorProp().Global)));
+			case "$global": {
+				if (isOutputHTML()) break;
+				const globalRead = _marko_compiler.types.memberExpression(scopeIdentifier, _marko_compiler.types.identifier(getAccessorProp().Global));
+				const key = !isOptimize() && getSignalGlobalKey(identifier);
+				if (key) identifier.parentPath.replaceWith(callRuntime("_global_read", globalRead, _marko_compiler.types.stringLiteral(key)));
+				else identifier.replaceWith(globalRead);
 				break;
+			}
 			case "$signal": if (isOutputHTML()) identifier.replaceWith(_marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement([_marko_compiler.types.throwStatement(_marko_compiler.types.newExpression(_marko_compiler.types.identifier("Error"), [_marko_compiler.types.stringLiteral("Cannot use $signal in a server render.")]))])), []));
 			else {
 				const section = getSection(identifier);
@@ -10117,6 +10156,13 @@ var referenced_identifier_default = {
 		}
 	}
 };
+function getSignalGlobalKey(identifier) {
+	const { parent } = identifier;
+	if (!_marko_compiler.types.isMemberExpression(parent) || parent.computed || !_marko_compiler.types.isIdentifier(parent.property) || parent.object !== identifier.node) return;
+	const { name } = parent.property;
+	if (name === "runtimeId" || name === "renderId") return;
+	return getExprRoot(identifier).node.extra?.referencedBindings ? name : void 0;
+}
 //#endregion
 //#region src/translator/visitors/scriptlet.ts
 var scriptlet_default = {
@@ -10375,6 +10421,7 @@ function pushCompatRegistration(key, statement) {
 }
 var dynamic_tag_default = {
 	analyze: { enter(tag) {
+		if (tag.node.extra?.tagNameUnresolved) throw tagNotFoundError(tag);
 		(0, _marko_compiler_babel_utils.assertAttributesOrArgs)(tag);
 		const { node } = tag;
 		const definedBodySection = node.extra?.defineBodySection;
@@ -10659,7 +10706,7 @@ var tag_default = {
 var text_default = {
 	analyze: { exit(text) {
 		if (isNonHTMLText(text)) return;
-		writeTo(text)`${text.node.value}`;
+		writeTextTo(text, text.node.value);
 		if (!isStaticText(getPrevStaticSibling(text))) enterShallow(text);
 	} },
 	translate: { exit(text) {

package/dist/translator/util/constants/structure-kind.d.ts

@@ -1,4 +1,5 @@
 export declare const Visit = "visit";
+export declare const Text = "text";
 export declare const Child = "child";
 export declare const SectionRef = "sectionRef";
 export declare const ExportRef = "exportRef";

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

@@ -28,7 +28,11 @@ export interface StructureExportRef {
     path: string;
     hint: string;
 }
-export type StructureOp = string | Step.Value | StructureVisit | StructureChild;
+export type StructureOp = string | Step.Value | StructureText | StructureVisit | StructureChild;
+export interface StructureText {
+    kind: typeof StructureKind.Text;
+    value: string;
+}
 export interface StructureVisit {
     kind: typeof StructureKind.Visit;
     code: typeof WalkCode.Get | typeof WalkCode.Replace | typeof WalkCode.DynamicTagWithVar;

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

@@ -6,6 +6,7 @@ export declare function exit(path: t.NodePath<any>): void;
 export declare function enterShallow(path: t.NodePath<any>): void;
 export declare function child(tag: t.NodePath<t.MarkoTag>, name: string, renderer?: StructureRef): void;
 export declare function writeTo(path: t.NodePath<any>): (strs: TemplateStringsArray, ...exprs: string[]) => void;
+export declare function writeTextTo(path: t.NodePath<any>, value: string): void;
 export declare function visit(path: t.NodePath<t.MarkoTag | t.MarkoPlaceholder | t.Program>, code: StructureVisit["code"], claimed?: boolean): StructureVisit | undefined;
 type ResolvedPart = string | t.Expression;
 interface ResolvedStructure {

package/dist/translator/util/tag-name-type.d.ts

@@ -10,6 +10,7 @@ declare module "@marko/compiler/dist/types" {
         tagNameNullable?: boolean;
         tagNameDynamic?: boolean;
         tagNameImported?: string;
+        tagNameUnresolved?: boolean;
         tagNameLoad?: LoadImportConfig;
         featureType?: ProgramExtra["featureType"];
     }

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

@@ -17,3 +17,4 @@ declare const _default: {
 };
 export default _default;
 export declare function getTagRelativePath(tag: t.NodePath<t.MarkoTag>): string;
+export declare function tagNotFoundError(tag: t.NodePath<t.MarkoTag>): Error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.42",
+  "version": "6.3.44",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -51,14 +51,14 @@
     }
   },
   "dependencies": {
-    "@marko/compiler": "^5.42.1",
+    "@marko/compiler": "^5.42.2",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.42",
-    "marko": "5.39.35"
+    "@marko/runtime-tags": "npm:marko@6.3.44",
+    "marko": "5.39.36"
   },
   "engines": {
     "node": ">=22"