marko 6.0.0-next.3.21 → 6.0.0-next.3.23

package/dist/translator/index.js

@@ -110,7 +110,7 @@ var attrs_default = {
 
 // src/translator/core/await.ts
 var import_compiler22 = require("@marko/compiler");
-var import_babel_utils11 = require("@marko/compiler/babel-utils");
+var import_babel_utils12 = require("@marko/compiler/babel-utils");
 
 // src/translator/util/evaluate.ts
 var import_babel_utils2 = require("@marko/compiler/babel-utils");
@@ -137,8 +137,8 @@ var import_compiler21 = require("@marko/compiler");
 
 // src/translator/visitors/program/index.ts
 var import_compiler20 = require("@marko/compiler");
-var import_babel_utils10 = require("@marko/compiler/babel-utils");
-var import_path = __toESM(require("path"));
+var import_babel_utils11 = require("@marko/compiler/babel-utils");
+var import_path2 = __toESM(require("path"));
 
 // src/translator/util/binding-has-downstream-expressions.ts
 function bindingHasDownstreamExpressions(binding) {
@@ -546,6 +546,7 @@ var KNOWN_OBJECTS = /* @__PURE__ */ new Map([
 // src/html/writer.ts
 var K_SCOPE_ID = Symbol("Scope ID");
 var kPendingContexts = Symbol("Pending Contexts");
+var branchIdKey = Symbol();
 var tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb));
 
 // src/html/attrs.ts
@@ -626,7 +627,8 @@ var pureFunctions = [
   "value",
   "state",
   "intersection",
-  "closure",
+  "loopClosure",
+  "conditionalClosure",
   "dynamicClosure",
   "loopOf",
   "loopIn",
@@ -857,9 +859,6 @@ function find(data, cb) {
     }
   }
 }
-function map(data, cb) {
-  return data ? Array.isArray(data) ? data.map(cb) : [cb(data, 0)] : [];
-}
 function findSorted(compare, data, item) {
   let max = data.length;
   let pos = 0;
@@ -936,17 +935,17 @@ function joinRepeatable(compare, a, b) {
 
 // src/translator/util/state.ts
 var createProgramState = (init) => {
-  const map2 = /* @__PURE__ */ new WeakMap();
+  const map = /* @__PURE__ */ new WeakMap();
   return [
     () => {
-      let state = map2.get(currentProgramPath);
+      let state = map.get(currentProgramPath);
       if (!state) {
-        map2.set(currentProgramPath, state = init());
+        map.set(currentProgramPath, state = init());
       }
       return state;
     },
     (value) => {
-      map2.set(currentProgramPath, value);
+      map.set(currentProgramPath, value);
     }
   ];
 };
@@ -1021,37 +1020,37 @@ function analyzeTagNameType(tag) {
 }
 function analyzeExpressionTagName(name2, extra) {
   const pending = [name2];
-  let path4;
+  let path5;
   let type;
   let nullable = false;
   let tagNameImported;
-  while ((path4 = pending.pop()) && type !== 2 /* DynamicTag */) {
-    if (path4.isConditionalExpression()) {
-      pending.push(path4.get("consequent"));
-      if (path4.node.alternate) {
-        pending.push(path4.get("alternate"));
-      }
-    } else if (path4.isLogicalExpression()) {
-      if (path4.node.operator === "||") {
-        pending.push(path4.get("left"));
+  while ((path5 = pending.pop()) && type !== 2 /* DynamicTag */) {
+    if (path5.isConditionalExpression()) {
+      pending.push(path5.get("consequent"));
+      if (path5.node.alternate) {
+        pending.push(path5.get("alternate"));
+      }
+    } else if (path5.isLogicalExpression()) {
+      if (path5.node.operator === "||") {
+        pending.push(path5.get("left"));
       } else {
         nullable = true;
       }
-      pending.push(path4.get("right"));
-    } else if (path4.isAssignmentExpression()) {
-      pending.push(path4.get("right"));
-    } else if (path4.isBinaryExpression()) {
-      type = path4.node.operator !== "+" || type !== void 0 ? 2 /* DynamicTag */ : 0 /* NativeTag */;
-    } else if (path4.isStringLiteral() || path4.isTemplateLiteral()) {
+      pending.push(path5.get("right"));
+    } else if (path5.isAssignmentExpression()) {
+      pending.push(path5.get("right"));
+    } else if (path5.isBinaryExpression()) {
+      type = path5.node.operator !== "+" || type !== void 0 ? 2 /* DynamicTag */ : 0 /* NativeTag */;
+    } else if (path5.isStringLiteral() || path5.isTemplateLiteral()) {
       type = type !== void 0 ? 2 /* DynamicTag */ : 0 /* NativeTag */;
-    } else if (path4.isNullLiteral()) {
+    } else if (path5.isNullLiteral()) {
       nullable = true;
-    } else if (path4.isIdentifier()) {
-      if (path4.node.name === "undefined") {
+    } else if (path5.isIdentifier()) {
+      if (path5.node.name === "undefined") {
         nullable = true;
         continue;
       }
-      const binding = path4.scope.getBinding(path4.node.name);
+      const binding = path5.scope.getBinding(path5.node.name);
       if (!binding) {
         type = 2 /* DynamicTag */;
         continue;
@@ -1101,18 +1100,18 @@ function analyzeExpressionTagName(name2, extra) {
 }
 
 // src/translator/util/sections.ts
-function startSection(path4) {
-  const extra = path4.node.extra ??= {};
+function startSection(path5) {
+  const extra = path5.node.extra ??= {};
   let section = extra.section;
-  if (!section && (path4.type === "Program" || path4.get("body").length)) {
-    const parentSection = path4.parentPath ? getOrCreateSection(path4.parentPath) : void 0;
-    const sectionNamePath = path4.parentPath?.get(
+  if (!section && (path5.type === "Program" || path5.get("body").length)) {
+    const parentSection = path5.parentPath ? getOrCreateSection(path5.parentPath) : void 0;
+    const sectionNamePath = path5.parentPath?.get(
       "name"
     );
-    const sectionName = path4.isProgram() ? "" : currentProgramPath.scope.generateUid(
+    const sectionName = path5.isProgram() ? "" : currentProgramPath.scope.generateUid(
       sectionNamePath.toString() + "_content"
     );
-    const programExtra = path4.hub.file.path.node.extra ??= {};
+    const programExtra = path5.hub.file.path.node.extra ??= {};
     const sections = programExtra.sections ??= [];
     section = extra.section = {
       id: sections.length,
@@ -1122,16 +1121,17 @@ function startSection(path4) {
       params: void 0,
       closures: void 0,
       bindings: void 0,
-      content: getContentInfo(path4),
+      content: getContentInfo(path5),
       upstreamExpression: void 0,
-      hasCleanup: false
+      hasAbortSignal: false,
+      isBranch: false
     };
     sections.push(section);
   }
   return section;
 }
-function getOrCreateSection(path4) {
-  let cur = path4;
+function getOrCreateSection(path5) {
+  let cur = path5;
   while (true) {
     if (cur.type === "Program" || cur.type === "MarkoTagBody" && !cur.node.attributeTags && analyzeTagNameType(cur.parentPath) !== 0 /* NativeTag */ && cur.parent.name.value !== "html-comment") {
       return startSection(cur);
@@ -1142,9 +1142,9 @@ function getOrCreateSection(path4) {
 function getSectionForBody(body) {
   return body.node.extra?.section;
 }
-function getSection(path4) {
+function getSection(path5) {
   let section;
-  let currentPath = path4;
+  let currentPath = path5;
   while ((section = currentPath.node.extra?.section) === void 0) {
     currentPath = currentPath.parentPath;
   }
@@ -1176,8 +1176,8 @@ function forEachSectionReverse(fn) {
     fn(sections[i]);
   }
 }
-function getContentInfo(path4) {
-  const body = path4.get("body");
+function getContentInfo(path5) {
+  const body = path5.get("body");
   const contentInfo = {
     startType: null,
     endType: null,
@@ -1201,8 +1201,8 @@ function getContentInfo(path4) {
   }
   return null;
 }
-function getNodeContentType(path4, extraMember, contentInfo) {
-  switch (path4.type) {
+function getNodeContentType(path5, extraMember, contentInfo) {
+  switch (path5.type) {
     case "MarkoText":
       return 4 /* Text */;
     case "MarkoPlaceholder":
@@ -1214,7 +1214,7 @@ function getNodeContentType(path4, extraMember, contentInfo) {
     case "ExportNamedDeclaration":
       return null;
     case "MarkoTag": {
-      const tag = path4;
+      const tag = path5;
       if (isCoreTag(tag)) {
         switch (tag.node.name.value) {
           case "html-comment":
@@ -1265,6 +1265,43 @@ var checkStatefulClosures = (section, immediateOnly) => {
 
 // src/translator/visitors/program/dom.ts
 var import_compiler18 = require("@marko/compiler");
+var import_babel_utils10 = require("@marko/compiler/babel-utils");
+
+// src/translator/util/get-style-file.ts
+var import_path = __toESM(require("path"));
+function getStyleFile(file) {
+  const { filename } = file.opts;
+  const fs = file.markoOpts.fileSystem;
+  const base = getBase(filename);
+  const styleMatch = new RegExp(
+    `^(${escapeRegExp(base)}\\.${"index" === base ? "|" : ""})style\\.\\w+$`
+  );
+  for (const file2 of fs.readdirSync(import_path.default.dirname(filename)).sort()) {
+    if (styleMatch.test(file2)) {
+      return `./${file2}`;
+    }
+  }
+}
+function getBase(filename) {
+  const start = filename.lastIndexOf(import_path.default.sep) + 1;
+  const leftDot = filename.indexOf(".", start);
+  if (leftDot === -1) {
+    return filename.slice(start);
+  }
+  const rightDot = filename.lastIndexOf(".");
+  const closeBracket = leftDot - 1;
+  if (filename[closeBracket] === "]") {
+    const openBracket = filename.lastIndexOf("[", closeBracket);
+    if (openBracket > start) {
+      return filename.slice(start, openBracket) + filename.slice(leftDot, rightDot);
+    }
+  }
+  return filename.slice(start, rightDot);
+}
+var regexpCharsReg = /[\\^$.*+?()[\]{}|]/g;
+function escapeRegExp(str) {
+  return str.replace(regexpCharsReg, "\\$&");
+}
 
 // src/translator/util/signals.ts
 var import_compiler17 = require("@marko/compiler");
@@ -1287,29 +1324,29 @@ function getKnownAttrValues(tag) {
 
 // src/translator/util/plugin-hooks.ts
 var import_compiler7 = require("@marko/compiler");
-function enter(modulePlugin, path4) {
+function enter(modulePlugin, path5) {
   if (!modulePlugin) {
     return false;
   }
-  const { node } = path4;
+  const { node } = path5;
   const plugin = isModulePlugin(modulePlugin) ? modulePlugin.default : modulePlugin;
   if (isFunctionPlugin(plugin)) {
-    plugin(path4, import_compiler7.types);
+    plugin(path5, import_compiler7.types);
   } else if (plugin.enter) {
-    plugin.enter(path4, import_compiler7.types);
+    plugin.enter(path5, import_compiler7.types);
   }
-  return node !== path4.node;
+  return node !== path5.node;
 }
-function exit(modulePlugin, path4) {
+function exit(modulePlugin, path5) {
   if (!modulePlugin) {
     return false;
   }
-  const { node } = path4;
+  const { node } = path5;
   const plugin = isModulePlugin(modulePlugin) ? modulePlugin.default : modulePlugin;
   if (!isFunctionPlugin(plugin) && plugin.exit) {
-    plugin.exit(path4, import_compiler7.types);
+    plugin.exit(path5, import_compiler7.types);
   }
-  return node !== path4.node;
+  return node !== path5.node;
 }
 function isModulePlugin(plugin) {
   return Boolean(plugin.default);
@@ -1341,11 +1378,11 @@ function translateByTarget({
   dom
 }) {
   return {
-    enter(path4) {
-      enter(isOutputHTML() ? html : dom, path4);
+    enter(path5) {
+      enter(isOutputHTML() ? html : dom, path5);
     },
-    exit(path4) {
-      exit(isOutputHTML() ? html : dom, path4);
+    exit(path5) {
+      exit(isOutputHTML() ? html : dom, path5);
     }
   };
 }
@@ -1431,18 +1468,18 @@ var walkCodeToName = {
   [116 /* OutEnd */]: "outEnd",
   [126 /* MultiplierEnd */]: "multiplierEnd"
 };
-function enter2(path4) {
-  getSteps(getSection(path4)).push(0 /* Enter */);
+function enter2(path5) {
+  getSteps(getSection(path5)).push(0 /* Enter */);
 }
-function exit2(path4) {
-  getSteps(getSection(path4)).push(1 /* Exit */);
+function exit2(path5) {
+  getSteps(getSection(path5)).push(1 /* Exit */);
 }
-function enterShallow(path4) {
-  getSteps(getSection(path4)).push(0 /* Enter */, 1 /* Exit */);
+function enterShallow(path5) {
+  getSteps(getSection(path5)).push(0 /* Enter */, 1 /* Exit */);
 }
-function injectWalks(path4, expr) {
-  const walks = getWalks(getSection(path4));
-  const walkComment = getWalkComment(getSection(path4));
+function injectWalks(path5, expr) {
+  const walks = getWalks(getSection(path5));
+  const walkComment = getWalkComment(getSection(path5));
   walkComment.push(
     `${walkCodeToName[47 /* BeginChild */]}`,
     expr.name,
@@ -1451,11 +1488,11 @@ function injectWalks(path4, expr) {
   appendLiteral(walks, String.fromCharCode(47 /* BeginChild */));
   walks.push(expr, String.fromCharCode(38 /* EndChild */));
 }
-function visit(path4, code) {
+function visit(path5, code) {
   if (isOutputHTML()) {
     return;
   }
-  const section = getSection(path4);
+  const section = getSection(path5);
   const steps = getSteps(section);
   const walks = getWalks(section);
   const walkComment = getWalkComment(section);
@@ -1497,7 +1534,7 @@ function visit(path4, code) {
   }
   if (code !== void 0) {
     if (code !== 32 /* Get */) {
-      writeTo(path4)`<!>`;
+      writeTo(path5)`<!>`;
     }
     walkComment.push(`${walkCodeToName[code]}`);
     walkString += String.fromCharCode(code);
@@ -1555,8 +1592,8 @@ var [getTrailerWrites] = createSectionState(
   "trailerWrites",
   () => [""]
 );
-function writeTo(path4, trailer) {
-  const section = getSection(path4);
+function writeTo(path5, trailer) {
+  const section = getSection(path5);
   const get = trailer ? getTrailerWrites : getWrites;
   return (strs, ...exprs) => {
     const exprsLen = exprs.length;
@@ -1567,8 +1604,8 @@ function writeTo(path4, trailer) {
     }
   };
 }
-function consumeHTML(path4) {
-  const section = getSection(path4);
+function consumeHTML(path5) {
+  const section = getSection(path5);
   const writes = getWrites(section);
   const trailers = getTrailerWrites(section);
   const writeResult = normalizeStringExpression(writes);
@@ -1590,14 +1627,14 @@ function consumeHTML(path4) {
     return import_compiler10.types.expressionStatement(callRuntime("writeTrailers", trailerResult));
   }
 }
-function flushBefore(path4) {
-  const expr = consumeHTML(path4);
+function flushBefore(path5) {
+  const expr = consumeHTML(path5);
   if (expr) {
-    path4.insertBefore(expr)[0].skip();
+    path5.insertBefore(expr)[0].skip();
   }
 }
-function flushInto(path4) {
-  const target = path4.isProgram() ? path4 : path4.get("body");
+function flushInto(path5) {
+  const target = path5.isProgram() ? path5 : path5.get("body");
   const expr = consumeHTML(target);
   if (expr) {
     target.pushContainer("body", expr)[0].skip();
@@ -1613,15 +1650,15 @@ function getSectionMeta(section) {
     writes: normalizeStringExpression([writePrefix, ...writes, writePostfix]) || import_compiler10.types.stringLiteral("")
   };
 }
-function markNode(path4, binding) {
-  const section = getSection(path4);
+function markNode(path5, binding) {
+  const section = getSection(path5);
   if (binding.type !== 0 /* dom */) {
-    throw path4.buildCodeFrameError(
+    throw path5.buildCodeFrameError(
       "Tried to mark a node that was not determined to need a mark during analyze."
     );
   }
   if (isOutputHTML()) {
-    writeTo(path4)`${callRuntime(
+    writeTo(path5)`${callRuntime(
       "markResumeNode",
       getScopeIdIdentifier(section),
       getScopeAccessorLiteral(binding)
@@ -1926,9 +1963,9 @@ var [getSignals] = createSectionState(
   "signals",
   () => /* @__PURE__ */ new Map()
 );
-var [getSubscribeBuilder, _setSubscribeBuilder] = createSectionState("queue");
-function setSubscriberBuilder(tag, builder) {
-  _setSubscribeBuilder(getSectionForBody(tag.get("body")), builder);
+var [getClosureSignalBuilder, _setClosureSignalBuilder] = createSectionState("queue");
+function setClosureSignalBuilder(tag, builder) {
+  _setClosureSignalBuilder(getSectionForBody(tag.get("body")), builder);
 }
 var [forceResumeScope, _setForceResumeScope] = createSectionState("forceResumeScope");
 function setForceResumeScope(section) {
@@ -1960,7 +1997,7 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         subscribers: [],
         closures: /* @__PURE__ */ new Map(),
         hasDownstreamIntersections: () => {
-          let hasDownstreamIntersections = !!(signal.intersection || signal.closures.size);
+          let hasDownstreamIntersections = !!signal.intersection;
           if (!hasDownstreamIntersections) {
             for (const value of signal.values) {
               if (value.signal.hasDownstreamIntersections()) {
@@ -2014,24 +2051,41 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         signal
       );
       signal.build = () => {
-        const builder = getSubscribeBuilder(section);
+        const builder = getClosureSignalBuilder(section);
         const ownerScope = getScopeExpression(
           section,
           referencedBindings.section
         );
         const isImmediateOwner = ownerScope.object === scopeIdentifier;
-        const isDynamicClosure = signal.isDynamicClosure = !(isImmediateOwner && builder);
-        return callRuntime(
-          isDynamicClosure ? "dynamicClosure" : "closure",
+        const isDynamicClosure = !isImmediateOwner || !builder;
+        const render = getSignalFn(signal, [
+          scopeIdentifier,
+          import_compiler17.types.identifier(referencedBindings.name)
+        ]);
+        signal.isDynamicClosure = isDynamicClosure;
+        const intersection = buildSignalIntersections(signal);
+        return isDynamicClosure ? callRuntime(
+          "dynamicClosure",
           getScopeAccessorLiteral(referencedBindings),
-          getSignalFn(signal, [
-            scopeIdentifier,
-            import_compiler17.types.identifier(referencedBindings.name)
-          ]),
+          render,
           isImmediateOwner ? null : import_compiler17.types.arrowFunctionExpression([scopeIdentifier], ownerScope),
-          buildSignalIntersections(signal)
-        );
+          intersection
+        ) : builder(signal, render, intersection);
       };
+      addStatement(
+        "render",
+        section,
+        void 0,
+        import_compiler17.types.expressionStatement(
+          import_compiler17.types.callExpression(
+            import_compiler17.types.memberExpression(signal.identifier, import_compiler17.types.identifier("_")),
+            [
+              scopeIdentifier,
+              createScopeReadExpression(section, referencedBindings)
+            ]
+          )
+        )
+      );
     }
   }
   return signal;
@@ -2069,8 +2123,9 @@ function initValue(binding, runtimeHelper = "value") {
 function getSignalFn(signal, params, referencedBindings) {
   const section = signal.section;
   const binding = signal.referencedBindings;
-  if (binding && !Array.isArray(binding) && binding.section === section) {
-    const [scopeIdentifier2, valueIdentifier] = params;
+  const [scopeIdentifier2, valueIdentifier] = params;
+  const isValueSignal = binding && !Array.isArray(binding) && binding.section === section;
+  if (isValueSignal) {
     for (const alias of binding.aliases) {
       const aliasSignal = getSignal(alias.section, alias);
       signal.render.push(
@@ -2107,12 +2162,29 @@ function getSignalFn(signal, params, referencedBindings) {
       )
     );
   }
+  if (isValueSignal) {
+    const closureEntries = Array.from(signal.closures.entries()).sort(
+      ([a], [b]) => a.id - b.id
+    );
+    for (const [_closureSection, closureSignal] of closureEntries) {
+      if (isStatefulReferences(closureSignal.referencedBindings)) {
+        signal.render.push(
+          import_compiler17.types.expressionStatement(
+            import_compiler17.types.callExpression(closureSignal.identifier, [
+              scopeIdentifier2,
+              valueIdentifier
+            ])
+          )
+        );
+      }
+    }
+  }
   if (referencedBindings) {
     signal.render.unshift(
       import_compiler17.types.variableDeclaration("const", [
         import_compiler17.types.variableDeclarator(
           createScopeReadPattern(section, referencedBindings),
-          scopeIdentifier
+          scopeIdentifier2
         )
       ])
     );
@@ -2132,7 +2204,6 @@ function getTranslatedExtraArgs(signal) {
   return emptyExtraArgs;
 }
 function buildSignalIntersections(signal) {
-  const section = signal.section;
   let intersections = signal.intersection;
   const binding = signal.referencedBindings;
   if (binding && !Array.isArray(binding) && binding.section === signal.section) {
@@ -2163,24 +2234,6 @@ function buildSignalIntersections(signal) {
       );
     }
   }
-  const closureEntries = Array.from(signal.closures.entries()).sort(
-    ([a], [b]) => a.id - b.id
-  );
-  for (const [closureSection, closureSignal] of closureEntries) {
-    const builder = getSubscribeBuilder(closureSection);
-    const isImmediateOwner = closureSection.parent === section;
-    if (builder && isImmediateOwner) {
-      intersections = push(intersections, builder(closureSignal.identifier));
-    } else if (!signal.hasDynamicSubscribers) {
-      signal.hasDynamicSubscribers = true;
-    }
-  }
-  if (signal.hasDynamicSubscribers) {
-    intersections = push(
-      intersections,
-      callRuntime("dynamicSubscribers", signal.valueAccessor)
-    );
-  }
   return intersections && import_compiler17.types.arrowFunctionExpression(
     [],
     Array.isArray(intersections) ? callRuntime("intersections", import_compiler17.types.arrayExpression(intersections)) : intersections
@@ -2474,8 +2527,8 @@ function getMappedId(reference) {
 function addHTMLEffectCall(section, referencedBindings) {
   addStatement("effect", section, referencedBindings, void 0, false);
 }
-function writeHTMLResumeStatements(path4, tagVarIdentifier) {
-  const section = getSectionForBody(path4);
+function writeHTMLResumeStatements(path5, tagVarIdentifier) {
+  const section = getSectionForBody(path5);
   if (!section) return;
   const allSignals = Array.from(getSignals(section).values());
   const scopeIdIdentifier = getScopeIdIdentifier(section);
@@ -2493,9 +2546,9 @@ function writeHTMLResumeStatements(path4, tagVarIdentifier) {
       }
       setForceResumeScope(closure.section);
       const isImmediateOwner = section.parent?.id === closure.section.id;
-      const isDynamicClosure = !getSubscribeBuilder(section) || !isImmediateOwner;
+      const isDynamicClosure = !getClosureSignalBuilder(section) || !isImmediateOwner;
       if (isDynamicClosure) {
-        path4.pushContainer(
+        path5.pushContainer(
           "body",
           import_compiler17.types.expressionStatement(
             callRuntime(
@@ -2513,7 +2566,7 @@ function writeHTMLResumeStatements(path4, tagVarIdentifier) {
   for (let i = allSignals.length; i--; ) {
     if (allSignals[i].effect.length) {
       const signalRefs = allSignals[i].referencedBindings;
-      path4.pushContainer(
+      path5.pushContainer(
         "body",
         import_compiler17.types.expressionStatement(
           callRuntime(
@@ -2554,7 +2607,7 @@ function writeHTMLResumeStatements(path4, tagVarIdentifier) {
     }
   }
   if (serializedProperties.length || forceResumeScope(section)) {
-    path4.pushContainer(
+    path5.pushContainer(
       "body",
       import_compiler17.types.expressionStatement(
         callRuntime(
@@ -2565,8 +2618,17 @@ function writeHTMLResumeStatements(path4, tagVarIdentifier) {
       )
     );
   }
-  if (path4.get("body").length) {
-    path4.unshiftContainer(
+  const resumeClosestBranch2 = !section.isBranch && (section.hasAbortSignal || !!section.closures || !!find(section.bindings, (binding) => binding.type === 1 /* let */));
+  if (resumeClosestBranch2) {
+    path5.pushContainer(
+      "body",
+      import_compiler17.types.expressionStatement(
+        callRuntime("resumeClosestBranch", scopeIdIdentifier)
+      )
+    );
+  }
+  if (path5.get("body").length) {
+    path5.unshiftContainer(
       "body",
       import_compiler17.types.variableDeclaration("const", [
         import_compiler17.types.variableDeclarator(scopeIdIdentifier, callRuntime("nextScopeId"))
@@ -2753,21 +2815,22 @@ var dom_default = {
       const templateIdentifier = import_compiler18.types.identifier(domExports.template);
       const walksIdentifier = import_compiler18.types.identifier(domExports.walks);
       const setupIdentifier = import_compiler18.types.identifier(domExports.setup);
-      const closuresIdentifier = import_compiler18.types.identifier(domExports.closures);
       const paramsBinding = program.node.extra.binding;
       const programParamsSignal = paramsBinding && bindingHasDownstreamExpressions(paramsBinding) ? initValue(paramsBinding) : void 0;
+      const styleFile = getStyleFile(program.hub.file);
+      if (styleFile) {
+        (0, import_babel_utils10.importDefault)(program.hub.file, styleFile);
+      }
       forEachSectionReverse((childSection) => {
         if (childSection !== section) {
           const tagParamsSignal = childSection.params && initValue(childSection.params);
           const { walks: walks2, writes: writes2, setup: setup2 } = getSectionMeta(childSection);
-          const closures2 = getSectionClosuresExpr(childSection);
           const identifier = import_compiler18.types.identifier(childSection.name);
           const renderer = callRuntime(
             getSectionParentIsOwner(childSection) ? "createRenderer" : "createRendererWithOwner",
             writes2,
             walks2,
             setup2,
-            closures2 && import_compiler18.types.arrowFunctionExpression([], closures2),
             tagParamsSignal?.identifier && import_compiler18.types.arrowFunctionExpression([], tagParamsSignal.identifier)
           );
           writeSignals(childSection);
@@ -2787,7 +2850,6 @@ var dom_default = {
           );
         }
       });
-      const closures = getSectionClosuresExpr(section);
       writeSignals(section);
       writeRegisteredFns();
       if (!setup) {
@@ -2817,15 +2879,6 @@ var dom_default = {
           ])
         )
       );
-      if (closures) {
-        program.node.body.push(
-          import_compiler18.types.exportNamedDeclaration(
-            import_compiler18.types.variableDeclaration("const", [
-              import_compiler18.types.variableDeclarator(closuresIdentifier, closures)
-            ])
-          )
-        );
-      }
       program.node.body.push(
         import_compiler18.types.exportDefaultDeclaration(
           callRuntime(
@@ -2834,7 +2887,6 @@ var dom_default = {
             templateIdentifier,
             walksIdentifier,
             setupIdentifier,
-            closures && import_compiler18.types.arrowFunctionExpression([], closuresIdentifier),
             programParamsSignal?.identifier && import_compiler18.types.arrowFunctionExpression([], programParamsSignal.identifier)
           )
         )
@@ -2842,23 +2894,13 @@ var dom_default = {
     }
   }
 };
-function getSectionClosuresExpr(section) {
-  if (section.closures) {
-    return import_compiler18.types.arrayExpression(
-      map(
-        section.closures,
-        (closure) => getSignal(section, closure).identifier
-      ).reverse()
-    );
-  }
-}
 
 // src/translator/visitors/program/html.ts
 var import_compiler19 = require("@marko/compiler");
 
 // src/translator/util/is-static.ts
-function isStatic(path4) {
-  return path4.isImportDeclaration() || path4.isExportDeclaration() || path4.isMarkoScriptlet({ static: true });
+function isStatic(path5) {
+  return path5.isImportDeclaration() || path5.isExportDeclaration() || path5.isMarkoScriptlet({ static: true });
 }
 
 // src/translator/visitors/program/html.ts
@@ -3057,12 +3099,12 @@ var program_default = {
       if (getMarkoOpts().output === "hydrate") {
         const entryFile = program.hub.file;
         const visitedFiles = /* @__PURE__ */ new Set([
-          (0, import_babel_utils10.resolveRelativePath)(entryFile, entryFile.opts.filename)
+          (0, import_babel_utils11.resolveRelativePath)(entryFile, entryFile.opts.filename)
         ]);
         entry_builder_default.visit(entryFile, entryFile, function visitChild(resolved) {
           if (!visitedFiles.has(resolved)) {
             visitedFiles.add(resolved);
-            const file = (0, import_babel_utils10.loadFileForImport)(entryFile, resolved);
+            const file = (0, import_babel_utils11.loadFileForImport)(entryFile, resolved);
             if (file) {
               entry_builder_default.visit(
                 file,
@@ -3101,9 +3143,9 @@ var program_default = {
   }
 };
 function resolveRelativeToEntry(entryFile, file, req) {
-  return file === entryFile ? (0, import_babel_utils10.resolveRelativePath)(file, req) : (0, import_babel_utils10.resolveRelativePath)(
+  return file === entryFile ? (0, import_babel_utils11.resolveRelativePath)(file, req) : (0, import_babel_utils11.resolveRelativePath)(
     entryFile,
-    req[0] === "." ? import_path.default.join(file.opts.filename, "..", req) : req
+    req[0] === "." ? import_path2.default.join(file.opts.filename, "..", req) : req
   );
 }
 function buildTemplateExports(binding, scope) {
@@ -3131,22 +3173,22 @@ function buildTemplateExports(binding, scope) {
 }
 
 // src/translator/util/get-root.ts
-function getMarkoRoot(path4) {
-  let curPath = path4;
+function getMarkoRoot(path5) {
+  let curPath = path5;
   do
     curPath = curPath.parentPath;
   while (curPath && !isMarko(curPath));
   return curPath;
 }
-function getExprRoot(path4) {
-  let curPath = path4;
+function getExprRoot(path5) {
+  let curPath = path5;
   while (!isMarko(curPath.parentPath)) {
     curPath = curPath.parentPath;
   }
   return curPath;
 }
-function getFnRoot(path4) {
-  let curPath = path4;
+function getFnRoot(path5) {
+  let curPath = path5;
   if (curPath.isProgram()) return;
   while (!isFunctionExpression(curPath)) {
     if (isMarko(curPath)) return;
@@ -3154,8 +3196,8 @@ function getFnRoot(path4) {
   }
   return curPath;
 }
-function isMarko(path4) {
-  switch (path4.type) {
+function isMarko(path5) {
+  switch (path5.type) {
     case "MarkoTag":
     case "MarkoTagBody":
     case "MarkoAttribute":
@@ -3167,8 +3209,8 @@ function isMarko(path4) {
       return false;
   }
 }
-function isFunctionExpression(path4) {
-  switch (path4.type) {
+function isFunctionExpression(path5) {
+  switch (path5.type) {
     case "FunctionExpression":
     case "ArrowFunctionExpression":
       return true;
@@ -3292,8 +3334,8 @@ function trackAssignment(assignment, binding) {
     }
   });
 }
-function setReferencesScope(path4) {
-  let fnRoot = getFnRoot(path4);
+function setReferencesScope(path5) {
+  let fnRoot = getFnRoot(path5);
   while (fnRoot) {
     (fnRoot.node.extra ??= {}).referencesScope = true;
     fnRoot = getFnRoot(fnRoot.parentPath);
@@ -3635,10 +3677,10 @@ var [getReadsByExpression] = createProgramState(
 var [getReadsByFunction] = createProgramState(
   () => /* @__PURE__ */ new Map()
 );
-function addReadToExpression(path4, binding, node) {
-  const exprExtra = path4.node.extra ??= {};
+function addReadToExpression(path5, binding, node) {
+  const exprExtra = path5.node.extra ??= {};
   const readsByExpression = getReadsByExpression();
-  exprExtra.section = getOrCreateSection(path4);
+  exprExtra.section = getOrCreateSection(path5);
   readsByExpression.set(
     exprExtra,
     push(readsByExpression.get(exprExtra), { binding, node })
@@ -3855,10 +3897,10 @@ function isStatefulBinding(binding) {
 // src/translator/core/await.ts
 var await_default = {
   analyze(tag) {
-    (0, import_babel_utils11.assertNoVar)(tag);
-    (0, import_babel_utils11.assertNoArgs)(tag);
+    (0, import_babel_utils12.assertNoVar)(tag);
+    (0, import_babel_utils12.assertNoArgs)(tag);
     assertNoSpreadAttrs(tag);
-    (0, import_babel_utils11.assertNoAttributeTags)(tag);
+    (0, import_babel_utils12.assertNoAttributeTags)(tag);
     const { node } = tag;
     const [valueAttr] = node.attributes;
     if (!valueAttr) {
@@ -3906,8 +3948,6 @@ var await_default = {
           setForceResumeScope(bodySection);
         }
         flushInto(tag);
-        setSubscriberBuilder(tag, () => {
-        });
         writeHTMLResumeStatements(tagBody);
         tag.replaceWith(
           import_compiler22.types.expressionStatement(
@@ -3932,7 +3972,6 @@ var await_default = {
           return;
         }
         setSectionParentIsOwner(bodySection, true);
-        setSubscriberBuilder(tag, (signal) => signal);
       },
       exit(tag) {
         tag.remove();
@@ -3951,7 +3990,7 @@ var await_default = {
 
 // src/translator/core/client.ts
 var import_compiler23 = require("@marko/compiler");
-var import_babel_utils12 = require("@marko/compiler/babel-utils");
+var import_babel_utils13 = require("@marko/compiler/babel-utils");
 var client_default = {
   parse(tag) {
     const {
@@ -3961,7 +4000,7 @@ var client_default = {
     const rawValue = node.rawValue;
     const code = rawValue.replace(/^client\s*/, "").trim();
     const start = node.name.start + (rawValue.length - code.length);
-    let body = (0, import_babel_utils12.parseStatements)(file, code, start, start + code.length);
+    let body = (0, import_babel_utils13.parseStatements)(file, code, start, start + code.length);
     if (body.length === 1 && import_compiler23.types.isBlockStatement(body[0])) {
       body = body[0].body;
     }
@@ -3982,7 +4021,7 @@ var client_default = {
 
 // src/translator/core/const.ts
 var import_compiler25 = require("@marko/compiler");
-var import_babel_utils13 = require("@marko/compiler/babel-utils");
+var import_babel_utils14 = require("@marko/compiler/babel-utils");
 
 // src/translator/util/translate-var.ts
 var import_compiler24 = require("@marko/compiler");
@@ -4001,8 +4040,8 @@ function translateVar(tag, initialValue, kind = "const") {
 // src/translator/core/const.ts
 var const_default = {
   analyze(tag) {
-    (0, import_babel_utils13.assertNoArgs)(tag);
-    (0, import_babel_utils13.assertNoParams)(tag);
+    (0, import_babel_utils14.assertNoArgs)(tag);
+    (0, import_babel_utils14.assertNoParams)(tag);
     assertNoBodyContent(tag);
     const { node } = tag;
     const [valueAttr] = node.attributes;
@@ -4059,13 +4098,13 @@ var const_default = {
 
 // src/translator/core/debug.ts
 var import_compiler26 = require("@marko/compiler");
-var import_babel_utils14 = require("@marko/compiler/babel-utils");
+var import_babel_utils15 = require("@marko/compiler/babel-utils");
 var debug_default = {
   analyze(tag) {
     const [valueAttr] = tag.node.attributes;
-    (0, import_babel_utils14.assertNoVar)(tag);
-    (0, import_babel_utils14.assertNoArgs)(tag);
-    (0, import_babel_utils14.assertNoParams)(tag);
+    (0, import_babel_utils15.assertNoVar)(tag);
+    (0, import_babel_utils15.assertNoArgs)(tag);
+    (0, import_babel_utils15.assertNoParams)(tag);
     assertNoBodyContent(tag);
     if (tag.node.attributes.length > 1 || tag.node.attributes.length === 1 && (!import_compiler26.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value")) {
       throw tag.get("name").buildCodeFrameError(
@@ -4102,11 +4141,11 @@ var debug_default = {
 
 // src/translator/core/define.ts
 var import_compiler31 = require("@marko/compiler");
-var import_babel_utils19 = require("@marko/compiler/babel-utils");
+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_utils15 = require("@marko/compiler/babel-utils");
+var import_babel_utils16 = require("@marko/compiler/babel-utils");
 
 // src/translator/util/get-parent-tag.ts
 function getParentTag(tag) {
@@ -4136,12 +4175,12 @@ function analyzeAttributeTags(tag) {
   const sampleAttrTagsForControlFlow = /* @__PURE__ */ new Map();
   for (const child of attrTags2) {
     if (child.isMarkoTag()) {
-      if ((0, import_babel_utils15.isAttributeTag)(child)) {
+      if ((0, import_babel_utils16.isAttributeTag)(child)) {
         const name2 = getTagName(child);
         lookup[name2] ||= createAttrTagMeta(name2, [name2]);
         analyzeAttributeTags(child);
       } else {
-        const isRepeated = (0, import_babel_utils15.isLoopTag)(child);
+        const isRepeated = (0, import_babel_utils16.isLoopTag)(child);
         let curGroup;
         for (const name2 of crawlAttrTags(child, attrTagNodesByName)) {
           const oldMeta = lookup[name2];
@@ -4196,7 +4235,7 @@ function crawlAttrTags(tag, attrTagNodesByName, attrTagNames = /* @__PURE__ */ n
   const attrTags2 = tag.node.body.attributeTags ? tag.get("body").get("body") : tag.get("attributeTags");
   for (const child of attrTags2) {
     if (child.isMarkoTag()) {
-      if ((0, import_babel_utils15.isAttributeTag)(child)) {
+      if ((0, import_babel_utils16.isAttributeTag)(child)) {
         const tagName = getTagName(child);
         attrTagNames.add(tagName);
         (attrTagNodesByName[tagName] ||= []).push(child);
@@ -4237,15 +4276,15 @@ function getConditionRoot(tag) {
 
 // src/translator/util/translate-attrs.ts
 var import_compiler30 = require("@marko/compiler");
-var import_babel_utils18 = require("@marko/compiler/babel-utils");
+var import_babel_utils19 = require("@marko/compiler/babel-utils");
 
 // src/translator/core/for.ts
 var import_compiler29 = require("@marko/compiler");
-var import_babel_utils17 = require("@marko/compiler/babel-utils");
+var import_babel_utils18 = require("@marko/compiler/babel-utils");
 
 // src/translator/visitors/tag/native-tag.ts
 var import_compiler28 = require("@marko/compiler");
-var import_babel_utils16 = require("@marko/compiler/babel-utils");
+var import_babel_utils17 = require("@marko/compiler/babel-utils");
 var kNativeTagBinding = Symbol("native tag binding");
 var kSerializeMarker = Symbol("serialize marker");
 var kGetterId = Symbol("node getter id");
@@ -4347,9 +4386,9 @@ var native_tag_default = {
   },
   analyze: {
     enter(tag) {
-      (0, import_babel_utils16.assertNoArgs)(tag);
-      (0, import_babel_utils16.assertNoParams)(tag);
-      (0, import_babel_utils16.assertNoAttributeTags)(tag);
+      (0, import_babel_utils17.assertNoArgs)(tag);
+      (0, import_babel_utils17.assertNoParams)(tag);
+      (0, import_babel_utils17.assertNoAttributeTags)(tag);
       const { node } = tag;
       if (node.var && !import_compiler28.types.isIdentifier(node.var)) {
         throw tag.get("var").buildCodeFrameError(
@@ -4441,7 +4480,7 @@ var native_tag_default = {
       const nodeRef2 = extra[kNativeTagBinding];
       const isHTML = isOutputHTML();
       const name2 = tag.get("name");
-      const tagDef = (0, import_babel_utils16.getTagDef)(tag);
+      const tagDef = (0, import_babel_utils17.getTagDef)(tag);
       const write2 = writeTo(tag);
       const section = getSection(tag);
       if (isHTML && extra.tagNameNullable) {
@@ -4758,7 +4797,7 @@ var native_tag_default = {
       const extra = tag.node.extra;
       const nodeRef2 = extra[kNativeTagBinding];
       const isHTML = isOutputHTML();
-      const openTagOnly = (0, import_babel_utils16.getTagDef)(tag)?.parseOptions?.openTagOnly;
+      const openTagOnly = (0, import_babel_utils17.getTagDef)(tag)?.parseOptions?.openTagOnly;
       const selectArgs = isHTML && htmlSelectArgs.get(tag.node);
       const tagName = getTagName(tag);
       if (isHTML && extra.tagNameNullable) {
@@ -4895,15 +4934,14 @@ function isInvokedFunction(expr) {
 
 // src/translator/core/for.ts
 var kForMarkerBinding = Symbol("for marker binding");
-var kForScopeStartIndex = Symbol("for scope start index");
 var kOnlyChildInParent = Symbol("only child in parent");
 var for_default = {
   analyze(tag) {
     const tagExtra = tag.node.extra ??= {};
     const isAttrTag = tag.node.body.attributeTags;
     let allowAttrs;
-    (0, import_babel_utils17.assertNoVar)(tag);
-    (0, import_babel_utils17.assertNoArgs)(tag);
+    (0, import_babel_utils18.assertNoVar)(tag);
+    (0, import_babel_utils18.assertNoArgs)(tag);
     assertNoSpreadAttrs(tag);
     switch (getForType(tag.node)) {
       case "of":
@@ -4923,7 +4961,7 @@ var for_default = {
     if (!isAttrTag) {
       allowAttrs.push("by");
     }
-    (0, import_babel_utils17.assertAllowedAttributes)(tag, allowAttrs);
+    (0, import_babel_utils18.assertAllowedAttributes)(tag, allowAttrs);
     if (isAttrTag) return;
     const tagBody = tag.get("body");
     const bodySection = startSection(tagBody);
@@ -4931,6 +4969,7 @@ var for_default = {
       dropReferences(getAllTagReferenceNodes(tag.node));
       return;
     }
+    bodySection.isBranch = true;
     const section = getOrCreateSection(tag);
     if (isOnlyChildInParent(tag)) {
       const parentTag = getParentTag(tag).node;
@@ -4961,22 +5000,12 @@ var for_default = {
           tag.remove();
           return;
         }
-        const tagExtra = tag.node.extra;
-        const isStateful = isStatefulReferences(tagExtra.referencedBindings);
         setSectionParentIsOwner(bodySection, true);
         if (!isOnlyChildInParent(tag)) {
           visit(tag, 37 /* Replace */);
           enterShallow(tag);
         }
         flushBefore(tag);
-        if (isStateful && !bodySection.content?.singleChild) {
-          tagExtra[kForScopeStartIndex] = tag.scope.generateUidIdentifier("k");
-          writeTo(tagBody)`${callRuntime(
-            "markResumeScopeStart",
-            getScopeIdIdentifier(bodySection),
-            import_compiler29.types.updateExpression("++", tagExtra[kForScopeStartIndex])
-          )}`;
-        }
       },
       exit(tag) {
         if (tag.node.body.attributeTags) return;
@@ -4994,22 +5023,12 @@ var for_default = {
         const statements = [];
         const bodyStatements = node.body.body;
         const hasStatefulClosures = checkStatefulClosures(bodySection, true);
+        const singleNodeOptimization = bodySection.content === null || bodySection.content.singleChild;
         let keyExpression;
         if (isStateful && isOnlyChildInParent(tag)) {
           parentTag.node.extra[kSerializeMarker] = true;
         }
-        if (tagExtra[kForScopeStartIndex]) {
-          statements.push(
-            import_compiler29.types.variableDeclaration("let", [
-              import_compiler29.types.variableDeclarator(
-                tagExtra[kForScopeStartIndex],
-                import_compiler29.types.numericLiteral(0)
-              )
-            ])
-          );
-        }
         if (isStateful || hasStatefulClosures) {
-          const singleNodeOptimization = bodySection.content === null || bodySection.content.singleChild;
           const defaultParamNames = {
             of: ["list", "index"],
             in: ["key", "value"],
@@ -5060,50 +5079,33 @@ var for_default = {
           } else {
             keyExpression = params[defaultByParamIndex];
           }
-          const write2 = writeTo(tag);
-          const forScopeIdsIdentifier = tag.scope.generateUidIdentifier("forScopeIds");
           const forScopesIdentifier = getScopeIdentifier(bodySection);
           statements.push(
-            import_compiler29.types.variableDeclaration(
-              "const",
-              [
-                isStateful && singleNodeOptimization && import_compiler29.types.variableDeclarator(
-                  forScopeIdsIdentifier,
-                  import_compiler29.types.arrayExpression([])
-                ),
-                import_compiler29.types.variableDeclarator(
-                  forScopesIdentifier,
-                  import_compiler29.types.newExpression(import_compiler29.types.identifier("Map"), [])
-                )
-              ].filter(Boolean)
-            )
+            import_compiler29.types.variableDeclaration("const", [
+              import_compiler29.types.variableDeclarator(
+                forScopesIdentifier,
+                import_compiler29.types.newExpression(import_compiler29.types.identifier("Map"), [])
+              )
+            ])
           );
-          if (isStateful) {
-            if (singleNodeOptimization) {
-              bodyStatements.push(
-                import_compiler29.types.expressionStatement(
-                  import_compiler29.types.callExpression(
-                    import_compiler29.types.memberExpression(
-                      forScopeIdsIdentifier,
-                      import_compiler29.types.identifier("push")
-                    ),
-                    [getScopeIdIdentifier(bodySection)]
-                  )
+          if (keyExpression && (isStateful || hasStatefulClosures)) {
+            bodyStatements.push(
+              import_compiler29.types.expressionStatement(
+                import_compiler29.types.callExpression(
+                  import_compiler29.types.memberExpression(
+                    getScopeIdentifier(bodySection),
+                    import_compiler29.types.identifier("set")
+                  ),
+                  [
+                    keyExpression,
+                    callRuntime(
+                      "ensureScopeWithId",
+                      getScopeIdIdentifier(bodySection)
+                    )
+                  ]
                 )
-              );
-              write2`${callRuntime(
-                "markResumeControlSingleNodeEnd",
-                getScopeIdIdentifier(tagSection),
-                getScopeAccessorLiteral(nodeRef2),
-                forScopeIdsIdentifier
-              )}`;
-            } else {
-              write2`${callRuntime(
-                "markResumeControlEnd",
-                getScopeIdIdentifier(tagSection),
-                getScopeAccessorLiteral(nodeRef2)
-              )}`;
-            }
+              )
+            );
           }
           getSerializedScopeProperties(tagSection).set(
             import_compiler29.types.stringLiteral(
@@ -5117,30 +5119,22 @@ var for_default = {
           );
         }
         flushInto(tag);
-        setSubscriberBuilder(tag, () => {
+        setClosureSignalBuilder(tag, () => {
         });
         writeHTMLResumeStatements(tagBody);
-        if (keyExpression && (isStateful || hasStatefulClosures)) {
-          bodyStatements.push(
-            import_compiler29.types.expressionStatement(
-              import_compiler29.types.callExpression(
-                import_compiler29.types.memberExpression(
-                  getScopeIdentifier(bodySection),
-                  import_compiler29.types.identifier("set")
-                ),
-                [
-                  keyExpression,
-                  callRuntime(
-                    "getScopeById",
-                    getScopeIdIdentifier(bodySection)
-                  )
-                ]
-              )
-            )
+        const forTagArgs = getBaseArgsInForTag(forType, forAttrs);
+        const forTagHTMLRuntime = isStateful ? forTypeToHTMLResumeRuntime(forType, singleNodeOptimization) : forTypeToRuntime(forType);
+        forTagArgs.push(
+          import_compiler29.types.arrowFunctionExpression(params, import_compiler29.types.blockStatement(bodyStatements))
+        );
+        if (isStateful) {
+          forTagArgs.push(
+            getScopeIdIdentifier(tagSection),
+            getScopeAccessorLiteral(nodeRef2)
           );
         }
         statements.push(
-          buildForRuntimeCall(forType, forAttrs, params, bodyStatements)
+          import_compiler29.types.expressionStatement(callRuntime(forTagHTMLRuntime, ...forTagArgs))
         );
         for (const replacement of tag.replaceWithMultiple(statements)) {
           replacement.skip();
@@ -5171,11 +5165,12 @@ var for_default = {
         const tagExtra = node.extra;
         const { referencedBindings } = tagExtra;
         const nodeRef2 = isOnlyChildInParent(tag) ? getParentTag(tag).node.extra[kNativeTagBinding] : tag.node.extra[kForMarkerBinding];
-        setSubscriberBuilder(tag, (signal2) => {
+        setClosureSignalBuilder(tag, (_closureSignal, render, intersection) => {
           return callRuntime(
-            "inLoopScope",
-            signal2,
-            getScopeAccessorLiteral(nodeRef2)
+            "loopClosure",
+            getScopeAccessorLiteral(nodeRef2),
+            render,
+            intersection
           );
         });
         const forType = getForType(node);
@@ -5314,6 +5309,27 @@ function forTypeToRuntime(type) {
       return "forTo";
   }
 }
+function forTypeToHTMLResumeRuntime(type, singleNodeOptimization) {
+  if (singleNodeOptimization) {
+    switch (type) {
+      case "of":
+        return "resumeSingleNodeForOf";
+      case "in":
+        return "resumeSingleNodeForIn";
+      case "to":
+        return "resumeSingleNodeForTo";
+    }
+  } else {
+    switch (type) {
+      case "of":
+        return "resumeForOf";
+      case "in":
+        return "resumeForIn";
+      case "to":
+        return "resumeForTo";
+    }
+  }
+}
 function forTypeToDOMRuntime(type) {
   switch (type) {
     case "of":
@@ -5354,7 +5370,7 @@ function isOnlyChildInParent(tag) {
     return extra[kOnlyChildInParent];
   }
   const parentTag = getParentTag(tag);
-  if (parentTag && (0, import_babel_utils17.getTagDef)(parentTag)?.html) {
+  if (parentTag && (0, import_babel_utils18.getTagDef)(parentTag)?.html) {
     return extra[kOnlyChildInParent] = tag.parent.body.length === 1;
   }
   return extra[kOnlyChildInParent] = false;
@@ -5390,7 +5406,7 @@ function translateAttrs(tag, templateExports, statements = [], contentKey = "con
     for (let i = 0; i < attrTags2.length; i++) {
       const child = attrTags2[i];
       if (child.isMarkoTag()) {
-        if ((0, import_babel_utils18.isAttributeTag)(child)) {
+        if ((0, import_babel_utils19.isAttributeTag)(child)) {
           const attrTagMeta = attrTagLookup[getTagName(child)];
           if (attrTagMeta.dynamic) {
             i = addDynamicAttrTagStatements(
@@ -5488,7 +5504,7 @@ function getTranslatedBodyContentProperty(props) {
 function addDynamicAttrTagStatements(attrTags2, index, attrTagLookup, statements, templateExports, contentKey = "content") {
   const tag = attrTags2[index];
   if (tag.isMarkoTag()) {
-    if ((0, import_babel_utils18.isAttributeTag)(tag)) {
+    if ((0, import_babel_utils19.isAttributeTag)(tag)) {
       const attrTagMeta = attrTagLookup[getTagName(tag)];
       if (usesExport(templateExports, attrTagMeta.name) && attrTagMeta.dynamic) {
         const translatedAttrTag = translateAttrs(
@@ -5693,7 +5709,7 @@ function buildContent(body) {
 }
 function getNonAttributeTagParent(tag) {
   let cur = tag;
-  while ((0, import_babel_utils18.isAttributeTag)(cur) || (0, import_babel_utils18.isTransparentTag)(cur)) {
+  while ((0, import_babel_utils19.isAttributeTag)(cur) || (0, import_babel_utils19.isTransparentTag)(cur)) {
     cur = getParentTag(cur);
   }
   return cur;
@@ -5702,7 +5718,7 @@ function getNonAttributeTagParent(tag) {
 // src/translator/core/define.ts
 var define_default = {
   analyze(tag) {
-    (0, import_babel_utils19.assertNoArgs)(tag);
+    (0, import_babel_utils20.assertNoArgs)(tag);
     if (!tag.node.var) {
       throw tag.get("name").buildCodeFrameError("The `define` tag requires a tag variable.");
     }
@@ -5765,17 +5781,17 @@ var define_default = {
 
 // src/translator/core/effect.ts
 var import_compiler32 = require("@marko/compiler");
-var import_babel_utils20 = require("@marko/compiler/babel-utils");
+var import_babel_utils21 = require("@marko/compiler/babel-utils");
 var effect_default = {
   migrate: [
     (tag) => {
-      (0, import_babel_utils20.assertNoArgs)(tag);
-      (0, import_babel_utils20.assertNoParams)(tag);
+      (0, import_babel_utils21.assertNoArgs)(tag);
+      (0, import_babel_utils21.assertNoParams)(tag);
       assertNoBodyContent(tag);
-      (0, import_babel_utils20.assertNoAttributeTags)(tag);
+      (0, import_babel_utils21.assertNoAttributeTags)(tag);
       assertNoSpreadAttrs(tag);
-      (0, import_babel_utils20.assertAllowedAttributes)(tag, ["value"]);
-      (0, import_babel_utils20.diagnosticDeprecate)(tag, {
+      (0, import_babel_utils21.assertAllowedAttributes)(tag, ["value"]);
+      (0, import_babel_utils21.diagnosticDeprecate)(tag, {
         label: "The 'effect' tag has been replaced by the 'script' tag.",
         fix() {
           const { node } = tag;
@@ -5798,12 +5814,12 @@ var effect_default = {
 };
 
 // src/translator/core/export.ts
-var import_babel_utils21 = require("@marko/compiler/babel-utils");
+var import_babel_utils22 = require("@marko/compiler/babel-utils");
 var export_default = {
   parse(tag) {
     const { node } = tag;
     tag.replaceWith(
-      (0, import_babel_utils21.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end)[0]
+      (0, import_babel_utils22.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end)[0]
     );
   },
   parseOptions: {
@@ -5819,14 +5835,14 @@ var export_default = {
 
 // src/translator/core/html-comment.ts
 var import_compiler33 = require("@marko/compiler");
-var import_babel_utils22 = require("@marko/compiler/babel-utils");
+var import_babel_utils23 = require("@marko/compiler/babel-utils");
 var kCommentTagBinding = Symbol("comment tag binding");
 var kGetterId2 = Symbol("node getter id");
 var html_comment_default = {
   analyze(tag) {
-    (0, import_babel_utils22.assertNoArgs)(tag);
-    (0, import_babel_utils22.assertNoParams)(tag);
-    (0, import_babel_utils22.assertNoAttributes)(tag);
+    (0, import_babel_utils23.assertNoArgs)(tag);
+    (0, import_babel_utils23.assertNoParams)(tag);
+    (0, import_babel_utils23.assertNoAttributes)(tag);
     const tagVar = tag.node.var;
     let needsBinding = false;
     let needsGetter = false;
@@ -5995,12 +6011,12 @@ var html_comment_default = {
 
 // src/translator/core/html-script.ts
 var import_compiler34 = require("@marko/compiler");
-var import_babel_utils23 = require("@marko/compiler/babel-utils");
+var import_babel_utils24 = require("@marko/compiler/babel-utils");
 var kGetterId3 = Symbol("node getter id");
 var html_script_default = {
   analyze(tag) {
-    (0, import_babel_utils23.assertNoArgs)(tag);
-    (0, import_babel_utils23.assertNoParams)(tag);
+    (0, import_babel_utils24.assertNoArgs)(tag);
+    (0, import_babel_utils24.assertNoParams)(tag);
     const { node } = tag;
     if (node.var && !import_compiler34.types.isIdentifier(node.var)) {
       throw tag.get("var").buildCodeFrameError(
@@ -6390,12 +6406,12 @@ function getUsedAttrs2(tag) {
 
 // src/translator/core/html-style.ts
 var import_compiler35 = require("@marko/compiler");
-var import_babel_utils24 = require("@marko/compiler/babel-utils");
+var import_babel_utils25 = require("@marko/compiler/babel-utils");
 var kGetterId4 = Symbol("node getter id");
 var html_style_default = {
   analyze(tag) {
-    (0, import_babel_utils24.assertNoArgs)(tag);
-    (0, import_babel_utils24.assertNoParams)(tag);
+    (0, import_babel_utils25.assertNoArgs)(tag);
+    (0, import_babel_utils25.assertNoParams)(tag);
     const { node } = tag;
     if (node.var && !import_compiler35.types.isIdentifier(node.var)) {
       throw tag.get("var").buildCodeFrameError(
@@ -6780,14 +6796,14 @@ function getUsedAttrs3(tag) {
 
 // src/translator/core/id.ts
 var import_compiler36 = require("@marko/compiler");
-var import_babel_utils25 = require("@marko/compiler/babel-utils");
+var import_babel_utils26 = require("@marko/compiler/babel-utils");
 var id_default = {
   analyze(tag) {
-    (0, import_babel_utils25.assertNoArgs)(tag);
-    (0, import_babel_utils25.assertNoParams)(tag);
-    (0, import_babel_utils25.assertNoAttributes)(tag);
+    (0, import_babel_utils26.assertNoArgs)(tag);
+    (0, import_babel_utils26.assertNoParams)(tag);
+    (0, import_babel_utils26.assertNoAttributes)(tag);
     assertNoBodyContent(tag);
-    (0, import_babel_utils25.assertNoAttributeTags)(tag);
+    (0, import_babel_utils26.assertNoAttributeTags)(tag);
     const { node } = tag;
     if (!node.var) {
       throw tag.get("name").buildCodeFrameError("The `id` tag requires a tag variable.");
@@ -6829,7 +6845,7 @@ var id_default = {
 
 // src/translator/core/if.ts
 var import_compiler38 = require("@marko/compiler");
-var import_babel_utils26 = require("@marko/compiler/babel-utils");
+var import_babel_utils27 = require("@marko/compiler/babel-utils");
 
 // src/translator/util/to-first-statement-or-block.ts
 var import_compiler37 = require("@marko/compiler");
@@ -6858,6 +6874,7 @@ var IfTag = {
       let singleNodeOptimization = true;
       for (const [branchTag, branchBodySection] of branches) {
         if (branchBodySection) {
+          branchBodySection.isBranch = true;
           branchBodySection.upstreamExpression = rootExtra;
           if (!(branchBodySection.content === null || branchBodySection.content?.singleChild)) {
             singleNodeOptimization = false;
@@ -6885,9 +6902,6 @@ var IfTag = {
         if (tag.node.body.attributeTags) return;
         const tagBody = tag.get("body");
         const bodySection = getSectionForBody(tagBody);
-        const rootExtra = getRoot(tag).node.extra;
-        const isStateful = isStatefulReferences(rootExtra.referencedBindings);
-        const singleNodeOptimization = rootExtra.singleNodeOptimization;
         if (isRoot(tag)) {
           visit(tag, 37 /* Replace */);
         }
@@ -6895,12 +6909,6 @@ var IfTag = {
         flushBefore(tag);
         if (bodySection) {
           setSectionParentIsOwner(bodySection, true);
-          if (isStateful && !singleNodeOptimization) {
-            writeTo(tagBody)`${callRuntime(
-              "markResumeScopeStart",
-              getScopeIdIdentifier(bodySection)
-            )}`;
-          }
         }
       },
       exit(tag) {
@@ -6919,12 +6927,11 @@ var IfTag = {
             setForceResumeScope(bodySection);
           }
           flushInto(tag);
-          setSubscriberBuilder(tag, () => {
+          setClosureSignalBuilder(tag, () => {
           });
           writeHTMLResumeStatements(tagBody);
         }
         if (isLast) {
-          const write2 = writeTo(tag);
           const nextTag = tag.getNextSibling();
           const ifScopeIdIdentifier = tag.scope.generateUidIdentifier("ifScopeId");
           const ifRendererIdentifier = tag.scope.generateUidIdentifier("ifRenderer");
@@ -6985,6 +6992,31 @@ var IfTag = {
           if (!(isStateful || hasStatefulClosures)) {
             nextTag.insertBefore(statement);
           } else {
+            if (isStateful) {
+              getSerializedScopeProperties(section).set(
+                import_compiler38.types.stringLiteral(
+                  getScopeAccessorLiteral(nodeRef2).value + "(" /* ConditionalRenderer */
+                ),
+                ifRendererIdentifier
+              );
+              const cbNode = import_compiler38.types.arrowFunctionExpression(
+                [],
+                import_compiler38.types.blockStatement([statement])
+              );
+              statement = import_compiler38.types.expressionStatement(
+                singleNodeOptimization ? callRuntime(
+                  "resumeSingleNodeConditional",
+                  cbNode,
+                  getScopeIdIdentifier(section),
+                  getScopeAccessorLiteral(nodeRef2)
+                ) : callRuntime(
+                  "resumeConditional",
+                  cbNode,
+                  getScopeIdIdentifier(section),
+                  getScopeAccessorLiteral(nodeRef2)
+                )
+              );
+            }
             nextTag.insertBefore([
               import_compiler38.types.variableDeclaration(
                 "let",
@@ -6995,28 +7027,6 @@ var IfTag = {
               ),
               statement
             ]);
-            if (isStateful) {
-              if (singleNodeOptimization) {
-                write2`${callRuntime(
-                  "markResumeControlSingleNodeEnd",
-                  getScopeIdIdentifier(section),
-                  getScopeAccessorLiteral(nodeRef2),
-                  ifScopeIdIdentifier
-                )}`;
-              } else {
-                write2`${callRuntime(
-                  "markResumeControlEnd",
-                  getScopeIdIdentifier(section),
-                  getScopeAccessorLiteral(nodeRef2)
-                )}`;
-              }
-              getSerializedScopeProperties(section).set(
-                import_compiler38.types.stringLiteral(
-                  getScopeAccessorLiteral(nodeRef2).value + "(" /* ConditionalRenderer */
-                ),
-                ifRendererIdentifier
-              );
-            }
             getSerializedScopeProperties(section).set(
               import_compiler38.types.stringLiteral(
                 getScopeAccessorLiteral(nodeRef2).value + "!" /* ConditionalScope */
@@ -7055,14 +7065,21 @@ var IfTag = {
             const [branchTag, branchBodySection] = branches[i];
             const [testAttr] = branchTag.node.attributes;
             const consequent = branchBodySection ? import_compiler38.types.identifier(branchBodySection.name) : import_compiler38.types.numericLiteral(0);
-            setSubscriberBuilder(branchTag, (subscriber) => {
-              return callRuntime(
-                "inConditionalScope",
-                subscriber,
-                getScopeAccessorLiteral(nodeRef2)
-                /*t.identifier(section.name)*/
-              );
-            });
+            setClosureSignalBuilder(
+              branchTag,
+              (_closureSignal, render, intersection) => {
+                return callRuntime(
+                  "conditionalClosure",
+                  getScopeAccessorLiteral(nodeRef2),
+                  import_compiler38.types.arrowFunctionExpression(
+                    [],
+                    import_compiler38.types.identifier(branchBodySection.name)
+                  ),
+                  render,
+                  intersection
+                );
+              }
+            );
             branchTag.remove();
             expr = testAttr ? import_compiler38.types.conditionalExpression(testAttr.value, consequent, expr) : consequent;
           }
@@ -7109,9 +7126,9 @@ var ElseTag = {
   ]
 };
 function assertValidCondition(tag) {
-  (0, import_babel_utils26.assertNoVar)(tag);
-  (0, import_babel_utils26.assertNoArgs)(tag);
-  (0, import_babel_utils26.assertNoParams)(tag);
+  (0, import_babel_utils27.assertNoVar)(tag);
+  (0, import_babel_utils27.assertNoArgs)(tag);
+  (0, import_babel_utils27.assertNoParams)(tag);
   assertHasBody(tag);
   assertNoSpreadAttrs(tag);
   switch (getTagName(tag)) {
@@ -7194,20 +7211,17 @@ function getBranches(tag, bodySection) {
   }
   return [isLast, branches];
 }
-function getRoot(tag) {
-  return isRoot(tag) ? tag : BRANCHES_LOOKUP.get(tag)[0][0];
-}
 function isRoot(tag) {
   return isCoreTagName(tag, "if");
 }
 
 // src/translator/core/import.ts
-var import_babel_utils27 = require("@marko/compiler/babel-utils");
+var import_babel_utils28 = require("@marko/compiler/babel-utils");
 var import_default = {
   parse(tag) {
     const { node } = tag;
     tag.replaceWith(
-      (0, import_babel_utils27.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end)[0]
+      (0, import_babel_utils28.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end)[0]
     );
   },
   parseOptions: {
@@ -7226,7 +7240,7 @@ var import_default = {
 
 // src/translator/core/let.ts
 var import_compiler39 = require("@marko/compiler");
-var import_babel_utils28 = require("@marko/compiler/babel-utils");
+var import_babel_utils29 = require("@marko/compiler/babel-utils");
 var let_default = {
   analyze(tag) {
     const { node } = tag;
@@ -7255,8 +7269,8 @@ var let_default = {
         }
       }
     }
-    (0, import_babel_utils28.assertNoArgs)(tag);
-    (0, import_babel_utils28.assertNoParams)(tag);
+    (0, import_babel_utils29.assertNoArgs)(tag);
+    (0, import_babel_utils29.assertNoParams)(tag);
     assertNoBodyContent(tag);
     assertNoSpreadAttrs(tag);
     if (!tagVar) {
@@ -7265,7 +7279,7 @@ var let_default = {
     if (!import_compiler39.types.isIdentifier(tagVar)) {
       throw tag.get("var").buildCodeFrameError("The `let` tag variable cannot be destructured.");
     }
-    if (valueChangeAttr && (0, import_babel_utils28.computeNode)(valueChangeAttr.value)) {
+    if (valueChangeAttr && (0, import_babel_utils29.computeNode)(valueChangeAttr.value)) {
       throw tag.get("attributes").find((attr2) => attr2.node === valueChangeAttr).get("value").buildCodeFrameError(
         "The `let` tag `valueChange` attribute must be a function."
       );
@@ -7328,13 +7342,13 @@ var let_default = {
 
 // src/translator/core/lifecycle.ts
 var import_compiler40 = require("@marko/compiler");
-var import_babel_utils29 = require("@marko/compiler/babel-utils");
+var import_babel_utils30 = require("@marko/compiler/babel-utils");
 var kRef = Symbol("lifecycle attrs reference");
 var lifecycle_default = {
   analyze(tag) {
-    (0, import_babel_utils29.assertNoArgs)(tag);
-    (0, import_babel_utils29.assertNoVar)(tag);
-    (0, import_babel_utils29.assertNoParams)(tag);
+    (0, import_babel_utils30.assertNoArgs)(tag);
+    (0, import_babel_utils30.assertNoVar)(tag);
+    (0, import_babel_utils30.assertNoParams)(tag);
     assertNoBodyContent(tag);
     const { node } = tag;
     const tagExtra = node.extra ??= {};
@@ -7408,13 +7422,13 @@ var lifecycle_default = {
 
 // src/translator/core/log.ts
 var import_compiler41 = require("@marko/compiler");
-var import_babel_utils30 = require("@marko/compiler/babel-utils");
+var import_babel_utils31 = require("@marko/compiler/babel-utils");
 var log_default = {
   analyze(tag) {
     const [valueAttr] = tag.node.attributes;
-    (0, import_babel_utils30.assertNoArgs)(tag);
-    (0, import_babel_utils30.assertNoVar)(tag);
-    (0, import_babel_utils30.assertNoParams)(tag);
+    (0, import_babel_utils31.assertNoArgs)(tag);
+    (0, import_babel_utils31.assertNoVar)(tag);
+    (0, import_babel_utils31.assertNoParams)(tag);
     assertNoBodyContent(tag);
     if (!valueAttr) {
       throw tag.get("name").buildCodeFrameError("The `log` tag requires a value.");
@@ -7460,7 +7474,7 @@ var log_default = {
 
 // src/translator/core/script.ts
 var import_compiler42 = require("@marko/compiler");
-var import_babel_utils31 = require("@marko/compiler/babel-utils");
+var import_babel_utils32 = require("@marko/compiler/babel-utils");
 var htmlScriptTagAlternateMsg = " For a native html `script` tag use the `html-script` core tag instead.";
 var script_default = {
   parse(tag) {
@@ -7480,7 +7494,7 @@ var script_default = {
       }
       const start = body[0]?.start;
       const end = body[body.length - 1]?.end;
-      const bodyStatements = (0, import_babel_utils31.parseStatements)(tag.hub.file, code, start, end);
+      const bodyStatements = (0, import_babel_utils32.parseStatements)(tag.hub.file, code, start, end);
       const valueFn = import_compiler42.types.arrowFunctionExpression(
         [],
         import_compiler42.types.blockStatement(bodyStatements),
@@ -7492,10 +7506,10 @@ var script_default = {
   },
   analyze(tag) {
     const { node } = tag;
-    (0, import_babel_utils31.assertNoArgs)(tag);
-    (0, import_babel_utils31.assertNoParams)(tag);
+    (0, import_babel_utils32.assertNoArgs)(tag);
+    (0, import_babel_utils32.assertNoParams)(tag);
     assertNoBodyContent(tag);
-    (0, import_babel_utils31.assertNoAttributeTags)(tag);
+    (0, import_babel_utils32.assertNoAttributeTags)(tag);
     if (node.var) {
       throw tag.hub.buildError(
         node.var,
@@ -7597,7 +7611,7 @@ function isAwaitExpression(node) {
 
 // src/translator/core/server.ts
 var import_compiler43 = require("@marko/compiler");
-var import_babel_utils32 = require("@marko/compiler/babel-utils");
+var import_babel_utils33 = require("@marko/compiler/babel-utils");
 var server_default = {
   parse(tag) {
     const {
@@ -7607,7 +7621,7 @@ var server_default = {
     const rawValue = node.rawValue;
     const code = rawValue.replace(/^server\s*/, "").trim();
     const start = node.name.start + (rawValue.length - code.length);
-    let body = (0, import_babel_utils32.parseStatements)(file, code, start, start + code.length);
+    let body = (0, import_babel_utils33.parseStatements)(file, code, start, start + code.length);
     if (body.length === 1 && import_compiler43.types.isBlockStatement(body[0])) {
       body = body[0].body;
     }
@@ -7628,7 +7642,7 @@ var server_default = {
 
 // src/translator/core/static.ts
 var import_compiler44 = require("@marko/compiler");
-var import_babel_utils33 = require("@marko/compiler/babel-utils");
+var import_babel_utils34 = require("@marko/compiler/babel-utils");
 var static_default = {
   parse(tag) {
     const {
@@ -7638,7 +7652,7 @@ var static_default = {
     const rawValue = node.rawValue;
     const code = rawValue.replace(/^static\s*/, "").trim();
     const start = node.name.start + (rawValue.length - code.length);
-    let body = (0, import_babel_utils33.parseStatements)(file, code, start, start + code.length);
+    let body = (0, import_babel_utils34.parseStatements)(file, code, start, start + code.length);
     if (body.length === 1 && import_compiler44.types.isBlockStatement(body[0])) {
       body = body[0].body;
     }
@@ -7659,16 +7673,16 @@ var static_default = {
 
 // src/translator/core/style.ts
 var import_compiler45 = require("@marko/compiler");
-var import_babel_utils34 = require("@marko/compiler/babel-utils");
+var import_babel_utils35 = require("@marko/compiler/babel-utils");
 var import_magic_string = __toESM(require("magic-string"));
-var import_path2 = __toESM(require("path"));
+var import_path3 = __toESM(require("path"));
 var STYLE_EXT_REG = /^style((?:\.[a-zA-Z0-9$_-]+)+)?/;
 var htmlStyleTagAlternateMsg = " For a native html `style` tag use the `html-style` core tag instead.";
 var style_default = {
   analyze(tag) {
-    (0, import_babel_utils34.assertNoArgs)(tag);
-    (0, import_babel_utils34.assertNoParams)(tag);
-    (0, import_babel_utils34.assertNoAttributeTags)(tag);
+    (0, import_babel_utils35.assertNoArgs)(tag);
+    (0, import_babel_utils35.assertNoParams)(tag);
+    (0, import_babel_utils35.assertNoAttributeTags)(tag);
     const { node } = tag;
     const ext = STYLE_EXT_REG.exec(node.rawValue || "")?.[1]?.slice(1);
     for (const attr2 of node.attributes) {
@@ -7707,30 +7721,30 @@ var style_default = {
     }
     const markoText = node.body.body[0];
     const { resolveVirtualDependency } = getMarkoOpts();
-    const start = (0, import_babel_utils34.getStart)(file, markoText);
-    const end = (0, import_babel_utils34.getEnd)(file, markoText);
+    const start = (0, import_babel_utils35.getStart)(file, markoText);
+    const end = (0, import_babel_utils35.getEnd)(file, markoText);
     let code = markoText.value;
-    let map2;
+    let map;
     if (resolveVirtualDependency && sourceMaps && start !== null && end !== null) {
       const magicString = new import_magic_string.default(file.code, { filename });
       magicString.remove(0, start);
       magicString.remove(end, file.code.length);
-      map2 = magicString.generateMap({
+      map = magicString.generateMap({
         source: filename,
         includeContent: true
       });
       if (sourceMaps === "inline" || sourceMaps === "both") {
         code += `
-/*# sourceMappingURL=${map2.toUrl()}*/`;
+/*# sourceMappingURL=${map.toUrl()}*/`;
         if (sourceMaps === "inline") {
-          map2 = void 0;
+          map = void 0;
         }
       }
     }
     const importPath = resolveVirtualDependency?.(filename, {
-      virtualPath: `./${import_path2.default.basename(filename) + ext}`,
+      virtualPath: `./${import_path3.default.basename(filename) + ext}`,
       code,
-      map: map2
+      map
     });
     if (importPath) {
       if (!node.var) {
@@ -7752,7 +7766,7 @@ var style_default = {
           import_compiler45.types.variableDeclaration("const", [
             import_compiler45.types.variableDeclarator(
               node.var,
-              (0, import_babel_utils34.importDefault)(file, importPath, "style")
+              (0, import_babel_utils35.importDefault)(file, importPath, "style")
             )
           ])
         );
@@ -7771,13 +7785,13 @@ var style_default = {
 
 // src/translator/core/try.ts
 var import_compiler46 = require("@marko/compiler");
-var import_babel_utils35 = require("@marko/compiler/babel-utils");
+var import_babel_utils36 = require("@marko/compiler/babel-utils");
 var try_default = {
   analyze(tag) {
-    (0, import_babel_utils35.assertNoVar)(tag);
-    (0, import_babel_utils35.assertNoArgs)(tag);
-    (0, import_babel_utils35.assertNoParams)(tag);
-    (0, import_babel_utils35.assertNoAttributes)(tag);
+    (0, import_babel_utils36.assertNoVar)(tag);
+    (0, import_babel_utils36.assertNoArgs)(tag);
+    (0, import_babel_utils36.assertNoParams)(tag);
+    (0, import_babel_utils36.assertNoAttributes)(tag);
     assertNoSpreadAttrs(tag);
     analyzeAttributeTags(tag);
     const { node } = tag;
@@ -7840,7 +7854,6 @@ function setAllSectionsParentIsOwner(tag) {
   const bodySection = getSectionForBody(tag.get("body"));
   if (bodySection) {
     setSectionParentIsOwner(bodySection, true);
-    setSubscriberBuilder(tag, (signal) => signal);
   }
 }
 
@@ -7920,7 +7933,7 @@ var document_type_default = {
 
 // src/translator/visitors/function.ts
 var import_compiler47 = require("@marko/compiler");
-var import_babel_utils36 = require("@marko/compiler/babel-utils");
+var import_babel_utils37 = require("@marko/compiler/babel-utils");
 var functionIdsBySection = /* @__PURE__ */ new WeakMap();
 var function_default = {
   analyze(fn) {
@@ -7936,7 +7949,7 @@ var function_default = {
     const name2 = extra.name = fn.node.id?.name || (isMarkoAttribute(markoRoot) ? markoRoot.node.default ? import_compiler47.types.toIdentifier(
       markoRoot.parentPath.has("var") ? markoRoot.parentPath.get("var") : markoRoot.parentPath.get("name")
     ) : markoRoot.node.name : import_compiler47.types.isVariableDeclarator(fn.parent) && import_compiler47.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : "anonymous");
-    if (isMarkoAttribute(markoRoot) && ((0, import_babel_utils36.isNativeTag)(markoRoot.parentPath) && /^on[A-Z-]/.test(markoRoot.node.name) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"))) {
+    if (isMarkoAttribute(markoRoot) && ((0, import_babel_utils37.isNativeTag)(markoRoot.parentPath) && /^on[A-Z-]/.test(markoRoot.node.name) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"))) {
       return;
     }
     const {
@@ -7957,7 +7970,7 @@ var function_default = {
       id = `_${index}`;
     }
     extra.section = section;
-    extra.registerId = (0, import_babel_utils36.getTemplateId)(
+    extra.registerId = (0, import_babel_utils37.getTemplateId)(
       markoOpts,
       filename,
       `${section.id}/${name2 + id}`
@@ -7975,18 +7988,18 @@ function isFunction(fn, isStatic2) {
       return false;
   }
 }
-function isMarkoAttribute(path4) {
-  return path4 ? path4.isMarkoAttribute() : false;
+function isMarkoAttribute(path5) {
+  return path5 ? path5.isMarkoAttribute() : false;
 }
 
 // src/translator/visitors/import-declaration.ts
-var import_babel_utils37 = require("@marko/compiler/babel-utils");
+var import_babel_utils38 = require("@marko/compiler/babel-utils");
 var import_declaration_default = {
   analyze(importDecl) {
     const { node } = importDecl;
     const { source } = node;
     const { value } = source;
-    const tagImport = (0, import_babel_utils37.resolveTagImport)(importDecl, value);
+    const tagImport = (0, import_babel_utils38.resolveTagImport)(importDecl, value);
     if (tagImport) {
       node.extra ??= {};
       node.extra.tagImport = tagImport;
@@ -8156,7 +8169,11 @@ var referenced_identifier_default = {
   analyze(identifier) {
     const { name: name2 } = identifier.node;
     if (identifier.scope.hasBinding(name2)) return;
-    if (name2 === "$global" || name2 === "$signal") {
+    if (name2 === "$global") {
+      setReferencesScope(identifier);
+    } else if (name2 === "$signal") {
+      const section = getOrCreateSection(identifier);
+      section.hasAbortSignal = true;
       setReferencesScope(identifier);
     }
   },
@@ -8177,13 +8194,6 @@ var referenced_identifier_default = {
         break;
       case "$signal":
         if (isOutputHTML()) {
-          const section = getSection(identifier);
-          if (!section.hasCleanup) {
-            section.hasCleanup = true;
-            const exprRoot = getExprRoot(identifier);
-            const write2 = writeTo(exprRoot);
-            write2`${callRuntime("markResumeCleanup", getScopeIdIdentifier(section))}`;
-          }
           identifier.replaceWith(
             import_compiler49.types.callExpression(
               import_compiler49.types.arrowFunctionExpression(
@@ -8269,20 +8279,20 @@ var scriptlet_default = {
 
 // src/translator/visitors/tag/index.ts
 var import_compiler53 = require("@marko/compiler");
-var import_babel_utils41 = require("@marko/compiler/babel-utils");
+var import_babel_utils42 = require("@marko/compiler/babel-utils");
 
 // src/translator/visitors/tag/attribute-tag.ts
 var import_compiler50 = require("@marko/compiler");
-var import_babel_utils38 = require("@marko/compiler/babel-utils");
+var import_babel_utils39 = require("@marko/compiler/babel-utils");
 var attribute_tag_default = {
   analyze: {
     enter(tag) {
-      (0, import_babel_utils38.assertNoVar)(tag);
-      (0, import_babel_utils38.assertNoArgs)(tag);
+      (0, import_babel_utils39.assertNoVar)(tag);
+      (0, import_babel_utils39.assertNoArgs)(tag);
       const body = tag.get("body");
       startSection(body);
       trackParamsReferences(body, 3 /* param */);
-      if (!(0, import_babel_utils38.findParentTag)(tag)) {
+      if (!(0, import_babel_utils39.findParentTag)(tag)) {
         throw tag.get("name").buildCodeFrameError("@tags must be nested within another tag.");
       }
     }
@@ -8304,15 +8314,15 @@ var attribute_tag_default = {
 
 // src/translator/visitors/tag/custom-tag.ts
 var import_compiler51 = require("@marko/compiler");
-var import_babel_utils39 = require("@marko/compiler/babel-utils");
-var import_path3 = __toESM(require("path"));
+var import_babel_utils40 = require("@marko/compiler/babel-utils");
+var import_path4 = __toESM(require("path"));
 var kChildScopeBinding = Symbol("custom tag child scope");
 var custom_tag_default = {
   analyze: {
     enter(tag) {
-      (0, import_babel_utils39.assertAttributesOrSingleArg)(tag);
+      (0, import_babel_utils40.assertAttributesOrSingleArg)(tag);
       analyzeAttributeTags(tag);
-      const templateFile = (0, import_babel_utils39.getTagTemplate)(tag);
+      const templateFile = (0, import_babel_utils40.getTagTemplate)(tag);
       if (!templateFile) {
         const tagName = getTagName(tag);
         if (tagName && tag.scope.hasBinding(tagName)) {
@@ -8335,7 +8345,7 @@ var custom_tag_default = {
         void 0,
         tagExtra
       );
-      const childFile = (0, import_babel_utils39.loadFileForTag)(tag);
+      const childFile = (0, import_babel_utils40.loadFileForTag)(tag);
       if (childFile.opts.filename === tag.hub.file.opts.filename) {
         mergeReferences(section, tag.node, getAllTagReferenceNodes(tag.node));
       } else {
@@ -8373,7 +8383,7 @@ function translateHTML(tag) {
   writeHTMLResumeStatements(tagBody);
   if (import_compiler51.types.isStringLiteral(node.name)) {
     const relativePath = getTagRelativePath(tag);
-    tagIdentifier = isCircularRequest(tag.hub.file, relativePath) ? htmlRendererIdentifier : (0, import_babel_utils39.importDefault)(tag.hub.file, relativePath, getTagName(tag));
+    tagIdentifier = isCircularRequest(tag.hub.file, relativePath) ? htmlRendererIdentifier : (0, import_babel_utils40.importDefault)(tag.hub.file, relativePath, getTagName(tag));
   } else {
     tagIdentifier = node.name;
   }
@@ -8390,7 +8400,7 @@ function translateHTML(tag) {
     getScopeAccessorLiteral(childScopeBinding),
     callRuntime("writeExistingScope", peekScopeId)
   );
-  const inputExport = (0, import_babel_utils39.loadFileForTag)(tag)?.ast.program.extra?.domExports?.params?.props?.[0];
+  const inputExport = (0, import_babel_utils40.loadFileForTag)(tag)?.ast.program.extra?.domExports?.params?.props?.[0];
   const { properties, statements } = inputExport ? translateAttrs(tag, inputExport.props) : {
     properties: [],
     statements: []
@@ -8467,7 +8477,7 @@ function translateDOM(tag) {
   const { file } = tag.hub;
   const tagName = import_compiler51.types.isIdentifier(node.name) ? node.name.name : import_compiler51.types.isStringLiteral(node.name) ? node.name.value : "tag";
   const relativePath = getTagRelativePath(tag);
-  const childFile = (0, import_babel_utils39.loadFileForTag)(tag);
+  const childFile = (0, import_babel_utils40.loadFileForTag)(tag);
   const childExports = childFile.ast.program.extra.domExports;
   const tagIdentifier = importOrSelfReferenceName(
     file,
@@ -8484,10 +8494,10 @@ function translateDOM(tag) {
       childScopeBinding
     });
   }
-  write2`${(0, import_babel_utils39.importNamed)(file, relativePath, childExports.template, `${tagName}_template`)}`;
+  write2`${(0, import_babel_utils40.importNamed)(file, relativePath, childExports.template, `${tagName}_template`)}`;
   injectWalks(
     tag,
-    (0, import_babel_utils39.importNamed)(file, relativePath, childExports.walks, `${tagName}_walks`)
+    (0, import_babel_utils40.importNamed)(file, relativePath, childExports.walks, `${tagName}_walks`)
   );
   if (node.var) {
     const source = initValue(
@@ -8534,8 +8544,8 @@ function getTagRelativePath(tag) {
   } = tag;
   let relativePath;
   if (import_compiler51.types.isStringLiteral(node.name)) {
-    const template = (0, import_babel_utils39.getTagTemplate)(tag);
-    relativePath = template && (0, import_babel_utils39.resolveRelativePath)(file, template);
+    const template = (0, import_babel_utils40.getTagTemplate)(tag);
+    relativePath = template && (0, import_babel_utils40.resolveRelativePath)(file, template);
   } else if (node.extra?.tagNameImported) {
     relativePath = node.extra.tagNameImported;
   }
@@ -8581,7 +8591,7 @@ function analyzeAttrs(section, tag, templateExport) {
     const attrTags2 = tag.node.body.attributeTags ? tag.get("body").get("body") : tag.get("attributeTags");
     for (const child of attrTags2) {
       if (child.isMarkoTag()) {
-        if ((0, import_babel_utils39.isAttributeTag)(child)) {
+        if ((0, import_babel_utils40.isAttributeTag)(child)) {
           const attrTagMeta = attrTagLookup[getTagName(child)];
           const childAttrExports = templateExport.props[attrTagMeta.name];
           if (childAttrExports) {
@@ -8678,7 +8688,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
       );
     }
     let translatedProps = propsToExpression(translatedAttrs.properties);
-    if ((0, import_babel_utils39.isAttributeTag)(tag)) {
+    if ((0, import_babel_utils40.isAttributeTag)(tag)) {
       translatedProps = callRuntime("attrTag", translatedProps);
     }
     addValue(
@@ -8724,7 +8734,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
     for (let i = 0; i < attrTags2.length; i++) {
       const child = attrTags2[i];
       if (child.isMarkoTag()) {
-        if ((0, import_babel_utils39.isAttributeTag)(child)) {
+        if ((0, import_babel_utils40.isAttributeTag)(child)) {
           const attrTagMeta = attrTagLookup[getTagName(child)];
           const childAttrExport = templateExport.props[attrTagMeta.name];
           if (childAttrExport) {
@@ -8786,7 +8796,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
   if (bodySection && !seen.has("content")) {
     seen.add("content");
     if (templateExport.props.content) {
-      const contentExportIdentifier = (0, import_babel_utils39.importNamed)(
+      const contentExportIdentifier = (0, import_babel_utils40.importNamed)(
         tag.hub.file,
         info.relativePath,
         templateExport.props.content.id,
@@ -8890,11 +8900,11 @@ function importOrSelfReferenceName(file, request, name2, nameHint) {
   if (isCircularRequest(file, request)) {
     return import_compiler51.types.identifier(name2);
   }
-  return (0, import_babel_utils39.importNamed)(file, request, name2, nameHint);
+  return (0, import_babel_utils40.importNamed)(file, request, name2, nameHint);
 }
 function isCircularRequest(file, request) {
   const { filename } = file.opts;
-  return request === filename || request[0] === "." && import_path3.default.resolve(filename, "..", request) === filename;
+  return request === filename || request[0] === "." && import_path4.default.resolve(filename, "..", request) === filename;
 }
 function callStatement(id, ...args) {
   return import_compiler51.types.expressionStatement(callExpression(id, ...args));
@@ -8917,12 +8927,12 @@ function always() {
 
 // src/translator/visitors/tag/dynamic-tag.ts
 var import_compiler52 = require("@marko/compiler");
-var import_babel_utils40 = require("@marko/compiler/babel-utils");
+var import_babel_utils41 = require("@marko/compiler/babel-utils");
 var kDOMBinding = Symbol("dynamic tag dom binding");
 var dynamic_tag_default = {
   analyze: {
     enter(tag) {
-      (0, import_babel_utils40.assertAttributesOrArgs)(tag);
+      (0, import_babel_utils41.assertAttributesOrArgs)(tag);
       analyzeAttributeTags(tag);
       const section = getOrCreateSection(tag);
       const tagExtra = tag.node.extra ??= {};
@@ -8957,7 +8967,7 @@ var dynamic_tag_default = {
       const isClassAPI = extra.featureType === "class";
       let tagExpression = node.name;
       if (import_compiler52.types.isStringLiteral(tagExpression)) {
-        tagExpression = (0, import_babel_utils40.importDefault)(
+        tagExpression = (0, import_babel_utils41.importDefault)(
           tag.hub.file,
           getTagRelativePath(tag),
           tagExpression.value
@@ -8969,10 +8979,10 @@ var dynamic_tag_default = {
             "body",
             import_compiler52.types.expressionStatement(
               import_compiler52.types.callExpression(
-                (0, import_babel_utils40.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"),
+                (0, import_babel_utils41.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"),
                 [
                   import_compiler52.types.identifier(tagExpression.name),
-                  import_compiler52.types.stringLiteral((0, import_babel_utils40.loadFileForTag)(tag).metadata.marko.id)
+                  import_compiler52.types.stringLiteral((0, import_babel_utils41.loadFileForTag)(tag).metadata.marko.id)
                 ]
               )
             )
@@ -8983,7 +8993,7 @@ var dynamic_tag_default = {
             import_compiler52.types.expressionStatement(
               callRuntime(
                 "register",
-                import_compiler52.types.stringLiteral((0, import_babel_utils40.loadFileForTag)(tag).metadata.marko.id),
+                import_compiler52.types.stringLiteral((0, import_babel_utils41.loadFileForTag)(tag).metadata.marko.id),
                 import_compiler52.types.identifier(tagExpression.name)
               )
             )
@@ -9018,7 +9028,6 @@ var dynamic_tag_default = {
       if (isOutputHTML()) {
         flushInto(tag);
         writeHTMLResumeStatements(tag.get("body"));
-        const write2 = writeTo(tag);
         if (node.var) {
           if (!hasMultipleArgs && args.length === 1) {
             args.push(import_compiler52.types.unaryExpression("void", import_compiler52.types.numericLiteral(0)));
@@ -9042,12 +9051,14 @@ var dynamic_tag_default = {
         const dynamicScopeIdentifier = currentProgramPath.scope.generateUidIdentifier("dynamicScope");
         const dynamicTagExpr = hasMultipleArgs ? callRuntime(
           "dynamicTagArgs",
-          dynamicScopeIdentifier,
+          getScopeIdIdentifier(section),
+          getScopeAccessorLiteral(nodeRef2),
           tagExpression,
           import_compiler52.types.arrayExpression(args)
         ) : callRuntime(
           "dynamicTagInput",
-          dynamicScopeIdentifier,
+          getScopeIdIdentifier(section),
+          getScopeAccessorLiteral(nodeRef2),
           tagExpression,
           ...args
         );
@@ -9064,11 +9075,6 @@ var dynamic_tag_default = {
             import_compiler52.types.variableDeclarator(node.var, dynamicTagExpr)
           ]) : import_compiler52.types.expressionStatement(dynamicTagExpr)
         );
-        write2`${callRuntime(
-          "markResumeControlEnd",
-          getScopeIdIdentifier(section),
-          getScopeAccessorLiteral(nodeRef2)
-        )}`;
         getSerializedScopeProperties(section).set(
           import_compiler52.types.stringLiteral(
             getScopeAccessorLiteral(nodeRef2).value + "!" /* ConditionalScope */
@@ -9219,7 +9225,7 @@ var tag_default = {
   },
   analyze: {
     enter(tag) {
-      const tagDef = (0, import_babel_utils41.getTagDef)(tag);
+      const tagDef = (0, import_babel_utils42.getTagDef)(tag);
       const type = analyzeTagNameType(tag);
       const hook = tagDef?.analyzer?.hook;
       if (hook) {
@@ -9243,7 +9249,7 @@ var tag_default = {
       }
     },
     exit(tag) {
-      const hook = (0, import_babel_utils41.getTagDef)(tag)?.analyzer?.hook;
+      const hook = (0, import_babel_utils42.getTagDef)(tag)?.analyzer?.hook;
       if (hook) {
         exit(hook, tag);
         return;
@@ -9252,7 +9258,7 @@ var tag_default = {
   },
   translate: {
     enter(tag) {
-      const tagDef = (0, import_babel_utils41.getTagDef)(tag);
+      const tagDef = (0, import_babel_utils42.getTagDef)(tag);
       const extra = tag.node.extra;
       if (tagDef?.translator) {
         if (tagDef.translator.path) {
@@ -9269,7 +9275,7 @@ var tag_default = {
             );
           }
           if (attr2.node.modifier) {
-            if ((0, import_babel_utils41.isNativeTag)(attr2.parentPath)) {
+            if ((0, import_babel_utils42.isNativeTag)(attr2.parentPath)) {
               attr2.node.name += `:${attr2.node.modifier}`;
             } else {
               throw attr2.buildCodeFrameError(
@@ -9305,7 +9311,7 @@ var tag_default = {
       }
     },
     exit(tag) {
-      const translator = (0, import_babel_utils41.getTagDef)(tag)?.translator;
+      const translator = (0, import_babel_utils42.getTagDef)(tag)?.translator;
       if (translator) {
         exit(translator.hook, tag);
         return;