@marko/runtime-tags 6.0.109 → 6.0.111

package/dist/debug/dom.js

@@ -535,19 +535,20 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const serializeContext = {
           _: registeredValues
         };
-        const visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
-          let curBranchScopes;
-          const branchScopesStack = [];
-          const branchStarts = [];
-          const orphanBranches = [];
-          const endBranch = (accessor, singleNode) => {
-            const parent = visit.parentNode;
-            let startVisit = visit;
-            let i = orphanBranches.length;
-            let branchId;
-            let branch;
-            let childBranch;
-            let endedBranches;
+        const visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => {
+          return (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+            if (visitType !== "[" /* BranchStart */) {
+              visitScope["Getter:" /* Getter */ + nextToken(
+                /* read accessor */
+              )] = /* @__PURE__ */ ((node) => () => node)(
+                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
+              );
+              accessor = "BranchScopes:" /* BranchScopes */ + lastToken;
+              singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */;
+              nextToken(
+                /* read optional first branchId */
+              );
+            }
             while (branchId = +lastToken) {
               (endedBranches ||= []).push(
                 branch = scopeLookup[branchId] ||= {
@@ -592,33 +593,16 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0];
               }
             }
-          };
-          return () => {
             if (visitType === "[" /* BranchStart */) {
-              if (lastToken) {
-                endBranch();
-              } else {
+              if (!endedBranches) {
                 branchScopesStack.push(curBranchScopes);
                 curBranchScopes = void 0;
               }
               branchStarts.push(visit);
-            } else {
-              visitScope["Getter:" /* Getter */ + nextToken(
-                /* read accessor */
-              )] = /* @__PURE__ */ ((node) => () => node)(
-                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-              );
-              endBranch(
-                "BranchScopes:" /* BranchScopes */ + lastToken,
-                (nextToken(
-                  /* read optional first branchId */
-                ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
-              );
             }
           };
         })();
         let $global;
-        let lastScopeId = 0;
         let lastEffect;
         let visits;
         let resumes;
@@ -628,12 +612,13 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         let visitScope;
         let lastToken;
         let lastTokenIndex;
+        let lastScopeId = 0;
         const nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
           // eslint-disable-next-line no-cond-assign
           (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
         );
-        render.w = () => {
+        render.w = (effects = []) => {
           try {
             walk2();
             isResuming = 1;
@@ -641,11 +626,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               if (typeof serialized === "string") {
                 lastEffect = serialized;
               } else if (typeof serialized === "number") {
-                queueEffect(
+                effects.push(
+                  registeredValues[lastEffect],
                   scopeLookup[serialized] ||= {
                     ["#Id" /* Id */]: serialized
-                  },
-                  registeredValues[lastEffect]
+                  }
                 );
               } else {
                 for (const scope of serialized(serializeContext)) {
@@ -680,7 +665,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 visitBranches();
               }
             }
-            run();
+            runEffects(effects);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/dist/debug/dom.mjs

@@ -432,19 +432,20 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const serializeContext = {
           _: registeredValues
         };
-        const visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
-          let curBranchScopes;
-          const branchScopesStack = [];
-          const branchStarts = [];
-          const orphanBranches = [];
-          const endBranch = (accessor, singleNode) => {
-            const parent = visit.parentNode;
-            let startVisit = visit;
-            let i = orphanBranches.length;
-            let branchId;
-            let branch;
-            let childBranch;
-            let endedBranches;
+        const visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => {
+          return (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+            if (visitType !== "[" /* BranchStart */) {
+              visitScope["Getter:" /* Getter */ + nextToken(
+                /* read accessor */
+              )] = /* @__PURE__ */ ((node) => () => node)(
+                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
+              );
+              accessor = "BranchScopes:" /* BranchScopes */ + lastToken;
+              singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */;
+              nextToken(
+                /* read optional first branchId */
+              );
+            }
             while (branchId = +lastToken) {
               (endedBranches ||= []).push(
                 branch = scopeLookup[branchId] ||= {
@@ -489,33 +490,16 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0];
               }
             }
-          };
-          return () => {
             if (visitType === "[" /* BranchStart */) {
-              if (lastToken) {
-                endBranch();
-              } else {
+              if (!endedBranches) {
                 branchScopesStack.push(curBranchScopes);
                 curBranchScopes = void 0;
               }
               branchStarts.push(visit);
-            } else {
-              visitScope["Getter:" /* Getter */ + nextToken(
-                /* read accessor */
-              )] = /* @__PURE__ */ ((node) => () => node)(
-                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-              );
-              endBranch(
-                "BranchScopes:" /* BranchScopes */ + lastToken,
-                (nextToken(
-                  /* read optional first branchId */
-                ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
-              );
             }
           };
         })();
         let $global;
-        let lastScopeId = 0;
         let lastEffect;
         let visits;
         let resumes;
@@ -525,12 +509,13 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         let visitScope;
         let lastToken;
         let lastTokenIndex;
+        let lastScopeId = 0;
         const nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
           // eslint-disable-next-line no-cond-assign
           (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
         );
-        render.w = () => {
+        render.w = (effects = []) => {
           try {
             walk2();
             isResuming = 1;
@@ -538,11 +523,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               if (typeof serialized === "string") {
                 lastEffect = serialized;
               } else if (typeof serialized === "number") {
-                queueEffect(
+                effects.push(
+                  registeredValues[lastEffect],
                   scopeLookup[serialized] ||= {
                     ["#Id" /* Id */]: serialized
-                  },
-                  registeredValues[lastEffect]
+                  }
                 );
               } else {
                 for (const scope of serialized(serializeContext)) {
@@ -577,7 +562,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 visitBranches();
               }
             }
-            run();
+            runEffects(effects);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/dist/dom.js

@@ -342,60 +342,51 @@ function init(runtimeId = "M") {
       value: resumeRender = ((renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
-          let curBranchScopes, branchScopesStack = [], branchStarts = [], orphanBranches = [], endBranch = (accessor, singleNode) => {
-            let parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, branchId, branch, childBranch, endedBranches;
-            for (; branchId = +lastToken; ) {
-              if ((endedBranches ||= []).push(
-                branch = scopeLookup[branchId] ||= {
-                  L: branchId
-                }
-              ), branch.F = branch, singleNode) {
-                for (; startVisit.previousSibling && ~visits.indexOf(
-                  startVisit = startVisit.previousSibling
-                ); ) ;
-                branch.K = branch.S = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch.a = startVisit);
-              } else
-                curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
-              for (; i && orphanBranches[--i].L > branchId; )
-                (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
-                  childBranch
-                );
-              nextToken(
-                /* read optional next branchId */
+        }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+          for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
+            /* read accessor */
+          )] = /* @__PURE__ */ ((node) => () => node)(
+            visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
+          ), accessor = "A" /* BranchScopes */ + lastToken, singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */, nextToken(
+            /* read optional first branchId */
+          )); branchId = +lastToken; ) {
+            if ((endedBranches ||= []).push(
+              branch = scopeLookup[branchId] ||= {
+                L: branchId
+              }
+            ), branch.F = branch, singleNode) {
+              for (; startVisit.previousSibling && ~visits.indexOf(
+                startVisit = startVisit.previousSibling
+              ); ) ;
+              branch.K = branch.S = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch.a = startVisit);
+            } else
+              curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
+            for (; i && orphanBranches[--i].L > branchId; )
+              (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
+                childBranch
               );
-            }
-            endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0]));
-          };
-          return () => {
-            visitType === "[" /* BranchStart */ ? (lastToken ? endBranch() : (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit)) : (visitScope["J" /* Getter */ + nextToken(
-              /* read accessor */
-            )] = /* @__PURE__ */ ((node) => () => node)(
-              visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-            ), endBranch(
-              "A" /* BranchScopes */ + lastToken,
-              (nextToken(
-                /* read optional first branchId */
-              ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
-            ));
-          };
-        })(), $global, lastScopeId = 0, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, nextToken = () => lastToken = visitText.slice(
+            nextToken(
+              /* read optional next branchId */
+            );
+          }
+          endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0])), visitType === "[" /* BranchStart */ && (endedBranches || (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit));
+        })(), $global, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, lastScopeId = 0, nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
           // eslint-disable-next-line no-cond-assign
           (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
         );
-        return render.w = () => {
+        return render.w = (effects = []) => {
           try {
             walk2(), isResuming = 1;
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
               else if (typeof serialized == "number")
-                queueEffect(
+                effects.push(
+                  registeredValues[lastEffect],
                   scopeLookup[serialized] ||= {
                     L: serialized
-                  },
-                  registeredValues[lastEffect]
+                  }
                 );
               else
                 for (let scope of serialized(serializeContext))
@@ -406,7 +397,7 @@ function init(runtimeId = "M") {
               )] ||= {
                 L: +lastToken
               }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
-            run();
+            runEffects(effects);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/dist/dom.mjs

@@ -242,60 +242,51 @@ function init(runtimeId = "M") {
       value: resumeRender = ((renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
-          let curBranchScopes, branchScopesStack = [], branchStarts = [], orphanBranches = [], endBranch = (accessor, singleNode) => {
-            let parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, branchId, branch, childBranch, endedBranches;
-            for (; branchId = +lastToken; ) {
-              if ((endedBranches ||= []).push(
-                branch = scopeLookup[branchId] ||= {
-                  L: branchId
-                }
-              ), branch.F = branch, singleNode) {
-                for (; startVisit.previousSibling && ~visits.indexOf(
-                  startVisit = startVisit.previousSibling
-                ); ) ;
-                branch.K = branch.S = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch.a = startVisit);
-              } else
-                curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
-              for (; i && orphanBranches[--i].L > branchId; )
-                (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
-                  childBranch
-                );
-              nextToken(
-                /* read optional next branchId */
+        }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+          for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
+            /* read accessor */
+          )] = /* @__PURE__ */ ((node) => () => node)(
+            visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
+          ), accessor = "A" /* BranchScopes */ + lastToken, singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */, nextToken(
+            /* read optional first branchId */
+          )); branchId = +lastToken; ) {
+            if ((endedBranches ||= []).push(
+              branch = scopeLookup[branchId] ||= {
+                L: branchId
+              }
+            ), branch.F = branch, singleNode) {
+              for (; startVisit.previousSibling && ~visits.indexOf(
+                startVisit = startVisit.previousSibling
+              ); ) ;
+              branch.K = branch.S = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch.a = startVisit);
+            } else
+              curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
+            for (; i && orphanBranches[--i].L > branchId; )
+              (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
+                childBranch
               );
-            }
-            endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0]));
-          };
-          return () => {
-            visitType === "[" /* BranchStart */ ? (lastToken ? endBranch() : (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit)) : (visitScope["J" /* Getter */ + nextToken(
-              /* read accessor */
-            )] = /* @__PURE__ */ ((node) => () => node)(
-              visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-            ), endBranch(
-              "A" /* BranchScopes */ + lastToken,
-              (nextToken(
-                /* read optional first branchId */
-              ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
-            ));
-          };
-        })(), $global, lastScopeId = 0, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, nextToken = () => lastToken = visitText.slice(
+            nextToken(
+              /* read optional next branchId */
+            );
+          }
+          endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0])), visitType === "[" /* BranchStart */ && (endedBranches || (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit));
+        })(), $global, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, lastScopeId = 0, nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
           // eslint-disable-next-line no-cond-assign
           (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
         );
