@marko/runtime-tags 6.0.173 → 6.1.0

package/dist/debug/html.js

@@ -2218,7 +2218,7 @@ function getFilteredGlobals($global) {
 	return filtered;
 }
 function _subscribe(subscribers, scope) {
-	$chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
+	if (subscribers) $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
 	return referenceScope(scope);
 }
 //#endregion

package/dist/debug/html.mjs

@@ -2216,7 +2216,7 @@ function getFilteredGlobals($global) {
 	return filtered;
 }
 function _subscribe(subscribers, scope) {
-	$chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
+	if (subscribers) $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
 	return referenceScope(scope);
 }
 //#endregion

package/dist/html/writer.d.ts

@@ -145,4 +145,4 @@ export declare function _trailers(html: string): void;
 type QueueCallback = (ticked: true) => void;
 export declare function queueTick(cb: QueueCallback): void;
 export declare function offTick(cb: QueueCallback): void;
-export declare function _subscribe(subscribers: Set<ScopeInternals>, scope: ScopeInternals): ScopeInternals;
+export declare function _subscribe(subscribers: Set<ScopeInternals> | undefined, scope: ScopeInternals): ScopeInternals;

package/dist/html.js

@@ -1464,7 +1464,7 @@ function getFilteredGlobals($global) {
 	return filtered;
 }
 function _subscribe(subscribers, scope) {
-	return $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
+	return subscribers && $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
 }
 //#endregion
 //#region src/html/attrs.ts

package/dist/html.mjs

@@ -1463,7 +1463,7 @@ function getFilteredGlobals($global) {
 	return filtered;
 }
 function _subscribe(subscribers, scope) {
-	return $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
+	return subscribers && $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
 }
 //#endregion
 //#region src/html/attrs.ts

package/dist/translator/index.js

@@ -2134,24 +2134,6 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 	};
 })(_dynamic_tag);
 //#endregion
