marko 6.0.84 → 6.0.86

package/dist/debug/html.js

@@ -52,7 +52,6 @@ __export(html_exports, {
   _for_of: () => _for_of,
   _for_to: () => _for_to,
   _for_until: () => _for_until,
-  _get_serialize_reason: () => _get_serialize_reason,
   _hoist: () => _hoist,
   _html: () => _html,
   _id: () => _id,
@@ -62,6 +61,7 @@ __export(html_exports, {
   _resume_branch: () => _resume_branch,
   _scope: () => writeScope,
   _scope_id: () => _scope_id,
+  _scope_reason: () => _scope_reason,
   _scope_with_id: () => _scope_with_id,
   _script: () => _script,
   _sep: () => _sep,
@@ -1804,7 +1804,7 @@ function getScopeById(scopeId) {
 function _set_serialize_reason(reason) {
   $chunk.boundary.state.serializeReason = reason;
 }
-function _get_serialize_reason() {
+function _scope_reason() {
   const reason = $chunk.boundary.state.serializeReason;
   $chunk.boundary.state.serializeReason = void 0;
   return reason;
@@ -3480,7 +3480,6 @@ function NOOP3() {
   _for_of,
   _for_to,
   _for_until,
-  _get_serialize_reason,
   _hoist,
   _html,
   _id,
@@ -3490,6 +3489,7 @@ function NOOP3() {
   _resume_branch,
   _scope,
   _scope_id,
+  _scope_reason,
   _scope_with_id,
   _script,
   _sep,

package/dist/debug/html.mjs

@@ -1715,7 +1715,7 @@ function getScopeById(scopeId) {
 function _set_serialize_reason(reason) {
   $chunk.boundary.state.serializeReason = reason;
 }
-function _get_serialize_reason() {
+function _scope_reason() {
   const reason = $chunk.boundary.state.serializeReason;
   $chunk.boundary.state.serializeReason = void 0;
   return reason;
@@ -3390,7 +3390,6 @@ export {
   _for_of,
   _for_to,
   _for_until,
-  _get_serialize_reason,
   _hoist,
   _html,
   _id,
@@ -3400,6 +3399,7 @@ export {
   _resume_branch,
   writeScope as _scope,
   _scope_id,
+  _scope_reason,
   _scope_with_id,
   _script,
   _sep,

package/dist/html/writer.d.ts

@@ -28,7 +28,7 @@ export declare function _scope_id(): number;
 export declare function _peek_scope_id(): number;
 export declare function getScopeById(scopeId: number | undefined): PartialScope | undefined;
 export declare function _set_serialize_reason(reason: undefined | 0 | 1): void;
-export declare function _get_serialize_reason(): 0 | 1 | undefined;
+export declare function _scope_reason(): 0 | 1 | undefined;
 export declare function _serialize_if(condition: undefined | 1 | Record<string, 1>, key: string): 1 | undefined;
 export declare function _serialize_guard(condition: undefined | 1 | Record<string, 1>, key: string): 0 | 1;
 export declare function _el_resume(scopeId: number, accessor: Accessor, shouldResume?: 0 | 1): string;

package/dist/html.d.ts

@@ -5,4 +5,4 @@ export { _escape, _escape_script, _escape_style, _escape_textarea_value, _unesca
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, } from "./html/for";
 export { _template } from "./html/template";
-export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _get_serialize_reason, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _scope, _scope_id, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";
+export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";

package/dist/html.js

@@ -49,7 +49,6 @@ __export(html_exports, {
   _for_of: () => _for_of,
   _for_to: () => _for_to,
   _for_until: () => _for_until,
-  _get_serialize_reason: () => _get_serialize_reason,
   _hoist: () => _hoist,
   _html: () => _html,
   _id: () => _id,
@@ -59,6 +58,7 @@ __export(html_exports, {
   _resume_branch: () => _resume_branch,
   _scope: () => writeScope,
   _scope_id: () => _scope_id,
+  _scope_reason: () => _scope_reason,
   _scope_with_id: () => _scope_with_id,
   _script: () => _script,
   _sep: () => _sep,
@@ -1173,7 +1173,7 @@ function getScopeById(scopeId) {
 function _set_serialize_reason(reason) {
   $chunk.boundary.state.serializeReason = reason;
 }
-function _get_serialize_reason() {
+function _scope_reason() {
   let reason = $chunk.boundary.state.serializeReason;
   return $chunk.boundary.state.serializeReason = void 0, reason;
 }
@@ -2275,7 +2275,6 @@ function NOOP3() {
   _for_of,
   _for_to,
   _for_until,
-  _get_serialize_reason,
   _hoist,
   _html,
   _id,
@@ -2285,6 +2284,7 @@ function NOOP3() {
   _resume_branch,
   _scope,
   _scope_id,
+  _scope_reason,
   _scope_with_id,
   _script,
   _sep,

package/dist/html.mjs

@@ -1087,7 +1087,7 @@ function getScopeById(scopeId) {
 function _set_serialize_reason(reason) {
   $chunk.boundary.state.serializeReason = reason;
 }
-function _get_serialize_reason() {
+function _scope_reason() {
   let reason = $chunk.boundary.state.serializeReason;
   return $chunk.boundary.state.serializeReason = void 0, reason;
 }
@@ -2188,7 +2188,6 @@ export {
   _for_of,
   _for_to,
   _for_until,
-  _get_serialize_reason,
   _hoist,
   _html,
   _id,
@@ -2198,6 +2197,7 @@ export {
   _resume_branch,
   writeScope as _scope,
   _scope_id,
+  _scope_reason,
   _scope_with_id,
   _script,
   _sep,

package/dist/translator/index.js

@@ -2650,80 +2650,85 @@ var import_compiler14 = require("@marko/compiler");
 
 // src/translator/util/with-comment.ts
 function withLeadingComment(node, value) {
-  const comment = {
-    type: "CommentBlock",
-    value: ` ${value} `
-  };
-  node.leadingComments = node.leadingComments ? [...node.leadingComments, comment] : [comment];
+  if (value) {
+    const comment = {
+      type: "CommentBlock",
+      value: ` ${value} `
+    };
+    node.leadingComments = node.leadingComments ? [...node.leadingComments, comment] : [comment];
+  }
   return node;
 }
 
 // src/translator/util/serialize-guard.ts
-function getSerializeGuard(reason, optional) {
-  return !reason ? import_compiler14.types.numericLiteral(0) : reason === true || reason.state ? optional ? void 0 : reason === true ? import_compiler14.types.numericLiteral(1) : withLeadingComment(
-    import_compiler14.types.numericLiteral(1),
-    mapToString(reason.state, ", ", getDebugName)
-  ) : getInputSerializeReasonGuard(reason);
+function getSerializeGuard(section, reason, optional) {
+  if (!isReasonDynamic(reason)) {
+    return reason ? optional ? void 0 : withLeadingComment(
+      import_compiler14.types.numericLiteral(1),
+      getDebugNames(reason === true ? void 0 : reason.state)
+    ) : import_compiler14.types.numericLiteral(0);
+  }
+  let expr;
+  for (const [paramsSection, params] of groupParamsBySection(reason.param)) {
+    if (!isSameOrChildSection(paramsSection, section)) {
+      return optional ? void 0 : withLeadingComment(import_compiler14.types.numericLiteral(1), getDebugNames(params));
+    }
+    const serializeIdentifier = import_compiler14.types.identifier(
+      getSharedUid(`scope${paramsSection.id}_reason`, paramsSection)
+    );
+    const guard = paramsSection.paramReasonGroups ? callRuntime(
+      "_serialize_guard",
+      serializeIdentifier,
+      withLeadingComment(
+        import_compiler14.types.numericLiteral(getParamReasonGroupIndex(paramsSection, params)),
+        getDebugNames(params)
+      )
+    ) : serializeIdentifier;
+    expr = expr ? import_compiler14.types.logicalExpression("||", expr, guard) : guard;
+  }
+  return expr;
 }
-function getSerializeGuardForAny(reasons, optional) {
+function getSerializeGuardForAny(section, reasons, optional) {
   if (!reasons || reasons === true) {
-    return getSerializeGuard(reasons, optional);
+    return getSerializeGuard(section, reasons, optional);
   }
   if (reasons.length === 1) {
-    return getSerializeGuard(reasons[0], optional);
+    return getSerializeGuard(section, reasons[0], optional);
   }
   let expr;
   for (const reason of reasons) {
-    if (reason.state) {
-      return optional ? void 0 : withLeadingComment(
-        import_compiler14.types.numericLiteral(1),
-        mapToString(reason.state, ", ", getDebugName)
-      );
+    if (!isReasonDynamic(reason)) {
+      return optional ? void 0 : withLeadingComment(import_compiler14.types.numericLiteral(1), getDebugNames(reason.state));
     }
-    const guard = getSerializeGuard(reason, false);
+    const guard = getSerializeGuard(section, reason, false);
     expr = expr ? import_compiler14.types.logicalExpression("||", expr, guard) : guard;
   }
   return expr;
 }
-function getExprIfSerialized(reason, expr) {
+function getExprIfSerialized(section, reason, expr) {
   if (!isReasonDynamic(reason)) {
     return reason && expr;
   }
   let orExpr;
-  for (const [section, reasons] of groupParamsBySection(reason.param)) {
+  for (const [paramsSection, params] of groupParamsBySection(reason.param)) {
+    if (!isSameOrChildSection(paramsSection, section)) {
+      return expr;
+    }
     const serializeIdentifier = import_compiler14.types.identifier(
-      getSharedUid("serialize", section)
+      getSharedUid(`scope${paramsSection.id}_reason`, paramsSection)
     );
-    const guard = section.paramReasonGroups ? callRuntime(
+    const guard = paramsSection.paramReasonGroups ? callRuntime(
       "_serialize_if",
       serializeIdentifier,
       withLeadingComment(
-        import_compiler14.types.numericLiteral(getParamReasonGroupIndex(section, reasons)),
-        mapToString(reasons, ", ", getDebugName)
+        import_compiler14.types.numericLiteral(getParamReasonGroupIndex(paramsSection, params)),
+        getDebugNames(params)
       )
     ) : serializeIdentifier;
     orExpr = orExpr ? import_compiler14.types.logicalExpression("||", orExpr, guard) : guard;
   }
   return import_compiler14.types.logicalExpression("&&", orExpr, expr);
 }
-function getInputSerializeReasonGuard(reason) {
-  let expr;
-  for (const [section, reasons] of groupParamsBySection(reason.param)) {
-    const serializeIdentifier = import_compiler14.types.identifier(
-      getSharedUid("serialize", section)
-    );
-    const guard = section.paramReasonGroups ? callRuntime(
-      "_serialize_guard",
-      serializeIdentifier,
-      withLeadingComment(
-        import_compiler14.types.numericLiteral(getParamReasonGroupIndex(section, reasons)),
-        mapToString(reasons, ", ", getDebugName)
-      )
-    ) : serializeIdentifier;
-    expr = expr ? import_compiler14.types.logicalExpression("||", expr, guard) : guard;
-  }
-  return expr;
-}
 
 // src/translator/util/walks.ts
 var import_compiler15 = require("@marko/compiler");
@@ -2992,7 +2997,7 @@ function markNode(path5, nodeBinding, reason) {
         "_el_resume",
         getScopeIdIdentifier(section),
         getScopeAccessorLiteral(nodeBinding),
-        getSerializeGuard(reason, true)
+        getSerializeGuard(section, reason, true)
       )}`;
     }
   }
@@ -3354,20 +3359,15 @@ function initValue(binding, isLet = false) {
   const signal = getSignal(section, binding);
   signal.build = () => {
     const fn = getSignalFn(signal);
-    const isParamBinding = !binding.upstreamAlias && (binding.type === 3 /* param */ || binding.type === 4 /* local */ || binding.type === 2 /* input */);
-    const isNakedAlias = binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0;
-    const needsGuard = !isNakedAlias && (binding.closureSections || binding.downstreamExpressions.size || fn.type === "ArrowFunctionExpression" && fn.body.body.length > 0);
-    const needsCache = needsGuard || signal.intersection;
-    const needsMarks = isParamBinding || signal.intersection;
-    if (needsCache || needsMarks || binding.hoists.size) {
-      return callRuntime(
-        isLet ? "_let" : "_const",
-        getScopeAccessorLiteral(binding, isLet),
-        fn
-      );
-    } else {
+    const isDirectAlias = binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0;
+    if (isDirectAlias || !signalHasStatements(signal)) {
       return fn;
     }
+    return callRuntime(
+      isLet ? "_let" : "_const",
+      getScopeAccessorLiteral(binding, isLet),
+      fn
+    );
   };
   signal.valueAccessor = getScopeAccessorLiteral(binding);
   for (const alias of binding.aliases) {
@@ -3379,12 +3379,12 @@ function initValue(binding, isLet = false) {
   return signal;
 }
 function signalHasStatements(signal) {
-  if (signal.render.length || signal.effect.length || signal.values.length || signal.intersection) {
+  if (signal.extraArgs || signal.render.length || signal.effect.length || signal.values.length || signal.intersection) {
     return true;
   }
   const binding = signal.referencedBindings;
   if (binding) {
-    if (!Array.isArray(binding) && binding.section === signal.section && (binding.aliases.size || binding.propertyAliases.size)) {
+    if (!Array.isArray(binding) && (binding.closureSections || binding.type === 0 /* dom */ || binding.section === signal.section && (binding.hoists.size || binding.aliases.size || binding.propertyAliases.size))) {
       return true;
     }
   } else if (signal.section.referencedClosures) {
@@ -3411,7 +3411,7 @@ function getSignalFn(signal) {
   if (isValue) {
     for (const alias of binding.aliases) {
       const aliasSignal = getSignal(alias.section, alias);
-      if (aliasSignal.render.length || aliasSignal.values.length || aliasSignal.effect.length) {
+      if (signalHasStatements(aliasSignal)) {
         if (alias.excludeProperties !== void 0) {
           const props = [];
           const aliasId = import_compiler22.types.identifier(alias.name);
@@ -3474,8 +3474,7 @@ function getSignalFn(signal) {
     }
   }
   for (const value of signal.values) {
-    const valSignal = value.signal;
-    if (!valSignal.referencedBindings || Array.isArray(valSignal.referencedBindings) || !valSignal.referencedBindings.upstreamAlias || valSignal.referencedBindings.property !== void 0 || valSignal.referencedBindings.excludeProperties !== void 0 || valSignal.effect.length || valSignal.render.length || valSignal.values.length) {
+    if (signalHasStatements(value.signal)) {
       signal.render.push(
         import_compiler22.types.expressionStatement(
           import_compiler22.types.callExpression(value.signal.identifier, [
@@ -3486,7 +3485,14 @@ function getSignalFn(signal) {
         )
       );
     } else {
-      signal.render.push(import_compiler22.types.expressionStatement(value.value));
+      signal.render.push(
+        import_compiler22.types.expressionStatement(
+          withLeadingComment(
+            value.value,
+            getDebugNames(value.signal.referencedBindings)
+          )
+        )
+      );
     }
   }
   forEach(signal.intersection, (intersection) => {
@@ -3782,15 +3788,7 @@ function writeSignals(section) {
       );
     }
     let value = signal.build();
-    if (!value) {
-      return;
-    }
-    if (
-      // It's possible for aliases to render nothing
-      // if they're only consumed in effects/closures.
-      // This ignores writing out those signals in that case.
-      signal.referencedBindings && !Array.isArray(signal.referencedBindings) && signal.referencedBindings.upstreamAlias && signal.referencedBindings.property === void 0 && signal.referencedBindings.excludeProperties === void 0 && import_compiler22.types.isFunction(value) && import_compiler22.types.isBlockStatement(value.body) && !value.body.body.length
-    ) {
+    if (!value || !signal.register && import_compiler22.types.isFunction(value) && import_compiler22.types.isBlockStatement(value.body) && !value.body.body.length) {
       return;
     }
     if (import_compiler22.types.isCallExpression(value)) {
@@ -4064,7 +4062,11 @@ function writeHTMLResumeStatements(path5) {
     serializedProperties.push(
       toObjectProperty(
         accessor,
-        sectionSerializeReason && (sectionSerializeReason === reason || sectionSerializeReason !== true && reason !== true && compareSources(sectionSerializeReason, reason) === 0) ? getDeclaredBindingExpression(binding) : getExprIfSerialized(reason, getDeclaredBindingExpression(binding))
+        sectionSerializeReason && (sectionSerializeReason === reason || sectionSerializeReason !== true && reason !== true && compareSources(sectionSerializeReason, reason) === 0) ? getDeclaredBindingExpression(binding) : getExprIfSerialized(
+          section,
+          reason,
+          getDeclaredBindingExpression(binding)
+        )
       )
     );
     if (debug) {
@@ -4098,14 +4100,14 @@ function writeHTMLResumeStatements(path5) {
       serializedProperties.push(
         toObjectProperty(
           ownerAccessor,
-          sectionSerializeReason && (sectionSerializeReason === ownerReason || sectionSerializeReason !== true && ownerReason !== true && compareSources(sectionSerializeReason, ownerReason) === 0) ? getOwnerExpr : getExprIfSerialized(ownerReason, getOwnerExpr)
+          sectionSerializeReason && (sectionSerializeReason === ownerReason || sectionSerializeReason !== true && ownerReason !== true && compareSources(sectionSerializeReason, ownerReason) === 0) ? getOwnerExpr : getExprIfSerialized(section, ownerReason, getOwnerExpr)
         )
       );
     }
   }
   for (const [key, { expression, reason }] of serializedLookup) {
     serializedProperties.push(
-      toObjectProperty(key, getExprIfSerialized(reason, expression))
+      toObjectProperty(key, getExprIfSerialized(section, reason, expression))
     );
   }
   if (sectionSerializeReason) {
@@ -4129,15 +4131,15 @@ function writeHTMLResumeStatements(path5) {
         writeScopeArgs.push(import_compiler22.types.objectExpression(debugVars));
       }
     }
-    let writeScopeCall = writeScopeBuilder ? writeScopeBuilder(callRuntime("_scope", ...writeScopeArgs)) : callRuntime("_scope", ...writeScopeArgs);
-    if (sectionSerializeReason !== true && !sectionSerializeReason.state) {
-      writeScopeCall = import_compiler22.types.logicalExpression(
-        "&&",
-        getSerializeGuard(sectionSerializeReason, false),
-        writeScopeCall
-      );
-    }
-    body.push(import_compiler22.types.expressionStatement(writeScopeCall));
+    body.push(
+      import_compiler22.types.expressionStatement(
+        getExprIfSerialized(
+          section,
+          sectionSerializeReason,
+          writeScopeBuilder ? writeScopeBuilder(callRuntime("_scope", ...writeScopeArgs)) : callRuntime("_scope", ...writeScopeArgs)
+        )
+      )
+    );
   }
   const resumeClosestBranch = !section.isBranch && (section.hasAbortSignal || !!section.referencedClosures || !!find(section.bindings, (binding) => binding.type === 1 /* let */));
   if (resumeClosestBranch) {
@@ -4189,12 +4191,15 @@ function replaceAssignedNode(node) {
     case "UpdateExpression": {
       const { extra } = node.argument;
       if (isAssignedBindingExtra(extra)) {
-        const buildAssignment = getBuildAssignment(extra);
-        if (buildAssignment) {
+        const builtAssignment = getBuildAssignment(extra)?.(
+          extra.section,
+          node
+        );
+        if (builtAssignment) {
           if (!node.prefix) {
             node.prefix = true;
             const replacement = import_compiler22.types.sequenceExpression([
-              buildAssignment(extra.section, node),
+              builtAssignment,
               import_compiler22.types.binaryExpression(
                 node.operator === "++" ? "-" : "+",
                 node.argument,
@@ -4204,7 +4209,7 @@ function replaceAssignedNode(node) {
             updateExpressions.add(replacement);
             return replacement;
           }
-          return buildAssignment(extra.section, node);
+          return builtAssignment;
         }
       }
       break;
@@ -4214,27 +4219,20 @@ function replaceAssignedNode(node) {
         case "Identifier": {
           const { extra } = node.left;
           if (isAssignedBindingExtra(extra)) {
-            const buildAssignment = getBuildAssignment(extra);
-            if (buildAssignment) {
-              if (bindingUtil.has(
+            return getBuildAssignment(extra)?.(
+              extra.section,
+              bindingUtil.has(
                 extra.fnExtra?.referencedBindingsInFunction,
                 extra.assignment
-              )) {
-                return buildAssignment(extra.section, node);
-              } else {
-                return buildAssignment(
-                  extra.section,
-                  node.operator === "=" ? node.right : import_compiler22.types.binaryExpression(
-                    node.operator.slice(
-                      0,
-                      -1
-                    ),
-                    node.left,
-                    node.right
-                  )
-                );
-              }
-            }
+              ) ? node : node.operator === "=" ? node.right : import_compiler22.types.binaryExpression(
+                node.operator.slice(
+                  0,
+                  -1
+                ),
+                node.left,
+                node.right
+              )
+            ) || extra?.assignment && withLeadingComment(node.right, getDebugName(extra.assignment));
           }
           break;
         }
@@ -4247,18 +4245,27 @@ function replaceAssignedNode(node) {
             if (isAssignedBindingExtra(extra)) {
               const buildAssignment = getBuildAssignment(extra);
               if (buildAssignment) {
-                if (!bindingUtil.has(
-                  extra.fnExtra?.referencedBindingsInFunction,
-                  extra.assignment
-                )) {
-                  id.name = generateUid(id.name);
-                  (params ||= []).push(import_compiler22.types.identifier(id.name));
-                }
-                (assignments ||= []).push(
-                  buildAssignment(extra.section, import_compiler22.types.identifier(id.name))
+                const uid = generateUid(id.name);
+                const builtAssignment = buildAssignment(
+                  extra.section,
+                  import_compiler22.types.identifier(uid)
                 );
+                if (builtAssignment) {
+                  if (!bindingUtil.has(
+                    extra.fnExtra?.referencedBindingsInFunction,
+                    extra.assignment
+                  )) {
+                    id.name = uid;
+                  }
+                  (params ||= []).push(import_compiler22.types.identifier(uid));
+                  (assignments ||= []).push(builtAssignment);
+                  return;
+                }
               }
             }
+            if (extra?.assignment) {
+              (params ||= []).push(import_compiler22.types.identifier(id.name));
+            }
           });
           if (assignments) {
             const resultId = generateUid("result");
@@ -4370,22 +4377,25 @@ var dom_default = {
         if (childSection !== section) {
           forEach(childSection.referencedClosures, (closure) => {
             const closureSignal = getSignal(childSection, closure);
-            addStatement(
-              "render",
-              childSection,
-              void 0,
-              import_compiler23.types.expressionStatement(
-                import_compiler23.types.callExpression(
-                  isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler23.types.memberExpression(
-                    closureSignal.identifier,
-                    import_compiler23.types.identifier("_")
-                  ),
-                  [scopeIdentifier]
+            if (signalHasStatements(closureSignal)) {
+              addStatement(
+                "render",
+                childSection,
+                void 0,
+                import_compiler23.types.expressionStatement(
+                  import_compiler23.types.callExpression(
+                    isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler23.types.memberExpression(
+                      closureSignal.identifier,
+                      import_compiler23.types.identifier("_")
+                    ),
+                    [scopeIdentifier]
+                  )
                 )
-              )
-            );
+              );
+            }
           });
           const tagParamsSignal = childSection.params && initValue(childSection.params);
+          const tagParamsIdentifier = tagParamsSignal && signalHasStatements(tagParamsSignal) ? tagParamsSignal.identifier : void 0;
           const { walks: walks2, writes: writes2, setup: setup2, decls: decls2 } = getSectionMeta(childSection);
           writeSignals(childSection);
           if (!childSection.downstreamBinding || bindingHasDownstreamExpressions(childSection.downstreamBinding)) {
@@ -4395,7 +4405,7 @@ var dom_default = {
                 writes2,
                 walks2,
                 setup2,
-                tagParamsSignal?.identifier
+                tagParamsIdentifier
               ])
             ) : callRuntime(
               getSectionRegisterReasons(childSection) ? "_content_resume" : "_content",
@@ -4404,30 +4414,33 @@ var dom_default = {
                 writes2,
                 walks2,
                 setup2,
-                tagParamsSignal?.identifier,
+                tagParamsIdentifier,
                 childSection.hoisted || childSection.isHoistThrough ? getSectionInstancesAccessorLiteral(childSection) : void 0
               ])
             );
             if (childSection.referencedLocalClosures) {
-              renderer = callRuntime(
-                "_content_closures",
-                renderer,
-                import_compiler23.types.objectExpression(
-                  toArray(childSection.referencedLocalClosures, (closure) => {
-                    const expr = getSignalFn(getSignal(childSection, closure));
-                    const key = toPropertyName(getScopeAccessor(closure));
-                    if (import_compiler23.types.isFunction(expr) && import_compiler23.types.isBlockStatement(expr.body)) {
-                      return import_compiler23.types.objectMethod(
-                        "method",
-                        key,
-                        expr.params,
-                        expr.body
-                      );
-                    }
-                    return import_compiler23.types.objectProperty(key, expr);
-                  })
-                )
-              );
+              const objProps = [];
+              forEach(childSection.referencedLocalClosures, (closure) => {
+                const closureSignal = getSignal(childSection, closure);
+                const key = toPropertyName(getScopeAccessor(closure));
+                if (signalHasStatements(closureSignal)) {
+                  const expr = getSignalFn(closureSignal);
+                  if (import_compiler23.types.isFunction(expr) && import_compiler23.types.isBlockStatement(expr.body)) {
+                    objProps.push(
+                      import_compiler23.types.objectMethod("method", key, expr.params, expr.body)
+                    );
+                  } else {
+                    objProps.push(import_compiler23.types.objectProperty(key, expr));
+                  }
+                }
+              });
+              if (objProps.length) {
+                renderer = callRuntime(
+                  "_content_closures",
+                  renderer,
+                  import_compiler23.types.objectExpression(objProps)
+                );
+              }
             }
             program.node.body.push(
               import_compiler23.types.variableDeclaration("const", [
@@ -4521,8 +4534,8 @@ var html_default = {
         renderContent.push(
           import_compiler24.types.variableDeclaration("const", [
             import_compiler24.types.variableDeclarator(
-              import_compiler24.types.identifier(getSharedUid("serialize", section)),
-              callRuntime("_get_serialize_reason")
+              import_compiler24.types.identifier(getSharedUid(`scope${section.id}_reason`, section)),
+              callRuntime("_scope_reason")
             )
           ])
         );
@@ -5285,6 +5298,7 @@ var native_tag_default = {
                   getScopeIdIdentifier(tagSection),
                   usedAttrs.staticContentAttr.value,
                   getSerializeGuard(
+                    tagSection,
                     nodeBinding && getSerializeReason(tagSection, nodeBinding),
                     true
                   )
@@ -5293,6 +5307,7 @@ var native_tag_default = {
             ];
           } else if (spreadExpression && !hasChildren) {
             const serializeReason = getSerializeGuard(
+              tagSection,
               nodeBinding && getSerializeReason(tagSection, nodeBinding),
               true
             );
@@ -6042,10 +6057,12 @@ var for_default = {
         if (branchSerializeReason) {
           const skipParentEnd = onlyChildParentTagName && markerSerializeReason;
           const statefulSerializeArg = getSerializeGuard(
+            tagSection,
             getSerializeReason(tagSection, kStatefulReason),
             !(skipParentEnd || singleNodeOptimization)
           );
           const markerSerializeArg = getSerializeGuard(
+            tagSection,
             markerSerializeReason,
             !statefulSerializeArg
           );
@@ -6053,7 +6070,11 @@ var for_default = {
             forAttrs.by || import_compiler31.types.numericLiteral(0),
             getScopeIdIdentifier(tagSection),
             getScopeAccessorLiteral(nodeBinding),
-            getSerializeGuard(branchSerializeReason, !markerSerializeArg),
+            getSerializeGuard(
+              tagSection,
+              branchSerializeReason,
+              !markerSerializeArg
+            ),
             markerSerializeArg,
             statefulSerializeArg
           );
@@ -6604,8 +6625,10 @@ function buildContent(body) {
         body.node.body.unshift(
           import_compiler32.types.variableDeclaration("const", [
             import_compiler32.types.variableDeclarator(
-              import_compiler32.types.identifier(getSharedUid("serialize", bodySection)),
-              callRuntime("_get_serialize_reason")
+              import_compiler32.types.identifier(
+                getSharedUid(`scope${bodySection.id}_reason`, bodySection)
+              ),
+              callRuntime("_scope_reason")
             )
           ])
         );
@@ -6756,7 +6779,7 @@ function knownTagTranslateHTML(tag, tagIdentifier, contentSection, propTree) {
     if (contentSection.paramReasonGroups.length === 1) {
       const [group] = contentSection.paramReasonGroups;
       const reason = getSerializeReason(section, childScopeBinding, group.id);
-      childSerializeReasonExpr = reason && getSerializeGuard(reason, false);
+      childSerializeReasonExpr = reason && getSerializeGuard(section, reason, false);
     } else {
       const props = [];
       let hasDynamicReasons = false;
@@ -6770,9 +6793,9 @@ function knownTagTranslateHTML(tag, tagIdentifier, contentSection, propTree) {
             import_compiler33.types.objectProperty(
               withLeadingComment(
                 import_compiler33.types.numericLiteral(i),
-                mapToString(group.reason, ", ", getDebugName)
+                getDebugNames(group.reason)
               ),
-              getSerializeGuard(reason, false)
+              getSerializeGuard(section, reason, false)
             )
           );
         } else {
@@ -8040,6 +8063,8 @@ function finalizeReferences() {
         }
       }
     }
+  });
+  forEachSection((section) => {
     forEach(section.referencedLocalClosures, (closure) => {
       addSerializeReason(
         section,
@@ -8048,41 +8073,39 @@ function finalizeReferences() {
       );
     });
     forEach(section.referencedClosures, (closure) => {
-      if (!isForceSerialized(closure.section, closure)) {
-        const sourceSection = closure.section;
-        let serializeReason;
-        let currentSection = section;
-        while (currentSection !== sourceSection) {
-          const upstreamReason = currentSection.downstreamBinding ? getSectionRegisterReasons(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
-          if (upstreamReason === true) {
-            serializeReason = true;
-            break;
-          }
-          serializeReason = mergeSerializeReasons(
-            serializeReason,
-            upstreamReason
-          );
-          currentSection = currentSection.parent;
+      const sourceSection = closure.section;
+      let currentSection = section;
+      let branchesReason;
+      while (currentSection !== sourceSection) {
+        const upstreamReason = currentSection.downstreamBinding ? getSectionRegisterReasons(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
+        if (upstreamReason === true) {
+          branchesReason = true;
+          break;
         }
-        addSerializeReason(closure.section, serializeReason, closure);
+        branchesReason = mergeSerializeReasons(branchesReason, upstreamReason);
+        currentSection = currentSection.parent;
       }
+      addSerializeReason(sourceSection, branchesReason, closure);
       addSerializeReason(
-        closure.section,
-        getSerializeReason(closure.section, closure)
+        sourceSection,
+        getSerializeReason(sourceSection, closure)
       );
-      if (closure.sources && isDynamicClosure(section, closure)) {
-        addSerializeReason(
-          closure.section,
-          closure.sources,
-          closure,
-          getAccessorPrefix().ClosureScopes
-        );
-        addSerializeReason(
-          section,
-          closure.sources,
-          closure,
-          getAccessorPrefix().ClosureSignalIndex
-        );
+      if (isDynamicClosure(section, closure)) {
+        addOwnerSerializeReason(section, sourceSection, branchesReason);
+        if (closure.sources) {
+          addSerializeReason(
+            sourceSection,
+            closure.sources,
+            closure,
+            getAccessorPrefix().ClosureScopes
+          );
+          addSerializeReason(
+            section,
+            closure.sources,
+            closure,
+            getAccessorPrefix().ClosureSignalIndex
+          );
+        }
       }
     });
   });
@@ -8400,6 +8423,9 @@ function getDebugName(binding) {
   const { root, access } = getDebugScopeAccess(binding);
   return root.name + access;
 }
+function getDebugNames(refs) {
+  return mapToString(refs, ", ", getDebugName);
+}
 function getSectionInstancesAccessor(section) {
   return section.sectionAccessor ? section.sectionAccessor.prefix + getScopeAccessor(section.sectionAccessor.binding) : getAccessorPrefix().ClosureScopes + section.id;
 }
@@ -8704,7 +8730,7 @@ var await_default = {
                 node.body.params,
                 toFirstExpressionOrBlock(node.body.body)
               ),
-              getSerializeGuard(bodySection?.serializeReason, true)
+              getSerializeGuard(section, bodySection?.serializeReason, true)
             )
           )
         )[0].skip();
@@ -10313,10 +10339,12 @@ var IfTag = {
               getParentTag(ifTag).node.extra[kSkipEndTag] = true;
             }
             const statefulSerializeArg = getSerializeGuard(
+              ifTagSection,
               getSerializeReason(ifTagSection, kStatefulReason2),
               !(skipParentEnd || singleNodeOptimization)
             );
             const markerSerializeArg = getSerializeGuard(
+              ifTagSection,
               markerSerializeReason,
               !statefulSerializeArg
             );
@@ -10331,6 +10359,7 @@ var IfTag = {
                 getScopeIdIdentifier(ifTagSection),
                 getScopeAccessorLiteral(nodeBinding),
                 getSerializeGuardForAny(
+                  ifTagSection,
                   branchSerializeReasons,
                   !markerSerializeArg
                 ),
@@ -10637,8 +10666,12 @@ var let_default = {
           signal.extraArgs = [valueChangeAttr.value];
         }
         signal.buildAssignment = (valueSection, value) => {
-          const scope = getScopeExpression(valueSection, signal.section);
-          return import_compiler48.types.callExpression(signal.identifier, [scope, value]);
+          if (valueChangeAttr || signalHasStatements(signal)) {
+            return import_compiler48.types.callExpression(signal.identifier, [
+              getScopeExpression(valueSection, signal.section),
+              value
+            ]);
+          }
         };
       } else {
         translateVar(tag, valueAttr.value, "let");
@@ -11430,7 +11463,7 @@ var placeholder_default = {
             if (markerSerializeReason === true || markerSerializeReason.state) {
               write`<!>`;
             } else {
-              write`${callRuntime("_sep", getSerializeGuard(markerSerializeReason, true))}`;
+              write`${callRuntime("_sep", getSerializeGuard(section, markerSerializeReason, true))}`;
             }
           }
           visit(placeholder, 37 /* Replace */);
@@ -12074,6 +12107,7 @@ var dynamic_tag_default = {
         flushInto(tag);
         writeHTMLResumeStatements(tag.get("body"));
         const serializeArg = getSerializeGuard(
+          tagSection,
           getSerializeReason(tagSection, nodeBinding),
           true
         );

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

@@ -105,6 +105,7 @@ export declare function getDebugScopeAccess(binding: Binding): {
     access: string;
 };
 export declare function getDebugName(binding: Binding): string;
+export declare function getDebugNames(refs: ReferencedBindings): string;
 export declare function getSectionInstancesAccessor(section: Section): string;
 export declare function getSectionInstancesAccessorLiteral(section: Section): t.StringLiteral | t.NumericLiteral | undefined;
 export declare function getReadReplacement(node: t.Identifier | t.MemberExpression): t.Node | undefined;

package/dist/translator/util/serialize-guard.d.ts

@@ -1,5 +1,6 @@
 import { types as t } from "@marko/compiler";
+import { type Section } from "./sections";
 import { type SerializeReason, type SerializeReasons } from "./serialize-reasons";
-export declare function getSerializeGuard(reason: undefined | SerializeReason, optional: boolean): t.Expression | undefined;
-export declare function getSerializeGuardForAny(reasons: undefined | SerializeReasons, optional: boolean): t.Expression | undefined;
-export declare function getExprIfSerialized<T extends undefined | SerializeReason, U extends t.Expression>(reason: T, expr: U): T extends {} ? U : undefined;
+export declare function getSerializeGuard(section: Section, reason: undefined | SerializeReason, optional: boolean): t.Expression | undefined;
+export declare function getSerializeGuardForAny(section: Section, reasons: undefined | SerializeReasons, optional: boolean): t.Expression | undefined;
+export declare function getExprIfSerialized<T extends undefined | SerializeReason, U extends t.Expression>(section: Section, reason: T, expr: U): T extends {} ? U : undefined;

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

@@ -23,7 +23,7 @@ export type Signal = {
     export: boolean;
     extraArgs?: t.Expression[];
     prependStatements?: t.Statement[];
-    buildAssignment?: (valueSection: Section, value: t.Expression) => t.Expression;
+    buildAssignment?: (valueSection: Section, value: t.Expression) => t.Expression | undefined;
 };
 type closureSignalBuilder = (closure: Binding, render: t.Expression) => t.Expression;
 export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;

package/package.json

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