@marko/runtime-tags 6.0.169 → 6.0.171

package/dist/debug/dom.js

@@ -550,8 +550,9 @@ function enableBranches() {
 	branchesEnabled = 1;
 }
 const ready = /* @__PURE__ */ ((_) => (id) => {
-	readyLookup[id]?.();
+	const cb = readyLookup[id];
 	readyLookup[id] = 1;
+	cb?.();
 })(readyLookup = {});
 function initEmbedded(readyId, runtimeId) {
 	embedEnabled = 1;
@@ -647,7 +648,7 @@ function init(runtimeId = "M") {
 				if (readyLookup) {
 					for (const readyId in render.b) if (readyLookup[readyId] !== 1) {
 						readyLookup[readyId] = ((prev) => () => {
-							render.m();
+							runResumeEffects(render);
 							prev?.();
 						})(readyLookup[readyId]);
 						return effects;
@@ -1652,10 +1653,9 @@ function abort(ctrl) {
 }
 //#endregion
 //#region src/common/compat-meta.ts
-const prefix = "$compat_";
-const RENDERER_REGISTER_ID = prefix + "renderer";
-const SET_SCOPE_REGISTER_ID = prefix + "setScope";
-const RENDER_BODY_ID = prefix + "renderBody";
+const RENDERER_REGISTER_ID = "$compat_renderer";
+const SET_SCOPE_REGISTER_ID = "$compat_setScope";
+const RENDER_BODY_ID = "$compat_renderBody";
 //#endregion
 //#region src/dom/compat.ts
 const classIdToBranch = /* @__PURE__ */ new Map();

package/dist/debug/dom.mjs

@@ -548,8 +548,9 @@ function enableBranches() {
 	branchesEnabled = 1;
 }
 const ready = /* @__PURE__ */ ((_) => (id) => {
-	readyLookup[id]?.();
+	const cb = readyLookup[id];
 	readyLookup[id] = 1;
+	cb?.();
 })(readyLookup = {});
 function initEmbedded(readyId, runtimeId) {
 	embedEnabled = 1;
@@ -645,7 +646,7 @@ function init(runtimeId = "M") {
 				if (readyLookup) {
 					for (const readyId in render.b) if (readyLookup[readyId] !== 1) {
 						readyLookup[readyId] = ((prev) => () => {
-							render.m();
+							runResumeEffects(render);
 							prev?.();
 						})(readyLookup[readyId]);
 						return effects;
@@ -1650,10 +1651,9 @@ function abort(ctrl) {
 }
 //#endregion
 //#region src/common/compat-meta.ts
-const prefix = "$compat_";
-const RENDERER_REGISTER_ID = prefix + "renderer";
-const SET_SCOPE_REGISTER_ID = prefix + "setScope";
-const RENDER_BODY_ID = prefix + "renderBody";
+const RENDERER_REGISTER_ID = "$compat_renderer";
+const SET_SCOPE_REGISTER_ID = "$compat_setScope";
+const RENDER_BODY_ID = "$compat_renderBody";
 //#endregion
 //#region src/dom/compat.ts
 const classIdToBranch = /* @__PURE__ */ new Map();

package/dist/debug/html.js

@@ -2409,10 +2409,9 @@ function normalizeBoolAttrValue(value) {
 }
 //#endregion
 //#region src/common/compat-meta.ts
-const prefix = "$compat_";
-const RENDERER_REGISTER_ID = prefix + "renderer";
-const SET_SCOPE_REGISTER_ID = prefix + "setScope";
-const RENDER_BODY_ID = prefix + "renderBody";
+const RENDERER_REGISTER_ID = "$compat_renderer";
+const SET_SCOPE_REGISTER_ID = "$compat_setScope";
+const RENDER_BODY_ID = "$compat_renderBody";
 //#endregion
 //#region src/common/meta.ts
 const DYNAMIC_TAG_SCRIPT_REGISTER_ID = "_dynamicTagScript";

package/dist/debug/html.mjs

@@ -2407,10 +2407,9 @@ function normalizeBoolAttrValue(value) {
 }
 //#endregion
 //#region src/common/compat-meta.ts
-const prefix = "$compat_";
-const RENDERER_REGISTER_ID = prefix + "renderer";
-const SET_SCOPE_REGISTER_ID = prefix + "setScope";
-const RENDER_BODY_ID = prefix + "renderBody";
+const RENDERER_REGISTER_ID = "$compat_renderer";
+const SET_SCOPE_REGISTER_ID = "$compat_setScope";
+const RENDER_BODY_ID = "$compat_renderBody";
 //#endregion
 //#region src/common/meta.ts
 const DYNAMIC_TAG_SCRIPT_REGISTER_ID = "_dynamicTagScript";

package/dist/dom.js

@@ -21,7 +21,8 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 		walker.nextSibling();
 	} else storedMultiplier = currentMultiplier * 10 + value - 117;
 }, cloneCache = {}, registeredValues = {}, curRuntimeId, readyLookup, branchesEnabled, embedEnabled, ready = /* @__PURE__ */ ((_) => (id) => {
-	readyLookup[id]?.(), readyLookup[id] = 1;
+	let cb = readyLookup[id];
+	readyLookup[id] = 1, cb?.();
 })(readyLookup = {}), isResuming, inputType = "", controllableDelegate = /* @__PURE__ */ createDelegator(), _dynamic_tag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let childScopeAccessor = "A" + nodeAccessor, rendererAccessor = "D" + nodeAccessor;
@@ -441,7 +442,7 @@ function init(runtimeId = "M") {
 			return render.m = (effects = []) => {
 				if (readyLookup) {
 					for (let readyId in render.b) if (readyLookup[readyId] !== 1) return readyLookup[readyId] = ((prev) => () => {
-						render.m(), prev?.();
+						runResumeEffects(render), prev?.();
 					})(readyLookup[readyId]), effects;
 					render.b = 0;
 				}

package/dist/dom.mjs

@@ -21,7 +21,8 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 		walker.nextSibling();
 	} else storedMultiplier = currentMultiplier * 10 + value - 117;
 }, cloneCache = {}, registeredValues = {}, curRuntimeId, readyLookup, branchesEnabled, embedEnabled, ready = /* @__PURE__ */ ((_) => (id) => {
-	readyLookup[id]?.(), readyLookup[id] = 1;
+	let cb = readyLookup[id];
+	readyLookup[id] = 1, cb?.();
 })(readyLookup = {}), isResuming, inputType = "", controllableDelegate = /* @__PURE__ */ createDelegator(), _dynamic_tag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let childScopeAccessor = "A" + nodeAccessor, rendererAccessor = "D" + nodeAccessor;
@@ -440,7 +441,7 @@ function init(runtimeId = "M") {
 			return render.m = (effects = []) => {
 				if (readyLookup) {
 					for (let readyId in render.b) if (readyLookup[readyId] !== 1) return readyLookup[readyId] = ((prev) => () => {
-						render.m(), prev?.();
+						runResumeEffects(render), prev?.();
 					})(readyLookup[readyId]), effects;
 					render.b = 0;
 				}

package/dist/translator/index.js

@@ -26,6 +26,8 @@ let package_json = require("../../package.json");
 let _marko_compiler = require("@marko/compiler");
 let _marko_compiler_babel_utils = require("@marko/compiler/babel-utils");
 let _marko_compiler_config = require("@marko/compiler/config");
+let node_path = require("node:path");
+node_path = __toESM(node_path);
 let path = require("path");
 path = __toESM(path);
 let magic_string = require("magic-string");
@@ -1091,7 +1093,7 @@ function isOutputHTML() {
 	return getMarkoOpts().output === "html";
 }
 function isOutputDOM() {
-	return !isOutputHTML();
+	return getMarkoOpts().output === "dom";
 }
 function getMarkoOpts() {
 	return (0, _marko_compiler_babel_utils.getFile)().markoOpts;
@@ -1760,11 +1762,11 @@ var entry_builder_default = {
 	build(entryFile, exportInit) {
 		const state = entryFile[kState];
 		if (!state) throw entryFile.path.buildCodeFrameError("Unable to build hydrate code, no files were visited before finalizing the build");
-		const body = state.imports.map((it) => _marko_compiler.types.importDeclaration([], _marko_compiler.types.stringLiteral(it)));
+		const body = [];
 		if (state.init) {
 			const isPage = entryFile.path.node.extra.page;
 			const initHelper = isPage ? "init" : "initEmbedded";
-			body.unshift(_marko_compiler.types.importDeclaration([_marko_compiler.types.importSpecifier(_marko_compiler.types.identifier(initHelper), _marko_compiler.types.identifier(initHelper))], _marko_compiler.types.stringLiteral(`${runtime_info_default.name}/${entryFile.markoOpts.optimize ? "" : "debug/"}dom`)));
+			body.push(_marko_compiler.types.importDeclaration([_marko_compiler.types.importSpecifier(_marko_compiler.types.identifier(initHelper), _marko_compiler.types.identifier(initHelper))], _marko_compiler.types.stringLiteral(`${runtime_info_default.name}/${entryFile.markoOpts.optimize ? "" : "debug/"}dom`)), _marko_compiler.types.importDeclaration([], _marko_compiler.types.stringLiteral(`./${node_path.default.basename(entryFile.opts.filename)}`)));
 			const { runtimeId } = entryFile.markoOpts;
 			const readyId = !isPage && (0, _marko_compiler_babel_utils.getTemplateId)(entryFile.markoOpts, entryFile.opts.filename);
 			const initExpression = _marko_compiler.types.callExpression(_marko_compiler.types.identifier(initHelper), readyId ? runtimeId ? [_marko_compiler.types.stringLiteral(readyId), _marko_compiler.types.stringLiteral(runtimeId)] : [_marko_compiler.types.stringLiteral(readyId)] : runtimeId ? [_marko_compiler.types.stringLiteral(runtimeId)] : []);
@@ -1773,13 +1775,9 @@ var entry_builder_default = {
 		return body;
 	},
 	visit(file, entryFile, visitChild) {
-		const state = entryFile[kState] ||= {
-			imports: [],
-			init: false
-		};
+		const state = entryFile[kState] ||= { init: false };
 		const programExtra = file.path.node.extra;
 		const { analyzedTags } = file.metadata.marko;
-		state.imports.push((0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, file.opts.filename));
 		if (programExtra.isInteractive || programExtra.needsCompat) state.init = true;
 		for (const tag of analyzedTags || []) visitChild(tag);
 	}
@@ -2071,12 +2069,6 @@ function normalizeBoolAttrValue(value) {
 	if (value != null && value !== false) return true;
 }
 //#endregion
-//#region src/common/compat-meta.ts
-const prefix = "$C_";
-prefix + "";
-prefix + "";
-prefix + "";
-//#endregion
 //#region src/html/dynamic-tag.ts
 const voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
 let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
@@ -2374,7 +2366,7 @@ function appendLiteral(arr, str) {
 	arr[arr.length - 1] += str;
 }
 function escapeTemplateRaw(raw) {
-	return raw.replace(/\\/g, "\\\\").replace(/`/g, "\\`");
+	return raw.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$(?=\{)/g, "\\$");
 }
 function shiftItems(list, start, offset) {
 	for (let i = list.length - 1; i >= start; i--) list[i + offset] = list[i];
@@ -8407,7 +8399,7 @@ var text_default = { translate: { exit(text) {
 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$9]) => `\x1b[90m${msg} at ${getFileNameWithLoc(fileName, path$9)}:\x1b[0m\n${getFrame(file, path$9)}`).join("\n\n")}`;
+	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")}`;
 	if (!("MARKO_DEBUG" in process.env)) err.stack = finalMsg;
 	Object.defineProperty(err, "message", {
 		get() {
@@ -8628,13 +8620,13 @@ function mergeVisitors(visitor5, visitor6) {
 function mergeVisit(visit5, visit6) {
 	const enter5 = getVisitorEnter(visit5);
 	const enter6 = getVisitorEnter(visit6);
-	const enter = (enter5 || enter6) && function enter(path$7, state) {
-		return (isTagsAPI() ? enter6 : enter5)?.call(this, path$7, state);
+	const enter = (enter5 || enter6) && function enter(path$8, state) {
+		return (isTagsAPI() ? enter6 : enter5)?.call(this, path$8, state);
 	};
 	const exit5 = getVisitorExit(visit5);
 	const exit6 = getVisitorExit(visit6);
-	const exit = (exit5 || exit6) && function exit(path$8, state) {
-		return (isTagsAPI() ? exit6 : exit5)?.call(this, path$8, state);
+	const exit = (exit5 || exit6) && function exit(path$9, state) {
+		return (isTagsAPI() ? exit6 : exit5)?.call(this, path$9, state);
 	};
 	return exit ? enter ? {
 		enter,

package/dist/translator/util/entry-builder.d.ts

@@ -8,7 +8,6 @@ declare module "@marko/compiler/dist/types" {
 }
 type EntryFile = t.BabelFile & {
     [kState]?: {
-        imports: string[];
         init: boolean;
     };
 };

package/package.json

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