marko 6.0.2 → 6.0.4

package/dist/translator/index.js

@@ -1539,7 +1539,7 @@ function forceSectionSerialize(section, prop) {
     forceSerializeKey(section, getSectionPropSerializeReasonKey(section, prop));
   } else if (section.serializeReason !== true) {
     reasonExprs.delete(section);
-    section.serializeReason = true;
+    setSectionSerializeReason(section, true);
   }
 }
 function forceBindingSerialize(section, binding, prefix2) {
@@ -1547,7 +1547,7 @@ function forceBindingSerialize(section, binding, prefix2) {
 }
 function forceSerializeKey(section, key) {
   if (section.serializeReasons.get(key) !== true) {
-    section.serializeReasons.set(key, true);
+    setSectionKeyedSerializeReason(section, key, true);
     keyedReasonExprs.get(section)?.delete(key);
   }
 }
@@ -1616,9 +1616,9 @@ function addSectionSerializeReasonRef(section, ref, prop) {
           if (reason === true) {
             forceSectionSerialize(section);
           } else {
-            section.serializeReason = mergeSerializeReasons(
-              existingReason,
-              reason
+            setSectionSerializeReason(
+              section,
+              mergeSerializeReasons(existingReason, reason)
             );
           }
         }
@@ -1636,7 +1636,8 @@ function addKeyedSerializeReasonRef(section, key, ref) {
       if (reason === true) {
         forceSerializeKey(section, key);
       } else {
-        section.serializeReasons.set(
+        setSectionKeyedSerializeReason(
+          section,
           key,
           mergeSerializeReasons(existingReason, reason)
         );
@@ -1658,9 +1659,9 @@ function addSectionSerializeReason(section, reason, prop) {
         if (reason === true) {
           forceSectionSerialize(section);
         } else {
-          section.serializeReason = mergeSerializeReasons(
-            existingReason,
-            reason
+          setSectionSerializeReason(
+            section,
+            mergeSerializeReasons(existingReason, reason)
           );
         }
       }
@@ -1682,7 +1683,8 @@ function addKeyedSerializeReason(section, key, reason) {
     if (reason === true) {
       forceSerializeKey(section, key);
     } else {
-      section.serializeReasons.set(
+      setSectionKeyedSerializeReason(
+        section,
         key,
         mergeSerializeReasons(existingReason, reason)
       );
@@ -1730,19 +1732,23 @@ function applySerializeReasonExprs(section) {
   if (keyedExprs) {
     keyedReasonExprs.delete(section);
     for (const [key, exprs] of keyedExprs) {
-      const reason = getSerializeSourcesForExprs(exprs);
-      if (reason) {
-        section.serializeReasons.set(
+      const reason2 = getSerializeSourcesForExprs(exprs);
+      if (reason2) {
+        setSectionKeyedSerializeReason(
+          section,
           key,
-          mergeSerializeReasons(section.serializeReasons.get(key), reason)
+          mergeSerializeReasons(section.serializeReasons.get(key), reason2)
         );
       }
     }
   }
-  section.serializeReason = mergeSerializeReasons(
-    section.serializeReason,
-    getSerializeSourcesForExprs(reasonExprs.get(section))
-  );
+  const reason = getSerializeSourcesForExprs(reasonExprs.get(section));
+  if (reason) {
+    setSectionSerializeReason(
+      section,
+      mergeSerializeReasons(section.serializeReason, reason)
+    );
+  }
   reasonExprs.delete(section);
 }
 function finalizeSectionSerializeReasons(section) {
@@ -1755,7 +1761,7 @@ function finalizeSectionSerializeReasons(section) {
       }
       reason = mergeSerializeReasons(reason, keyedReason);
     }
-    section.serializeReason = reason;
+    setSectionSerializeReason(section, reason);
   }
 }
 function getSerializeSourcesForExpr(expr) {
@@ -1799,6 +1805,12 @@ function mergeSerializeReasons(a, b) {
   if (a === true || b === true) return true;
   return bindingUtil.union(a, b);
 }
+function setSectionSerializeReason(section, reason) {
+  section.serializeReason = reason;
+}
+function setSectionKeyedSerializeReason(section, key, reason) {
+  section.serializeReasons.set(key, reason);
+}
 
 // src/translator/util/state.ts
 var import_babel_utils9 = require("@marko/compiler/babel-utils");
@@ -2360,7 +2372,7 @@ function getExprIfSerialized(reason, expr) {
   ) : void 0;
 }
 function getSerializeGuard(reason) {
-  return reason ? reason === true ? import_compiler13.types.numericLiteral(1) : callRuntime(
+  return callRuntime(
     "serializeGuard",
     import_compiler13.types.identifier(getSharedUid("serialize")),
     import_compiler13.types.numericLiteral(
@@ -2369,7 +2381,7 @@ function getSerializeGuard(reason) {
         reason
       )
     )
-  ) : void 0;
+  );
 }
 var html_default = {
   translate: {
@@ -4316,6 +4328,7 @@ function withPreviousLocation(newNode, originalNode) {
 
 // src/translator/util/references.ts
 var kIsInvoked = Symbol("hoist is invoked");
+var kBranchSerializeReason = Symbol("branch serialize reason");
 var [getBindings] = createProgramState(() => /* @__PURE__ */ new Set());
 var [getNextBindingId, setNextBindingId] = createProgramState(() => 0);
 function createBinding(name2, type, section, upstreamAlias, property, loc = null, declared = false) {
@@ -4768,8 +4781,16 @@ function finalizeReferences() {
       );
     });
     if (section.parent && section.isBranch && section.sectionAccessor && section.upstreamExpression) {
-      addSectionSerializeReasonRef(section, getDirectClosures(section));
-      addSectionSerializeReasonExpr(section, section.upstreamExpression);
+      addSectionSerializeReasonRef(
+        section,
+        !!(section.isHoistThrough || section.hoisted) || getDirectClosures(section),
+        kBranchSerializeReason
+      );
+      addSectionSerializeReasonExpr(
+        section,
+        section.upstreamExpression,
+        kBranchSerializeReason
+      );
       addBindingSerializeReasonExpr(
         section.parent,
         section.sectionAccessor.binding,
@@ -5783,6 +5804,9 @@ var native_tag_default = {
             relatedControllable.attrs.map((it) => it?.value)
           );
         }
+        if (hasEventHandlers || spreadReferenceNodes) {
+          forceBindingSerialize(tagSection, nodeBinding);
+        }
         if (node.var) {
           forceBindingSerialize(tagSection, nodeBinding);
           for (const ref of tag.scope.getBinding(node.var.name).referencePaths) {
@@ -5794,8 +5818,8 @@ var native_tag_default = {
                 tagSection,
                 getAccessorProp().Owner
               );
-              if (!isInvokedFunction(ref)) {
-                tagExtra[kGetterId] ||= getRegisterUID(
+              if (!tagExtra[kGetterId] && !isInvokedFunction(ref)) {
+                tagExtra[kGetterId] = getRegisterUID(
                   tagSection,
                   nodeBinding.name
                 );
@@ -5807,15 +5831,12 @@ var native_tag_default = {
               );
             }
           }
-        } else if (hasEventHandlers || spreadReferenceNodes) {
-          forceBindingSerialize(tagSection, nodeBinding);
-        } else {
-          addBindingSerializeReasonExpr(
-            tagSection,
-            nodeBinding,
-            push(attrExprExtras, tagExtra)
-          );
         }
+        addBindingSerializeReasonExpr(
+          tagSection,
+          nodeBinding,
+          push(attrExprExtras, tagExtra)
+        );
       }
     }
   },
@@ -6385,14 +6406,14 @@ var for_default = {
         const statements = [];
         const bodyStatements = node.body.body;
         const singleNodeOptimization = bodySection.content === null || bodySection.content.singleChild && bodySection.content.startType !== 4 /* Text */;
-        const branchSerializeReason = getSectionSerializeReason(bodySection);
+        const branchSerializeReason = getSectionSerializeReason(
+          bodySection,
+          kBranchSerializeReason
+        );
         const markerSerializeReason = getBindingSerializeReason(
           tagSection,
           nodeBinding
         );
-        if (markerSerializeReason && onlyChildInParentOptimization) {
-          getParentTag(tag).node.extra[kSkipMark] = true;
-        }
         flushInto(tag);
         writeHTMLResumeStatements(tagBody);
         const forTagArgs = getBaseArgsInForTag(forType, forAttrs);
@@ -6401,18 +6422,15 @@ var for_default = {
           import_compiler33.types.arrowFunctionExpression(params, import_compiler33.types.blockStatement(bodyStatements))
         );
         if (branchSerializeReason) {
+          if (markerSerializeReason && onlyChildInParentOptimization) {
+            getParentTag(tag).node.extra[kSkipMark] = true;
+          }
           forTagArgs.push(
             forAttrs.by || import_compiler33.types.numericLiteral(0),
             getScopeIdIdentifier(tagSection),
             getScopeAccessorLiteral(nodeBinding),
-            branchSerializeReason !== true && markerSerializeReason && markerSerializeReason !== true && !bindingUtil.isSuperset(
-              branchSerializeReason,
-              markerSerializeReason
-            ) ? import_compiler33.types.logicalExpression(
-              "||",
-              getSerializeGuard(branchSerializeReason),
-              getSerializeGuard(markerSerializeReason)
-            ) : getSerializeGuard(branchSerializeReason)
+            branchSerializeReason === true ? markerSerializeReason === true && !onlyChildInParentOptimization ? void 0 : import_compiler33.types.numericLiteral(1) : getSerializeGuard(branchSerializeReason),
+            !markerSerializeReason ? import_compiler33.types.numericLiteral(0) : markerSerializeReason === true ? onlyChildInParentOptimization ? import_compiler33.types.numericLiteral(1) : void 0 : getSerializeGuard(markerSerializeReason)
           );
           if (onlyChildInParentOptimization) {
             forTagArgs.push(import_compiler33.types.numericLiteral(1));
@@ -7371,6 +7389,9 @@ var html_script_default = {
           bodyPlaceholderNodes.slice(1)
         );
       }
+      if (hasEventHandlers || spreadReferenceNodes) {
+        forceBindingSerialize(tagSection, nodeBinding);
+      }
       if (node.var) {
         forceBindingSerialize(tagSection, nodeBinding);
         for (const ref of tag.scope.getBinding(node.var.name).referencePaths) {
@@ -7389,15 +7410,12 @@ var html_script_default = {
             trackHoistedReference(ref, nodeBinding);
           }
         }
-      } else if (hasEventHandlers || spreadReferenceNodes) {
-        forceBindingSerialize(tagSection, nodeBinding);
-      } else {
-        addBindingSerializeReasonExpr(
-          tagSection,
-          nodeBinding,
-          push(attrExprExtras, tagExtra)
-        );
       }
+      addBindingSerializeReasonExpr(
+        tagSection,
+        nodeBinding,
+        push(attrExprExtras, tagExtra)
+      );
     }
   },
   translate: {
@@ -7783,6 +7801,9 @@ var html_style_default = {
           bodyPlaceholderNodes.slice(1)
         );
       }
+      if (hasEventHandlers || spreadReferenceNodes) {
+        forceBindingSerialize(tagSection, nodeBinding);
+      }
       if (node.var) {
         forceBindingSerialize(tagSection, nodeBinding);
         for (const ref of tag.scope.getBinding(node.var.name).referencePaths) {
@@ -7801,15 +7822,12 @@ var html_style_default = {
             trackHoistedReference(ref, nodeBinding);
           }
         }
-      } else if (hasEventHandlers || spreadReferenceNodes) {
-        forceBindingSerialize(tagSection, nodeBinding);
-      } else {
-        addBindingSerializeReasonExpr(
-          tagSection,
-          nodeBinding,
-          push(attrExprExtras, tagExtra)
-        );
       }
+      addBindingSerializeReasonExpr(
+        tagSection,
+        nodeBinding,
+        push(attrExprExtras, tagExtra)
+      );
     }
   },
   translate: {
@@ -8255,14 +8273,14 @@ var IfTag = {
           const nextTag = tag.getNextSibling();
           let branchSerializeReasons;
           let statement;
-          if (markerSerializeReason && onlyChildInParentOptimization) {
-            getParentTag(ifTag).node.extra[kSkipMark] = true;
-          }
           for (let i = branches.length; i--; ) {
             const [branchTag, branchBody] = branches[i];
             const bodyStatements = branchTag.node.body.body;
             if (branchBody) {
-              const branchSerializeReason = getSectionSerializeReason(branchBody);
+              const branchSerializeReason = getSectionSerializeReason(
+                branchBody,
+                kBranchSerializeReason
+              );
               if (branchSerializeReason) {
                 if (branchSerializeReasons !== true) {
                   if (branchSerializeReason === true) {
@@ -8296,7 +8314,9 @@ var IfTag = {
             branchTag.remove();
           }
           if (branchSerializeReasons) {
-            const branchSerializeExpr = branchSerializeReasons === true ? !onlyChildInParentOptimization && !markerSerializeReason ? void 0 : getSerializeGuard(branchSerializeReasons) : getSerializeGuardForAny(branchSerializeReasons);
+            if (onlyChildInParentOptimization && markerSerializeReason) {
+              getParentTag(ifTag).node.extra[kSkipMark] = true;
+            }
             const cbNode = import_compiler42.types.arrowFunctionExpression(
               [],
               import_compiler42.types.blockStatement([statement])
@@ -8307,16 +8327,16 @@ var IfTag = {
                 cbNode,
                 getScopeIdIdentifier(ifTagSection),
                 getScopeAccessorLiteral(nodeBinding),
-                branchSerializeExpr,
-                markerSerializeReason ? getSerializeGuard(markerSerializeReason) : onlyChildInParentOptimization ? import_compiler42.types.numericLiteral(0) : void 0,
+                branchSerializeReasons === true ? markerSerializeReason === true && !onlyChildInParentOptimization ? void 0 : import_compiler42.types.numericLiteral(1) : getSerializeGuardForAny(branchSerializeReasons),
+                !markerSerializeReason ? import_compiler42.types.numericLiteral(0) : markerSerializeReason === true ? onlyChildInParentOptimization ? import_compiler42.types.numericLiteral(1) : void 0 : getSerializeGuard(markerSerializeReason),
                 onlyChildInParentOptimization && import_compiler42.types.numericLiteral(1)
               ) : callRuntime(
                 "resumeConditional",
                 cbNode,
                 getScopeIdIdentifier(ifTagSection),
                 getScopeAccessorLiteral(nodeBinding),
-                branchSerializeExpr,
-                getSerializeGuard(markerSerializeReason)
+                branchSerializeReasons === true ? markerSerializeReason === true ? void 0 : import_compiler42.types.numericLiteral(1) : getSerializeGuardForAny(branchSerializeReasons),
+                !markerSerializeReason ? import_compiler42.types.numericLiteral(0) : markerSerializeReason === true ? void 0 : getSerializeGuard(markerSerializeReason)
               )
             );
           }
@@ -9834,13 +9854,12 @@ function translateHTML(tag) {
   let childSerializeReasonExpr;
   if (childSerializeReasonIds) {
     if (childSerializeReasonIds.length === 1) {
-      childSerializeReasonExpr = getSerializeGuard(
-        getBindingSerializeReason(
-          section,
-          childScopeBinding,
-          childSerializeReasonIds[0]
-        )
+      const reason = getBindingSerializeReason(
+        section,
+        childScopeBinding,
+        childSerializeReasonIds[0]
       );
+      childSerializeReasonExpr = !reason ? void 0 : reason == true ? import_compiler56.types.numericLiteral(1) : getSerializeGuard(reason);
     } else {
       const props = [];
       let hasDynamicReasons = false;
@@ -9854,7 +9873,10 @@ function translateHTML(tag) {
         if (reason) {
           hasDynamicReasons ||= reason !== true;
           props.push(
-            import_compiler56.types.objectProperty(import_compiler56.types.numericLiteral(i), getSerializeGuard(reason))
+            import_compiler56.types.objectProperty(
+              import_compiler56.types.numericLiteral(i),
+              reason === true ? import_compiler56.types.numericLiteral(1) : getSerializeGuard(reason)
+            )
           );
         } else {
           hasSkippedReasons = true;
@@ -10598,6 +10620,7 @@ var dynamic_tag_default = {
           tagSection,
           nodeBinding
         );
+        const serializeArg = !serializeReason ? import_compiler57.types.numericLiteral(0) : serializeReason === true ? void 0 : getSerializeGuard(serializeReason);
         const dynamicTagExpr = hasTagArgs ? callRuntime(
           "dynamicTag",
           getScopeIdIdentifier(tagSection),
@@ -10606,16 +10629,16 @@ var dynamic_tag_default = {
           import_compiler57.types.arrayExpression(args),
           import_compiler57.types.numericLiteral(0),
           import_compiler57.types.numericLiteral(1),
-          getSerializeGuard(serializeReason)
+          serializeArg
         ) : callRuntime(
           "dynamicTag",
           getScopeIdIdentifier(tagSection),
           getScopeAccessorLiteral(nodeBinding),
           tagExpression,
           args[0],
-          args[1] || (serializeReason ? import_compiler57.types.numericLiteral(0) : void 0),
-          serializeReason ? import_compiler57.types.numericLiteral(0) : void 0,
-          getSerializeGuard(serializeReason)
+          args[1] || (serializeArg ? import_compiler57.types.numericLiteral(0) : void 0),
+          serializeArg ? import_compiler57.types.numericLiteral(0) : void 0,
+          serializeArg
         );
         if (node.var) {
           const dynamicScopeIdentifier = generateUidIdentifier(

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

@@ -3,6 +3,7 @@ import { type Many, type OneMany, type Opt, Sorted } from "./optional";
 import { type Section } from "./sections";
 import { type SerializeReason } from "./serialize-reasons";
 declare const kIsInvoked: unique symbol;
+export declare const kBranchSerializeReason: unique symbol;
 export type Aliases = undefined | Binding | {
     [property: string]: Aliases;
 };

package/dist/translator/visitors/program/html.d.ts

@@ -2,7 +2,7 @@ import { types as t } from "@marko/compiler";
 import type { DynamicSerializeReason } from "../../util/serialize-reasons";
 export declare function getTemplateContentName(): string;
 export declare function getExprIfSerialized<T extends undefined | boolean | DynamicSerializeReason, U extends t.Expression>(reason: T, expr: U): T extends {} ? U : undefined;
-export declare function getSerializeGuard<T extends undefined | boolean | DynamicSerializeReason>(reason: T): T extends {} ? t.Expression : undefined;
+export declare function getSerializeGuard(reason: DynamicSerializeReason): t.CallExpression;
 declare const _default: {
     translate: {
         exit(this: unknown, program: t.NodePath<t.Program>): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,7 +48,7 @@
     "build": "node -r ~ts ./scripts/bundle.ts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.18",
+    "@marko/compiler": "^5.39.19",
     "csstype": "^3.1.3",
     "magic-string": "^0.30.17"
   },