-//#region src/translator/util/to-property-name.ts
-function isValidPropertyIdentifier(name) {
-	return /^[a-z_$][a-z0-9_$]*$/i.test(name);
-}
-function toPropertyName(name) {
-	if (isValidPropertyIdentifier(name)) return _marko_compiler.types.identifier(name);
-	else if (/^(?:0|[1-9][0-9]*)$/.test(name)) return _marko_compiler.types.numericLiteral(parseInt(name, 10));
-	return _marko_compiler.types.stringLiteral(name);
-}
-function toObjectProperty(name, value) {
-	return _marko_compiler.types.objectProperty(toPropertyName(name), value);
-}
-function toMemberExpression(object, key, optional) {
-	const prop = toPropertyName(key);
-	const computed = prop.type !== "Identifier";
-	return optional ? _marko_compiler.types.optionalMemberExpression(object, prop, computed, true) : _marko_compiler.types.memberExpression(object, prop, computed);
-}
-//#endregion
 //#region src/translator/util/runtime.ts
 const pureDOMFunctions = new Set([
 	"_await_promise",
@@ -2177,7 +2159,7 @@ const pureDOMFunctions = new Set([
 ]);
 function importRuntime(name) {
 	const { output } = getMarkoOpts();
-	return toMemberExpression((0, _marko_compiler_babel_utils.importStar)((0, _marko_compiler_babel_utils.getFile)(), getRuntimePath(output), "_"), name);
+	return (0, _marko_compiler_babel_utils.importNamed)((0, _marko_compiler_babel_utils.getFile)(), getRuntimePath(output), name);
 }
 function callRuntime(name, ...args) {
 	const callExpression = _marko_compiler.types.callExpression(importRuntime(name), filterArguments(args));
@@ -2771,6 +2753,24 @@ function forEachIdentifierPath(nodePath, cb) {
 	}
 }
 //#endregion
+//#region src/translator/util/to-property-name.ts
+function isValidPropertyIdentifier(name) {
+	return /^[a-z_$][a-z0-9_$]*$/i.test(name);
+}
+function toPropertyName(name) {
+	if (isValidPropertyIdentifier(name)) return _marko_compiler.types.identifier(name);
+	else if (/^(?:0|[1-9][0-9]*)$/.test(name)) return _marko_compiler.types.numericLiteral(parseInt(name, 10));
+	return _marko_compiler.types.stringLiteral(name);
+}
+function toObjectProperty(name, value) {
+	return _marko_compiler.types.objectProperty(toPropertyName(name), value);
+}
+function toMemberExpression(object, key, optional) {
+	const prop = toPropertyName(key);
+	const computed = prop.type !== "Identifier";
+	return optional ? _marko_compiler.types.optionalMemberExpression(object, prop, computed, true) : _marko_compiler.types.memberExpression(object, prop, computed);
+}
+//#endregion
 //#region src/translator/util/get-declared-binding-expression.ts
 function getDeclaredBindingExpression(binding) {
 	const canonicalBinding = getCanonicalBinding(binding);
@@ -3204,6 +3204,7 @@ function writeHTMLResumeStatements(path) {
 	const body = path.node.body;
 	const allSignals = Array.from(getSignals(section).values());
 	const scopeIdIdentifier = getScopeIdIdentifier(section);
+	const sectionSerializeReason = nonAnalyzedForceSerializedSection.has(section) ? true : section.serializeReason;
 	forEach(section.referencedClosures, (closure) => {
 		if (closure.sources) {
 			if (isDynamicClosure(section, closure)) {
@@ -3219,7 +3220,11 @@ function writeHTMLResumeStatements(path) {
 				if (underTryPlaceholder(section)) {
 					const reason = getSerializeReason(section);
 					if (reason) getHTMLSectionStatements(section).push(_marko_compiler.types.expressionStatement(getExprIfSerialized(section, reason, callRuntime("_script", getScopeIdIdentifier(section), _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending"))))));
-				} else addWriteScopeBuilder(section, (expr) => callRuntime("_subscribe", identifier, expr));
+				} else {
+					const closureScopesReason = getSerializeReason(closure.section, closure, getAccessorPrefix().ClosureScopes);
+					const subscribeArg = isReasonDynamic(closureScopesReason) && !isSameReason(closureScopesReason, sectionSerializeReason) ? getExprIfSerialized(closure.section, closureScopesReason, identifier) : identifier;
+					addWriteScopeBuilder(section, (expr) => callRuntime("_subscribe", subscribeArg, expr));
+				}
 			}
 		}
 	});
@@ -3231,7 +3236,6 @@ function writeHTMLResumeStatements(path) {
 	const writeScopeBuilder = getSectionWriteScopeBuilder(section);
 	const serializedLookup = getSerializedAccessors(section);
 	const serializedProperties = [];
-	const sectionSerializeReason = nonAnalyzedForceSerializedSection.has(section) ? true : section.serializeReason;
 	const ifSerialized = (reason, expr) => {
 		if (isSameReason(sectionSerializeReason, reason)) return expr;
 		return getExprIfSerialized(section, reason, expr);

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

@@ -3,7 +3,7 @@ import type { Falsy } from "../../common/types";
 import { _attr, _attr_class, _attr_style, _escape, _escape_comment, _escape_script, _escape_style, _unescaped } from "../../html";
 export type DOMRuntimeHelpers = keyof typeof import("../../dom");
 export type HTMLRuntimeHelpers = keyof typeof import("../../html");
-export declare function importRuntime(name: DOMRuntimeHelpers | HTMLRuntimeHelpers): t.MemberExpression;
+export declare function importRuntime(name: DOMRuntimeHelpers | HTMLRuntimeHelpers): t.Identifier;
 export declare function callRuntime(name: DOMRuntimeHelpers | HTMLRuntimeHelpers, ...args: Array<Parameters<typeof t.callExpression>[1][number] | Falsy>): t.CallExpression;
 export declare function getHTMLRuntime(): {
     _escape: typeof _escape;

package/package.json

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