marko 6.3.14 → 6.3.15

package/dist/translator/index.js

@@ -1754,13 +1754,14 @@ function getContext(key) {
 function getState() {
 	return $chunk.boundary.state;
 }
-function _html(html) {
-	$chunk.writeHTML(html);
+function getScopeById(scopeId) {
+	if (scopeId !== void 0) return $chunk.boundary.state.scopes.get(scopeId);
 }
-function _script(scopeId, registryId) {
-	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
-	$chunk.boundary.state.needsMainRuntime = true;
-	$chunk.writeEffect(scopeId, registryId);
+function _scope_id() {
+	return $chunk.boundary.state.scopeId++;
+}
+function _peek_scope_id() {
+	return $chunk.boundary.state.scopeId;
 }
 const kPendingContexts = Symbol("Pending Contexts");
 function withContext(key, value, cb, cbValue) {
@@ -1775,27 +1776,23 @@ function withContext(key, value, cb, cbValue) {
 		ctx[key] = prev;
 	}
 }
-function _scope_id() {
-	return $chunk.boundary.state.scopeId++;
-}
-function _peek_scope_id() {
-	return $chunk.boundary.state.scopeId;
+const kBranchId = Symbol("Branch Id");
+const kIsAsync = Symbol("Is Async");
+function withBranchId(branchId, cb) {
+	return withContext(kBranchId, branchId, cb);
 }
-function getScopeById(scopeId) {
-	if (scopeId !== void 0) return $chunk.boundary.state.scopes.get(scopeId);
+function _html(html) {
+	$chunk.writeHTML(html);
 }
-function _set_serialize_reason(reason) {
-	$chunk.boundary.state.serializeReason = reason;
+function _script(scopeId, registryId) {
+	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
+	$chunk.boundary.state.needsMainRuntime = true;
+	$chunk.writeEffect(scopeId, registryId);
 }
 function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
 	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { ["#ClosestBranchId"]: branchId });
 }
-const kBranchId = Symbol("Branch Id");
-const kIsAsync = Symbol("Is Async");
-function withBranchId(branchId, cb) {
-	return withContext(kBranchId, branchId, cb);
-}
 let writeScope = (scopeId, partialScope) => {
 	const { state } = $chunk.boundary;
 	const target = $chunk.serializeState;
@@ -1814,6 +1811,9 @@ function scopeWithId(state, scopeId) {
 	if (!scope) scopes.set(scopeId, scope = { [K_SCOPE_ID]: scopeId });
 	return scope;
 }
+function _set_serialize_reason(reason) {
+	$chunk.boundary.state.serializeReason = reason;
+}
 globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask;
 //#endregion
 //#region src/html/attrs.ts
@@ -1989,25 +1989,28 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 	if (typeof renderer === "string") {
 		const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
 		rendered = true;
-		_scope_id();
-		_html(`<${renderer}${_attrs(input, "a", branchId, renderer)}>`);
-		if (!voidElementsReg.test(renderer)) {
-			const renderContent = content || normalizeDynamicRenderer(input.content);
-			if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
-			else if (renderContent) {
-				if (typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-				if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent, 1);
-				else _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
-			}
-			_html(`</${renderer}>`);
-		}
-		const childScope = getScopeById(branchId);
-		const needsScript = childScope && (childScope["EventAttributes:a"] || childScope["ControlledHandler:a"]);
-		if (needsScript) {
-			writeScope(branchId, { ["#Renderer"]: renderer });
-			_script(branchId, "d");
-		}
-		if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
+		const renderNative = () => {
+			_scope_id();
+			_html(`<${renderer}${_attrs(input, "a", branchId, renderer)}>`);
+			if (!voidElementsReg.test(renderer)) {
+				const renderContent = content || normalizeDynamicRenderer(input.content);
+				if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
+				else if (renderContent) {
+					if (typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
+					if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent, 1);
+					else _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
+				}
+				_html(`</${renderer}>`);
+			}
+			const childScope = getScopeById(branchId);
+			const needsScript = childScope && (childScope["EventAttributes:a"] || childScope["ControlledHandler:a"]);
+			if (needsScript) {
+				writeScope(branchId, { ["#Renderer"]: renderer });
+				_script(branchId, "d");
+			}
+			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
+		};
+		renderNative();
 	} else {
 		if (shouldResume) _html(state.mark("[", ""));
 		const render = () => {
@@ -2298,7 +2301,10 @@ function getScopeReasonDeclaration(section) {
 	return _marko_compiler.types.variableDeclaration("const", getSectionReasonState(section).declarators);
 }
 function getSerializeGuard(section, reason, optional) {
-	if (!isReasonDynamic(reason) || isCrossSection(section, reason)) return reason ? optional ? void 0 : withLeadingComment(_marko_compiler.types.numericLiteral(1), getDebugNames(reason === true ? void 0 : reason.state)) : _marko_compiler.types.numericLiteral(0);
+	if (!isReasonDynamic(reason) || isCrossSection(section, reason)) {
+		if (!reason) return _marko_compiler.types.numericLiteral(0);
+		return optional ? void 0 : withLeadingComment(_marko_compiler.types.numericLiteral(1), getDebugNames(reason === true ? void 0 : reason.state));
+	}
 	return getOrHoist(reason, true);
 }
 function getSerializeGuardForAny(section, reasons, optional) {
@@ -3013,12 +3019,14 @@ function getSignalFn(signal) {
 	}
 	for (const value of signal.values) {
 		if (value.signal.inline) continue;
-		if (signalHasStatements(value.signal)) signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value.signal.identifier, [
-			scopeIdentifier,
-			value.value,
-			...getTranslatedExtraArgs(value.signal)
-		])));
-		else signal.render.push(_marko_compiler.types.expressionStatement(withLeadingComment(value.value, getDebugNames(value.signal.referencedBindings))));
+		if (signalHasStatements(value.signal)) {
+			const invocation = _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value.signal.identifier, [
+				scopeIdentifier,
+				value.value,
+				...getTranslatedExtraArgs(value.signal)
+			]));
+			signal.render.push(invocation);
+		} else signal.render.push(_marko_compiler.types.expressionStatement(withLeadingComment(value.value, getDebugNames(value.signal.referencedBindings))));
 	}
 	forEach(signal.intersection, (intersection) => {
 		signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(intersection.identifier, [scopeIdentifier])));
@@ -3150,13 +3158,16 @@ function addValue(targetSection, referencedBindings, signal, value) {
 	});
 	if (value.extra?.referencedBindingsInFunction) parentSignal.hasSideEffect = true;
 }
-function getResumeRegisterId(section, referencedBindings, type) {
-	const { markoOpts, opts: { filename } } = (0, _marko_compiler_babel_utils.getFile)();
+function buildResumeRegisterKey(section, referencedBindings, type) {
 	let name = "";
 	if (referencedBindings) if (typeof referencedBindings === "string") name += `_${referencedBindings}`;
 	else if (Array.isArray(referencedBindings)) for (const ref of referencedBindings) name += `_${ref.name}`;
 	else name += `_${referencedBindings.name}`;
-	return (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, filename, `${section.id}${name}${type ? "/" + type : ""}`);
+	return `${section.id}${name}${type ? "/" + type : ""}`;
+}
+function getResumeRegisterId(section, referencedBindings, type) {
+	const { markoOpts, opts: { filename } } = (0, _marko_compiler_babel_utils.getFile)();
+	return (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, filename, buildResumeRegisterKey(section, referencedBindings, type));
 }
 function writeSignals(section) {
 	const seen = /* @__PURE__ */ new Set();
@@ -3175,7 +3186,8 @@ function writeSignals(section) {
 		if (signal.effect.length) {
 			traverseReplace(signal, "effect", replaceEffectNode);
 			const effectIdentifier = _marko_compiler.types.identifier(`${signal.identifier.name}__script`);
-			effectDeclarator = _marko_compiler.types.variableDeclarator(effectIdentifier, callRuntime("_script", _marko_compiler.types.stringLiteral(getResumeRegisterId(section, signal.referencedBindings)), _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], toFirstExpressionOrBlock(signal.effect))));
+			const effectFn = _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], toFirstExpressionOrBlock(signal.effect));
+			effectDeclarator = _marko_compiler.types.variableDeclarator(effectIdentifier, callRuntime("_script", _marko_compiler.types.stringLiteral(getResumeRegisterId(section, signal.referencedBindings)), effectFn));
 		}
 		let signalDeclaration;
 		if (signal.build) {

package/package.json

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