-        return render.w = () => {
+        return render.w = (effects = []) => {
           try {
             walk2(), isResuming = 1;
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
               else if (typeof serialized == "number")
-                queueEffect(
+                effects.push(
+                  registeredValues[lastEffect],
                   scopeLookup[serialized] ||= {
                     L: serialized
-                  },
-                  registeredValues[lastEffect]
+                  }
                 );
               else
                 for (let scope of serialized(serializeContext))
@@ -306,7 +297,7 @@ function init(runtimeId = "M") {
               )] ||= {
                 L: +lastToken
               }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
-            run();
+            runEffects(effects);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/dist/translator/index.js

@@ -2827,10 +2827,7 @@ function getExprIfSerialized(section, reason, expr) {
 
 // src/translator/util/walks.ts
 var import_compiler15 = require("@marko/compiler");
-var [getWalks] = createSectionState(
-  "walks",
-  () => [""]
-);
+var [getWalks] = createSectionState("walks", () => [""]);
 var [getWalkComment] = createSectionState(
   "walkComment",
   () => []
@@ -2871,16 +2868,12 @@ function enterShallow(path5) {
   const steps = getSteps(section);
   steps.push(0 /* Enter */, 1 /* Exit */);
 }
-function injectWalks(tag, expr) {
+function injectWalks(tag, name2, expr) {
   const section = getSection(tag);
   const walks = getWalks(section);
   const walkComment = getWalkComment(section);
   visitInternal(section);
-  walkComment.push(
-    `${walkCodeToName[tag.node.var ? 48 /* BeginChildWithVar */ : 47 /* BeginChild */]}`,
-    expr && import_compiler15.types.isIdentifier(expr) ? expr.name : tag.get("name").toString(),
-    walkCodeToName[38 /* EndChild */]
-  );
+  walkComment.push(`<${name2}${tag.node.var ? "/var" : ""}>`);
   appendLiteral(
     walks,
     String.fromCharCode(
@@ -2979,18 +2972,18 @@ function getWalkString(section) {
   }
   visitInternal(section);
   const walks = getWalks(section);
-  const walkLiteral = normalizeStringExpression(walks);
+  const walkLiteral = normalizeStringExpression(walks.map(unwrapWalk));
   if (walkLiteral && walkLiteral.value !== "") {
     withLeadingComment(walkLiteral, getWalkComment(section).join(", "));
   }
   return walkLiteral;
 }
+function unwrapWalk(walk) {
+  return typeof walk === "function" ? walk() || "" : walk;
+}
 
 // src/translator/util/writer.ts
-var [getWrites] = createSectionState(
-  "writes",
-  () => [""]
-);
+var [getWrites] = createSectionState("writes", () => [""]);
 var [getTrailerWrites] = createSectionState(
   "trailerWrites",
   () => [""]
@@ -3011,7 +3004,7 @@ function consumeHTML(path5) {
   const section = getSection(path5);
   const writes = getWrites(section);
   const trailers = getTrailerWrites(section);
-  const writeResult = normalizeStringExpression(writes);
+  const writeResult = normalizeStringExpression(writes.map(unwrapWrite));
   const trailerResult = normalizeStringExpression(trailers);
   writes.length = 0;
   writes[0] = "";
@@ -3050,9 +3043,12 @@ var [getSectionMeta] = createSectionState(
     const writePostfix = section.content?.endType === 1 /* Dynamic */ ? "<!>" : "";
     const writes = getWrites(section);
     const meta = {
-      setup: getSetup(section),
       walks: getWalkString(section),
-      writes: normalizeStringExpression([writePrefix, ...writes, writePostfix]),
+      writes: normalizeStringExpression([
+        writePrefix,
+        ...writes.map(unwrapWrite),
+        writePostfix
+      ]),
       decls: void 0
     };
     return meta;
@@ -3097,6 +3093,9 @@ function markNode(path5, nodeBinding, reason) {
     }
   }
 }
+function unwrapWrite(write) {
+  return typeof write === "function" ? write() || "" : write;
+}
 
 // src/translator/core/return.ts
 var tagsWithReturn = /* @__PURE__ */ new WeakSet();
@@ -4362,8 +4361,9 @@ function getRegisteredFnExpression(node) {
 var dom_default = {
   translate: {
     exit(program) {
+      forEachSectionReverse(getSectionMeta);
       const section = getSectionForBody(program);
-      const { walks, writes, setup, decls } = getSectionMeta(section);
+      const { walks, writes, decls } = getSectionMeta(section);
       const domExports = program.node.extra.domExports;
       const templateIdentifier = import_compiler23.types.identifier(domExports.template);
       const walksIdentifier = import_compiler23.types.identifier(domExports.walks);
@@ -4398,14 +4398,15 @@ var dom_default = {
           });
           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);
+          const { walks: walks2, writes: writes2, decls: decls2 } = getSectionMeta(childSection);
+          const setup = getSetup(childSection);
           writeSignals(childSection);
           if (!childSection.downstreamBinding || bindingHasDownstreamExpressions(childSection.downstreamBinding)) {
             if (getSectionParentIsOwner(childSection)) {
               setSectionRendererArgs(childSection, [
                 writes2,
                 walks2,
-                setup2,
+                setup,
                 tagParamsIdentifier
               ]);
             } else {
@@ -4415,7 +4416,7 @@ var dom_default = {
                 ...replaceNullishAndEmptyFunctionsWith0([
                   writes2,
                   walks2,
-                  setup2,
+                  setup,
                   tagParamsIdentifier,
                   childSection.hoisted || childSection.isHoistThrough ? getSectionInstancesAccessorLiteral(childSection) : void 0
                 ])
@@ -4455,13 +4456,13 @@ var dom_default = {
             }
           }
           if (decls2) {
-            extraDecls = extraDecls ? [...extraDecls, ...decls2] : decls2;
+            extraDecls = extraDecls ? [...decls2, ...extraDecls] : decls2;
           }
         }
       });
       writeSignals(section);
       writeRegisteredFns();
-      if (!setup) {
+      if (!getSetup(section)) {
         program.node.body.unshift(
           import_compiler23.types.exportNamedDeclaration(
             import_compiler23.types.variableDeclaration("const", [
@@ -8484,8 +8485,8 @@ function finalizeReferences() {
       }
     }
   }
+  forEachSection(finalizeParamSerializeReasonGroups);
   forEachSectionReverse((section) => {
-    finalizeParamSerializeReasonGroups(section);
     finalizeKnownTags(section);
     finalizeSerializeReason(section);
     finalizeParamSerializeReasonGroups(section);
@@ -9421,6 +9422,11 @@ var define_default = {
         const babelBinding = tag.scope.getBinding(tag.node.var.name);
         let allDirectReferences = true;
         for (const ref of babelBinding.referencePaths) {
+          if (isReferenceHoisted(babelBinding.path, ref)) {
+            throw ref.buildCodeFrameError(
+              "Hoisted values must be functions. The `<define>` tag variable may not be hoisted. Please move the `<define>` tag prior to any references or extract to a separate `.marko` file."
+            );
+          }
           if (ref.parent.type === "MarkoTag" && ref.parent.name === ref.node) {
             (ref.parent.extra ??= {}).defineBodySection = bodySection;
             dropReferences(ref.parent.name);
@@ -11478,6 +11484,7 @@ function buildUndefined4() {
 // src/translator/core/try.ts
 var import_compiler57 = require("@marko/compiler");
 var import_babel_utils46 = require("@marko/compiler/babel-utils");
+var hasEnabledCatch = /* @__PURE__ */ new WeakSet();
 var kDOMBinding2 = Symbol("try tag dom binding");
 var try_default = {
   analyze(tag) {
@@ -11591,9 +11598,13 @@ var try_default = {
             translatedAttrs.statements
           );
         }
-        (0, import_babel_utils46.getProgram)().node.body.push(
-          import_compiler57.types.expressionStatement(callRuntime("_enable_catch"))
-        );
+        const program = (0, import_babel_utils46.getProgram)().node;
+        if (!hasEnabledCatch.has(program)) {
+          hasEnabledCatch.add(program);
+          program.body.push(
+            import_compiler57.types.expressionStatement(callRuntime("_enable_catch"))
+          );
+        }
         addValue(
           section,
           referencedBindings,
@@ -12181,7 +12192,7 @@ function translateDOM(tag) {
       }
     );
     write`${import_compiler62.types.identifier(childExports.template)}`;
-    injectWalks(tag, import_compiler62.types.identifier(childExports.walks));
+    injectWalks(tag, tagName, import_compiler62.types.identifier(childExports.walks));
   } else {
     knownTagTranslateDOM(
       tag,
@@ -12214,6 +12225,7 @@ function translateDOM(tag) {
     write`${(0, import_babel_utils50.importNamed)(file, relativePath, childExports.template, `${tagName}_template`)}`;
     injectWalks(
       tag,
+      tagName,
       (0, import_babel_utils50.importNamed)(file, relativePath, childExports.walks, `${tagName}_walks`)
     );
   }
@@ -12359,11 +12371,12 @@ var dynamic_tag_default = {
               }
             }
           );
-          const sectionMeta = getSectionMetaIdentifiers(definedBodySection);
-          if (sectionMeta.writes) {
-            write`${sectionMeta.writes}`;
-          }
-          injectWalks(tag, sectionMeta.walks);
+          write`${() => getSectionMetaIdentifiers(definedBodySection).writes || ""}`;
+          injectWalks(
+            tag,
+            tag.get("name").toString(),
+            () => getSectionMetaIdentifiers(definedBodySection).walks
+          );
           tag.remove();
         }
         return;

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

@@ -86,6 +86,7 @@ export declare function trackDomVarReferences(tag: t.NodePath<t.MarkoTag>, bindi
 export declare function trackVarReferences(tag: t.NodePath<t.MarkoTag>, type: BindingType, upstreamAlias?: Binding["upstreamAlias"]): Binding | undefined;
 export declare function trackParamsReferences(body: t.NodePath<t.MarkoTagBody | t.Program>, type: BindingType, upstreamAlias?: Binding["upstreamAlias"]): Binding | undefined;
 export declare function trackHoistedReference(referencePath: t.NodePath<t.Identifier>, binding: Binding): void;
+export declare function isReferenceHoisted(bindingPath: t.NodePath, reference: t.NodePath): boolean;
 export declare function setReferencesScope(path: t.NodePath<any>): void;
 export declare function mergeReferences<T extends t.Node>(section: Section, target: T, nodes: (t.Node | undefined)[]): NonNullable<T["extra"]> & ReferencedExtra;
 export declare function compareReferences(a: ReferencedBindings, b: ReferencedBindings): number;

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

@@ -1,6 +1,7 @@
 import { types as t } from "@marko/compiler";
 import { WalkCode } from "../../common/types";
 import { type Section } from "../util/sections";
+type Walk = string | t.Expression | (() => undefined | string | t.Expression);
 export declare enum Step {
     Enter = 0,
     Exit = 1
@@ -9,7 +10,7 @@ type VisitCodes = WalkCode.Get | WalkCode.Inside | WalkCode.Replace | WalkCode.D
 export declare function enter(path: t.NodePath<any>): void;
 export declare function exit(path: t.NodePath<any>): void;
 export declare function enterShallow(path: t.NodePath<any>): void;
-export declare function injectWalks(tag: t.NodePath<t.MarkoTag>, expr: t.Expression | undefined): void;
+export declare function injectWalks(tag: t.NodePath<t.MarkoTag>, name: string, expr: Walk): void;
 export declare function visit(path: t.NodePath<t.MarkoTag | t.MarkoPlaceholder | t.Program>, code: VisitCodes): void;
 export declare function getWalkString(section: Section): t.Expression | undefined;
 export {};

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

@@ -2,12 +2,12 @@ import { types as t } from "@marko/compiler";
 import { type Section } from "../util/sections";
 import { type Binding } from "./references";
 import type { SerializeReason } from "./serialize-reasons";
-export declare function writeTo(path: t.NodePath<any>, trailer?: boolean): (strs: TemplateStringsArray, ...exprs: Array<string | t.Expression>) => void;
+type Write = string | t.Expression | (() => undefined | string | t.Expression);
+export declare function writeTo(path: t.NodePath<any>, trailer?: boolean): (strs: TemplateStringsArray, ...exprs: Write[]) => void;
 export declare function consumeHTML(path: t.NodePath<any>): t.ExpressionStatement | undefined;
 export declare function flushBefore(path: t.NodePath<any>): void;
 export declare function flushInto(path: t.NodePath<t.MarkoTag> | t.NodePath<t.Program>): void;
 interface SectionMeta {
-    setup: t.Expression | undefined;
     walks: t.Expression | undefined;
     writes: t.Expression | undefined;
     decls: t.VariableDeclarator[] | undefined;

package/package.json

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