marko 6.0.85 → 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,74 +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), getDebugNames(reason.state)) : 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) {
+    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)),
-        getDebugNames(reasons)
+        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)),
-        getDebugNames(reasons)
-      )
-    ) : serializeIdentifier;
-    expr = expr ? import_compiler14.types.logicalExpression("||", expr, guard) : guard;
-  }
-  return expr;
-}
 
 // src/translator/util/walks.ts
 var import_compiler15 = require("@marko/compiler");
@@ -2986,7 +2997,7 @@ function markNode(path5, nodeBinding, reason) {
         "_el_resume",
         getScopeIdIdentifier(section),
         getScopeAccessorLiteral(nodeBinding),
-        getSerializeGuard(reason, true)
+        getSerializeGuard(section, reason, true)
       )}`;
     }
   }
@@ -4051,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) {
@@ -4085,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) {
@@ -4116,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) {
@@ -4519,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")
             )
           ])
         );
@@ -5283,6 +5298,7 @@ var native_tag_default = {
                   getScopeIdIdentifier(tagSection),
                   usedAttrs.staticContentAttr.value,
                   getSerializeGuard(
+                    tagSection,
                     nodeBinding && getSerializeReason(tagSection, nodeBinding),
                     true
                   )
@@ -5291,6 +5307,7 @@ var native_tag_default = {
             ];
           } else if (spreadExpression && !hasChildren) {
             const serializeReason = getSerializeGuard(
+              tagSection,
               nodeBinding && getSerializeReason(tagSection, nodeBinding),
               true
             );
@@ -6040,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
           );
@@ -6051,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
           );
@@ -6602,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")
             )
           ])
         );
@@ -6754,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,7 +6795,7 @@ function knownTagTranslateHTML(tag, tagIdentifier, contentSection, propTree) {
                 import_compiler33.types.numericLiteral(i),
                 getDebugNames(group.reason)
               ),
-              getSerializeGuard(reason, false)
+              getSerializeGuard(section, reason, false)
             )
           );
         } else {
@@ -8038,6 +8063,8 @@ function finalizeReferences() {
         }
       }
     }
+  });
+  forEachSection((section) => {
     forEach(section.referencedLocalClosures, (closure) => {
       addSerializeReason(
         section,
@@ -8046,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
+          );
+        }
       }
     });
   });
@@ -8705,7 +8730,7 @@ var await_default = {
                 node.body.params,
                 toFirstExpressionOrBlock(node.body.body)
               ),
-              getSerializeGuard(bodySection?.serializeReason, true)
+              getSerializeGuard(section, bodySection?.serializeReason, true)
             )
           )
         )[0].skip();
@@ -10314,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
             );
@@ -10332,6 +10359,7 @@ var IfTag = {
                 getScopeIdIdentifier(ifTagSection),
                 getScopeAccessorLiteral(nodeBinding),
                 getSerializeGuardForAny(
+                  ifTagSection,
                   branchSerializeReasons,
                   !markerSerializeArg
                 ),
@@ -11435,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 */);
@@ -12079,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/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/package.json

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