marko 6.0.0-next.3.31 → 6.0.0-next.3.33

package/dist/debug/html.js

@@ -68,6 +68,7 @@ __export(html_exports, {
   resumeSingleNodeForIn: () => resumeSingleNodeForIn,
   resumeSingleNodeForOf: () => resumeSingleNodeForOf,
   resumeSingleNodeForTo: () => resumeSingleNodeForTo,
+  setTagVar: () => setTagVar,
   styleAttr: () => styleAttr,
   toString: () => toString,
   tryContent: () => tryContent,
@@ -741,20 +742,27 @@ function writeRegistered(state, val, parent, accessor, { access, scope }) {
     );
     state.refs.set(val, fnRef);
     if (scopeRef) {
-      const scopeId = ensureId(state, scopeRef);
       if (isCircular(parent, scopeRef)) {
         state.assigned.add(fnRef);
-        fnRef.init = access + "(" + scopeId + ")";
+        fnRef.init = access + "(" + ensureId(state, scopeRef) + ")";
         fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=";
         return false;
       }
-      state.buf.push(access + "(" + scopeId + ")");
+      state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
     } else {
-      state.buf.push(access + "(");
+      const pos = state.buf.push("");
+      const assigns = state.assigned.size;
       writeProp(state, scope, parent, "");
-      const scopeRef2 = state.refs.get(scope);
-      if (scopeRef2) ensureId(state, scopeRef2);
-      state.buf.push(")");
+      const scopeRef2 = parent && state.refs.get(scope);
+      const scopeId = scopeRef2 && ensureId(state, scopeRef2);
+      if (scopeId && assigns !== state.assigned.size) {
+        state.assigned.add(fnRef);
+        fnRef.init = access + "(" + scopeId + ")";
+        fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=";
+      } else {
+        state.buf[pos - 2] += access + "(";
+        state.buf.push(")");
+      }
     }
   } else {
     state.buf.push(access);
@@ -1537,6 +1545,13 @@ function withContext(key, value, cb) {
     ctx[key] = prev;
   }
 }
+function setTagVar(parentScopeId, childScope, registryId) {
+  childScope["/" /* TagVariable */] = register2(
+    {},
+    registryId,
+    parentScopeId
+  );
+}
 function register2(val, id, scopeId) {
   return scopeId === void 0 ? register(id, val) : register(id, val, ensureScopeWithId(scopeId));
 }
@@ -2481,7 +2496,7 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
+function dynamicTagInput(scopeId, accessor, tag, input, content) {
   if (!tag && !content) {
     nextScopeId();
     return;
@@ -2542,7 +2557,7 @@ function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
   let result;
   resumeConditional(
     () => {
-      result = renderer(content ? { ...input, content } : input, tagVar);
+      result = renderer(content ? { ...input, content } : input);
     },
     scopeId,
     accessor
@@ -2981,6 +2996,7 @@ function NOOP2() {
   resumeSingleNodeForIn,
   resumeSingleNodeForOf,
   resumeSingleNodeForTo,
+  setTagVar,
   styleAttr,
   toString,
   tryContent,

package/dist/debug/html.mjs

@@ -660,20 +660,27 @@ function writeRegistered(state, val, parent, accessor, { access, scope }) {
     );
     state.refs.set(val, fnRef);
     if (scopeRef) {
-      const scopeId = ensureId(state, scopeRef);
       if (isCircular(parent, scopeRef)) {
         state.assigned.add(fnRef);
-        fnRef.init = access + "(" + scopeId + ")";
+        fnRef.init = access + "(" + ensureId(state, scopeRef) + ")";
         fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=";
         return false;
       }
-      state.buf.push(access + "(" + scopeId + ")");
+      state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
     } else {
-      state.buf.push(access + "(");
+      const pos = state.buf.push("");
+      const assigns = state.assigned.size;
       writeProp(state, scope, parent, "");
-      const scopeRef2 = state.refs.get(scope);
-      if (scopeRef2) ensureId(state, scopeRef2);
-      state.buf.push(")");
+      const scopeRef2 = parent && state.refs.get(scope);
+      const scopeId = scopeRef2 && ensureId(state, scopeRef2);
+      if (scopeId && assigns !== state.assigned.size) {
+        state.assigned.add(fnRef);
+        fnRef.init = access + "(" + scopeId + ")";
+        fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=";
+      } else {
+        state.buf[pos - 2] += access + "(";
+        state.buf.push(")");
+      }
     }
   } else {
     state.buf.push(access);
@@ -1456,6 +1463,13 @@ function withContext(key, value, cb) {
     ctx[key] = prev;
   }
 }
+function setTagVar(parentScopeId, childScope, registryId) {
+  childScope["/" /* TagVariable */] = register2(
+    {},
+    registryId,
+    parentScopeId
+  );
+}
 function register2(val, id, scopeId) {
   return scopeId === void 0 ? register(id, val) : register(id, val, ensureScopeWithId(scopeId));
 }
@@ -2400,7 +2414,7 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
+function dynamicTagInput(scopeId, accessor, tag, input, content) {
   if (!tag && !content) {
     nextScopeId();
     return;
@@ -2461,7 +2475,7 @@ function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
   let result;
   resumeConditional(
     () => {
-      result = renderer(content ? { ...input, content } : input, tagVar);
+      result = renderer(content ? { ...input, content } : input);
     },
     scopeId,
     accessor
@@ -2899,6 +2913,7 @@ export {
   resumeSingleNodeForIn,
   resumeSingleNodeForOf,
   resumeSingleNodeForTo,
+  setTagVar,
   styleAttr,
   toString,
   tryContent,

package/dist/html/dynamic-tag.d.ts

@@ -4,7 +4,7 @@ interface BodyContentObject {
     [x: PropertyKey]: unknown;
     content: ServerRenderer;
 }
-export declare function dynamicTagInput(scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, input: Record<string, unknown>, content?: () => void, tagVar?: unknown): undefined;
+export declare function dynamicTagInput(scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, input: Record<string, unknown>, content?: () => void): undefined;
 export declare function dynamicTagArgs(scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, args: unknown[]): undefined;
 declare let getDynamicRenderer: (value: any) => string | ServerRenderer | undefined;
 export declare let createRenderer: (fn: ServerRenderer) => ServerRenderer;

package/dist/html/writer.d.ts

@@ -16,6 +16,7 @@ export declare function write(html: string): void;
 export declare function writeScript(script: string): void;
 export declare function writeEffect(scopeId: number, registryId: string): void;
 export declare function withContext(key: PropertyKey, value: unknown, cb: () => void): void;
+export declare function setTagVar(parentScopeId: number, childScope: PartialScope, registryId: string): void;
 export declare function register<T extends WeakKey>(val: T, id: string, scopeId?: number): T;
 export declare function nextTagId(): string;
 export declare function nextScopeId(): number;

package/dist/html.d.ts

@@ -7,4 +7,4 @@ export { createRenderer, dynamicTagArgs, dynamicTagInput, } from "./html/dynamic
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
 export { debug } from "./html/serializer";
 export { createTemplate } from "./html/template";
-export { $global, ensureScopeWithId, fork, getScopeById, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScope, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, resumeSingleNodeConditional, resumeSingleNodeForIn, resumeSingleNodeForOf, resumeSingleNodeForTo, tryContent, write, writeEffect, writeExistingScope, writeScope, writeTrailers, } from "./html/writer";
+export { $global, ensureScopeWithId, fork, getScopeById, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScope, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, resumeSingleNodeConditional, resumeSingleNodeForIn, resumeSingleNodeForOf, resumeSingleNodeForTo, setTagVar, tryContent, write, writeEffect, writeExistingScope, writeScope, writeTrailers, } from "./html/writer";

package/dist/html.js

@@ -65,6 +65,7 @@ __export(html_exports, {
   resumeSingleNodeForIn: () => resumeSingleNodeForIn,
   resumeSingleNodeForOf: () => resumeSingleNodeForOf,
   resumeSingleNodeForTo: () => resumeSingleNodeForTo,
+  setTagVar: () => setTagVar,
   styleAttr: () => styleAttr,
   toString: () => toString,
   tryContent: () => tryContent,
@@ -528,14 +529,14 @@ function writeRegistered(state, val, parent, accessor, { access, scope }) {
       state.buf.length
     );
     if (state.refs.set(val, fnRef), scopeRef) {
-      let scopeId = ensureId(state, scopeRef);
       if (isCircular(parent, scopeRef))
-        return state.assigned.add(fnRef), fnRef.init = access + "(" + scopeId + ")", fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=", !1;
-      state.buf.push(access + "(" + scopeId + ")");
+        return state.assigned.add(fnRef), fnRef.init = access + "(" + ensureId(state, scopeRef) + ")", fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=", !1;
+      state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
     } else {
-      state.buf.push(access + "("), writeProp(state, scope, parent, "");
-      let scopeRef2 = state.refs.get(scope);
-      scopeRef2 && ensureId(state, scopeRef2), state.buf.push(")");
+      let pos = state.buf.push(""), assigns = state.assigned.size;
+      writeProp(state, scope, parent, "");
+      let scopeRef2 = parent && state.refs.get(scope), scopeId = scopeRef2 && ensureId(state, scopeRef2);
+      scopeId && assigns !== state.assigned.size ? (state.assigned.add(fnRef), fnRef.init = access + "(" + scopeId + ")", fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=") : (state.buf[pos - 2] += access + "(", state.buf.push(")"));
     }
   } else
     state.buf.push(access);
@@ -1006,6 +1007,13 @@ function withContext(key, value, cb) {
     ctx[kPendingContexts]--, ctx[key] = prev;
   }
 }
+function setTagVar(parentScopeId, childScope, registryId) {
+  childScope["/" /* TagVariable */] = register2(
+    {},
+    registryId,
+    parentScopeId
+  );
+}
 function register2(val, id, scopeId) {
   return scopeId === void 0 ? register(id, val) : register(id, val, ensureScopeWithId(scopeId));
 }
@@ -1630,7 +1638,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
+function dynamicTagInput(scopeId, accessor, tag, input, content) {
   if (!tag && !content) {
     nextScopeId();
     return;
@@ -1665,7 +1673,7 @@ function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
   let renderer = getDynamicRenderer(tag), result;
   return resumeConditional(
     () => {
-      result = renderer(content ? { ...input, content } : input, tagVar);
+      result = renderer(content ? { ...input, content } : input);
     },
     scopeId,
     accessor
@@ -1971,6 +1979,7 @@ function NOOP2() {
   resumeSingleNodeForIn,
   resumeSingleNodeForOf,
   resumeSingleNodeForTo,
+  setTagVar,
   styleAttr,
   toString,
   tryContent,

package/dist/html.mjs

@@ -450,14 +450,14 @@ function writeRegistered(state, val, parent, accessor, { access, scope }) {
       state.buf.length
     );
     if (state.refs.set(val, fnRef), scopeRef) {
-      let scopeId = ensureId(state, scopeRef);
       if (isCircular(parent, scopeRef))
-        return state.assigned.add(fnRef), fnRef.init = access + "(" + scopeId + ")", fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=", !1;
-      state.buf.push(access + "(" + scopeId + ")");
+        return state.assigned.add(fnRef), fnRef.init = access + "(" + ensureId(state, scopeRef) + ")", fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=", !1;
+      state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
     } else {
-      state.buf.push(access + "("), writeProp(state, scope, parent, "");
-      let scopeRef2 = state.refs.get(scope);
-      scopeRef2 && ensureId(state, scopeRef2), state.buf.push(")");
+      let pos = state.buf.push(""), assigns = state.assigned.size;
+      writeProp(state, scope, parent, "");
+      let scopeRef2 = parent && state.refs.get(scope), scopeId = scopeRef2 && ensureId(state, scopeRef2);
+      scopeId && assigns !== state.assigned.size ? (state.assigned.add(fnRef), fnRef.init = access + "(" + scopeId + ")", fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=") : (state.buf[pos - 2] += access + "(", state.buf.push(")"));
     }
   } else
     state.buf.push(access);
@@ -928,6 +928,13 @@ function withContext(key, value, cb) {
     ctx[kPendingContexts]--, ctx[key] = prev;
   }
 }
+function setTagVar(parentScopeId, childScope, registryId) {
+  childScope["/" /* TagVariable */] = register2(
+    {},
+    registryId,
+    parentScopeId
+  );
+}
 function register2(val, id, scopeId) {
   return scopeId === void 0 ? register(id, val) : register(id, val, ensureScopeWithId(scopeId));
 }
@@ -1552,7 +1559,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
+function dynamicTagInput(scopeId, accessor, tag, input, content) {
   if (!tag && !content) {
     nextScopeId();
     return;
@@ -1587,7 +1594,7 @@ function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
   let renderer = getDynamicRenderer(tag), result;
   return resumeConditional(
     () => {
-      result = renderer(content ? { ...input, content } : input, tagVar);
+      result = renderer(content ? { ...input, content } : input);
     },
     scopeId,
     accessor
@@ -1892,6 +1899,7 @@ export {
   resumeSingleNodeForIn,
   resumeSingleNodeForOf,
   resumeSingleNodeForTo,
+  setTagVar,
   styleAttr,
   toString,
   tryContent,

package/dist/translator/core/return.d.ts

@@ -1,6 +1,6 @@
 import { types as t } from "@marko/compiler";
 import { type Tag } from "@marko/compiler/babel-utils";
-declare const returnId: (section: import("../util/sections").Section) => t.Identifier | undefined;
-export { returnId };
+declare const getSectionReturnValueIdentifier: (section: import("../util/sections").Section) => t.Identifier | undefined;
+export { getSectionReturnValueIdentifier };
 declare const _default: Tag;
 export default _default;

package/dist/translator/index.js

@@ -742,6 +742,20 @@ function isConditionTag(tag) {
   }
   return false;
 }
+function isControlFlowTag(tag) {
+  if (isCoreTag(tag)) {
+    switch (getTagName(tag)) {
+      case "if":
+      case "else-if":
+      case "else":
+      case "for":
+      case "await":
+      case "try":
+        return true;
+    }
+  }
+  return false;
+}
 
 // src/translator/util/optional.ts
 var Sorted = class {
@@ -1102,6 +1116,7 @@ function startSection(path5) {
       params: void 0,
       closures: void 0,
       bindings: void 0,
+      assignments: void 0,
       content: getContentInfo(path5),
       upstreamExpression: void 0,
       hasAbortSignal: false,
@@ -1303,6 +1318,14 @@ function getKnownAttrValues(tag) {
   return attrs2;
 }
 
+// src/translator/util/get-parent-tag.ts
+function getParentTag(tag) {
+  const parent = tag.parent.type === "MarkoTagBody" ? tag.parentPath.parentPath : tag.parentPath;
+  if (parent.type === "MarkoTag") {
+    return parent;
+  }
+}
+
 // src/translator/util/plugin-hooks.ts
 var import_compiler7 = require("@marko/compiler");
 function enter(modulePlugin, path5) {
@@ -1648,10 +1671,8 @@ function markNode(path5, binding) {
 }
 
 // src/translator/core/return.ts
-var [returnId, _setReturnId] = createSectionState(
-  "returnId"
-);
-var usedTag = /* @__PURE__ */ new WeakSet();
+var tagsWithReturn = /* @__PURE__ */ new WeakSet();
+var [getSectionReturnValueIdentifier, setReturnValueIdentifier] = createSectionState("returnValue");
 var return_default = {
   analyze(tag) {
     (0, import_babel_utils8.assertNoArgs)(tag);
@@ -1659,12 +1680,25 @@ var return_default = {
     (0, import_babel_utils8.assertNoParams)(tag);
     assertNoBodyContent(tag);
     (0, import_babel_utils8.assertAllowedAttributes)(tag, ["value", "valueChange"]);
-    if (usedTag.has(tag.hub)) {
+    const parentTag = getParentTag(tag);
+    if (parentTag) {
+      if ((0, import_babel_utils8.isNativeTag)(parentTag)) {
+        throw tag.get("name").buildCodeFrameError(
+          "The `return` tag can not be used in a native tag."
+        );
+      } else if (isControlFlowTag(parentTag)) {
+        throw tag.get("name").buildCodeFrameError(
+          `The \`return\` tag can not be used under an \`${parentTag.get("name").toString()}\` tag.`
+        );
+      }
+    }
+    if (tagsWithReturn.has(tag.parentPath)) {
       throw tag.get("name").buildCodeFrameError(
-        "The `return` tag can only be used once per template."
+        `Cannot have multiple \`return\` tags ${tag.parent.type === "Program" ? "for the template" : "within a tag's body content"}.`
       );
+    } else {
+      tagsWithReturn.add(tag.parentPath);
     }
-    usedTag.add(tag.hub);
     if (!getKnownAttrValues(tag.node).value) {
       throw tag.get("name").buildCodeFrameError("The `return` tag requires a value.");
     }
@@ -1682,11 +1716,11 @@ var return_default = {
           );
         }
         if (attrs2.value) {
-          const returnId2 = currentProgramPath.scope.generateUidIdentifier("return");
-          _setReturnId(section, returnId2);
+          const returnId = tag.scope.generateUidIdentifier("return");
+          setReturnValueIdentifier(section, returnId);
           tag.replaceWith(
             import_compiler11.types.variableDeclaration("const", [
-              import_compiler11.types.variableDeclarator(returnId2, attrs2.value)
+              import_compiler11.types.variableDeclarator(returnId, attrs2.value)
             ])
           )[0].skip();
         }
@@ -2507,11 +2541,23 @@ function getMappedId(reference) {
 function addHTMLEffectCall(section, referencedBindings) {
   addStatement("effect", section, referencedBindings, void 0, false);
 }
-function writeHTMLResumeStatements(path5, tagVarIdentifier) {
+function writeHTMLResumeStatements(path5) {
   const section = getSectionForBody(path5);
   if (!section) return;
   const allSignals = Array.from(getSignals(section).values());
   const scopeIdIdentifier = getScopeIdIdentifier(section);
+  forEach(section.assignments, (assignment) => {
+    let currentSection = section;
+    while (currentSection !== assignment.section) {
+      getSerializedScopeProperties(currentSection).set(
+        import_compiler17.types.stringLiteral("_"),
+        callRuntime(
+          "ensureScopeWithId",
+          getScopeIdIdentifier(currentSection = currentSection.parent)
+        )
+      );
+    }
+  });
   forEach(section.closures, (closure) => {
     if (isStatefulReferences(closure)) {
       let currentSection = section;
@@ -2570,14 +2616,6 @@ function writeHTMLResumeStatements(path5, tagVarIdentifier) {
       accessors.add(accessor.value);
     }
   });
-  if (tagVarIdentifier && returnId(section) !== void 0) {
-    serializedProperties.push(
-      import_compiler17.types.objectProperty(
-        import_compiler17.types.stringLiteral("/" /* TagVariable */),
-        tagVarIdentifier
-      )
-    );
-  }
   for (const [key, value] of additionalProperties) {
     if (!accessors.has(key.value)) {
       serializedProperties.push(
@@ -2647,6 +2685,10 @@ function writeHTMLResumeStatements(path5, tagVarIdentifier) {
       ])
     );
   }
+  const returnIdentifier = getSectionReturnValueIdentifier(section);
+  if (returnIdentifier !== void 0) {
+    path5.pushContainer("body", import_compiler17.types.returnStatement(returnIdentifier));
+  }
 }
 function getSetup(section) {
   return getSignals(section).get(void 0)?.identifier;
@@ -2919,15 +2961,9 @@ function isStatic(path5) {
 var html_default = {
   translate: {
     exit(program) {
-      const section = getSectionForBody(program);
-      const tagVarIdentifier = program.scope.generateUidIdentifier("tagVar");
       flushInto(program);
-      writeHTMLResumeStatements(program, tagVarIdentifier);
+      writeHTMLResumeStatements(program);
       traverseReplace(program.node, "body", replaceNode);
-      const returnIdentifier = returnId(section);
-      if (returnIdentifier !== void 0) {
-        program.pushContainer("body", import_compiler19.types.returnStatement(returnIdentifier));
-      }
       const renderContent = [];
       for (const child of program.get("body")) {
         if (!isStatic(child)) {
@@ -2948,7 +2984,7 @@ var html_default = {
             callRuntime(
               "createRenderer",
               import_compiler19.types.arrowFunctionExpression(
-                [import_compiler19.types.identifier("input"), tagVarIdentifier],
+                [import_compiler19.types.identifier("input")],
                 import_compiler19.types.blockStatement(renderContent)
               )
             )
@@ -3350,6 +3386,7 @@ function trackAssignment(assignment, binding) {
   forEachIdentifier(assignment.node, (id) => {
     if (id.name === binding.name) {
       const extra = id.extra ??= {};
+      section.assignments = bindingUtil.add(section.assignments, binding);
       extra.assignment = binding;
       extra.section = section;
     }
@@ -4170,16 +4207,6 @@ var import_babel_utils20 = require("@marko/compiler/babel-utils");
 // src/translator/util/nested-attribute-tags.ts
 var import_compiler27 = require("@marko/compiler");
 var import_babel_utils16 = require("@marko/compiler/babel-utils");
-
-// src/translator/util/get-parent-tag.ts
-function getParentTag(tag) {
-  const parent = tag.parent.type === "MarkoTagBody" ? tag.parentPath.parentPath : tag.parentPath;
-  if (parent.type === "MarkoTag") {
-    return parent;
-  }
-}
-
-// src/translator/util/nested-attribute-tags.ts
 var attrTagToIdentifierLookup = /* @__PURE__ */ new WeakMap();
 function getAttrTagIdentifier(meta) {
   let name2 = attrTagToIdentifierLookup.get(meta);
@@ -8431,6 +8458,25 @@ function translateHTML(tag) {
     properties: [],
     statements: []
   };
+  if (tagVar) {
+    statements.push(
+      import_compiler51.types.expressionStatement(
+        callRuntime(
+          "setTagVar",
+          getScopeIdIdentifier(section),
+          peekScopeId,
+          import_compiler51.types.stringLiteral(
+            getResumeRegisterId(
+              section,
+              node.var.extra?.binding,
+              // TODO: node.var is not always an identifier.
+              "var"
+            )
+          )
+        )
+      )
+    );
+  }
   if (node.extra.tagNameNullable) {
     const contentProp = getTranslatedBodyContentProperty(properties);
     let contentId = void 0;
@@ -8466,23 +8512,7 @@ function translateHTML(tag) {
   } else if (tagVar) {
     translateVar(
       tag,
-      callExpression(
-        tagIdentifier,
-        propsToExpression(properties),
-        callRuntime(
-          "register",
-          import_compiler51.types.arrowFunctionExpression([], import_compiler51.types.blockStatement([])),
-          import_compiler51.types.stringLiteral(
-            getResumeRegisterId(
-              section,
-              node.var.extra?.binding,
-              // TODO: node.var is not always an identifier.
-              "var"
-            )
-          ),
-          getScopeIdIdentifier(section)
-        )
-      )
+      callExpression(tagIdentifier, propsToExpression(properties))
     );
     setForceResumeScope(section);
   } else {
@@ -9090,21 +9120,6 @@ var dynamic_tag_default = {
           if (!hasMultipleArgs && args.length === 1) {
             args.push(import_compiler52.types.unaryExpression("void", import_compiler52.types.numericLiteral(0)));
           }
-          args.push(
-            callRuntime(
-              "register",
-              import_compiler52.types.arrowFunctionExpression([], import_compiler52.types.blockStatement([])),
-              import_compiler52.types.stringLiteral(
-                getResumeRegisterId(
-                  section,
-                  node.var.extra?.binding,
-                  // TODO: node.var is not always an identifier.
-                  "var"
-                )
-              ),
-              getScopeIdIdentifier(section)
-            )
-          );
         }
         const dynamicScopeIdentifier = currentProgramPath.scope.generateUidIdentifier("dynamicScope");
         const dynamicTagExpr = hasMultipleArgs ? callRuntime(
@@ -9128,11 +9143,30 @@ var dynamic_tag_default = {
             )
           ])
         );
-        statements.push(
-          node.var ? import_compiler52.types.variableDeclaration("const", [
-            import_compiler52.types.variableDeclarator(node.var, dynamicTagExpr)
-          ]) : import_compiler52.types.expressionStatement(dynamicTagExpr)
-        );
+        if (node.var) {
+          statements.push(
+            import_compiler52.types.expressionStatement(
+              callRuntime(
+                "setTagVar",
+                getScopeIdIdentifier(section),
+                dynamicScopeIdentifier,
+                import_compiler52.types.stringLiteral(
+                  getResumeRegisterId(
+                    section,
+                    node.var.extra?.binding,
+                    // TODO: node.var is not always an identifier.
+                    "var"
+                  )
+                )
+              )
+            ),
+            import_compiler52.types.variableDeclaration("const", [
+              import_compiler52.types.variableDeclarator(node.var, dynamicTagExpr)
+            ])
+          );
+        } else {
+          statements.push(import_compiler52.types.expressionStatement(dynamicTagExpr));
+        }
         getSerializedScopeProperties(section).set(
           import_compiler52.types.stringLiteral(
             getScopeAccessorLiteral(nodeRef2).value + "!" /* ConditionalScope */

package/dist/translator/util/is-core-tag.d.ts

@@ -8,3 +8,6 @@ export declare function isCoreTagName(tag: t.NodePath, name: string): tag is t.N
 export declare function isConditionTag(tag: t.NodePath): tag is t.NodePath<t.MarkoTag & {
     name: t.StringLiteral;
 }>;
+export declare function isControlFlowTag(tag: t.NodePath): tag is t.NodePath<t.MarkoTag & {
+    name: t.StringLiteral;
+}>;

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

@@ -16,6 +16,7 @@ export interface Section {
     params: undefined | Binding;
     closures: ReferencedBindings;
     bindings: ReferencedBindings;
+    assignments: ReferencedBindings;
     upstreamExpression: t.NodeExtra | undefined;
     hasAbortSignal: boolean;
     isBranch: boolean;
@@ -29,10 +30,6 @@ declare module "@marko/compiler/dist/types" {
     interface ProgramExtra {
         section?: Section;
         sections?: Section[];
-        assignments?: [
-            valueSection: Section,
-            assignment: t.NodePath<t.UpdateExpression> | t.NodePath<t.AssignmentExpression>
-        ][];
     }
     interface MarkoTagBodyExtra {
         section?: Section;

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

@@ -56,6 +56,6 @@ export declare function getRegisterUID(section: Section, name: string): string;
 export declare function writeSignals(section: Section): void;
 export declare function writeRegisteredFns(): void;
 export declare function addHTMLEffectCall(section: Section, referencedBindings?: ReferencedBindings): void;
-export declare function writeHTMLResumeStatements(path: t.NodePath<t.MarkoTagBody | t.Program>, tagVarIdentifier?: t.Identifier): void;
+export declare function writeHTMLResumeStatements(path: t.NodePath<t.MarkoTagBody | t.Program>): void;
 export declare function getSetup(section: Section): t.Identifier | undefined;
 export declare function replaceRegisteredFunctionNode(node: t.Node): t.CallExpression | t.ClassPrivateProperty | t.ClassProperty | t.VariableDeclaration | t.Identifier | t.ObjectProperty | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.31",
+  "version": "6.0.0-next.3.33",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",