npm - marko - Versions diffs - 6.0.0-next.3.66 → 6.0.0-next.3.68 - Mend

marko 6.0.0-next.3.66 → 6.0.0-next.3.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/debug/dom.js +17 -23
package/dist/debug/dom.mjs +17 -23
package/dist/debug/html.js +26 -20
package/dist/debug/html.mjs +26 -20
package/dist/dom.js +17 -19
package/dist/dom.mjs +17 -19
package/dist/html/writer.d.ts +2 -3
package/dist/html.js +18 -10
package/dist/html.mjs +18 -10
package/dist/translator/index.js +888 -748
package/dist/translator/util/dynamic-sources.d.ts +18 -0
package/dist/translator/util/optional.d.ts +2 -0
package/dist/translator/util/references.d.ts +3 -3
package/dist/translator/util/sections.d.ts +3 -2
package/dist/translator/util/signals.d.ts +2 -2
package/package.json +1 -1
package/dist/translator/util/is-stateful.d.ts +0 -3

package/dist/translator/index.js CHANGED Viewed

@@ -109,7 +109,7 @@ var attrs_default = {
 };
 // src/translator/core/await.ts
-var import_compiler23 = require("@marko/compiler");
+var import_compiler24 = require("@marko/compiler");
 var import_babel_utils12 = require("@marko/compiler/babel-utils");
 // src/common/accessor.debug.ts
@@ -163,10 +163,10 @@ function evaluate(value) {
 }
 // src/translator/util/references.ts
-var import_compiler22 = require("@marko/compiler");
+var import_compiler23 = require("@marko/compiler");
 // src/translator/visitors/program/index.ts
-var import_compiler20 = require("@marko/compiler");
+var import_compiler21 = require("@marko/compiler");
 var import_babel_utils11 = require("@marko/compiler/babel-utils");
 var import_path2 = __toESM(require("path"));
@@ -853,6 +853,47 @@ var Sorted = class {
       }
     }
   }
+  findIndex(data, item) {
+    if (data) {
+      if (Array.isArray(data)) {
+        let max = data.length;
+        let pos = 0;
+        while (pos < max) {
+          const mid = pos + max >>> 1;
+          const compareResult = this.compare(data[mid], item);
+          if (compareResult === 0) return mid;
+          if (compareResult > 0) max = mid;
+          else pos = mid + 1;
+        }
+        return -1;
+      }
+      if (this.compare(data, item) === 0) {
+        return 0;
+      }
+    }
+    return -1;
+  }
+  isSuperset(superset, subset) {
+    if (!subset) {
+      return true;
+    }
+    if (!Array.isArray(subset)) {
+      return this.findIndex(superset, subset) !== -1;
+    }
+    if (!Array.isArray(superset)) {
+      return false;
+    }
+    const subLen = subset.length;
+    const supLen = superset.length;
+    if (subLen > supLen) {
+      return false;
+    }
+    for (let i = subLen; i--; ) {
+      const supIndex = this.findIndex(superset, subset[i]);
+      if (supIndex === -1 || supLen - supIndex <= i) return false;
+    }
+    return true;
+  }
 };
 function push(data, item) {
   if (data) {
@@ -1328,17 +1369,26 @@ function getNodeContentType(path5, extraMember, contentInfo) {
 var isSerializedSection = (section) => {
   return !(section.isBranch || section.downstreamBinding?.serialize === false);
 };
-var checkStatefulClosures = (section, immediateOnly) => {
-  return !!find(
-    section.referencedClosures,
-    (closure) => (!immediateOnly || section.parent === closure.section) && isStatefulReferences(closure)
-  );
-};
+function isSectionWithHoists(section) {
+  if (section.hoisted || section.isHoistThrough || section.referencedHoists)
+    return true;
+}
 function isImmediateOwner(section, binding) {
   return section.parent?.id === binding.section.id;
 }
+function isDirectClosure(section, closure) {
+  return section.isBranch && isImmediateOwner(section, closure);
+}
 function isDynamicClosure(section, closure) {
-  return !section.isBranch || !isImmediateOwner(section, closure);
+  return !isDirectClosure(section, closure);
+}
+function getDirectClosures(section) {
+  if (section.isBranch) {
+    return filter(
+      section.referencedClosures,
+      (closure) => isImmediateOwner(section, closure)
+    );
+  }
 }
 function isSameOrChildSection(section, other) {
   do {
@@ -1380,7 +1430,7 @@ function isNativeNode(tag) {
 }
 // src/translator/visitors/program/dom.ts
-var import_compiler18 = require("@marko/compiler");
+var import_compiler19 = require("@marko/compiler");
 var import_babel_utils10 = require("@marko/compiler/babel-utils");
 // src/translator/util/get-style-file.ts
@@ -1420,7 +1470,7 @@ function escapeRegExp(str) {
 }
 // src/translator/util/signals.ts
-var import_compiler17 = require("@marko/compiler");
+var import_compiler18 = require("@marko/compiler");
 var import_babel_utils9 = require("@marko/compiler/babel-utils");
 // src/translator/core/return.ts
@@ -1878,7 +1928,9 @@ var return_default = {
           setSerializedProperty(
             section,
             getAccessorProp().TagVariableChange,
-            attrs2.valueChange
+            attrs2.valueChange,
+            true
+            // TODO: this should be based on the child actually mutating the tag variable.
           );
         }
         if (attrs2.value) {
@@ -1935,6 +1987,95 @@ var return_default = {
   ]
 };
+// src/translator/util/dynamic-sources.ts
+var import_compiler12 = require("@marko/compiler");
+function getDynamicSourcesForBinding(binding) {
+  if (binding.sources) {
+    if (Array.isArray(binding.sources) ? binding.sources.every(isInputBinding) : isInputBinding(binding.sources)) {
+      return binding.sources;
+    }
+    return true;
+  }
+}
+function getDynamicSourcesForReferences(referencedBindings) {
+  if (referencedBindings) {
+    let dynamicSources;
+    if (Array.isArray(referencedBindings)) {
+      for (const binding of referencedBindings) {
+        const newDynamicSources = getDynamicSourcesForBinding(binding);
+        if (newDynamicSources === true) return true;
+        dynamicSources = bindingUtil.union(dynamicSources, newDynamicSources);
+      }
+      return dynamicSources;
+    } else {
+      return getDynamicSourcesForBinding(referencedBindings);
+    }
+  }
+}
+function getDynamicSourcesForExtra(extra) {
+  if (isReferencedExtra(extra)) {
+    return getDynamicSourcesForReferences(extra.referencedBindings);
+  }
+}
+function getDynamicSourcesForExtras(extras) {
+  let allDynamicSources;
+  for (const extra of extras) {
+    const dynamicSources = getDynamicSourcesForExtra(extra);
+    if (dynamicSources === true) return true;
+    allDynamicSources = bindingUtil.union(allDynamicSources, dynamicSources);
+  }
+  return allDynamicSources;
+}
+function getDynamicSourcesForSection(section) {
+  const referenced = getDynamicSourcesForReferences(
+    section.upstreamExpression?.referencedBindings
+  );
+  const closures = getDynamicSourcesForReferences(getDirectClosures(section));
+  if (referenced || closures) {
+    return {
+      referenced,
+      closures,
+      all: referenced === true || closures === true ? true : bindingUtil.union(referenced, closures)
+    };
+  }
+}
+function getDynamicSourcesForSections(sections) {
+  let first;
+  let merged;
+  for (const section of sections) {
+    const sources = section && getDynamicSourcesForSection(section);
+    if (sources) {
+      if (merged) {
+        merged.referenced = mergeDynamicSources(
+          merged.referenced,
+          sources.referenced
+        );
+        merged.closures = mergeDynamicSources(
+          merged.closures,
+          sources.closures
+        );
+        merged.all = mergeDynamicSources(merged.all, sources.all);
+      } else if (first) {
+        merged = {
+          referenced: mergeDynamicSources(first.referenced, sources.referenced),
+          closures: mergeDynamicSources(first.closures, sources.closures),
+          all: mergeDynamicSources(first.all, sources.all)
+        };
+      } else {
+        first = sources;
+      }
+    }
+  }
+  return merged || first;
+}
+function mergeDynamicSources(a, b) {
+  if (a === true || b === true) return true;
+  return bindingUtil.union(a, b);
+}
+function isInputBinding(binding) {
+  return binding.type === 2 /* input */;
+}
 // src/translator/util/for-each-identifier.ts
 function forEachIdentifier(node, cb) {
   switch (node.type) {
@@ -1978,10 +2119,10 @@ function forEachIdentifier(node, cb) {
 }
 // src/translator/util/get-defined-binding-expression.ts
-var import_compiler12 = require("@marko/compiler");
+var import_compiler13 = require("@marko/compiler");
 function getDeclaredBindingExpression(binding) {
   if (binding.declared || !binding.upstreamAlias) {
-    return import_compiler12.types.identifier(binding.name);
+    return import_compiler13.types.identifier(binding.name);
   } else if (binding.property !== void 0) {
     return toMemberExpression(
       getDeclaredBindingExpression(binding.upstreamAlias),
@@ -1994,10 +2135,10 @@ function getDeclaredBindingExpression(binding) {
 }
 // src/translator/util/scope-read.ts
-var import_compiler13 = require("@marko/compiler");
+var import_compiler14 = require("@marko/compiler");
 function createScopeReadPattern(section, referencedBindings) {
   const rootDepth = section.depth;
-  const rootPattern = import_compiler13.types.objectPattern([]);
+  const rootPattern = import_compiler14.types.objectPattern([]);
   let nestedPatterns;
   forEach(referencedBindings, (ref) => {
     const propertyValue = ref.name;
@@ -2011,9 +2152,9 @@ function createScopeReadPattern(section, referencedBindings) {
       let i = nestedPatterns.length;
       let prev = nestedPatterns[i - 1];
       for (; i <= relativeDepth; i++) {
-        const nestedPattern = import_compiler13.types.objectPattern([]);
+        const nestedPattern = import_compiler14.types.objectPattern([]);
         prev.properties.push(
-          import_compiler13.types.objectProperty(import_compiler13.types.identifier("_"), nestedPattern)
+          import_compiler14.types.objectProperty(import_compiler14.types.identifier("_"), nestedPattern)
         );
         nestedPatterns.push(nestedPattern);
         prev = nestedPattern;
@@ -2021,9 +2162,9 @@ function createScopeReadPattern(section, referencedBindings) {
       pattern = nestedPatterns[relativeDepth];
     }
     pattern.properties.push(
-      import_compiler13.types.objectProperty(
+      import_compiler14.types.objectProperty(
         toPropertyName(propertyKey),
-        import_compiler13.types.identifier(propertyValue),
+        import_compiler14.types.identifier(propertyValue),
         false,
         isShorthand
       )
@@ -2032,10 +2173,10 @@ function createScopeReadPattern(section, referencedBindings) {
   return rootPattern;
 }
 function getScopeExpression(section, targetSection) {
-  let scope = scopeIdentifier ?? import_compiler13.types.identifier("undefined");
+  let scope = scopeIdentifier ?? import_compiler14.types.identifier("undefined");
   const diff = section.depth - targetSection.depth;
   for (let i = 0; i < diff; i++) {
-    scope = import_compiler13.types.memberExpression(scope, import_compiler13.types.identifier("_"));
+    scope = import_compiler14.types.memberExpression(scope, import_compiler14.types.identifier("_"));
   }
   if (diff < 0) {
     throw new Error("Unable to find scope for reference.");
@@ -2044,7 +2185,7 @@ function getScopeExpression(section, targetSection) {
 }
 function createScopeReadExpression(section, reference) {
   const propName = toPropertyName(getScopeAccessor(reference));
-  return import_compiler13.types.memberExpression(
+  return import_compiler14.types.memberExpression(
     getScopeExpression(section, reference.section),
     propName,
     propName.type !== "Identifier"
@@ -2052,7 +2193,7 @@ function createScopeReadExpression(section, reference) {
 }
 // src/translator/util/simplify-fn.ts
-var import_compiler14 = require("@marko/compiler");
+var import_compiler15 = require("@marko/compiler");
 function simplifyFunction(fn) {
   switch (fn.type) {
     case "FunctionDeclaration":
@@ -2060,7 +2201,7 @@ function simplifyFunction(fn) {
     case "ArrowFunctionExpression":
       return fn;
     default:
-      return import_compiler14.types.functionExpression(
+      return import_compiler15.types.functionExpression(
         null,
         fn.params,
         fn.body,
@@ -2071,9 +2212,9 @@ function simplifyFunction(fn) {
 }
 // src/translator/util/to-first-expression-or-block.ts
-var import_compiler15 = require("@marko/compiler");
+var import_compiler16 = require("@marko/compiler");
 function toFirstExpressionOrBlock(stmts) {
-  if (stmts.length === 1 && import_compiler15.types.isExpressionStatement(stmts[0])) {
+  if (stmts.length === 1 && import_compiler16.types.isExpressionStatement(stmts[0])) {
     const { expression } = stmts[0];
     switch (expression.type) {
       case "ObjectExpression":
@@ -2083,20 +2224,20 @@ function toFirstExpressionOrBlock(stmts) {
         return expression;
     }
   }
-  return import_compiler15.types.blockStatement(stmts);
+  return import_compiler16.types.blockStatement(stmts);
 }
 function toParenthesizedExpressionIfNeeded(expr) {
   switch (expr.type) {
     case "ObjectExpression":
     case "AssignmentExpression":
-      return import_compiler15.types.parenthesizedExpression(expr);
+      return import_compiler16.types.parenthesizedExpression(expr);
     default:
       return expr;
   }
 }
 // src/translator/util/traverse.ts
-var import_compiler16 = require("@marko/compiler");
+var import_compiler17 = require("@marko/compiler");
 var skip = Symbol("skip");
 function traverseReplace(container, key, enter3) {
   const node = container[key];
@@ -2106,7 +2247,7 @@ function traverseReplace(container, key, enter3) {
         traverseReplace(node, i, enter3);
       }
     } else {
-      const keys = import_compiler16.types.VISITOR_KEYS[node.type];
+      const keys = import_compiler17.types.VISITOR_KEYS[node.type];
       for (let i = keys.length; i--; ) {
         traverseReplace(node, keys[i], enter3);
       }
@@ -2130,7 +2271,7 @@ function traverseContains(node, check) {
         case skip:
           return false;
       }
-      for (const key of import_compiler16.types.VISITOR_KEYS[node.type]) {
+      for (const key of import_compiler17.types.VISITOR_KEYS[node.type]) {
         if (traverseContains(node[key], check)) {
           return true;
         }
@@ -2149,13 +2290,26 @@ var [getClosureSignalBuilder, _setClosureSignalBuilder] = createSectionState("qu
 function setClosureSignalBuilder(tag, builder) {
   _setClosureSignalBuilder(getSectionForBody(tag.get("body")), builder);
 }
-var [forceResumeScope, _setForceResumeScope] = createSectionState("forceResumeScope");
-function setForceResumeScope(section) {
-  _setForceResumeScope(section, true);
+var [serializeSectionReason, setSerializeSectionReason] = createSectionState("serializeSectionSources");
+function serializeSectionIfNeeded(section, reason) {
+  if (reason) {
+    const existingReason = serializeSectionReason(section);
+    if (existingReason === true) return;
+    if (!existingReason || reason === true) {
+      setSerializeSectionReason(section, reason);
+    } else {
+      setSerializeSectionReason(
+        section,
+        bindingUtil.union(existingReason, reason)
+      );
+    }
+  }
 }
 var [getSerializedScopeProperties] = createSectionState("serializedScopeProperties", () => /* @__PURE__ */ new Map());
-function setSerializedProperty(section, key, value) {
-  getSerializedScopeProperties(section).set(key, value);
+function setSerializedProperty(section, key, expression, reason) {
+  if (reason) {
+    getSerializedScopeProperties(section).set(key, { expression, reason });
+  }
 }
 var [getSectionWriteScopeBuilder, setSectionWriteScopeBuilder] = createSectionState(
   "sectionWriteScopeBuilder"
@@ -2187,7 +2341,7 @@ function getHoistFunctionIdentifier(hoistedBinding) {
   return identifier;
 }
 var unimplementedBuild = () => {
-  return import_compiler17.types.stringLiteral("SIGNAL NOT INITIALIZED");
+  return import_compiler18.types.stringLiteral("SIGNAL NOT INITIALIZED");
 };
 function getSignal(section, referencedBindings, name2 = generateSignalName(referencedBindings)) {
   const signals = getSignals(section);
@@ -2197,7 +2351,7 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
     signals.set(
       referencedBindings,
       signal = {
-        identifier: exportName ? import_compiler17.types.identifier(exportName) : currentProgramPath.scope.generateUidIdentifier(
+        identifier: exportName ? import_compiler18.types.identifier(exportName) : currentProgramPath.scope.generateUidIdentifier(
           name2 + section.name.replace("_", "$")
         ),
         referencedBindings,
@@ -2254,13 +2408,13 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         const { id, scopeOffset } = intersectionMeta.get(referencedBindings);
         return callRuntime(
           "intersection",
-          import_compiler17.types.numericLiteral(id),
+          import_compiler18.types.numericLiteral(id),
           getSignalFn(
             signal,
             [scopeIdentifier],
             signal.renderReferencedBindings
           ),
-          scopeOffset || referencedBindings.length > 2 ? import_compiler17.types.numericLiteral(referencedBindings.length - 1) : void 0,
+          scopeOffset || referencedBindings.length > 2 ? import_compiler18.types.numericLiteral(referencedBindings.length - 1) : void 0,
           scopeOffset && getScopeAccessorLiteral(scopeOffset)
         );
       };
@@ -2268,14 +2422,14 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
       signal.build = () => {
         const render = getSignalFn(signal, [
           scopeIdentifier,
-          import_compiler17.types.identifier(referencedBindings.name)
+          import_compiler18.types.identifier(referencedBindings.name)
         ]);
         const closureSignalBuilder = getClosureSignalBuilder(section);
         return !closureSignalBuilder || isDynamicClosure(section, referencedBindings) ? callRuntime(
           "dynamicClosureRead",
           getScopeAccessorLiteral(referencedBindings),
           render,
-          isImmediateOwner(section, referencedBindings) ? void 0 : import_compiler17.types.arrowFunctionExpression(
+          isImmediateOwner(section, referencedBindings) ? void 0 : import_compiler18.types.arrowFunctionExpression(
             [scopeIdentifier],
             getScopeExpression(section, referencedBindings.section)
           )
@@ -2291,7 +2445,7 @@ function initValue(binding, runtimeHelper = "value") {
   signal.build = () => {
     const fn = getSignalFn(signal, [
       scopeIdentifier,
-      import_compiler17.types.identifier(binding.name)
+      import_compiler18.types.identifier(binding.name)
     ]);
     const isParamBinding = !binding.upstreamAlias && (binding.type === 3 /* param */ || binding.type === 2 /* input */);
     const isNakedAlias = binding.upstreamAlias && !binding.property;
@@ -2326,8 +2480,8 @@ function getSignalFn(signal, params, referencedBindings) {
     for (const alias of binding.aliases) {
       const aliasSignal = getSignal(alias.section, alias);
       signal.render.push(
-        import_compiler17.types.expressionStatement(
-          import_compiler17.types.callExpression(aliasSignal.identifier, [
+        import_compiler18.types.expressionStatement(
+          import_compiler18.types.callExpression(aliasSignal.identifier, [
             scopeIdentifier2,
             valueIdentifier,
             ...getTranslatedExtraArgs(aliasSignal)
@@ -2338,8 +2492,8 @@ function getSignalFn(signal, params, referencedBindings) {
     for (const [key, alias] of binding.propertyAliases) {
       const aliasSignal = getSignal(alias.section, alias);
       signal.render.push(
-        import_compiler17.types.expressionStatement(
-          import_compiler17.types.callExpression(aliasSignal.identifier, [
+        import_compiler18.types.expressionStatement(
+          import_compiler18.types.callExpression(aliasSignal.identifier, [
             scopeIdentifier2,
             toMemberExpression(valueIdentifier, key, binding.nullable),
             ...getTranslatedExtraArgs(aliasSignal)
@@ -2350,8 +2504,8 @@ function getSignalFn(signal, params, referencedBindings) {
   }
   for (const value of signal.values) {
     signal.render.push(
-      import_compiler17.types.expressionStatement(
-        import_compiler17.types.callExpression(value.signal.identifier, [
+      import_compiler18.types.expressionStatement(
+        import_compiler18.types.callExpression(value.signal.identifier, [
           value.scope,
           value.value,
           ...getTranslatedExtraArgs(value.signal)
@@ -2361,14 +2515,14 @@ function getSignalFn(signal, params, referencedBindings) {
   }
   forEach(signal.intersection, (intersection) => {
     signal.render.push(
-      import_compiler17.types.expressionStatement(import_compiler17.types.callExpression(intersection, [scopeIdentifier2]))
+      import_compiler18.types.expressionStatement(import_compiler18.types.callExpression(intersection, [scopeIdentifier2]))
     );
   });
   if (isValueSignal) {
     let dynamicClosureArgs;
     let dynamicClosureSignalIdentifier;
     forEach(binding.closureSections, (closureSection) => {
-      if (isStatefulReferences(binding)) {
+      if (binding.sources) {
         if (isDynamicClosure(closureSection, binding)) {
           if (!dynamicClosureArgs) {
             dynamicClosureArgs = [];
@@ -2376,8 +2530,8 @@ function getSignalFn(signal, params, referencedBindings) {
               signal.identifier.name + "_closure"
             );
             signal.render.push(
-              import_compiler17.types.expressionStatement(
-                import_compiler17.types.callExpression(dynamicClosureSignalIdentifier, [
+              import_compiler18.types.expressionStatement(
+                import_compiler18.types.callExpression(dynamicClosureSignalIdentifier, [
                   scopeIdentifier2
                 ])
               )
@@ -2388,8 +2542,8 @@ function getSignalFn(signal, params, referencedBindings) {
           );
         } else {
           signal.render.push(
-            import_compiler17.types.expressionStatement(
-              import_compiler17.types.callExpression(getSignal(closureSection, binding).identifier, [
+            import_compiler18.types.expressionStatement(
+              import_compiler18.types.callExpression(getSignal(closureSection, binding).identifier, [
                 scopeIdentifier2
               ])
             )
@@ -2399,8 +2553,8 @@ function getSignalFn(signal, params, referencedBindings) {
     });
     if (dynamicClosureSignalIdentifier) {
       (signal.prependStatements ||= []).push(
-        import_compiler17.types.variableDeclaration("const", [
-          import_compiler17.types.variableDeclarator(
+        import_compiler18.types.variableDeclaration("const", [
+          import_compiler18.types.variableDeclarator(
             dynamicClosureSignalIdentifier,
             callRuntime("dynamicClosure", ...dynamicClosureArgs)
           )
@@ -2409,24 +2563,24 @@ function getSignalFn(signal, params, referencedBindings) {
     }
   }
   if (signal.effect.length) {
-    const effectIdentifier = import_compiler17.types.identifier(`${signal.identifier.name}_effect`);
+    const effectIdentifier = import_compiler18.types.identifier(`${signal.identifier.name}_effect`);
     signal.render.push(
-      import_compiler17.types.expressionStatement(
-        import_compiler17.types.callExpression(effectIdentifier, [scopeIdentifier2])
+      import_compiler18.types.expressionStatement(
+        import_compiler18.types.callExpression(effectIdentifier, [scopeIdentifier2])
       )
     );
   }
   if (referencedBindings) {
     signal.render.unshift(
-      import_compiler17.types.variableDeclaration("const", [
-        import_compiler17.types.variableDeclarator(
+      import_compiler18.types.variableDeclaration("const", [
+        import_compiler18.types.variableDeclarator(
           createScopeReadPattern(section, referencedBindings),
           scopeIdentifier2
         )
       ])
     );
   }
-  return import_compiler17.types.arrowFunctionExpression(params, import_compiler17.types.blockStatement(signal.render));
+  return import_compiler18.types.arrowFunctionExpression(params, import_compiler18.types.blockStatement(signal.render));
 }
 var hasTranslatedExtraArgs = /* @__PURE__ */ new WeakSet();
 var emptyExtraArgs = [];
@@ -2471,19 +2625,19 @@ function replaceNullishAndEmptyFunctionsWith0(args) {
   for (let i = args.length; i--; ) {
     const arg = args[i];
     if (!arg) {
-      args[i] = import_compiler17.types.numericLiteral(0);
-    } else if (import_compiler17.types.isArrowFunctionExpression(arg) && import_compiler17.types.isBlockStatement(arg.body)) {
+      args[i] = import_compiler18.types.numericLiteral(0);
+    } else if (import_compiler18.types.isArrowFunctionExpression(arg) && import_compiler18.types.isBlockStatement(arg.body)) {
       const body = arg.body.body;
       if (body.length === 0) {
-        args[i] = import_compiler17.types.numericLiteral(0);
-      } else if (body.length === 1 && import_compiler17.types.isExpressionStatement(body[0])) {
+        args[i] = import_compiler18.types.numericLiteral(0);
+      } else if (body.length === 1 && import_compiler18.types.isExpressionStatement(body[0])) {
         arg.body = toParenthesizedExpressionIfNeeded(body[0].expression);
       }
-    } else if (import_compiler17.types.isNullLiteral(arg) || import_compiler17.types.isUnaryExpression(arg) && arg.operator === "void") {
-      args[i] = import_compiler17.types.numericLiteral(0);
+    } else if (import_compiler18.types.isNullLiteral(arg) || import_compiler18.types.isUnaryExpression(arg) && arg.operator === "void") {
+      args[i] = import_compiler18.types.numericLiteral(0);
     }
   }
-  for (let i = args.length - 1; import_compiler17.types.isNumericLiteral(args[i]) && args[i].value === 0; ) {
+  for (let i = args.length - 1; import_compiler18.types.isNumericLiteral(args[i]) && args[i].value === 0; ) {
     args.length = i--;
   }
   return args;
@@ -2576,7 +2730,7 @@ function writeSignals(section) {
   forEach(section.hoisted, (binding) => {
     for (const hoistedBinding of binding.hoists.values()) {
       const accessors = [
-        binding.type === 0 /* dom */ ? import_compiler17.types.stringLiteral(
+        binding.type === 0 /* dom */ ? import_compiler18.types.stringLiteral(
           getAccessorPrefix().Getter + getScopeAccessor(binding)
         ) : getScopeAccessorLiteral(binding)
       ];
@@ -2591,12 +2745,12 @@ function writeSignals(section) {
       const hoistIdentifier = getHoistFunctionIdentifier(hoistedBinding);
       currentProgramPath.pushContainer(
         "body",
-        import_compiler17.types.variableDeclaration("const", [
-          import_compiler17.types.variableDeclarator(
+        import_compiler18.types.variableDeclaration("const", [
+          import_compiler18.types.variableDeclarator(
             hoistIdentifier,
             hoistedBinding.downstreamExpressions.size ? callRuntime(
               "register",
-              import_compiler17.types.stringLiteral(
+              import_compiler18.types.stringLiteral(
                 getResumeRegisterId(
                   hoistedBinding.section,
                   hoistedBinding,
@@ -2613,7 +2767,7 @@ function writeSignals(section) {
           hoistedBinding.section,
           void 0,
           initValue(hoistedBinding),
-          import_compiler17.types.callExpression(hoistIdentifier, [scopeIdentifier])
+          import_compiler18.types.callExpression(hoistIdentifier, [scopeIdentifier])
         );
       }
     }
@@ -2627,20 +2781,20 @@ function writeSignals(section) {
     let effectDeclarator;
     if (signal.effect.length) {
       traverseReplace(signal, "effect", replaceEffectNode);
-      const effectIdentifier = import_compiler17.types.identifier(`${signal.identifier.name}_effect`);
+      const effectIdentifier = import_compiler18.types.identifier(`${signal.identifier.name}_effect`);
       const referencedBindings = signal.effectReferencedBindings;
       const referencesScope = traverseContains(
         signal.effect,
         isScopeIdentifier
       );
-      effectDeclarator = import_compiler17.types.variableDeclarator(
+      effectDeclarator = import_compiler18.types.variableDeclarator(
         effectIdentifier,
         callRuntime(
           "effect",
-          import_compiler17.types.stringLiteral(
+          import_compiler18.types.stringLiteral(
             getResumeRegisterId(section, signal.referencedBindings)
           ),
-          import_compiler17.types.arrowFunctionExpression(
+          import_compiler18.types.arrowFunctionExpression(
             referencedBindings ? referencesScope ? [
               scopeIdentifier,
               createScopeReadPattern(section, referencedBindings)
@@ -2651,30 +2805,30 @@ function writeSignals(section) {
       );
     }
     let value = signal.build();
-    if (import_compiler17.types.isCallExpression(value)) {
+    if (import_compiler18.types.isCallExpression(value)) {
       replaceNullishAndEmptyFunctionsWith0(value.arguments);
     }
     if (signal.register) {
       value = callRuntime(
         "registerBoundSignal",
-        import_compiler17.types.stringLiteral(
+        import_compiler18.types.stringLiteral(
           getResumeRegisterId(section, signal.referencedBindings, "var")
         ),
         value
       );
     }
-    const signalDeclarator = import_compiler17.types.variableDeclarator(signal.identifier, value);
-    let signalDeclaration = !section.parent && !signal.referencedBindings && (import_compiler17.types.isFunctionExpression(value) || import_compiler17.types.isArrowFunctionExpression(value)) ? import_compiler17.types.functionDeclaration(
+    const signalDeclarator = import_compiler18.types.variableDeclarator(signal.identifier, value);
+    let signalDeclaration = !section.parent && !signal.referencedBindings && (import_compiler18.types.isFunctionExpression(value) || import_compiler18.types.isArrowFunctionExpression(value)) ? import_compiler18.types.functionDeclaration(
       signal.identifier,
       value.params,
-      import_compiler17.types.isExpression(value.body) ? import_compiler17.types.blockStatement([import_compiler17.types.expressionStatement(value.body)]) : value.body
-    ) : import_compiler17.types.variableDeclaration("const", [signalDeclarator]);
+      import_compiler18.types.isExpression(value.body) ? import_compiler18.types.blockStatement([import_compiler18.types.expressionStatement(value.body)]) : value.body
+    ) : import_compiler18.types.variableDeclaration("const", [signalDeclarator]);
     if (signal.export) {
-      signalDeclaration = import_compiler17.types.exportNamedDeclaration(signalDeclaration);
+      signalDeclaration = import_compiler18.types.exportNamedDeclaration(signalDeclaration);
     }
     const signalStatements = signal.prependStatements || [];
     if (effectDeclarator) {
-      signalStatements.push(import_compiler17.types.variableDeclaration("const", [effectDeclarator]));
+      signalStatements.push(import_compiler18.types.variableDeclaration("const", [effectDeclarator]));
     }
     signalStatements.push(signalDeclaration);
     currentProgramPath.pushContainer("body", signalStatements);
@@ -2688,7 +2842,7 @@ function writeRegisteredFns() {
       let fn;
       const params = registeredFn.referencedBindings ? registeredFn.referencesScope ? [
         scopeIdentifier,
-        import_compiler17.types.assignmentPattern(
+        import_compiler18.types.assignmentPattern(
           createScopeReadPattern(
             registeredFn.section,
             registeredFn.referencedBindings
@@ -2702,18 +2856,18 @@ function writeRegisteredFns() {
         )
       ] : registeredFn.referencesScope ? [scopeIdentifier] : void 0;
       if (params) {
-        fn = import_compiler17.types.functionDeclaration(
-          import_compiler17.types.identifier(registeredFn.id),
+        fn = import_compiler18.types.functionDeclaration(
+          import_compiler18.types.identifier(registeredFn.id),
           params,
-          import_compiler17.types.blockStatement(toReturnedFunction(registeredFn.node))
+          import_compiler18.types.blockStatement(toReturnedFunction(registeredFn.node))
         );
       } else if (registeredFn.node.type === "FunctionDeclaration" && registeredFn.node.id?.name === registeredFn.id) {
         fn = registeredFn.node;
       } else {
-        fn = import_compiler17.types.functionDeclaration(
-          import_compiler17.types.identifier(registeredFn.id),
+        fn = import_compiler18.types.functionDeclaration(
+          import_compiler18.types.identifier(registeredFn.id),
           registeredFn.node.params,
-          registeredFn.node.body.type === "BlockStatement" ? registeredFn.node.body : import_compiler17.types.blockStatement([import_compiler17.types.returnStatement(registeredFn.node.body)]),
+          registeredFn.node.body.type === "BlockStatement" ? registeredFn.node.body : import_compiler18.types.blockStatement([import_compiler18.types.returnStatement(registeredFn.node.body)]),
           registeredFn.node.generator,
           registeredFn.node.async
         );
@@ -2722,11 +2876,11 @@ function writeRegisteredFns() {
     }
     for (const registeredFn of registeredFns) {
       statements.push(
-        import_compiler17.types.expressionStatement(
+        import_compiler18.types.expressionStatement(
           callRuntime(
             "register",
-            import_compiler17.types.stringLiteral(registeredFn.registerId),
-            import_compiler17.types.identifier(registeredFn.id)
+            import_compiler18.types.stringLiteral(registeredFn.registerId),
+            import_compiler18.types.identifier(registeredFn.id)
           )
         )
       );
@@ -2738,7 +2892,7 @@ function writeRegisteredFns() {
 }
 function toReturnedFunction(rawFn) {
   const fn = simplifyFunction(rawFn);
-  return fn.type === "FunctionDeclaration" ? [fn, import_compiler17.types.returnStatement(fn.id)] : [import_compiler17.types.returnStatement(fn)];
+  return fn.type === "FunctionDeclaration" ? [fn, import_compiler18.types.returnStatement(fn.id)] : [import_compiler18.types.returnStatement(fn)];
 }
 function sortSignals(a, b) {
   const aReferencedBindings = getReferencedBindings(a);
@@ -2773,9 +2927,10 @@ function writeHTMLResumeStatements(path5) {
   forEach(section.assignments, serializeOwnersUntilBinding);
   forEach(section.referencedHoists, serializeOwnersUntilBinding);
   forEach(section.referencedClosures, (closure) => {
-    if (isStatefulReferences(closure)) {
+    if (closure.sources) {
+      const serializeReason = getDynamicSourcesForBinding(closure);
       serializeOwnersUntilBinding(closure);
-      setForceResumeScope(closure.section);
+      serializeSectionIfNeeded(closure.section, serializeReason);
       if (isDynamicClosure(section, closure)) {
         const closureSignal = getSignal(closure.section, closure);
         let identifier = htmlDynamicClosureInstancesIdentifier.get(closureSignal);
@@ -2787,23 +2942,25 @@ function writeHTMLResumeStatements(path5) {
             )
           );
           getHTMLSectionStatements(closure.section).push(
-            import_compiler17.types.variableDeclaration("const", [
-              import_compiler17.types.variableDeclarator(
+            import_compiler18.types.variableDeclaration("const", [
+              import_compiler18.types.variableDeclarator(
                 identifier,
-                import_compiler17.types.newExpression(import_compiler17.types.identifier("Set"), [])
+                import_compiler18.types.newExpression(import_compiler18.types.identifier("Set"), [])
               )
             ])
           );
           setSerializedProperty(
             closure.section,
             getAccessorPrefix().ClosureScopes + getScopeAccessor(closure),
-            identifier
+            identifier,
+            serializeReason
           );
         }
         setSerializedProperty(
           section,
           getAccessorPrefix().ClosureSignalIndex + getScopeAccessor(closure),
-          import_compiler17.types.numericLiteral(getDynamicClosureIndex(closure, section))
+          import_compiler18.types.numericLiteral(getDynamicClosureIndex(closure, section)),
+          serializeReason
         );
         addWriteScopeBuilder(
           section,
@@ -2817,13 +2974,13 @@ function writeHTMLResumeStatements(path5) {
     for (const hoistedBinding of binding.hoists.values()) {
       if (hoistedBinding.downstreamExpressions.size) {
         getHTMLSectionStatements(hoistedBinding.section).push(
-          import_compiler17.types.variableDeclaration("const", [
-            import_compiler17.types.variableDeclarator(
-              import_compiler17.types.identifier(hoistedBinding.name),
+          import_compiler18.types.variableDeclaration("const", [
+            import_compiler18.types.variableDeclarator(
+              import_compiler18.types.identifier(hoistedBinding.name),
               callRuntime(
                 "hoist",
                 getScopeIdIdentifier(hoistedBinding.section),
-                import_compiler17.types.stringLiteral(
+                import_compiler18.types.stringLiteral(
                   getResumeRegisterId(
                     hoistedBinding.section,
                     hoistedBinding,
@@ -2844,10 +3001,10 @@ function writeHTMLResumeStatements(path5) {
           );
           sectionDynamicSubscribers.add(currentSection);
           getHTMLSectionStatements(parentSection).push(
-            import_compiler17.types.variableDeclaration("const", [
-              import_compiler17.types.variableDeclarator(
+            import_compiler18.types.variableDeclaration("const", [
+              import_compiler18.types.variableDeclarator(
                 subscribersIdentifier,
-                import_compiler17.types.newExpression(import_compiler17.types.identifier("Set"), [])
+                import_compiler18.types.newExpression(import_compiler18.types.identifier("Set"), [])
               )
             ])
           );
@@ -2858,7 +3015,8 @@ function writeHTMLResumeStatements(path5) {
           setSerializedProperty(
             parentSection,
             getSectionInstancesAccessor(currentSection),
-            subscribersIdentifier
+            subscribersIdentifier,
+            true
           );
         }
         currentSection = parentSection;
@@ -2868,7 +3026,8 @@ function writeHTMLResumeStatements(path5) {
       setSerializedProperty(
         section,
         getScopeAccessor(binding),
-        getDeclaredBindingExpression(binding)
+        getDeclaredBindingExpression(binding),
+        true
       );
     }
   });
@@ -2877,11 +3036,11 @@ function writeHTMLResumeStatements(path5) {
       const signalRefs = allSignals[i].referencedBindings;
       path5.pushContainer(
         "body",
-        import_compiler17.types.expressionStatement(
+        import_compiler18.types.expressionStatement(
           callRuntime(
             "writeEffect",
             scopeIdIdentifier,
-            import_compiler17.types.stringLiteral(getResumeRegisterId(section, signalRefs))
+            import_compiler18.types.stringLiteral(getResumeRegisterId(section, signalRefs))
           )
         )
       );
@@ -2898,11 +3057,12 @@ function writeHTMLResumeStatements(path5) {
       );
     }
   });
-  for (const [key, value] of serializedLookup) {
-    serializedProperties.push(toObjectProperty(key, value));
+  for (const [key, { expression }] of serializedLookup) {
+    serializedProperties.push(toObjectProperty(key, expression));
   }
   const writeScopeBuilder = getSectionWriteScopeBuilder(section);
-  if (writeScopeBuilder || serializedProperties.length || forceResumeScope(section)) {
+  const forceSerializeReason = serializeSectionReason(section);
+  if (writeScopeBuilder || serializedProperties.length || forceSerializeReason) {
     for (const prop of serializedProperties) {
       if (prop.key.type === "Identifier" && prop.value.type === "Identifier" && prop.key.name === prop.value.name) {
         prop.shorthand = true;
@@ -2910,7 +3070,7 @@ function writeHTMLResumeStatements(path5) {
     }
     const writeScopeArgs = [
       scopeIdIdentifier,
-      import_compiler17.types.objectExpression(serializedProperties)
+      import_compiler18.types.objectExpression(serializedProperties)
     ];
     if (!isOptimize()) {
       let debugVars;
@@ -2924,31 +3084,31 @@ function writeHTMLResumeStatements(path5) {
           }
           root = root.upstreamAlias;
         }
-        const locExpr = root.loc && import_compiler17.types.stringLiteral(
+        const locExpr = root.loc && import_compiler18.types.stringLiteral(
           `${root.loc.start.line}:${root.loc.start.column + 1}`
         );
         (debugVars ||= []).push(
           toObjectProperty(
             getScopeAccessor(binding),
-            root !== binding ? import_compiler17.types.arrayExpression(
-              locExpr ? [import_compiler17.types.stringLiteral(root.name + access), locExpr] : [import_compiler17.types.stringLiteral(root.name + access)]
-            ) : locExpr || import_compiler17.types.numericLiteral(0)
+            root !== binding ? import_compiler18.types.arrayExpression(
+              locExpr ? [import_compiler18.types.stringLiteral(root.name + access), locExpr] : [import_compiler18.types.stringLiteral(root.name + access)]
+            ) : locExpr || import_compiler18.types.numericLiteral(0)
           )
         );
       });
       writeScopeArgs.push(
-        import_compiler17.types.stringLiteral(path5.hub.file.opts.filenameRelative),
-        section.loc && section.loc.start.line != null ? import_compiler17.types.stringLiteral(
+        import_compiler18.types.stringLiteral(path5.hub.file.opts.filenameRelative),
+        section.loc && section.loc.start.line != null ? import_compiler18.types.stringLiteral(
           `${section.loc.start.line}:${section.loc.start.column + 1}`
-        ) : import_compiler17.types.numericLiteral(0)
+        ) : import_compiler18.types.numericLiteral(0)
       );
       if (debugVars) {
-        writeScopeArgs.push(import_compiler17.types.objectExpression(debugVars));
+        writeScopeArgs.push(import_compiler18.types.objectExpression(debugVars));
       }
     }
     path5.pushContainer(
       "body",
-      import_compiler17.types.expressionStatement(
+      import_compiler18.types.expressionStatement(
         writeScopeBuilder ? writeScopeBuilder(callRuntime("writeScope", ...writeScopeArgs)) : callRuntime("writeScope", ...writeScopeArgs)
       )
     );
@@ -2957,7 +3117,7 @@ function writeHTMLResumeStatements(path5) {
   if (resumeClosestBranch2) {
     path5.pushContainer(
       "body",
-      import_compiler17.types.expressionStatement(
+      import_compiler18.types.expressionStatement(
         callRuntime("resumeClosestBranch", scopeIdIdentifier)
       )
     );
@@ -2965,15 +3125,15 @@ function writeHTMLResumeStatements(path5) {
   const additionalStatements = getHTMLSectionStatements(section);
   if (path5.get("body").length || additionalStatements.length) {
     path5.unshiftContainer("body", [
-      import_compiler17.types.variableDeclaration("const", [
-        import_compiler17.types.variableDeclarator(scopeIdIdentifier, callRuntime("nextScopeId"))
+      import_compiler18.types.variableDeclaration("const", [
+        import_compiler18.types.variableDeclarator(scopeIdIdentifier, callRuntime("nextScopeId"))
       ]),
       ...additionalStatements
     ]);
   }
   const returnIdentifier = getSectionReturnValueIdentifier(section);
   if (returnIdentifier !== void 0) {
-    path5.pushContainer("body", import_compiler17.types.returnStatement(returnIdentifier));
+    path5.pushContainer("body", import_compiler18.types.returnStatement(returnIdentifier));
   }
 }
 function serializeOwners(from, to) {
@@ -2984,10 +3144,10 @@ function serializeOwners(from, to) {
     const serialized = getSerializedScopeProperties(cur);
     cur = parent;
     if (!serialized.has("_")) {
-      serialized.set(
-        "_",
-        callRuntime("ensureScopeWithId", getScopeIdIdentifier(cur))
-      );
+      serialized.set("_", {
+        expression: callRuntime("ensureScopeWithId", getScopeIdIdentifier(cur)),
+        reason: true
+      });
     }
   }
 }
@@ -3020,14 +3180,14 @@ function replaceAssignedNode(node) {
         if (buildAssignment) {
           const replacement = buildAssignment(
             extra.section,
-            import_compiler17.types.binaryExpression(
+            import_compiler18.types.binaryExpression(
               node.operator === "++" ? "+" : "-",
               node.argument,
-              import_compiler17.types.numericLiteral(1)
+              import_compiler18.types.numericLiteral(1)
             )
           );
           if (!node.prefix) {
-            return import_compiler17.types.sequenceExpression([replacement, node.argument]);
+            return import_compiler18.types.sequenceExpression([replacement, node.argument]);
           }
           return replacement;
         }
@@ -3046,7 +3206,7 @@ function replaceAssignedNode(node) {
             if (buildAssignment) {
               return buildAssignment(
                 extra.section,
-                node.operator === "=" ? node.right : import_compiler17.types.binaryExpression(
+                node.operator === "=" ? node.right : import_compiler18.types.binaryExpression(
                   node.operator.slice(
                     0,
                     -1
@@ -3072,26 +3232,26 @@ function replaceAssignedNode(node) {
               );
               if (signal?.buildAssignment) {
                 id.name = currentProgramPath.scope.generateUid(id.name);
-                (params ||= []).push(import_compiler17.types.identifier(id.name));
+                (params ||= []).push(import_compiler18.types.identifier(id.name));
                 (assignments ||= []).push(
-                  signal.buildAssignment(extra.section, import_compiler17.types.identifier(id.name))
+                  signal.buildAssignment(extra.section, import_compiler18.types.identifier(id.name))
                 );
               }
             }
           });
           if (params && assignments) {
             const resultId = currentProgramPath.scope.generateUid("result");
-            return import_compiler17.types.callExpression(
-              import_compiler17.types.arrowFunctionExpression(
-                [import_compiler17.types.identifier(resultId), ...params],
-                import_compiler17.types.sequenceExpression([
-                  import_compiler17.types.assignmentExpression(
+            return import_compiler18.types.callExpression(
+              import_compiler18.types.arrowFunctionExpression(
+                [import_compiler18.types.identifier(resultId), ...params],
+                import_compiler18.types.sequenceExpression([
+                  import_compiler18.types.assignmentExpression(
                     "=",
                     node.left,
-                    import_compiler17.types.identifier(resultId)
+                    import_compiler18.types.identifier(resultId)
                   ),
                   ...assignments,
-                  import_compiler17.types.identifier(resultId)
+                  import_compiler18.types.identifier(resultId)
                 ])
               ),
               [node.right]
@@ -3108,15 +3268,15 @@ function replaceRegisteredFunctionNode(node) {
   switch (node.type) {
     case "ClassMethod": {
       const replacement = getRegisteredFnExpression(node);
-      return replacement && import_compiler17.types.classProperty(node.key, replacement);
+      return replacement && import_compiler18.types.classProperty(node.key, replacement);
     }
     case "ClassPrivateMethod": {
       const replacement = getRegisteredFnExpression(node);
-      return replacement && import_compiler17.types.classPrivateProperty(node.key, replacement);
+      return replacement && import_compiler18.types.classPrivateProperty(node.key, replacement);
     }
     case "ObjectMethod": {
       const replacement = getRegisteredFnExpression(node);
-      return replacement && import_compiler17.types.objectProperty(node.key, replacement);
+      return replacement && import_compiler18.types.objectProperty(node.key, replacement);
     }
     case "ArrowFunctionExpression":
     case "FunctionExpression": {
@@ -3125,8 +3285,8 @@ function replaceRegisteredFunctionNode(node) {
     case "FunctionDeclaration": {
       const replacement = getRegisteredFnExpression(node);
       if (replacement) {
-        return import_compiler17.types.variableDeclaration("const", [
-          import_compiler17.types.variableDeclarator(node.id, replacement)
+        return import_compiler18.types.variableDeclaration("const", [
+          import_compiler18.types.variableDeclarator(node.id, replacement)
         ]);
       }
       break;
@@ -3152,9 +3312,9 @@ function getRegisteredFnExpression(node) {
       referencedBindings
     });
     if (referencesScope || referencedBindings) {
-      return import_compiler17.types.callExpression(import_compiler17.types.identifier(id), [scopeIdentifier]);
+      return import_compiler18.types.callExpression(import_compiler18.types.identifier(id), [scopeIdentifier]);
     } else {
-      return import_compiler17.types.identifier(id);
+      return import_compiler18.types.identifier(id);
     }
   }
 }
@@ -3178,9 +3338,9 @@ var dom_default = {
       const section = getSectionForBody(program);
       const { walks, writes, setup } = getSectionMeta(section);
       const domExports = program.node.extra.domExports;
-      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 templateIdentifier = import_compiler19.types.identifier(domExports.template);
+      const walksIdentifier = import_compiler19.types.identifier(domExports.walks);
+      const setupIdentifier = import_compiler19.types.identifier(domExports.setup);
       const inputBinding = program.node.params[0].extra?.binding;
       const programInputSignal = inputBinding && bindingHasDownstreamExpressions(inputBinding) ? initValue(inputBinding) : void 0;
       const styleFile = getStyleFile(program.hub.file);
@@ -3191,17 +3351,17 @@ var dom_default = {
         if (childSection !== section) {
           const tagParamsSignal = childSection.params && initValue(childSection.params);
           const { walks: walks2, writes: writes2, setup: setup2 } = getSectionMeta(childSection);
-          const identifier = import_compiler18.types.identifier(childSection.name);
-          const referencedClosures = childSection.referencedClosures ? import_compiler18.types.arrowFunctionExpression(
+          const identifier = import_compiler19.types.identifier(childSection.name);
+          const referencedClosures = childSection.referencedClosures ? import_compiler19.types.arrowFunctionExpression(
             [scopeIdentifier],
             toFirstExpressionOrBlock(
               map(childSection.referencedClosures, (closure) => {
                 const closureSignal = getSignal(childSection, closure);
-                return import_compiler18.types.expressionStatement(
-                  import_compiler18.types.callExpression(
-                    isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler18.types.memberExpression(
+                return import_compiler19.types.expressionStatement(
+                  import_compiler19.types.callExpression(
+                    isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler19.types.memberExpression(
                       closureSignal.identifier,
-                      import_compiler18.types.identifier("_")
+                      import_compiler19.types.identifier("_")
                     ),
                     [scopeIdentifier]
                   )
@@ -3220,7 +3380,7 @@ var dom_default = {
             ])
           ) : callRuntime(
             isSerializedSection(childSection) ? "registerContent" : "createContent",
-            import_compiler18.types.stringLiteral(getResumeRegisterId(childSection, "renderer")),
+            import_compiler19.types.stringLiteral(getResumeRegisterId(childSection, "renderer")),
             ...replaceNullishAndEmptyFunctionsWith0([
               writes2,
               walks2,
@@ -3232,8 +3392,8 @@ var dom_default = {
           );
           writeSignals(childSection);
           program.node.body.push(
-            import_compiler18.types.variableDeclaration("const", [
-              import_compiler18.types.variableDeclarator(identifier, renderer)
+            import_compiler19.types.variableDeclaration("const", [
+              import_compiler19.types.variableDeclarator(identifier, renderer)
             ])
           );
         }
@@ -3242,36 +3402,36 @@ var dom_default = {
       writeRegisteredFns();
       if (!setup) {
         program.node.body.unshift(
-          import_compiler18.types.exportNamedDeclaration(
-            import_compiler18.types.variableDeclaration("const", [
-              import_compiler18.types.variableDeclarator(
+          import_compiler19.types.exportNamedDeclaration(
+            import_compiler19.types.variableDeclaration("const", [
+              import_compiler19.types.variableDeclarator(
                 setupIdentifier,
-                import_compiler18.types.arrowFunctionExpression([], import_compiler18.types.blockStatement([]))
+                import_compiler19.types.arrowFunctionExpression([], import_compiler19.types.blockStatement([]))
               )
             ])
           )
         );
       }
       program.node.body.unshift(
-        import_compiler18.types.exportNamedDeclaration(
-          import_compiler18.types.variableDeclaration("const", [
-            import_compiler18.types.variableDeclarator(
+        import_compiler19.types.exportNamedDeclaration(
+          import_compiler19.types.variableDeclaration("const", [
+            import_compiler19.types.variableDeclarator(
               templateIdentifier,
-              writes || import_compiler18.types.stringLiteral("")
+              writes || import_compiler19.types.stringLiteral("")
             )
           ])
         ),
-        import_compiler18.types.exportNamedDeclaration(
-          import_compiler18.types.variableDeclaration("const", [
-            import_compiler18.types.variableDeclarator(walksIdentifier, walks || import_compiler18.types.stringLiteral(""))
+        import_compiler19.types.exportNamedDeclaration(
+          import_compiler19.types.variableDeclaration("const", [
+            import_compiler19.types.variableDeclarator(walksIdentifier, walks || import_compiler19.types.stringLiteral(""))
           ])
         )
       );
       program.node.body.push(
-        import_compiler18.types.exportDefaultDeclaration(
+        import_compiler19.types.exportDefaultDeclaration(
           callRuntime(
             "createTemplate",
-            import_compiler18.types.stringLiteral(program.hub.file.metadata.marko.id),
+            import_compiler19.types.stringLiteral(program.hub.file.metadata.marko.id),
             templateIdentifier,
             walksIdentifier,
             setupIdentifier,
@@ -3284,7 +3444,7 @@ var dom_default = {
 };
 // src/translator/visitors/program/html.ts
-var import_compiler19 = require("@marko/compiler");
+var import_compiler20 = require("@marko/compiler");
 // src/translator/util/is-static.ts
 function isStatic(path5) {
@@ -3323,22 +3483,22 @@ var html_default = {
         }
       }
       const contentId = templateContentIdentifierForProgram.get(program);
-      const contentFn = import_compiler19.types.arrowFunctionExpression(
-        [import_compiler19.types.identifier("input")],
-        import_compiler19.types.blockStatement(renderContent)
+      const contentFn = import_compiler20.types.arrowFunctionExpression(
+        [import_compiler20.types.identifier("input")],
+        import_compiler20.types.blockStatement(renderContent)
       );
-      const exportDefault = import_compiler19.types.exportDefaultDeclaration(
+      const exportDefault = import_compiler20.types.exportDefaultDeclaration(
         callRuntime(
           "createTemplate",
-          import_compiler19.types.stringLiteral(program.hub.file.metadata.marko.id),
-          contentId ? import_compiler19.types.identifier(contentId) : contentFn
+          import_compiler20.types.stringLiteral(program.hub.file.metadata.marko.id),
+          contentId ? import_compiler20.types.identifier(contentId) : contentFn
         )
       );
       program.pushContainer(
         "body",
         contentId ? [
-          import_compiler19.types.variableDeclaration("const", [
-            import_compiler19.types.variableDeclarator(import_compiler19.types.identifier(contentId), contentFn)
+          import_compiler20.types.variableDeclaration("const", [
+            import_compiler20.types.variableDeclarator(import_compiler20.types.identifier(contentId), contentFn)
           ]),
           exportDefault
         ] : exportDefault
@@ -3364,15 +3524,15 @@ function replaceRegisteredFunctionNode2(node, container) {
   switch (node.type) {
     case "ClassMethod": {
       const replacement = getRegisteredFnExpression2(node);
-      return replacement && import_compiler19.types.classProperty(node.key, replacement);
+      return replacement && import_compiler20.types.classProperty(node.key, replacement);
     }
     case "ClassPrivateMethod": {
       const replacement = getRegisteredFnExpression2(node);
-      return replacement && import_compiler19.types.classPrivateProperty(node.key, replacement);
+      return replacement && import_compiler20.types.classPrivateProperty(node.key, replacement);
     }
     case "ObjectMethod": {
       const replacement = getRegisteredFnExpression2(node);
-      return replacement && import_compiler19.types.objectProperty(node.key, replacement);
+      return replacement && import_compiler20.types.objectProperty(node.key, replacement);
     }
     case "FunctionDeclaration": {
       const { extra } = node;
@@ -3409,11 +3569,11 @@ function addRegisteredDeclarations(body) {
   if (registeredFnDeclarations) {
     for (const { id, registerId } of registeredFnDeclarations) {
       body.push(
-        import_compiler19.types.expressionStatement(
+        import_compiler20.types.expressionStatement(
           callRuntime(
             "register",
-            import_compiler19.types.identifier(id),
-            import_compiler19.types.stringLiteral(registerId)
+            import_compiler20.types.identifier(id),
+            import_compiler20.types.stringLiteral(registerId)
           )
         )
       );
@@ -3426,7 +3586,7 @@ function getRegisteredFnExpression2(node) {
     return callRuntime(
       "register",
       simplifyFunction(node),
-      import_compiler19.types.stringLiteral(extra.registerId),
+      import_compiler20.types.stringLiteral(extra.registerId),
       (extra.referencedBindingsInFunction || extra.referencesScope) && getScopeIdIdentifier(extra.section)
     );
   }
@@ -3444,7 +3604,7 @@ var program_default = {
   migrate: {
     enter(program) {
       previousProgramPath.set(program, currentProgramPath);
-      program.node.params = [import_compiler20.types.identifier("input")];
+      program.node.params = [import_compiler21.types.identifier("input")];
       currentProgramPath = program;
     },
     exit() {
@@ -3527,7 +3687,7 @@ var program_default = {
             body.push(child);
           }
         }
-        body[0] ??= import_compiler20.types.importDeclaration([], import_compiler20.types.stringLiteral(compatFile));
+        body[0] ??= import_compiler21.types.importDeclaration([], import_compiler21.types.stringLiteral(compatFile));
         program.node.body = body;
       }
       currentProgramPath = previousProgramPath.get(currentProgramPath);
@@ -3618,7 +3778,7 @@ function isFunction(path5) {
 }
 // src/translator/util/is-invoked-function.ts
-var import_compiler21 = require("@marko/compiler");
+var import_compiler22 = require("@marko/compiler");
 function isInvokedFunction(expr) {
   let curPath = expr;
   while (curPath) {
@@ -3661,7 +3821,7 @@ function createBinding(name2, type, section, upstreamAlias, upstreamExpression,
     closureSections: void 0,
     excludeProperties: void 0,
     serialize: false,
-    sources: /* @__PURE__ */ new Set(),
+    sources: void 0,
     aliases: /* @__PURE__ */ new Set(),
     hoists: /* @__PURE__ */ new Map(),
     propertyAliases: /* @__PURE__ */ new Map(),
@@ -3935,7 +4095,7 @@ function trackReference(referencePath, binding) {
   let propPath = binding.name;
   while (true) {
     const { parent } = root;
-    if (!import_compiler22.types.isMemberExpression(parent)) break;
+    if (!import_compiler23.types.isMemberExpression(parent)) break;
     const prop = getMemberExpressionPropString(parent);
     if (prop === void 0) break;
     if (reference.propertyAliases.has(prop)) {
@@ -4087,10 +4247,10 @@ function finalizeReferences() {
           for (let j = i + 1; j < numReferences; j++) {
             const binding1 = intersection[i];
             const binding2 = intersection[j];
-            if (!binding1.serialize && !isSuperset(binding1.sources, binding2.sources)) {
+            if (!binding1.serialize && !bindingUtil.isSuperset(binding1.sources, binding2.sources)) {
               binding1.serialize = true;
             }
-            if (!binding2.serialize && !isSuperset(binding2.sources, binding1.sources)) {
+            if (!binding2.serialize && !bindingUtil.isSuperset(binding2.sources, binding1.sources)) {
               binding2.serialize = true;
             }
           }
@@ -4102,7 +4262,7 @@ function finalizeReferences() {
         let serialize = false;
         const sourceSection = binding.section;
         let currentSection = section;
-        while (currentSection !== sourceSection && !(serialize = !currentSection.upstreamExpression || isStatefulReferences(
+        while (currentSection !== sourceSection && !(serialize = !currentSection.upstreamExpression || !!getDynamicSourcesForReferences(
           currentSection.upstreamExpression.referencedBindings
         ))) {
           currentSection = currentSection.parent;
@@ -4143,28 +4303,21 @@ function getMaxOwnSourceOffset(intersection, section) {
   let scopeOffset;
   for (const binding of intersection) {
     if (binding.section === section) {
-      for (const sourceBinding of binding.sources) {
-        if (sourceBinding.scopeOffset && (!scopeOffset || scopeOffset.id < sourceBinding.scopeOffset.id)) {
-          scopeOffset = sourceBinding.scopeOffset;
+      forEach(binding.sources, (source) => {
+        if (source.scopeOffset && (!scopeOffset || scopeOffset.id < source.scopeOffset.id)) {
+          scopeOffset = source.scopeOffset;
         }
-      }
+      });
     }
   }
   return scopeOffset;
 }
 var intersectionMeta = /* @__PURE__ */ new WeakMap();
-function isSuperset(set, subset) {
-  for (const elem of subset) {
-    if (!set.has(elem)) {
-      return false;
-    }
-  }
-  return true;
-}
 function resolveBindingSources(binding) {
   const derived = /* @__PURE__ */ new Set();
-  const { sources } = binding;
+  let sources;
   crawl(binding);
+  binding.sources = sources;
   function crawl(binding2) {
     if (binding2.type === 4 /* derived */ || binding2.type === 3 /* param */) {
       let alias;
@@ -4177,12 +4330,12 @@ function resolveBindingSources(binding) {
         derived.add(curBinding);
         forEach(curBinding.upstreamExpression.referencedBindings, crawl);
       } else if (curBinding.type === 2 /* input */) {
-        sources.add(binding2);
+        sources = bindingUtil.add(sources, binding2);
       } else {
-        sources.add(curBinding);
+        sources = bindingUtil.add(sources, curBinding);
       }
     } else {
-      sources.add(binding2);
+      sources = bindingUtil.add(sources, binding2);
     }
   }
 }
@@ -4242,9 +4395,9 @@ function getAllTagReferenceNodes(tag, referenceNodes = []) {
 }
 function getScopeAccessorLiteral(binding, includeId) {
   if (isOptimize()) {
-    return import_compiler22.types.numericLiteral(binding.id);
+    return import_compiler23.types.numericLiteral(binding.id);
   }
-  return import_compiler22.types.stringLiteral(
+  return import_compiler23.types.stringLiteral(
     binding.name + (includeId || binding.type === 0 /* dom */ ? `/${binding.id}` : "")
   );
 }
@@ -4259,7 +4412,7 @@ function getSectionInstancesAccessor(section) {
 }
 function getSectionInstancesAccessorLiteral(section) {
   const accessor = getSectionInstancesAccessor(section);
-  return accessor ? typeof accessor === "number" ? import_compiler22.types.numericLiteral(accessor) : import_compiler22.types.stringLiteral(accessor) : void 0;
+  return accessor ? typeof accessor === "number" ? import_compiler23.types.numericLiteral(accessor) : import_compiler23.types.stringLiteral(accessor) : void 0;
 }
 function getReadReplacement(node) {
   const { extra } = node;
@@ -4277,18 +4430,18 @@ function getReadReplacement(node) {
   if (binding) {
     if (node.type === "Identifier") {
       if (binding.type === 5 /* hoist */) {
-        replacement = node.extra?.[kIsInvoked] ? import_compiler22.types.callExpression(getHoistFunctionIdentifier(binding), [
+        replacement = node.extra?.[kIsInvoked] ? import_compiler23.types.callExpression(getHoistFunctionIdentifier(binding), [
           getScopeExpression(node.extra.section, binding.section)
-        ]) : import_compiler22.types.identifier(getScopeAccessor(binding));
+        ]) : import_compiler23.types.identifier(getScopeAccessor(binding));
       } else if (binding.name !== node.name) {
         node.name = binding.name;
       }
     } else {
-      replacement = import_compiler22.types.identifier(binding.name);
+      replacement = import_compiler23.types.identifier(binding.name);
     }
   } else if (read) {
     replacement = toMemberExpression(
-      import_compiler22.types.identifier(read.binding.name),
+      import_compiler23.types.identifier(read.binding.name),
       Array.isArray(read.props) ? read.props[0] : read.props
     );
     if (Array.isArray(read.props)) {
@@ -4404,31 +4557,6 @@ function isRegisteredFnExtra(extra) {
   return isReferencedExtra(extra) && extra.registerId !== void 0;
 }
-// src/translator/util/is-stateful.ts
-function isStatefulReferences(referencedBindings) {
-  if (referencedBindings) {
-    if (Array.isArray(referencedBindings)) {
-      for (const ref of referencedBindings) {
-        if (isStatefulBinding(ref)) {
-          return true;
-        }
-      }
-    } else {
-      return isStatefulBinding(referencedBindings);
-    }
-  }
-  return false;
-}
-function isStatefulBinding(binding) {
-  switch (binding.type) {
-    case 1 /* let */:
-    case 2 /* input */:
-      return true;
-    default:
-      return binding.upstreamAlias ? isStatefulBinding(binding.upstreamAlias) : !binding.upstreamExpression || isStatefulReferences(binding.upstreamExpression.referencedBindings);
-  }
-}
 // src/translator/core/await.ts
 var kDOMBinding = Symbol("await tag dom binding");
 var await_default = {
@@ -4452,7 +4580,7 @@ var await_default = {
     if (!valueAttr) {
       throw tag.get("name").buildCodeFrameError("The `await` tag requires a value.");
     }
-    if (node.attributes.length > 1 || !import_compiler23.types.isMarkoAttribute(valueAttr) || valueAttr.name !== "value") {
+    if (node.attributes.length > 1 || !import_compiler24.types.isMarkoAttribute(valueAttr) || valueAttr.name !== "value") {
       throw tag.get("name").buildCodeFrameError(
         "The `await` tag only supports the `value` attribute."
       );
@@ -4460,12 +4588,12 @@ var await_default = {
     if (!node.body.body.length) {
       throw tag.get("name").buildCodeFrameError("The `await` tag requires body content.");
     }
-    if (node.body.params.length && (node.body.params.length > 1 || import_compiler23.types.isSpreadElement(node.body.params[0]))) {
+    if (node.body.params.length && (node.body.params.length > 1 || import_compiler24.types.isSpreadElement(node.body.params[0]))) {
       throw tag.get("name").buildCodeFrameError(
         "The `await` tag only supports a single parameter."
       );
     }
-    startSection(tagBody);
+    const bodySection = startSection(tagBody);
     getOrCreateSection(tag);
     trackParamsReferences(
       tagBody,
@@ -4473,6 +4601,7 @@ var await_default = {
       void 0,
       evaluate(valueAttr.value)
     );
+    bodySection.upstreamExpression = valueAttr.value.extra;
   },
   translate: translateByTarget({
     html: {
@@ -4493,20 +4622,16 @@ var await_default = {
         const nodeRef2 = tagExtra[kDOMBinding];
         const tagBody = tag.get("body");
         const section = getSection(tag);
-        const bodySection = getSectionForBody(tagBody);
-        if (isStatefulReferences(valueAttr.extra?.referencedBindings) || checkStatefulClosures(bodySection, true)) {
-          setForceResumeScope(bodySection);
-        }
         flushInto(tag);
         writeHTMLResumeStatements(tagBody);
         tag.replaceWith(
-          import_compiler23.types.expressionStatement(
+          import_compiler24.types.expressionStatement(
             callRuntime(
               "fork",
               getScopeIdIdentifier(section),
               getScopeAccessorLiteral(nodeRef2),
               valueAttr.value,
-              import_compiler23.types.arrowFunctionExpression(
+              import_compiler24.types.arrowFunctionExpression(
                 node.body.params,
                 toFirstExpressionOrBlock(node.body.body)
               )
@@ -4538,12 +4663,12 @@ var await_default = {
           return callRuntime(
             "awaitTag",
             getScopeAccessorLiteral(nodeRef2),
-            import_compiler23.types.identifier(bodySection.name)
+            import_compiler24.types.identifier(bodySection.name)
           );
         };
         addValue(
           section,
-          tag.node.attributes[0].value.extra?.referencedBindings,
+          bodySection.upstreamExpression?.referencedBindings,
           signal,
           tag.node.attributes[0].value
         );
@@ -4562,7 +4687,7 @@ var await_default = {
 };
 // src/translator/core/client.ts
-var import_compiler24 = require("@marko/compiler");
+var import_compiler25 = require("@marko/compiler");
 var import_babel_utils13 = require("@marko/compiler/babel-utils");
 var client_default = {
   parse(tag) {
@@ -4574,10 +4699,10 @@ var client_default = {
     const code = rawValue.replace(/^client\s*/, "").trim();
     const start = node.name.start + (rawValue.length - code.length);
     let body = (0, import_babel_utils13.parseStatements)(file, code, start, start + code.length);
-    if (body.length === 1 && import_compiler24.types.isBlockStatement(body[0])) {
+    if (body.length === 1 && import_compiler25.types.isBlockStatement(body[0])) {
       body = body[0].body;
     }
-    tag.replaceWith(import_compiler24.types.markoScriptlet(body, true, "client"));
+    tag.replaceWith(import_compiler25.types.markoScriptlet(body, true, "client"));
   },
   parseOptions: {
     statement: true,
@@ -4593,11 +4718,11 @@ var client_default = {
 };
 // src/translator/core/const.ts
-var import_compiler26 = require("@marko/compiler");
+var import_compiler27 = require("@marko/compiler");
 var import_babel_utils14 = require("@marko/compiler/babel-utils");
 // src/translator/util/translate-var.ts
-var import_compiler25 = require("@marko/compiler");
+var import_compiler26 = require("@marko/compiler");
 function translateVar(tag, initialValue, kind = "const") {
   const {
     node: { var: tagVar }
@@ -4606,7 +4731,7 @@ function translateVar(tag, initialValue, kind = "const") {
     return;
   }
   tag.insertBefore(
-    import_compiler25.types.variableDeclaration(kind, [import_compiler25.types.variableDeclarator(tagVar, initialValue)])
+    import_compiler26.types.variableDeclaration(kind, [import_compiler26.types.variableDeclarator(tagVar, initialValue)])
   );
 }
@@ -4624,12 +4749,12 @@ var const_default = {
     if (!valueAttr) {
       throw tag.get("name").buildCodeFrameError("The `const` tag requires a value.");
     }
-    if (node.attributes.length > 1 || !import_compiler26.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value") {
+    if (node.attributes.length > 1 || !import_compiler27.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value") {
       throw tag.get("name").buildCodeFrameError(
         "The `const` tag only supports the `value` attribute."
       );
     }
-    const upstreamAlias = import_compiler26.types.isIdentifier(valueAttr.value) ? tag.scope.getBinding(valueAttr.value.name)?.identifier.extra?.binding : void 0;
+    const upstreamAlias = import_compiler27.types.isIdentifier(valueAttr.value) ? tag.scope.getBinding(valueAttr.value.name)?.identifier.extra?.binding : void 0;
     trackVarReferences(
       tag,
       4 /* derived */,
@@ -4670,7 +4795,7 @@ var const_default = {
 };
 // src/translator/core/debug.ts
-var import_compiler27 = require("@marko/compiler");
+var import_compiler28 = require("@marko/compiler");
 var import_babel_utils15 = require("@marko/compiler/babel-utils");
 var debug_default = {
   analyze(tag) {
@@ -4679,7 +4804,7 @@ var debug_default = {
     (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_compiler27.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value")) {
+    if (tag.node.attributes.length > 1 || tag.node.attributes.length === 1 && (!import_compiler28.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value")) {
       throw tag.get("name").buildCodeFrameError(
         "The `debug` tag only supports the `value` attribute."
       );
@@ -4690,7 +4815,7 @@ var debug_default = {
       const section = getSection(tag);
       const [valueAttr] = tag.node.attributes;
       const referencedBindings = valueAttr?.value.extra?.referencedBindings;
-      const statement = withPreviousLocation(import_compiler27.types.debuggerStatement(), tag.node);
+      const statement = withPreviousLocation(import_compiler28.types.debuggerStatement(), tag.node);
       if (isOutputHTML()) {
         tag.insertBefore(statement);
       } else {
@@ -4713,11 +4838,11 @@ var debug_default = {
 };
 // src/translator/core/define.ts
-var import_compiler33 = require("@marko/compiler");
+var import_compiler34 = require("@marko/compiler");
 var import_babel_utils21 = require("@marko/compiler/babel-utils");
 // src/translator/util/nested-attribute-tags.ts
-var import_compiler28 = require("@marko/compiler");
+var import_compiler29 = require("@marko/compiler");
 var import_babel_utils16 = require("@marko/compiler/babel-utils");
 var attrTagToIdentifierLookup = /* @__PURE__ */ new WeakMap();
 function getAttrTagIdentifier(meta) {
@@ -4726,7 +4851,7 @@ function getAttrTagIdentifier(meta) {
     name2 = currentProgramPath.scope.generateUid(meta.name);
     attrTagToIdentifierLookup.set(meta, name2);
   }
-  return import_compiler28.types.identifier(name2);
+  return import_compiler29.types.identifier(name2);
 }
 function analyzeAttributeTags(tag) {
   if (tag.node.extra?.attributeTags) return tag.node.extra.attributeTags;
@@ -4839,19 +4964,19 @@ function getConditionRoot(tag) {
 }
 // src/translator/util/translate-attrs.ts
-var import_compiler32 = require("@marko/compiler");
+var import_compiler33 = require("@marko/compiler");
 var import_babel_utils20 = require("@marko/compiler/babel-utils");
 // src/translator/core/for.ts
-var import_compiler31 = require("@marko/compiler");
+var import_compiler32 = require("@marko/compiler");
 var import_babel_utils19 = require("@marko/compiler/babel-utils");
 // src/translator/util/is-only-child-in-parent.ts
-var import_compiler30 = require("@marko/compiler");
+var import_compiler31 = require("@marko/compiler");
 var import_babel_utils18 = require("@marko/compiler/babel-utils");
 // src/translator/visitors/tag/native-tag.ts
-var import_compiler29 = require("@marko/compiler");
+var import_compiler30 = require("@marko/compiler");
 var import_babel_utils17 = require("@marko/compiler/babel-utils");
 var kNativeTagBinding = Symbol("native tag binding");
 var kSerializeMarker = Symbol("serialize marker");
@@ -4943,7 +5068,7 @@ var native_tag_default = {
           }
         }
         tag.node.attributes.push(
-          import_compiler29.types.markoAttribute(
+          import_compiler30.types.markoAttribute(
             "value",
             normalizeStringExpression(parts) || buildUndefined()
           )
@@ -4958,7 +5083,7 @@ var native_tag_default = {
       (0, import_babel_utils17.assertNoParams)(tag);
       (0, import_babel_utils17.assertNoAttributeTags)(tag);
       const { node } = tag;
-      if (node.var && !import_compiler29.types.isIdentifier(node.var)) {
+      if (node.var && !import_compiler30.types.isIdentifier(node.var)) {
         throw tag.get("var").buildCodeFrameError(
           "Tag variables on native elements cannot be destructured."
         );
@@ -4973,7 +5098,7 @@ var native_tag_default = {
       let spreadReferenceNodes;
       for (let i = attributes.length; i--; ) {
         const attr2 = attributes[i];
-        if (import_compiler29.types.isMarkoAttribute(attr2)) {
+        if (import_compiler30.types.isMarkoAttribute(attr2)) {
           if (seen[attr2.name]) {
             dropReferences(attr2.value);
             continue;
@@ -4985,14 +5110,14 @@ var native_tag_default = {
           } else if (!evaluate(attr2.value).confident) {
             hasDynamicAttributes = true;
           }
-        } else if (import_compiler29.types.isMarkoSpreadAttribute(attr2)) {
+        } else if (import_compiler30.types.isMarkoSpreadAttribute(attr2)) {
           hasEventHandlers = true;
           hasDynamicAttributes = true;
           (attr2.value.extra ??= {}).isEffect = true;
         }
         if (spreadReferenceNodes) {
           spreadReferenceNodes.push(attr2.value);
-        } else if (import_compiler29.types.isMarkoSpreadAttribute(attr2)) {
+        } else if (import_compiler30.types.isMarkoSpreadAttribute(attr2)) {
           spreadReferenceNodes = [attr2.value];
           relatedControllable = getRelatedControllable(tagName, seen);
         }
@@ -5020,7 +5145,7 @@ var native_tag_default = {
       }
       if (node.var || hasEventHandlers || hasDynamicAttributes) {
         currentProgramPath.node.extra.isInteractive ||= hasEventHandlers;
-        const tagName2 = node.name.type === "StringLiteral" ? node.name.value : import_compiler29.types.toIdentifier(tag.get("name"));
+        const tagName2 = node.name.type === "StringLiteral" ? node.name.value : import_compiler30.types.toIdentifier(tag.get("name"));
         const tagExtra = node.extra ??= {};
         const bindingName = "#" + tagName2;
         if (hasEventHandlers || node.var) {
@@ -5073,13 +5198,13 @@ var native_tag_default = {
               serializeOwners(referenceSection, section);
             }
           }
-          setForceResumeScope(section);
+          serializeSectionIfNeeded(section, true);
           translateVar(
             tag,
             callRuntime(
               "nodeRef",
               getterId && getScopeIdIdentifier(section),
-              getterId && import_compiler29.types.stringLiteral(getterId)
+              getterId && import_compiler30.types.stringLiteral(getterId)
             )
           );
         } else {
@@ -5090,13 +5215,13 @@ var native_tag_default = {
             );
             currentProgramPath.pushContainer(
               "body",
-              import_compiler29.types.variableDeclaration("const", [
-                import_compiler29.types.variableDeclarator(
+              import_compiler30.types.variableDeclaration("const", [
+                import_compiler30.types.variableDeclarator(
                   getterFnIdentifier,
                   callRuntime(
                     "nodeRef",
-                    import_compiler29.types.stringLiteral(getterId),
-                    import_compiler29.types.stringLiteral(
+                    import_compiler30.types.stringLiteral(getterId),
+                    import_compiler30.types.stringLiteral(
                       getAccessorPrefix().Getter + getScopeAccessorLiteral(nodeRef2).value
                     )
                   )
@@ -5109,22 +5234,22 @@ var native_tag_default = {
               const referenceSection = getSection(reference);
               if (isInvokedFunction(reference)) {
                 reference.parentPath.replaceWith(
-                  import_compiler29.types.expressionStatement(
+                  import_compiler30.types.expressionStatement(
                     createScopeReadExpression(referenceSection, nodeRef2)
                   )
                 );
               } else if (getterFnIdentifier) {
                 reference.replaceWith(
-                  import_compiler29.types.callExpression(getterFnIdentifier, [
+                  import_compiler30.types.callExpression(getterFnIdentifier, [
                     getScopeExpression(referenceSection, getSection(tag))
                   ])
                 );
               } else {
                 reference.replaceWith(
-                  import_compiler29.types.expressionStatement(
-                    import_compiler29.types.memberExpression(
+                  import_compiler30.types.expressionStatement(
+                    import_compiler30.types.memberExpression(
                       getScopeExpression(section, referenceSection),
-                      import_compiler29.types.stringLiteral(
+                      import_compiler30.types.stringLiteral(
                         getAccessorPrefix().Getter + getScopeAccessorLiteral(nodeRef2).value
                       ),
                       true
@@ -5160,7 +5285,7 @@ var native_tag_default = {
             "render",
             section,
             referencedBindings,
-            import_compiler29.types.expressionStatement(
+            import_compiler30.types.expressionStatement(
               callRuntime(helper, scopeIdentifier, visitAccessor, ...values)
             )
           );
@@ -5168,7 +5293,7 @@ var native_tag_default = {
             "effect",
             section,
             void 0,
-            import_compiler29.types.expressionStatement(
+            import_compiler30.types.expressionStatement(
               callRuntime(`${helper}_effect`, scopeIdentifier, visitAccessor)
             )
           );
@@ -5185,18 +5310,18 @@ var native_tag_default = {
           } else if (spreadExpression) {
             const spreadIdentifier = tag.scope.generateUidIdentifier("select_input");
             tag.insertBefore(
-              import_compiler29.types.variableDeclaration("const", [
-                import_compiler29.types.variableDeclarator(spreadIdentifier, spreadExpression)
+              import_compiler30.types.variableDeclaration("const", [
+                import_compiler30.types.variableDeclarator(spreadIdentifier, spreadExpression)
               ])
             );
             htmlSelectArgs.set(tag.node, {
-              value: import_compiler29.types.memberExpression(
+              value: import_compiler30.types.memberExpression(
                 spreadIdentifier,
-                import_compiler29.types.identifier("value")
+                import_compiler30.types.identifier("value")
               ),
-              valueChange: import_compiler29.types.memberExpression(
+              valueChange: import_compiler30.types.memberExpression(
                 spreadIdentifier,
-                import_compiler29.types.identifier("valueChange")
+                import_compiler30.types.identifier("valueChange")
               )
             });
             spreadExpression = spreadIdentifier;
@@ -5210,14 +5335,14 @@ var native_tag_default = {
           } else if (spreadExpression) {
             const spreadIdentifier = tag.scope.generateUidIdentifier("textarea_input");
             tag.insertBefore(
-              import_compiler29.types.variableDeclaration("const", [
-                import_compiler29.types.variableDeclarator(spreadIdentifier, spreadExpression)
+              import_compiler30.types.variableDeclaration("const", [
+                import_compiler30.types.variableDeclarator(spreadIdentifier, spreadExpression)
               ])
             );
-            value = import_compiler29.types.memberExpression(spreadIdentifier, import_compiler29.types.identifier("value"));
-            valueChange = import_compiler29.types.memberExpression(
+            value = import_compiler30.types.memberExpression(spreadIdentifier, import_compiler30.types.identifier("value"));
+            valueChange = import_compiler30.types.memberExpression(
               spreadIdentifier,
-              import_compiler29.types.identifier("valueChange")
+              import_compiler30.types.identifier("valueChange")
             );
             spreadExpression = spreadIdentifier;
           }
@@ -5253,10 +5378,10 @@ var native_tag_default = {
                 "render",
                 section,
                 valueReferences,
-                import_compiler29.types.expressionStatement(
+                import_compiler30.types.expressionStatement(
                   callRuntime(
                     helper,
-                    import_compiler29.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                    import_compiler30.types.memberExpression(scopeIdentifier, visitAccessor, true),
                     value
                   )
                 )
@@ -5271,18 +5396,18 @@ var native_tag_default = {
               if (isEventHandler(name3)) {
                 addHTMLEffectCall(section, valueReferences);
               } else {
-                write2`${callRuntime("attr", import_compiler29.types.stringLiteral(name3), value)}`;
+                write2`${callRuntime("attr", import_compiler30.types.stringLiteral(name3), value)}`;
               }
             } else if (isEventHandler(name3)) {
               addStatement(
                 "effect",
                 section,
                 valueReferences,
-                import_compiler29.types.expressionStatement(
+                import_compiler30.types.expressionStatement(
                   callRuntime(
                     "on",
-                    import_compiler29.types.memberExpression(scopeIdentifier, visitAccessor, true),
-                    import_compiler29.types.stringLiteral(getEventHandlerName(name3)),
+                    import_compiler30.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                    import_compiler30.types.stringLiteral(getEventHandlerName(name3)),
                     value
                   )
                 )
@@ -5292,11 +5417,11 @@ var native_tag_default = {
                 "render",
                 section,
                 valueReferences,
-                import_compiler29.types.expressionStatement(
+                import_compiler30.types.expressionStatement(
                   callRuntime(
                     "attr",
-                    import_compiler29.types.memberExpression(scopeIdentifier, visitAccessor, true),
-                    import_compiler29.types.stringLiteral(name3),
+                    import_compiler30.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                    import_compiler30.types.stringLiteral(name3),
                     value
                   )
                 )
@@ -5319,7 +5444,7 @@ var native_tag_default = {
               "render",
               section,
               extra.referencedBindings,
-              import_compiler29.types.expressionStatement(
+              import_compiler30.types.expressionStatement(
                 callRuntime(
                   "partialAttrs",
                   scopeIdentifier,
@@ -5334,7 +5459,7 @@ var native_tag_default = {
               "render",
               section,
               extra.referencedBindings,
-              import_compiler29.types.expressionStatement(
+              import_compiler30.types.expressionStatement(
                 callRuntime(
                   "attrs",
                   scopeIdentifier,
@@ -5348,7 +5473,7 @@ var native_tag_default = {
             "effect",
             section,
             extra.referencedBindings,
-            import_compiler29.types.expressionStatement(
+            import_compiler30.types.expressionStatement(
               callRuntime("attrsEvents", scopeIdentifier, visitAccessor)
             ),
             false
@@ -5369,7 +5494,7 @@ var native_tag_default = {
         write2`>`;
       }
       if (isHTML && extra.tagNameNullable) {
-        tag.insertBefore(import_compiler29.types.ifStatement(name2.node, consumeHTML(tag)))[0].skip();
+        tag.insertBefore(import_compiler30.types.ifStatement(name2.node, consumeHTML(tag)))[0].skip();
       }
       if (writeAtStartOfBody) {
         write2`${writeAtStartOfBody}`;
@@ -5390,16 +5515,16 @@ var native_tag_default = {
         writeTo(tag)`</${tag.node.name}>`;
         flushInto(tag);
         tag.insertBefore(
-          import_compiler29.types.expressionStatement(
+          import_compiler30.types.expressionStatement(
             callRuntime(
               "controllable_select_value",
               getScopeIdIdentifier(getSection(tag)),
               getScopeAccessorLiteral(nodeRef2),
               selectArgs.value,
               selectArgs.valueChange,
-              import_compiler29.types.arrowFunctionExpression(
+              import_compiler30.types.arrowFunctionExpression(
                 [],
-                import_compiler29.types.blockStatement(tag.node.body.body)
+                import_compiler30.types.blockStatement(tag.node.body.body)
               )
             )
           )
@@ -5407,9 +5532,14 @@ var native_tag_default = {
       } else {
         tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
       }
-      const shouldMark = nodeRef2 && (extra[kSerializeMarker] || extra[kSerializeMarker] === void 0 && (isStatefulReferences(extra.referencedBindings) || tag.node.attributes.some(
-        (attr2) => isStatefulReferences(attr2.value.extra?.referencedBindings)
-      )));
+      const allExtras = [extra];
+      for (const attr2 of tag.node.attributes) {
+        if (attr2.value.extra) {
+          allExtras.push(attr2.value.extra);
+        }
+      }
+      const serializeReason = getDynamicSourcesForExtras(allExtras);
+      const shouldMark = nodeRef2 && (extra[kSerializeMarker] || extra[kSerializeMarker] === void 0 && !!serializeReason);
       if (!openTagOnly && !selectArgs) {
         writeTo(
           tag,
@@ -5418,7 +5548,7 @@ var native_tag_default = {
       }
       if (isHTML && extra.tagNameNullable) {
         tag.insertBefore(
-          import_compiler29.types.ifStatement(tag.node.name, consumeHTML(tag))
+          import_compiler30.types.ifStatement(tag.node.name, consumeHTML(tag))
         )[0].skip();
       }
       if (shouldMark) {
@@ -5441,7 +5571,7 @@ function getUsedAttrs(tagName, tag) {
   for (let i = attributes.length; i--; ) {
     const attr2 = attributes[i];
     const { value } = attr2;
-    if (import_compiler29.types.isMarkoSpreadAttribute(attr2)) {
+    if (import_compiler30.types.isMarkoSpreadAttribute(attr2)) {
       if (!spreadProps) {
         spreadProps = [];
         staticControllable = getRelatedControllable(tagName, seen);
@@ -5455,7 +5585,7 @@ function getUsedAttrs(tagName, tag) {
           staticControllable = void 0;
         }
       }
-      spreadProps.push(import_compiler29.types.spreadElement(value));
+      spreadProps.push(import_compiler30.types.spreadElement(value));
     } else if (!seen[attr2.name]) {
       seen[attr2.name] = attr2;
       if (spreadProps) {
@@ -5485,16 +5615,16 @@ function getUsedAttrs(tagName, tag) {
       for (const attr2 of staticControllable.attrs) {
         if (attr2) {
           (skipProps ||= []).push(
-            toObjectProperty(attr2.name, import_compiler29.types.numericLiteral(1))
+            toObjectProperty(attr2.name, import_compiler30.types.numericLiteral(1))
           );
         }
       }
     }
     for (const { name: name2 } of staticAttrs) {
-      (skipProps ||= []).push(toObjectProperty(name2, import_compiler29.types.numericLiteral(1)));
+      (skipProps ||= []).push(toObjectProperty(name2, import_compiler30.types.numericLiteral(1)));
     }
     if (skipProps) {
-      skipExpression = import_compiler29.types.objectExpression(skipProps);
+      skipExpression = import_compiler30.types.objectExpression(skipProps);
     }
     spreadExpression = propsToExpression(spreadProps);
   }
@@ -5509,7 +5639,7 @@ function isChangeHandler(propName) {
   return /^(?:value|checked(?:Value)?|open)Change/.test(propName);
 }
 function buildUndefined() {
-  return import_compiler29.types.unaryExpression("void", import_compiler29.types.numericLiteral(0));
+  return import_compiler30.types.unaryExpression("void", import_compiler30.types.numericLiteral(0));
 }
 // src/translator/util/is-only-child-in-parent.ts
@@ -5612,8 +5742,6 @@ var for_default = {
         const tagSection = getSection(tag);
         const bodySection = getSectionForBody(tagBody);
         const { node } = tag;
-        const tagExtra = node.extra;
-        const isStateful = isStatefulReferences(tagExtra.referencedBindings);
         const onlyChildInParentOptimization = isOnlyChildInParent(tag);
         const nodeRef2 = getOptimizedOnlyChildNodeRef(tag, tagSection);
         const forAttrs = getKnownAttrValues(node);
@@ -5621,14 +5749,16 @@ var for_default = {
         const params = node.body.params;
         const statements = [];
         const bodyStatements = node.body.body;
-        const hasStatefulClosures = checkStatefulClosures(bodySection, true);
-        const hasHoists = bodySection.hoisted || bodySection.isHoistThrough || bodySection.referencedHoists;
+        const sectionSources = getDynamicSourcesForSection(bodySection);
+        const hasHoists = isSectionWithHoists(bodySection);
+        const serializeReason = hasHoists || sectionSources?.all;
         const singleNodeOptimization = bodySection.content === null || bodySection.content.singleChild && bodySection.content.startType !== 4 /* Text */;
         let keyExpression;
-        if (isStateful && onlyChildInParentOptimization) {
+        if (sectionSources?.referenced && onlyChildInParentOptimization) {
           getParentTag(tag).node.extra[kSerializeMarker] = false;
         }
-        if (isStateful || hasStatefulClosures || hasHoists) {
+        if (serializeReason) {
+          serializeSectionIfNeeded(bodySection, serializeReason);
           const defaultParamNames = {
             of: ["list", "index"],
             in: ["key", "value"],
@@ -5636,36 +5766,35 @@ var for_default = {
           }[forType];
           const defaultByParamIndex = forType === "of" ? 1 : 0;
           const requiredParamsIndex = forAttrs.by ? defaultParamNames.length - 1 : defaultByParamIndex;
-          setForceResumeScope(bodySection);
           for (let i = 0; i <= requiredParamsIndex; i++) {
             const existingParam = params[i];
-            if (!existingParam || !import_compiler31.types.isIdentifier(existingParam)) {
+            if (!existingParam || !import_compiler32.types.isIdentifier(existingParam)) {
               const id = params[i] = currentProgramPath.scope.generateUidIdentifier(
                 defaultParamNames[i]
               );
               if (existingParam) {
                 bodyStatements.unshift(
-                  import_compiler31.types.variableDeclaration("let", [
-                    import_compiler31.types.variableDeclarator(existingParam, id)
+                  import_compiler32.types.variableDeclaration("let", [
+                    import_compiler32.types.variableDeclarator(existingParam, id)
                   ])
                 );
               }
             }
           }
           if (forAttrs.by) {
-            if (import_compiler31.types.isStringLiteral(forAttrs.by)) {
+            if (import_compiler32.types.isStringLiteral(forAttrs.by)) {
               keyExpression = toMemberExpression(
                 params[0],
                 forAttrs.by.value
               );
-            } else if (import_compiler31.types.isFunction(forAttrs.by)) {
+            } else if (import_compiler32.types.isFunction(forAttrs.by)) {
               const byIdentifier = currentProgramPath.scope.generateUidIdentifier("by");
               statements.push(
-                import_compiler31.types.variableDeclaration("const", [
-                  import_compiler31.types.variableDeclarator(byIdentifier, forAttrs.by)
+                import_compiler32.types.variableDeclaration("const", [
+                  import_compiler32.types.variableDeclarator(byIdentifier, forAttrs.by)
                 ])
               );
-              keyExpression = import_compiler31.types.callExpression(
+              keyExpression = import_compiler32.types.callExpression(
                 byIdentifier,
                 params
               );
@@ -5681,57 +5810,56 @@ var for_default = {
           }
           const forScopesIdentifier = getScopeIdentifier(bodySection);
           getHTMLSectionStatements(tagSection).push(
-            import_compiler31.types.variableDeclaration("const", [
-              import_compiler31.types.variableDeclarator(
+            import_compiler32.types.variableDeclaration("const", [
+              import_compiler32.types.variableDeclarator(
                 forScopesIdentifier,
-                import_compiler31.types.newExpression(import_compiler31.types.identifier("Map"), [])
+                import_compiler32.types.newExpression(import_compiler32.types.identifier("Map"), [])
               )
             ])
           );
-          if (isStateful || hasStatefulClosures || hasHoists) {
-            bodyStatements.push(
-              import_compiler31.types.expressionStatement(
-                import_compiler31.types.callExpression(
-                  import_compiler31.types.memberExpression(forScopesIdentifier, import_compiler31.types.identifier("set")),
-                  [
-                    keyExpression,
-                    callRuntime(
-                      "ensureScopeWithId",
-                      getScopeIdIdentifier(bodySection)
-                    )
-                  ]
-                )
+          bodyStatements.push(
+            import_compiler32.types.expressionStatement(
+              import_compiler32.types.callExpression(
+                import_compiler32.types.memberExpression(forScopesIdentifier, import_compiler32.types.identifier("set")),
+                [
+                  keyExpression,
+                  callRuntime(
+                    "ensureScopeWithId",
+                    getScopeIdIdentifier(bodySection)
+                  )
+                ]
               )
-            );
-          }
+            )
+          );
           setSerializedProperty(
             tagSection,
             getAccessorPrefix().LoopScopeMap + getScopeAccessor(nodeRef2),
-            import_compiler31.types.conditionalExpression(
-              import_compiler31.types.memberExpression(forScopesIdentifier, import_compiler31.types.identifier("size")),
+            import_compiler32.types.conditionalExpression(
+              import_compiler32.types.memberExpression(forScopesIdentifier, import_compiler32.types.identifier("size")),
               forScopesIdentifier,
-              import_compiler31.types.identifier("undefined")
-            )
+              import_compiler32.types.identifier("undefined")
+            ),
+            serializeReason
           );
         }
         flushInto(tag);
         writeHTMLResumeStatements(tagBody);
         const forTagArgs = getBaseArgsInForTag(forType, forAttrs);
-        const forTagHTMLRuntime = isStateful ? forTypeToHTMLResumeRuntime(forType, singleNodeOptimization) : forTypeToRuntime(forType);
+        const forTagHTMLRuntime = sectionSources?.referenced ? forTypeToHTMLResumeRuntime(forType, singleNodeOptimization) : forTypeToRuntime(forType);
         forTagArgs.push(
-          import_compiler31.types.arrowFunctionExpression(params, import_compiler31.types.blockStatement(bodyStatements))
+          import_compiler32.types.arrowFunctionExpression(params, import_compiler32.types.blockStatement(bodyStatements))
         );
-        if (isStateful) {
+        if (sectionSources?.referenced) {
           forTagArgs.push(
             getScopeIdIdentifier(tagSection),
             getScopeAccessorLiteral(nodeRef2)
           );
           if (onlyChildInParentOptimization) {
-            forTagArgs.push(import_compiler31.types.numericLiteral(1));
+            forTagArgs.push(import_compiler32.types.numericLiteral(1));
           }
         }
         statements.push(
-          import_compiler31.types.expressionStatement(callRuntime(forTagHTMLRuntime, ...forTagArgs))
+          import_compiler32.types.expressionStatement(callRuntime(forTagHTMLRuntime, ...forTagArgs))
         );
         for (const replacement of tag.replaceWithMultiple(statements)) {
           replacement.skip();
@@ -5776,7 +5904,7 @@ var for_default = {
           return callRuntime(
             forTypeToDOMRuntime(forType),
             getScopeAccessorLiteral(nodeRef2),
-            import_compiler31.types.identifier(bodySection.name)
+            import_compiler32.types.identifier(bodySection.name)
           );
         };
         const params = node.body.params;
@@ -5807,7 +5935,7 @@ var for_default = {
           tagSection,
           referencedBindings,
           signal,
-          import_compiler31.types.arrayExpression(loopArgs)
+          import_compiler32.types.arrayExpression(loopArgs)
         );
         tag.remove();
       }
@@ -5873,11 +6001,11 @@ var for_default = {
   ]
 };
 function buildForRuntimeCall(type, attrs2, params, statements) {
-  return import_compiler31.types.expressionStatement(
+  return import_compiler32.types.expressionStatement(
     callRuntime(
       forTypeToRuntime(type),
       ...getBaseArgsInForTag(type, attrs2),
-      import_compiler31.types.arrowFunctionExpression(params, import_compiler31.types.blockStatement(statements))
+      import_compiler32.types.arrowFunctionExpression(params, import_compiler32.types.blockStatement(statements))
     )
   );
 }
@@ -5953,8 +6081,8 @@ function getBaseArgsInForTag(type, attrs2) {
     case "to":
       return [
         attrs2.to,
-        attrs2.from || import_compiler31.types.numericLiteral(0),
-        attrs2.step || import_compiler31.types.numericLiteral(1)
+        attrs2.from || import_compiler32.types.numericLiteral(0),
+        attrs2.step || import_compiler32.types.numericLiteral(1)
       ];
   }
 }
@@ -5972,8 +6100,8 @@ function translateAttrs(tag, templateExports, statements = [], contentKey = "con
         seen.add(attrTagMeta.name);
         if (attrTagMeta.dynamic) {
           statements.push(
-            import_compiler32.types.variableDeclaration("let", [
-              import_compiler32.types.variableDeclarator(getAttrTagIdentifier(attrTagMeta))
+            import_compiler33.types.variableDeclaration("let", [
+              import_compiler33.types.variableDeclarator(getAttrTagIdentifier(attrTagMeta))
             ])
           );
           properties.push(
@@ -6055,8 +6183,8 @@ function translateAttrs(tag, templateExports, statements = [], contentKey = "con
     seen.add(contentKey);
     const contentExpression = buildContent(tag.get("body"));
     if (contentExpression) {
-      const contentProp = import_compiler32.types.objectProperty(
-        import_compiler32.types.identifier(contentKey),
+      const contentProp = import_compiler33.types.objectProperty(
+        import_compiler33.types.identifier(contentKey),
         contentExpression
       );
       contentProps.add(contentProp);
@@ -6067,8 +6195,8 @@ function translateAttrs(tag, templateExports, statements = [], contentKey = "con
   for (let i = attributes.length; i--; ) {
     const attr2 = attributes[i];
     const { value } = attr2;
-    if (import_compiler32.types.isMarkoSpreadAttribute(attr2)) {
-      properties.push(import_compiler32.types.spreadElement(value));
+    if (import_compiler33.types.isMarkoSpreadAttribute(attr2)) {
+      properties.push(import_compiler33.types.spreadElement(value));
     } else if (!seen.has(attr2.name) && usesExport(templateExports, attr2.name)) {
       seen.add(attr2.name);
       properties.push(toObjectProperty(attr2.name, value));
@@ -6098,8 +6226,8 @@ function addDynamicAttrTagStatements(attrTags2, index, attrTagLookup, statements
         );
         if (attrTagMeta.repeated) {
           statements.push(
-            import_compiler32.types.expressionStatement(
-              import_compiler32.types.assignmentExpression(
+            import_compiler33.types.expressionStatement(
+              import_compiler33.types.assignmentExpression(
                 "=",
                 getAttrTagIdentifier(attrTagMeta),
                 callRuntime(
@@ -6112,8 +6240,8 @@ function addDynamicAttrTagStatements(attrTags2, index, attrTagLookup, statements
           );
         } else {
           statements.push(
-            import_compiler32.types.expressionStatement(
-              import_compiler32.types.assignmentExpression(
+            import_compiler33.types.expressionStatement(
+              import_compiler33.types.assignmentExpression(
                 "=",
                 getAttrTagIdentifier(attrTagMeta),
                 callRuntime(
@@ -6152,7 +6280,7 @@ function addDynamicAttrTagStatements(attrTags2, index, attrTagLookup, statements
   return index;
 }
 function propsToExpression(props) {
-  return props.length === 1 && import_compiler32.types.isSpreadElement(props[0]) ? props[0].argument : import_compiler32.types.objectExpression(props);
+  return props.length === 1 && import_compiler33.types.isSpreadElement(props[0]) ? props[0].argument : import_compiler33.types.objectExpression(props);
 }
 function translateForAttrTag(attrTags2, index, attrTagLookup, statements, templateExports, contentKey) {
   const forTag = attrTags2[index];
@@ -6177,9 +6305,9 @@ function translateForAttrTag(attrTags2, index, attrTagLookup, statements, templa
 function translateIfAttrTag(attrTags2, index, attrTagLookup, statements, templateExports, contentKey) {
   const ifTag = attrTags2[index];
   const consequentStatements = [];
-  let ifStatement = import_compiler32.types.ifStatement(
+  let ifStatement = import_compiler33.types.ifStatement(
     getConditionTestValue(ifTag),
-    import_compiler32.types.blockStatement(consequentStatements)
+    import_compiler33.types.blockStatement(consequentStatements)
   );
   statements.push(ifStatement);
   addAllAttrTagsAsDynamic(
@@ -6206,14 +6334,14 @@ function translateIfAttrTag(attrTags2, index, attrTagLookup, statements, templat
             contentKey
           );
           if (testValue) {
-            ifStatement.alternate = ifStatement = import_compiler32.types.ifStatement(
+            ifStatement.alternate = ifStatement = import_compiler33.types.ifStatement(
               testValue,
-              import_compiler32.types.blockStatement(alternateStatements)
+              import_compiler33.types.blockStatement(alternateStatements)
             );
             nextIndex++;
             continue;
           } else {
-            ifStatement.alternate = import_compiler32.types.blockStatement(alternateStatements);
+            ifStatement.alternate = import_compiler33.types.blockStatement(alternateStatements);
             break;
           }
         }
@@ -6270,10 +6398,10 @@ function buildContent(body) {
       const serialized = isSerializedSection(bodySection);
       return callRuntime(
         serialized ? "registerContent" : "createContent",
-        import_compiler32.types.stringLiteral(getResumeRegisterId(bodySection, "renderer")),
-        import_compiler32.types.arrowFunctionExpression(
+        import_compiler33.types.stringLiteral(getResumeRegisterId(bodySection, "renderer")),
+        import_compiler33.types.arrowFunctionExpression(
           body.node.params,
-          import_compiler32.types.blockStatement(body.node.body)
+          import_compiler33.types.blockStatement(body.node.body)
         ),
         serialized ? getScopeIdIdentifier(
           getSection(
@@ -6284,7 +6412,7 @@ function buildContent(body) {
         ) : void 0
       );
     } else {
-      return import_compiler32.types.callExpression(import_compiler32.types.identifier(bodySection.name), [
+      return import_compiler33.types.callExpression(import_compiler33.types.identifier(bodySection.name), [
         scopeIdentifier
       ]);
     }
@@ -6369,7 +6497,7 @@ var define_default = {
 };
 // src/translator/core/effect.ts
-var import_compiler34 = require("@marko/compiler");
+var import_compiler35 = require("@marko/compiler");
 var import_babel_utils22 = require("@marko/compiler/babel-utils");
 var effect_default = {
   migrate: [
@@ -6385,8 +6513,8 @@ var effect_default = {
         fix() {
           const { node } = tag;
           tag.replaceWith(
-            import_compiler34.types.markoTag(
-              withPreviousLocation(import_compiler34.types.stringLiteral("script"), node.name),
+            import_compiler35.types.markoTag(
+              withPreviousLocation(import_compiler35.types.stringLiteral("script"), node.name),
               node.attributes,
               node.body,
               node.arguments,
@@ -6423,7 +6551,7 @@ var export_default = {
 };
 // src/translator/core/html-comment.ts
-var import_compiler35 = require("@marko/compiler");
+var import_compiler36 = require("@marko/compiler");
 var import_babel_utils24 = require("@marko/compiler/babel-utils");
 var kCommentTagBinding = Symbol("comment tag binding");
 var kGetterId2 = Symbol("node getter id");
@@ -6436,7 +6564,7 @@ var html_comment_default = {
     let needsBinding = false;
     let needsGetter = false;
     if (tagVar) {
-      if (!import_compiler35.types.isIdentifier(tagVar)) {
+      if (!import_compiler36.types.isIdentifier(tagVar)) {
         throw tag.get("var").buildCodeFrameError(
           "The `html-comment` tag variable cannot be destructured."
         );
@@ -6487,7 +6615,7 @@ var html_comment_default = {
           callRuntime(
             "nodeRef",
             getterId && getScopeIdIdentifier(getSection(tag)),
-            getterId && import_compiler35.types.stringLiteral(getterId)
+            getterId && import_compiler36.types.stringLiteral(getterId)
           )
         );
       } else {
@@ -6500,12 +6628,12 @@ var html_comment_default = {
           );
           currentProgramPath.pushContainer(
             "body",
-            import_compiler35.types.variableDeclaration("const", [
-              import_compiler35.types.variableDeclarator(
+            import_compiler36.types.variableDeclaration("const", [
+              import_compiler36.types.variableDeclarator(
                 getterFnIdentifier,
                 callRuntime(
                   "nodeRef",
-                  import_compiler35.types.stringLiteral(getterId),
+                  import_compiler36.types.stringLiteral(getterId),
                   getScopeAccessorLiteral(commentBinding)
                 )
               )
@@ -6516,13 +6644,13 @@ var html_comment_default = {
           const referenceSection = getSection(reference);
           if (isInvokedFunction(reference)) {
             reference.parentPath.replaceWith(
-              import_compiler35.types.expressionStatement(
+              import_compiler36.types.expressionStatement(
                 createScopeReadExpression(referenceSection, commentBinding)
               )
             );
           } else if (getterFnIdentifier) {
             reference.replaceWith(
-              import_compiler35.types.callExpression(getterFnIdentifier, [
+              import_compiler36.types.callExpression(getterFnIdentifier, [
                 getScopeExpression(referenceSection, getSection(tag))
               ])
             );
@@ -6538,9 +6666,9 @@ var html_comment_default = {
     write2`<!--`;
     if (isOutputHTML()) {
       for (const child of tag.node.body.body) {
-        if (import_compiler35.types.isMarkoText(child)) {
+        if (import_compiler36.types.isMarkoText(child)) {
           write2`${child.value}`;
-        } else if (import_compiler35.types.isMarkoPlaceholder(child)) {
+        } else if (import_compiler36.types.isMarkoPlaceholder(child)) {
           write2`${callRuntime("escapeXML", child.value)}`;
         }
       }
@@ -6549,10 +6677,10 @@ var html_comment_default = {
       const templateExpressions = [];
       let currentQuasi = "";
       for (const child of tag.node.body.body) {
-        if (import_compiler35.types.isMarkoText(child)) {
+        if (import_compiler36.types.isMarkoText(child)) {
           currentQuasi += child.value;
-        } else if (import_compiler35.types.isMarkoPlaceholder(child)) {
-          templateQuasis.push(import_compiler35.types.templateElement({ raw: currentQuasi }));
+        } else if (import_compiler36.types.isMarkoPlaceholder(child)) {
+          templateQuasis.push(import_compiler36.types.templateElement({ raw: currentQuasi }));
           templateExpressions.push(child.value);
           currentQuasi = "";
         }
@@ -6560,20 +6688,20 @@ var html_comment_default = {
       if (templateExpressions.length === 0) {
         write2`${currentQuasi}`;
       } else {
-        templateQuasis.push(import_compiler35.types.templateElement({ raw: currentQuasi }));
+        templateQuasis.push(import_compiler36.types.templateElement({ raw: currentQuasi }));
         addStatement(
           "render",
           getSection(tag),
           tagExtra.referencedBindings,
-          import_compiler35.types.expressionStatement(
+          import_compiler36.types.expressionStatement(
             callRuntime(
               "data",
-              import_compiler35.types.memberExpression(
+              import_compiler36.types.memberExpression(
                 scopeIdentifier,
                 getScopeAccessorLiteral(commentBinding),
                 true
               ),
-              import_compiler35.types.templateLiteral(templateQuasis, templateExpressions)
+              import_compiler36.types.templateLiteral(templateQuasis, templateExpressions)
             )
           )
         );
@@ -6599,7 +6727,7 @@ var html_comment_default = {
 };
 // src/translator/core/html-script.ts
-var import_compiler36 = require("@marko/compiler");
+var import_compiler37 = require("@marko/compiler");
 var import_babel_utils25 = require("@marko/compiler/babel-utils");
 var kGetterId3 = Symbol("node getter id");
 var html_script_default = {
@@ -6607,7 +6735,7 @@ var html_script_default = {
     (0, import_babel_utils25.assertNoArgs)(tag);
     (0, import_babel_utils25.assertNoParams)(tag);
     const { node } = tag;
-    if (node.var && !import_compiler36.types.isIdentifier(node.var)) {
+    if (node.var && !import_compiler37.types.isIdentifier(node.var)) {
       throw tag.get("var").buildCodeFrameError(
         "Tag variables on native elements cannot be destructured."
       );
@@ -6620,7 +6748,7 @@ var html_script_default = {
     let spreadReferenceNodes;
     for (let i = attributes.length; i--; ) {
       const attr2 = attributes[i];
-      if (import_compiler36.types.isMarkoAttribute(attr2)) {
+      if (import_compiler37.types.isMarkoAttribute(attr2)) {
         if (seen[attr2.name]) {
           dropReferences(attr2.value);
           continue;
@@ -6632,14 +6760,14 @@ var html_script_default = {
         } else if (!evaluate(attr2.value).confident) {
           hasDynamicAttributes = true;
         }
-      } else if (import_compiler36.types.isMarkoSpreadAttribute(attr2)) {
+      } else if (import_compiler37.types.isMarkoSpreadAttribute(attr2)) {
         hasEventHandlers = true;
         hasDynamicAttributes = true;
         (attr2.value.extra ??= {}).isEffect = true;
       }
       if (spreadReferenceNodes) {
         spreadReferenceNodes.push(attr2.value);
-      } else if (import_compiler36.types.isMarkoSpreadAttribute(attr2)) {
+      } else if (import_compiler37.types.isMarkoSpreadAttribute(attr2)) {
         spreadReferenceNodes = [attr2.value];
       }
     }
@@ -6649,10 +6777,10 @@ var html_script_default = {
     const bodyPlaceholderNodes = [];
     let hasBodyPlaceholders = false;
     for (const child of tag.node.body.body) {
-      if (import_compiler36.types.isMarkoPlaceholder(child)) {
+      if (import_compiler37.types.isMarkoPlaceholder(child)) {
         bodyPlaceholderNodes.push(child.value);
         hasBodyPlaceholders = true;
-      } else if (!import_compiler36.types.isMarkoText(child)) {
+      } else if (!import_compiler37.types.isMarkoText(child)) {
         throw tag.hub.buildError(
           child,
           "Invalid child. Only text is allowed inside an html-script."
@@ -6706,7 +6834,7 @@ var html_script_default = {
           callRuntime(
             "nodeRef",
             getterId && getScopeIdIdentifier(section),
-            getterId && import_compiler36.types.stringLiteral(getterId)
+            getterId && import_compiler37.types.stringLiteral(getterId)
           )
         );
       } else {
@@ -6719,12 +6847,12 @@ var html_script_default = {
           );
           currentProgramPath.pushContainer(
             "body",
-            import_compiler36.types.variableDeclaration("const", [
-              import_compiler36.types.variableDeclarator(
+            import_compiler37.types.variableDeclaration("const", [
+              import_compiler37.types.variableDeclarator(
                 getterFnIdentifier,
                 callRuntime(
                   "nodeRef",
-                  import_compiler36.types.stringLiteral(getterId),
+                  import_compiler37.types.stringLiteral(getterId),
                   getScopeAccessorLiteral(nodeRef2)
                 )
               )
@@ -6735,13 +6863,13 @@ var html_script_default = {
           const referenceSection = getSection(reference);
           if (isInvokedFunction(reference)) {
             reference.parentPath.replaceWith(
-              import_compiler36.types.expressionStatement(
+              import_compiler37.types.expressionStatement(
                 createScopeReadExpression(referenceSection, nodeRef2)
               )
             );
           } else if (getterFnIdentifier) {
             reference.replaceWith(
-              import_compiler36.types.callExpression(getterFnIdentifier, [
+              import_compiler37.types.callExpression(getterFnIdentifier, [
                 getScopeExpression(referenceSection, getSection(tag))
               ])
             );
@@ -6774,10 +6902,10 @@ var html_script_default = {
               "render",
               section,
               valueReferences,
-              import_compiler36.types.expressionStatement(
+              import_compiler37.types.expressionStatement(
                 callRuntime(
                   helper,
-                  import_compiler36.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                  import_compiler37.types.memberExpression(scopeIdentifier, visitAccessor, true),
                   value
                 )
               )
@@ -6792,18 +6920,18 @@ var html_script_default = {
             if (isEventHandler(name2)) {
               addHTMLEffectCall(section, valueReferences);
             } else {
-              write2`${callRuntime("attr", import_compiler36.types.stringLiteral(name2), value)}`;
+              write2`${callRuntime("attr", import_compiler37.types.stringLiteral(name2), value)}`;
             }
           } else if (isEventHandler(name2)) {
             addStatement(
               "effect",
               section,
               valueReferences,
-              import_compiler36.types.expressionStatement(
+              import_compiler37.types.expressionStatement(
                 callRuntime(
                   "on",
-                  import_compiler36.types.memberExpression(scopeIdentifier, visitAccessor, true),
-                  import_compiler36.types.stringLiteral(getEventHandlerName(name2)),
+                  import_compiler37.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                  import_compiler37.types.stringLiteral(getEventHandlerName(name2)),
                   value
                 )
               )
@@ -6813,11 +6941,11 @@ var html_script_default = {
               "render",
               section,
               valueReferences,
-              import_compiler36.types.expressionStatement(
+              import_compiler37.types.expressionStatement(
                 callRuntime(
                   "attr",
-                  import_compiler36.types.memberExpression(scopeIdentifier, visitAccessor, true),
-                  import_compiler36.types.stringLiteral(name2),
+                  import_compiler37.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                  import_compiler37.types.stringLiteral(name2),
                   value
                 )
               )
@@ -6830,9 +6958,9 @@ var html_script_default = {
       if (isHTML) {
         addHTMLEffectCall(section, tagExtra.referencedBindings);
         if (skipExpression) {
-          write2`${callRuntime("partialAttrs", spreadExpression, skipExpression, visitAccessor, getScopeIdIdentifier(section), import_compiler36.types.stringLiteral("script"))}`;
+          write2`${callRuntime("partialAttrs", spreadExpression, skipExpression, visitAccessor, getScopeIdIdentifier(section), import_compiler37.types.stringLiteral("script"))}`;
         } else {
-          write2`${callRuntime("attrs", spreadExpression, visitAccessor, getScopeIdIdentifier(section), import_compiler36.types.stringLiteral("script"))}`;
+          write2`${callRuntime("attrs", spreadExpression, visitAccessor, getScopeIdIdentifier(section), import_compiler37.types.stringLiteral("script"))}`;
         }
       } else {
         if (skipExpression) {
@@ -6840,7 +6968,7 @@ var html_script_default = {
             "render",
             section,
             tagExtra.referencedBindings,
-            import_compiler36.types.expressionStatement(
+            import_compiler37.types.expressionStatement(
               callRuntime(
                 "partialAttrs",
                 scopeIdentifier,
@@ -6855,7 +6983,7 @@ var html_script_default = {
             "render",
             section,
             tagExtra.referencedBindings,
-            import_compiler36.types.expressionStatement(
+            import_compiler37.types.expressionStatement(
               callRuntime(
                 "attrs",
                 scopeIdentifier,
@@ -6869,7 +6997,7 @@ var html_script_default = {
           "effect",
           section,
           tagExtra.referencedBindings,
-          import_compiler36.types.expressionStatement(
+          import_compiler37.types.expressionStatement(
             callRuntime("attrsEvents", scopeIdentifier, visitAccessor)
           ),
           false
@@ -6880,9 +7008,9 @@ var html_script_default = {
     enter2(tag);
     if (isOutputHTML()) {
       for (const child of tag.node.body.body) {
-        if (import_compiler36.types.isMarkoText(child)) {
+        if (import_compiler37.types.isMarkoText(child)) {
           write2`${child.value}`;
-        } else if (import_compiler36.types.isMarkoPlaceholder(child)) {
+        } else if (import_compiler37.types.isMarkoPlaceholder(child)) {
           write2`${callRuntime("escapeScript", child.value)}`;
         }
       }
@@ -6892,11 +7020,11 @@ var html_script_default = {
       let currentQuasi = "";
       let referencePlaceholder;
       for (const child of tag.node.body.body) {
-        if (import_compiler36.types.isMarkoText(child)) {
+        if (import_compiler37.types.isMarkoText(child)) {
           currentQuasi += child.value;
-        } else if (import_compiler36.types.isMarkoPlaceholder(child)) {
+        } else if (import_compiler37.types.isMarkoPlaceholder(child)) {
           referencePlaceholder ||= child;
-          templateQuasis.push(import_compiler36.types.templateElement({ raw: currentQuasi }));
+          templateQuasis.push(import_compiler37.types.templateElement({ raw: currentQuasi }));
           templateExpressions.push(child.value);
           currentQuasi = "";
         }
@@ -6904,16 +7032,16 @@ var html_script_default = {
       if (!referencePlaceholder) {
         write2`${currentQuasi}`;
       } else {
-        templateQuasis.push(import_compiler36.types.templateElement({ raw: currentQuasi }));
+        templateQuasis.push(import_compiler37.types.templateElement({ raw: currentQuasi }));
         addStatement(
           "render",
           getSection(tag),
           referencePlaceholder.value.extra?.referencedBindings,
-          import_compiler36.types.expressionStatement(
+          import_compiler37.types.expressionStatement(
             callRuntime(
               "textContent",
-              import_compiler36.types.memberExpression(scopeIdentifier, visitAccessor, true),
-              import_compiler36.types.templateLiteral(templateQuasis, templateExpressions)
+              import_compiler37.types.memberExpression(scopeIdentifier, visitAccessor, true),
+              import_compiler37.types.templateLiteral(templateQuasis, templateExpressions)
             )
           )
         );
@@ -6952,11 +7080,11 @@ function getUsedAttrs2(tag) {
   for (let i = attributes.length; i--; ) {
     const attr2 = attributes[i];
     const { value } = attr2;
-    if (import_compiler36.types.isMarkoSpreadAttribute(attr2)) {
+    if (import_compiler37.types.isMarkoSpreadAttribute(attr2)) {
       if (!spreadProps) {
         spreadProps = [];
       }
-      spreadProps.push(import_compiler36.types.spreadElement(value));
+      spreadProps.push(import_compiler37.types.spreadElement(value));
     } else if (!seen[attr2.name]) {
       seen[attr2.name] = attr2;
       if (spreadProps) {
@@ -6970,10 +7098,10 @@ function getUsedAttrs2(tag) {
   if (spreadProps) {
     spreadProps.reverse();
     for (const { name: name2 } of staticAttrs) {
-      (skipProps ||= []).push(toObjectProperty(name2, import_compiler36.types.numericLiteral(1)));
+      (skipProps ||= []).push(toObjectProperty(name2, import_compiler37.types.numericLiteral(1)));
     }
     if (skipProps) {
-      skipExpression = import_compiler36.types.objectExpression(skipProps);
+      skipExpression = import_compiler37.types.objectExpression(skipProps);
     }
     spreadExpression = propsToExpression(spreadProps);
   }
@@ -6985,7 +7113,7 @@ function getUsedAttrs2(tag) {
 }
 // src/translator/core/html-style.ts
-var import_compiler37 = require("@marko/compiler");
+var import_compiler38 = require("@marko/compiler");
 var import_babel_utils26 = require("@marko/compiler/babel-utils");
 var kGetterId4 = Symbol("node getter id");
 var html_style_default = {
@@ -6993,7 +7121,7 @@ var html_style_default = {
     (0, import_babel_utils26.assertNoArgs)(tag);
     (0, import_babel_utils26.assertNoParams)(tag);
     const { node } = tag;
-    if (node.var && !import_compiler37.types.isIdentifier(node.var)) {
+    if (node.var && !import_compiler38.types.isIdentifier(node.var)) {
       throw tag.get("var").buildCodeFrameError(
         "Tag variables on native elements cannot be destructured."
       );
@@ -7006,7 +7134,7 @@ var html_style_default = {
     let spreadReferenceNodes;
     for (let i = attributes.length; i--; ) {
       const attr2 = attributes[i];
-      if (import_compiler37.types.isMarkoAttribute(attr2)) {
+      if (import_compiler38.types.isMarkoAttribute(attr2)) {
         if (seen[attr2.name]) {
           dropReferences(attr2.value);
           continue;
@@ -7018,14 +7146,14 @@ var html_style_default = {
         } else if (!evaluate(attr2.value).confident) {
           hasDynamicAttributes = true;
         }
-      } else if (import_compiler37.types.isMarkoSpreadAttribute(attr2)) {
+      } else if (import_compiler38.types.isMarkoSpreadAttribute(attr2)) {
         hasEventHandlers = true;
         hasDynamicAttributes = true;
         (attr2.value.extra ??= {}).isEffect = true;
       }
       if (spreadReferenceNodes) {
         spreadReferenceNodes.push(attr2.value);
-      } else if (import_compiler37.types.isMarkoSpreadAttribute(attr2)) {
+      } else if (import_compiler38.types.isMarkoSpreadAttribute(attr2)) {
         spreadReferenceNodes = [attr2.value];
       }
     }
@@ -7035,10 +7163,10 @@ var html_style_default = {
     const bodyPlaceholderNodes = [];
     let hasBodyPlaceholders = false;
     for (const child of tag.node.body.body) {
-      if (import_compiler37.types.isMarkoPlaceholder(child)) {
+      if (import_compiler38.types.isMarkoPlaceholder(child)) {
         bodyPlaceholderNodes.push(child.value);
         hasBodyPlaceholders = true;
-      } else if (!import_compiler37.types.isMarkoText(child)) {
+      } else if (!import_compiler38.types.isMarkoText(child)) {
         throw tag.hub.buildError(
           child,
           "Invalid child. Only text is allowed inside an html-style."
@@ -7092,7 +7220,7 @@ var html_style_default = {
           callRuntime(
             "nodeRef",
             getterId && getScopeIdIdentifier(section),
-            getterId && import_compiler37.types.stringLiteral(getterId)
+            getterId && import_compiler38.types.stringLiteral(getterId)
           )
         );
       } else {
@@ -7105,12 +7233,12 @@ var html_style_default = {
           );
           currentProgramPath.pushContainer(
             "body",
-            import_compiler37.types.variableDeclaration("const", [
-              import_compiler37.types.variableDeclarator(
+            import_compiler38.types.variableDeclaration("const", [
+              import_compiler38.types.variableDeclarator(
                 getterFnIdentifier,
                 callRuntime(
                   "nodeRef",
-                  import_compiler37.types.stringLiteral(getterId),
+                  import_compiler38.types.stringLiteral(getterId),
                   getScopeAccessorLiteral(nodeRef2)
                 )
               )
@@ -7121,13 +7249,13 @@ var html_style_default = {
           const referenceSection = getSection(reference);
           if (isInvokedFunction(reference)) {
             reference.parentPath.replaceWith(
-              import_compiler37.types.expressionStatement(
+              import_compiler38.types.expressionStatement(
                 createScopeReadExpression(referenceSection, nodeRef2)
               )
             );
           } else if (getterFnIdentifier) {
             reference.replaceWith(
-              import_compiler37.types.callExpression(getterFnIdentifier, [
+              import_compiler38.types.callExpression(getterFnIdentifier, [
                 getScopeExpression(referenceSection, getSection(tag))
               ])
             );
@@ -7160,10 +7288,10 @@ var html_style_default = {
               "render",
               section,
               valueReferences,
-              import_compiler37.types.expressionStatement(
+              import_compiler38.types.expressionStatement(
                 callRuntime(
                   helper,
-                  import_compiler37.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                  import_compiler38.types.memberExpression(scopeIdentifier, visitAccessor, true),
                   value
                 )
               )
@@ -7178,18 +7306,18 @@ var html_style_default = {
             if (isEventHandler(name2)) {
               addHTMLEffectCall(section, valueReferences);
             } else {
-              write2`${callRuntime("attr", import_compiler37.types.stringLiteral(name2), value)}`;
+              write2`${callRuntime("attr", import_compiler38.types.stringLiteral(name2), value)}`;
             }
           } else if (isEventHandler(name2)) {
             addStatement(
               "effect",
               section,
               valueReferences,
-              import_compiler37.types.expressionStatement(
+              import_compiler38.types.expressionStatement(
                 callRuntime(
                   "on",
-                  import_compiler37.types.memberExpression(scopeIdentifier, visitAccessor, true),
-                  import_compiler37.types.stringLiteral(getEventHandlerName(name2)),
+                  import_compiler38.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                  import_compiler38.types.stringLiteral(getEventHandlerName(name2)),
                   value
                 )
               )
@@ -7199,11 +7327,11 @@ var html_style_default = {
               "render",
               section,
               valueReferences,
-              import_compiler37.types.expressionStatement(
+              import_compiler38.types.expressionStatement(
                 callRuntime(
                   "attr",
-                  import_compiler37.types.memberExpression(scopeIdentifier, visitAccessor, true),
-                  import_compiler37.types.stringLiteral(name2),
+                  import_compiler38.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                  import_compiler38.types.stringLiteral(name2),
                   value
                 )
               )
@@ -7216,9 +7344,9 @@ var html_style_default = {
       if (isHTML) {
         addHTMLEffectCall(section, tagExtra.referencedBindings);
         if (skipExpression) {
-          write2`${callRuntime("partialAttrs", spreadExpression, skipExpression, visitAccessor, getScopeIdIdentifier(section), import_compiler37.types.stringLiteral("style"))}`;
+          write2`${callRuntime("partialAttrs", spreadExpression, skipExpression, visitAccessor, getScopeIdIdentifier(section), import_compiler38.types.stringLiteral("style"))}`;
         } else {
-          write2`${callRuntime("attrs", spreadExpression, visitAccessor, getScopeIdIdentifier(section), import_compiler37.types.stringLiteral("style"))}`;
+          write2`${callRuntime("attrs", spreadExpression, visitAccessor, getScopeIdIdentifier(section), import_compiler38.types.stringLiteral("style"))}`;
         }
       } else {
         if (skipExpression) {
@@ -7226,7 +7354,7 @@ var html_style_default = {
             "render",
             section,
             tagExtra.referencedBindings,
-            import_compiler37.types.expressionStatement(
+            import_compiler38.types.expressionStatement(
               callRuntime(
                 "partialAttrs",
                 scopeIdentifier,
@@ -7241,7 +7369,7 @@ var html_style_default = {
             "render",
             section,
             tagExtra.referencedBindings,
-            import_compiler37.types.expressionStatement(
+            import_compiler38.types.expressionStatement(
               callRuntime(
                 "attrs",
                 scopeIdentifier,
@@ -7255,7 +7383,7 @@ var html_style_default = {
           "effect",
           section,
           tagExtra.referencedBindings,
-          import_compiler37.types.expressionStatement(
+          import_compiler38.types.expressionStatement(
             callRuntime("attrsEvents", scopeIdentifier, visitAccessor)
           ),
           false
@@ -7266,9 +7394,9 @@ var html_style_default = {
     enter2(tag);
     if (isOutputHTML()) {
       for (const child of tag.node.body.body) {
-        if (import_compiler37.types.isMarkoText(child)) {
+        if (import_compiler38.types.isMarkoText(child)) {
           write2`${child.value}`;
-        } else if (import_compiler37.types.isMarkoPlaceholder(child)) {
+        } else if (import_compiler38.types.isMarkoPlaceholder(child)) {
           write2`${callRuntime("escapeStyle", child.value)}`;
         }
       }
@@ -7278,11 +7406,11 @@ var html_style_default = {
       let currentQuasi = "";
       let referencePlaceholder;
       for (const child of tag.node.body.body) {
-        if (import_compiler37.types.isMarkoText(child)) {
+        if (import_compiler38.types.isMarkoText(child)) {
           currentQuasi += child.value;
-        } else if (import_compiler37.types.isMarkoPlaceholder(child)) {
+        } else if (import_compiler38.types.isMarkoPlaceholder(child)) {
           referencePlaceholder ||= child;
-          templateQuasis.push(import_compiler37.types.templateElement({ raw: currentQuasi }));
+          templateQuasis.push(import_compiler38.types.templateElement({ raw: currentQuasi }));
           templateExpressions.push(child.value);
           currentQuasi = "";
         }
@@ -7290,16 +7418,16 @@ var html_style_default = {
       if (!referencePlaceholder) {
         write2`${currentQuasi}`;
       } else {
-        templateQuasis.push(import_compiler37.types.templateElement({ raw: currentQuasi }));
+        templateQuasis.push(import_compiler38.types.templateElement({ raw: currentQuasi }));
         addStatement(
           "render",
           getSection(tag),
           referencePlaceholder.value.extra?.referencedBindings,
-          import_compiler37.types.expressionStatement(
+          import_compiler38.types.expressionStatement(
             callRuntime(
               "textContent",
-              import_compiler37.types.memberExpression(scopeIdentifier, visitAccessor, true),
-              import_compiler37.types.templateLiteral(templateQuasis, templateExpressions)
+              import_compiler38.types.memberExpression(scopeIdentifier, visitAccessor, true),
+              import_compiler38.types.templateLiteral(templateQuasis, templateExpressions)
             )
           )
         );
@@ -7333,11 +7461,11 @@ function getUsedAttrs3(tag) {
   for (let i = attributes.length; i--; ) {
     const attr2 = attributes[i];
     const { value } = attr2;
-    if (import_compiler37.types.isMarkoSpreadAttribute(attr2)) {
+    if (import_compiler38.types.isMarkoSpreadAttribute(attr2)) {
       if (!spreadProps) {
         spreadProps = [];
       }
-      spreadProps.push(import_compiler37.types.spreadElement(value));
+      spreadProps.push(import_compiler38.types.spreadElement(value));
     } else if (!seen[attr2.name]) {
       seen[attr2.name] = attr2;
       if (spreadProps) {
@@ -7351,10 +7479,10 @@ function getUsedAttrs3(tag) {
   if (spreadProps) {
     spreadProps.reverse();
     for (const { name: name2 } of staticAttrs) {
-      (skipProps ||= []).push(toObjectProperty(name2, import_compiler37.types.numericLiteral(1)));
+      (skipProps ||= []).push(toObjectProperty(name2, import_compiler38.types.numericLiteral(1)));
     }
     if (skipProps) {
-      skipExpression = import_compiler37.types.objectExpression(skipProps);
+      skipExpression = import_compiler38.types.objectExpression(skipProps);
     }
     spreadExpression = propsToExpression(spreadProps);
   }
@@ -7366,7 +7494,7 @@ function getUsedAttrs3(tag) {
 }
 // src/translator/core/id.ts
-var import_compiler38 = require("@marko/compiler");
+var import_compiler39 = require("@marko/compiler");
 var import_babel_utils27 = require("@marko/compiler/babel-utils");
 var id_default = {
   analyze(tag) {
@@ -7379,7 +7507,7 @@ var id_default = {
     if (!node.var) {
       throw tag.get("name").buildCodeFrameError("The `id` tag requires a tag variable.");
     }
-    if (!import_compiler38.types.isIdentifier(node.var)) {
+    if (!import_compiler39.types.isIdentifier(node.var)) {
       throw tag.get("var").buildCodeFrameError("The `id` tag cannot be destructured");
     }
     trackVarReferences(tag, 4 /* derived */);
@@ -7390,7 +7518,7 @@ var id_default = {
       const id = isOutputHTML() ? callRuntime("nextTagId") : callRuntime("nextTagId", scopeIdentifier);
       if (isOutputHTML()) {
         tag.replaceWith(
-          import_compiler38.types.variableDeclaration("const", [import_compiler38.types.variableDeclarator(node.var, id)])
+          import_compiler39.types.variableDeclaration("const", [import_compiler39.types.variableDeclarator(node.var, id)])
         );
       } else {
         const source = initValue(node.var.extra.binding);
@@ -7415,17 +7543,17 @@ var id_default = {
 };
 // src/translator/core/if.ts
-var import_compiler40 = require("@marko/compiler");
+var import_compiler41 = require("@marko/compiler");
 var import_babel_utils28 = require("@marko/compiler/babel-utils");
 // src/translator/util/to-first-statement-or-block.ts
-var import_compiler39 = require("@marko/compiler");
+var import_compiler40 = require("@marko/compiler");
 function toFirstStatementOrBlock(body) {
   if (Array.isArray(body)) {
     if (body.length === 1) {
       return body[0];
     }
-    return import_compiler39.types.blockStatement(body);
+    return import_compiler40.types.blockStatement(body);
   }
   return body;
 }
@@ -7491,14 +7619,12 @@ var IfTag = {
         const [isLast, branches] = getBranches(tag, bodySection);
         const [rootTag] = branches[0];
         const rootExtra = rootTag.node.extra;
-        const isStateful = isStatefulReferences(rootExtra.referencedBindings);
         const singleNodeOptimization = rootExtra.singleNodeOptimization;
-        const hasStatefulClosures = bodySection && checkStatefulClosures(bodySection, true);
-        const hasHoists = bodySection && (bodySection.hoisted || bodySection.isHoistThrough || bodySection.referencedHoists);
+        const branchSources = getSourcesForBranches(branches);
+        const hasHoists = hasHoistsInBranches(branches);
+        const serializeReason = hasHoists || branchSources?.all;
         if (bodySection) {
-          if (isStateful || hasStatefulClosures || hasHoists) {
-            setForceResumeScope(bodySection);
-          }
+          serializeSectionIfNeeded(bodySection, serializeReason);
           flushInto(tag);
           writeHTMLResumeStatements(tagBody);
         }
@@ -7509,33 +7635,28 @@ var IfTag = {
           const ifScopeIdIdentifier = rootTag.scope.generateUidIdentifier("ifScopeId");
           const ifBranchIdentifier = rootTag.scope.generateUidIdentifier("ifBranch");
           let statement;
-          if (isStateful && onlyChildInParentOptimization) {
+          if (branchSources?.referenced && onlyChildInParentOptimization) {
             getParentTag(rootTag).node.extra[kSerializeMarker] = false;
           }
           for (let i = branches.length; i--; ) {
             const [branchTag, branchBodySection] = branches[i];
             const bodyStatements = branchTag.node.body.body;
             if (branchBodySection) {
-              const branchHasStatefulClosures = checkStatefulClosures(
-                branchBodySection,
-                true
-              );
-              const branchHasHoists = branchBodySection.hoisted || branchBodySection.isHoistThrough || branchBodySection.referencedHoists;
-              if (isStateful) {
+              if (branchSources?.referenced) {
                 bodyStatements.push(
-                  import_compiler40.types.expressionStatement(
-                    import_compiler40.types.assignmentExpression(
+                  import_compiler41.types.expressionStatement(
+                    import_compiler41.types.assignmentExpression(
                       "=",
                       ifBranchIdentifier,
-                      import_compiler40.types.numericLiteral(i)
+                      import_compiler41.types.numericLiteral(i)
                     )
                   )
                 );
               }
-              if (isStateful || branchHasStatefulClosures || branchHasHoists) {
+              if (serializeReason) {
                 bodyStatements.push(
-                  import_compiler40.types.expressionStatement(
-                    import_compiler40.types.assignmentExpression(
+                  import_compiler41.types.expressionStatement(
+                    import_compiler41.types.assignmentExpression(
                       "=",
                       ifScopeIdIdentifier,
                       getScopeIdIdentifier(branchBodySection)
@@ -7547,7 +7668,7 @@ var IfTag = {
             const [testAttr] = branchTag.node.attributes;
             const curStatement = toFirstStatementOrBlock(bodyStatements);
             if (testAttr) {
-              statement = import_compiler40.types.ifStatement(
+              statement = import_compiler41.types.ifStatement(
                 testAttr.value,
                 curStatement,
                 statement
@@ -7557,24 +7678,25 @@ var IfTag = {
             }
             branchTag.remove();
           }
-          if (isStateful || hasStatefulClosures || hasHoists) {
-            if (isStateful) {
+          if (serializeReason) {
+            if (branchSources?.referenced) {
               setSerializedProperty(
                 section,
                 getAccessorPrefix().ConditionalRenderer + getScopeAccessor(nodeRef2),
-                ifBranchIdentifier
+                ifBranchIdentifier,
+                branchSources.referenced
               );
-              const cbNode = import_compiler40.types.arrowFunctionExpression(
+              const cbNode = import_compiler41.types.arrowFunctionExpression(
                 [],
-                import_compiler40.types.blockStatement([statement])
+                import_compiler41.types.blockStatement([statement])
               );
-              statement = import_compiler40.types.expressionStatement(
+              statement = import_compiler41.types.expressionStatement(
                 singleNodeOptimization ? callRuntime(
                   "resumeSingleNodeConditional",
                   cbNode,
                   getScopeIdIdentifier(section),
                   getScopeAccessorLiteral(nodeRef2),
-                  onlyChildInParentOptimization && import_compiler40.types.numericLiteral(1)
+                  onlyChildInParentOptimization && import_compiler41.types.numericLiteral(1)
                 ) : callRuntime(
                   "resumeConditional",
                   cbNode,
@@ -7585,18 +7707,19 @@ var IfTag = {
             }
             nextTag.insertBefore(statement);
             getHTMLSectionStatements(section).push(
-              import_compiler40.types.variableDeclaration(
+              import_compiler41.types.variableDeclaration(
                 "let",
                 [
-                  import_compiler40.types.variableDeclarator(ifScopeIdIdentifier),
-                  isStateful && import_compiler40.types.variableDeclarator(ifBranchIdentifier)
+                  import_compiler41.types.variableDeclarator(ifScopeIdIdentifier),
+                  branchSources?.referenced && import_compiler41.types.variableDeclarator(ifBranchIdentifier)
                 ].filter(Boolean)
               )
             );
             setSerializedProperty(
               section,
               getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2),
-              callRuntime("getScopeById", ifScopeIdIdentifier)
+              callRuntime("getScopeById", ifScopeIdIdentifier),
+              serializeReason
             );
           } else {
             nextTag.insertBefore(statement);
@@ -7629,25 +7752,25 @@ var IfTag = {
           const rootExtra = branches[0][0].node.extra;
           const nodeRef2 = getOptimizedOnlyChildNodeRef(rootTag, section);
           const rendererIdentifiers = [];
-          let expr = import_compiler40.types.numericLiteral(branches.length);
+          let expr = import_compiler41.types.numericLiteral(branches.length);
           for (let i = branches.length; i--; ) {
             const [branchTag, branchBodySection] = branches[i];
             const [testAttr] = branchTag.node.attributes;
-            const consequent = import_compiler40.types.numericLiteral(branchBodySection ? i : -1);
+            const consequent = import_compiler41.types.numericLiteral(branchBodySection ? i : -1);
             if (branchBodySection) {
-              rendererIdentifiers.push(import_compiler40.types.identifier(branchBodySection.name));
+              rendererIdentifiers.push(import_compiler41.types.identifier(branchBodySection.name));
               setClosureSignalBuilder(branchTag, (closure, render) => {
                 return callRuntime(
                   "conditionalClosure",
                   getScopeAccessorLiteral(closure),
                   getScopeAccessorLiteral(nodeRef2),
-                  import_compiler40.types.numericLiteral(i),
+                  import_compiler41.types.numericLiteral(i),
                   render
                 );
               });
             }
             branchTag.remove();
-            expr = testAttr ? import_compiler40.types.conditionalExpression(testAttr.value, consequent, expr) : consequent;
+            expr = testAttr ? import_compiler41.types.conditionalExpression(testAttr.value, consequent, expr) : consequent;
           }
           const signal = getSignal(section, nodeRef2, "if");
           signal.build = () => {
@@ -7729,7 +7852,7 @@ function assertHasBody(tag) {
 function assertHasValueAttribute(tag) {
   const { node } = tag;
   const [valueAttr] = node.attributes;
-  if (!import_compiler40.types.isMarkoAttribute(valueAttr) || !valueAttr.default) {
+  if (!import_compiler41.types.isMarkoAttribute(valueAttr) || !valueAttr.default) {
     throw tag.get("name").buildCodeFrameError(`The \`${getTagName(tag)}\` tag requires a value.`);
   }
   if (node.attributes.length > 1) {
@@ -7776,6 +7899,21 @@ function getBranches(tag, bodySection) {
   }
   return [isLast, branches];
 }
+function hasHoistsInBranches(branches) {
+  for (const [, section] of branches) {
+    if (section && isSectionWithHoists(section)) return true;
+  }
+}
+function getSourcesForBranches(branches) {
+  if (branches.length === 1) {
+    return getDynamicSourcesForSection(branches[0][1]);
+  }
+  const branchSections = [];
+  for (const [, branchSection] of branches) {
+    branchSections.push(branchSection);
+  }
+  return getDynamicSourcesForSections(branchSections);
+}
 function isRoot(tag) {
   return isCoreTagName(tag, "if");
 }
@@ -7804,7 +7942,7 @@ var import_default = {
 };
 // src/translator/core/let.ts
-var import_compiler41 = require("@marko/compiler");
+var import_compiler42 = require("@marko/compiler");
 var import_babel_utils30 = require("@marko/compiler/babel-utils");
 var let_default = {
   analyze(tag) {
@@ -7813,7 +7951,7 @@ var let_default = {
     let valueAttr;
     let valueChangeAttr;
     for (const attr2 of node.attributes) {
-      if (import_compiler41.types.isMarkoAttribute(attr2)) {
+      if (import_compiler42.types.isMarkoAttribute(attr2)) {
         if (attr2.name === "value") {
           valueAttr = attr2;
         } else if (attr2.name === "valueChange") {
@@ -7841,7 +7979,7 @@ var let_default = {
     if (!tagVar) {
       throw tag.get("name").buildCodeFrameError("The `let` tag requires a tag variable.");
     }
-    if (!import_compiler41.types.isIdentifier(tagVar)) {
+    if (!import_compiler42.types.isIdentifier(tagVar)) {
       throw tag.get("var").buildCodeFrameError("The `let` tag variable cannot be destructured.");
     }
     if (valueChangeAttr && (0, import_babel_utils30.computeNode)(valueChangeAttr.value)) {
@@ -7860,10 +7998,10 @@ var let_default = {
       const { node } = tag;
       const tagVar = node.var;
       const valueAttr = node.attributes.find(
-        (attr2) => import_compiler41.types.isMarkoAttribute(attr2) && (attr2.default || attr2.name === "value")
-      ) ?? import_compiler41.types.markoAttribute("value", import_compiler41.types.identifier("undefined"));
+        (attr2) => import_compiler42.types.isMarkoAttribute(attr2) && (attr2.default || attr2.name === "value")
+      ) ?? import_compiler42.types.markoAttribute("value", import_compiler42.types.identifier("undefined"));
       const valueChangeAttr = node.attributes.find(
-        (attr2) => import_compiler41.types.isMarkoAttribute(attr2) && attr2.name === "valueChange"
+        (attr2) => import_compiler42.types.isMarkoAttribute(attr2) && attr2.name === "valueChange"
       );
       const section = getSection(tag);
       const binding = tagVar.extra.binding;
@@ -7876,7 +8014,7 @@ var let_default = {
         }
         signal.buildAssignment = (valueSection, value) => {
           const scope = getScopeExpression(valueSection, signal.section);
-          return import_compiler41.types.callExpression(signal.identifier, [scope, value]);
+          return import_compiler42.types.callExpression(signal.identifier, [scope, value]);
         };
       } else {
         translateVar(tag, valueAttr.value, "let");
@@ -7884,7 +8022,9 @@ var let_default = {
           setSerializedProperty(
             section,
             getAccessorPrefix().TagVariableChange + getScopeAccessor(binding),
-            valueChangeAttr.value
+            valueChangeAttr.value,
+            true
+            // TODO: could be based on if there are actually assignments.
           );
         }
       }
@@ -7905,7 +8045,7 @@ var let_default = {
 };
 // src/translator/core/lifecycle.ts
-var import_compiler42 = require("@marko/compiler");
+var import_compiler43 = require("@marko/compiler");
 var import_babel_utils31 = require("@marko/compiler/babel-utils");
 var kRef = Symbol("lifecycle attrs reference");
 var lifecycle_default = {
@@ -7930,7 +8070,7 @@ var lifecycle_default = {
       );
     }
     for (const attr2 of node.attributes) {
-      if (import_compiler42.types.isMarkoSpreadAttribute(attr2)) {
+      if (import_compiler43.types.isMarkoSpreadAttribute(attr2)) {
         throw tag.get("name").buildCodeFrameError(
           "The `lifecycle` tag does not support `...spread` attributes."
         );
@@ -7950,7 +8090,7 @@ var lifecycle_default = {
       if (isOutputDOM()) {
         const translatedAttrs = translateAttrs(tag);
         translatedAttrs.statements.push(
-          import_compiler42.types.expressionStatement(
+          import_compiler43.types.expressionStatement(
             callRuntime(
               "lifecycle",
               scopeIdentifier,
@@ -7985,7 +8125,7 @@ var lifecycle_default = {
 };
 // src/translator/core/log.ts
-var import_compiler43 = require("@marko/compiler");
+var import_compiler44 = require("@marko/compiler");
 var import_babel_utils32 = require("@marko/compiler/babel-utils");
 var log_default = {
   analyze(tag) {
@@ -7997,7 +8137,7 @@ var log_default = {
     if (!valueAttr) {
       throw tag.get("name").buildCodeFrameError("The `log` tag requires a value.");
     }
-    if (tag.node.attributes.length > 1 || !import_compiler43.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value") {
+    if (tag.node.attributes.length > 1 || !import_compiler44.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value") {
       throw tag.get("name").buildCodeFrameError(
         "The `log` tag only supports the `value` attribute."
       );
@@ -8009,9 +8149,9 @@ var log_default = {
       const [valueAttr] = tag.node.attributes;
       const { value } = valueAttr;
       const referencedBindings = value.extra?.referencedBindings;
-      const statement = import_compiler43.types.expressionStatement(
-        import_compiler43.types.callExpression(
-          import_compiler43.types.memberExpression(import_compiler43.types.identifier("console"), import_compiler43.types.identifier("log")),
+      const statement = import_compiler44.types.expressionStatement(
+        import_compiler44.types.callExpression(
+          import_compiler44.types.memberExpression(import_compiler44.types.identifier("console"), import_compiler44.types.identifier("log")),
           [value]
         )
       );
@@ -8037,7 +8177,7 @@ var log_default = {
 };
 // src/translator/core/script.ts
-var import_compiler44 = require("@marko/compiler");
+var import_compiler45 = require("@marko/compiler");
 var import_babel_utils33 = require("@marko/compiler/babel-utils");
 var htmlScriptTagAlternateMsg = " For a native html `script` tag use the `html-script` core tag instead.";
 var script_default = {
@@ -8059,12 +8199,12 @@ var script_default = {
       const start = body[0]?.start;
       const end = body[body.length - 1]?.end;
       const bodyStatements = (0, import_babel_utils33.parseStatements)(tag.hub.file, code, start, end);
-      const valueFn = import_compiler44.types.arrowFunctionExpression(
+      const valueFn = import_compiler45.types.arrowFunctionExpression(
         [],
-        import_compiler44.types.blockStatement(bodyStatements),
+        import_compiler45.types.blockStatement(bodyStatements),
         traverseContains(bodyStatements, isAwaitExpression)
       );
-      node.attributes.push(import_compiler44.types.markoAttribute("value", valueFn));
+      node.attributes.push(import_compiler45.types.markoAttribute("value", valueFn));
       node.body.body = [];
     }
   },
@@ -8113,28 +8253,28 @@ var script_default = {
       const referencedBindings = value.extra?.referencedBindings;
       if (isOutputDOM()) {
         const { value: value2 } = valueAttr;
-        const isFunction2 = import_compiler44.types.isFunctionExpression(value2) || import_compiler44.types.isArrowFunctionExpression(value2);
+        const isFunction2 = import_compiler45.types.isFunctionExpression(value2) || import_compiler45.types.isArrowFunctionExpression(value2);
         let inlineBody = null;
         if (isFunction2 && !(value2.async || value2.generator)) {
-          if (import_compiler44.types.isBlockStatement(value2.body)) {
+          if (import_compiler45.types.isBlockStatement(value2.body)) {
             let hasDeclaration = false;
             for (const child of value2.body.body) {
-              if (import_compiler44.types.isDeclaration(child)) {
+              if (import_compiler45.types.isDeclaration(child)) {
                 hasDeclaration = true;
                 break;
               }
             }
             inlineBody = hasDeclaration ? value2.body : value2.body.body;
           } else {
-            inlineBody = import_compiler44.types.expressionStatement(value2.body);
+            inlineBody = import_compiler45.types.expressionStatement(value2.body);
           }
         }
         addStatement(
           "effect",
           section,
           referencedBindings,
-          inlineBody || import_compiler44.types.expressionStatement(
-            import_compiler44.types.callExpression(value2, isFunction2 ? [] : [scopeIdentifier])
+          inlineBody || import_compiler45.types.expressionStatement(
+            import_compiler45.types.callExpression(value2, isFunction2 ? [] : [scopeIdentifier])
           )
         );
       } else {
@@ -8174,7 +8314,7 @@ function isAwaitExpression(node) {
 }
 // src/translator/core/server.ts
-var import_compiler45 = require("@marko/compiler");
+var import_compiler46 = require("@marko/compiler");
 var import_babel_utils34 = require("@marko/compiler/babel-utils");
 var server_default = {
   parse(tag) {
@@ -8186,10 +8326,10 @@ var server_default = {
     const code = rawValue.replace(/^server\s*/, "").trim();
     const start = node.name.start + (rawValue.length - code.length);
     let body = (0, import_babel_utils34.parseStatements)(file, code, start, start + code.length);
-    if (body.length === 1 && import_compiler45.types.isBlockStatement(body[0])) {
+    if (body.length === 1 && import_compiler46.types.isBlockStatement(body[0])) {
       body = body[0].body;
     }
-    tag.replaceWith(import_compiler45.types.markoScriptlet(body, true, "server"));
+    tag.replaceWith(import_compiler46.types.markoScriptlet(body, true, "server"));
   },
   parseOptions: {
     statement: true,
@@ -8205,7 +8345,7 @@ var server_default = {
 };
 // src/translator/core/static.ts
-var import_compiler46 = require("@marko/compiler");
+var import_compiler47 = require("@marko/compiler");
 var import_babel_utils35 = require("@marko/compiler/babel-utils");
 var static_default = {
   parse(tag) {
@@ -8217,10 +8357,10 @@ var static_default = {
     const code = rawValue.replace(/^static\s*/, "").trim();
     const start = node.name.start + (rawValue.length - code.length);
     let body = (0, import_babel_utils35.parseStatements)(file, code, start, start + code.length);
-    if (body.length === 1 && import_compiler46.types.isBlockStatement(body[0])) {
+    if (body.length === 1 && import_compiler47.types.isBlockStatement(body[0])) {
       body = body[0].body;
     }
-    tag.replaceWith(import_compiler46.types.markoScriptlet(body, true));
+    tag.replaceWith(import_compiler47.types.markoScriptlet(body, true));
   },
   parseOptions: {
     statement: true,
@@ -8236,7 +8376,7 @@ var static_default = {
 };
 // src/translator/core/style.ts
-var import_compiler47 = require("@marko/compiler");
+var import_compiler48 = require("@marko/compiler");
 var import_babel_utils36 = require("@marko/compiler/babel-utils");
 var import_magic_string = __toESM(require("magic-string"));
 var import_path3 = __toESM(require("path"));
@@ -8314,21 +8454,21 @@ var style_default = {
       if (!node.var) {
         currentProgramPath.pushContainer(
           "body",
-          import_compiler47.types.importDeclaration([], import_compiler47.types.stringLiteral(importPath))
+          import_compiler48.types.importDeclaration([], import_compiler48.types.stringLiteral(importPath))
         );
-      } else if (import_compiler47.types.isIdentifier(node.var)) {
+      } else if (import_compiler48.types.isIdentifier(node.var)) {
         currentProgramPath.pushContainer(
           "body",
-          import_compiler47.types.importDeclaration(
-            [import_compiler47.types.importDefaultSpecifier(node.var)],
-            import_compiler47.types.stringLiteral(importPath)
+          import_compiler48.types.importDeclaration(
+            [import_compiler48.types.importDefaultSpecifier(node.var)],
+            import_compiler48.types.stringLiteral(importPath)
           )
         );
       } else {
         currentProgramPath.pushContainer(
           "body",
-          import_compiler47.types.variableDeclaration("const", [
-            import_compiler47.types.variableDeclarator(
+          import_compiler48.types.variableDeclaration("const", [
+            import_compiler48.types.variableDeclarator(
               node.var,
               (0, import_babel_utils36.importDefault)(file, importPath, "style")
             )
@@ -8348,7 +8488,7 @@ var style_default = {
 };
 // src/translator/core/try.ts
-var import_compiler48 = require("@marko/compiler");
+var import_compiler49 = require("@marko/compiler");
 var import_babel_utils37 = require("@marko/compiler/babel-utils");
 var kDOMBinding2 = Symbol("try tag dom binding");
 var try_default = {
@@ -8408,7 +8548,7 @@ var try_default = {
         writeHTMLResumeStatements(tagBody);
         tag.insertBefore(translatedAttrs.statements);
         tag.replaceWith(
-          import_compiler48.types.expressionStatement(
+          import_compiler49.types.expressionStatement(
             callRuntime(
               "tryContent",
               getScopeIdIdentifier(section),
@@ -8450,7 +8590,7 @@ var try_default = {
           return callRuntime(
             "createTry",
             getScopeAccessorLiteral(nodeRef2),
-            import_compiler48.types.identifier(bodySection.name)
+            import_compiler49.types.identifier(bodySection.name)
           );
         };
         if (translatedAttrs.statements.length) {
@@ -8463,7 +8603,7 @@ var try_default = {
         }
         currentProgramPath.pushContainer(
           "body",
-          import_compiler48.types.expressionStatement(callRuntime("enableCatch"))
+          import_compiler49.types.expressionStatement(callRuntime("enableCatch"))
         );
         addValue(
           section,
@@ -8561,7 +8701,7 @@ var document_type_default = {
 };
 // src/translator/visitors/function.ts
-var import_compiler49 = require("@marko/compiler");
+var import_compiler50 = require("@marko/compiler");
 var import_babel_utils38 = require("@marko/compiler/babel-utils");
 var functionIdsBySection = /* @__PURE__ */ new WeakMap();
 var function_default = {
@@ -8578,9 +8718,9 @@ var function_default = {
     }
     const { node } = fn;
     const extra = node.extra ??= {};
-    const name2 = extra.name = fn.node.id?.name || (isMarkoAttribute(markoRoot) ? markoRoot.node.default ? import_compiler49.types.toIdentifier(
+    const name2 = extra.name = fn.node.id?.name || (isMarkoAttribute(markoRoot) ? markoRoot.node.default ? import_compiler50.types.toIdentifier(
       markoRoot.parentPath.has("var") ? markoRoot.parentPath.get("var") : markoRoot.parentPath.get("name")
-    ) : markoRoot.node.name : import_compiler49.types.isVariableDeclarator(fn.parent) && import_compiler49.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : import_compiler49.types.isObjectMethod(node) && import_compiler49.types.isIdentifier(node.key) ? node.key.name : "anonymous");
+    ) : markoRoot.node.name : import_compiler50.types.isVariableDeclarator(fn.parent) && import_compiler50.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : import_compiler50.types.isObjectMethod(node) && import_compiler50.types.isIdentifier(node.key) ? node.key.name : "anonymous");
     const {
       markoOpts,
       opts: { filename }
@@ -8641,7 +8781,7 @@ var import_declaration_default = {
 };
 // src/translator/visitors/placeholder.ts
-var import_compiler50 = require("@marko/compiler");
+var import_compiler51 = require("@marko/compiler");
 var kBinding = Symbol("placeholder node binding");
 var kSiblingText = Symbol("placeholder has sibling text");
 var placeholder_default = {
@@ -8675,13 +8815,13 @@ var placeholder_default = {
       const nodeBinding = extra[kBinding];
       const canWriteHTML = isHTML || confident && node.escape;
       const method = canWriteHTML ? node.escape ? "escapeXML" : "toString" : node.escape ? "data" : "html";
-      const isStateful = isStatefulReferences(referencedBindings);
+      const serializeReason = getDynamicSourcesForReferences(referencedBindings);
       const siblingText = extra[kSiblingText];
       if (confident && canWriteHTML) {
         write2`${getHTMLRuntime()[method](computed)}`;
       } else {
         if (siblingText === 1 /* Before */) {
-          if (isHTML && isStateful) {
+          if (isHTML && serializeReason) {
             write2`<!>`;
           }
           visit(placeholder, 37 /* Replace */);
@@ -8693,7 +8833,7 @@ var placeholder_default = {
         }
         if (isHTML) {
           write2`${callRuntime(method, value)}`;
-          if (isStateful) {
+          if (serializeReason) {
             markNode(placeholder, nodeBinding);
           }
         } else {
@@ -8701,10 +8841,10 @@ var placeholder_default = {
             "render",
             getSection(placeholder),
             value.extra?.referencedBindings,
-            import_compiler50.types.expressionStatement(
+            import_compiler51.types.expressionStatement(
               method === "data" ? callRuntime(
                 "data",
-                import_compiler50.types.memberExpression(
+                import_compiler51.types.memberExpression(
                   scopeIdentifier,
                   getScopeAccessorLiteral(nodeBinding),
                   true
@@ -8741,7 +8881,7 @@ function analyzeSiblingText(placeholder) {
       break;
     }
   }
-  if (!prev.node && import_compiler50.types.isProgram(placeholder.parentPath)) {
+  if (!prev.node && import_compiler51.types.isProgram(placeholder.parentPath)) {
     return placeholderExtra[kSiblingText] = 1 /* Before */;
   }
   let next = placeholder.getNextSibling();
@@ -8758,7 +8898,7 @@ function analyzeSiblingText(placeholder) {
       break;
     }
   }
-  if (!next.node && import_compiler50.types.isProgram(placeholder.parentPath)) {
+  if (!next.node && import_compiler51.types.isProgram(placeholder.parentPath)) {
     return placeholderExtra[kSiblingText] = 2 /* After */;
   }
   return placeholderExtra[kSiblingText] = 0 /* None */;
@@ -8780,7 +8920,7 @@ function isVoid2(value) {
 }
 // src/translator/visitors/referenced-identifier.ts
-var import_compiler51 = require("@marko/compiler");
+var import_compiler52 = require("@marko/compiler");
 var abortIdsByExpressionForSection = /* @__PURE__ */ new WeakMap();
 var referenced_identifier_default = {
   migrate(identifier) {
@@ -8788,8 +8928,8 @@ var referenced_identifier_default = {
     if (identifier.scope.hasBinding(name2)) return;
     switch (name2) {
       case "out":
-        if (import_compiler51.types.isMemberExpression(identifier.parent) && import_compiler51.types.isIdentifier(identifier.parent.property) && identifier.parent.property.name === "global") {
-          identifier.parentPath.replaceWith(import_compiler51.types.identifier("$global"));
+        if (import_compiler52.types.isMemberExpression(identifier.parent) && import_compiler52.types.isIdentifier(identifier.parent.property) && identifier.parent.property.name === "global") {
+          identifier.parentPath.replaceWith(import_compiler52.types.identifier("$global"));
         } else {
           throw identifier.buildCodeFrameError(
             "Only `out.global` is supported for compatibility."
@@ -8816,24 +8956,24 @@ var referenced_identifier_default = {
       case "$global":
         if (isOutputHTML()) {
           identifier.replaceWith(
-            import_compiler51.types.callExpression(importRuntime("$global"), [])
+            import_compiler52.types.callExpression(importRuntime("$global"), [])
           );
         } else {
           identifier.replaceWith(
-            import_compiler51.types.memberExpression(scopeIdentifier, import_compiler51.types.identifier("$global"))
+            import_compiler52.types.memberExpression(scopeIdentifier, import_compiler52.types.identifier("$global"))
           );
         }
         break;
       case "$signal":
         if (isOutputHTML()) {
           identifier.replaceWith(
-            import_compiler51.types.callExpression(
-              import_compiler51.types.arrowFunctionExpression(
+            import_compiler52.types.callExpression(
+              import_compiler52.types.arrowFunctionExpression(
                 [],
-                import_compiler51.types.blockStatement([
-                  import_compiler51.types.throwStatement(
-                    import_compiler51.types.newExpression(import_compiler51.types.identifier("Error"), [
-                      import_compiler51.types.stringLiteral("Cannot use $signal in a server render.")
+                import_compiler52.types.blockStatement([
+                  import_compiler52.types.throwStatement(
+                    import_compiler52.types.newExpression(import_compiler52.types.identifier("Error"), [
+                      import_compiler52.types.stringLiteral("Cannot use $signal in a server render.")
                     ])
                   )
                 ])
@@ -8859,19 +8999,19 @@ var referenced_identifier_default = {
               "render",
               section,
               exprRoot.node.extra?.referencedBindings,
-              import_compiler51.types.expressionStatement(
-                import_compiler51.types.callExpression(importRuntime("resetAbortSignal"), [
+              import_compiler52.types.expressionStatement(
+                import_compiler52.types.callExpression(importRuntime("resetAbortSignal"), [
                   scopeIdentifier,
-                  import_compiler51.types.numericLiteral(exprId)
+                  import_compiler52.types.numericLiteral(exprId)
                 ])
               ),
               false
             );
           }
           identifier.replaceWith(
-            import_compiler51.types.callExpression(importRuntime("getAbortSignal"), [
+            import_compiler52.types.callExpression(importRuntime("getAbortSignal"), [
               scopeIdentifier,
-              import_compiler51.types.numericLiteral(exprId)
+              import_compiler52.types.numericLiteral(exprId)
             ])
           );
         }
@@ -8911,11 +9051,11 @@ var scriptlet_default = {
 };
 // src/translator/visitors/tag/index.ts
-var import_compiler55 = require("@marko/compiler");
+var import_compiler56 = require("@marko/compiler");
 var import_babel_utils43 = require("@marko/compiler/babel-utils");
 // src/translator/visitors/tag/attribute-tag.ts
-var import_compiler52 = require("@marko/compiler");
+var import_compiler53 = require("@marko/compiler");
 var import_babel_utils40 = require("@marko/compiler/babel-utils");
 var attribute_tag_default = {
   analyze: {
@@ -8946,7 +9086,7 @@ var attribute_tag_default = {
 };
 // src/translator/visitors/tag/custom-tag.ts
-var import_compiler53 = require("@marko/compiler");
+var import_compiler54 = require("@marko/compiler");
 var import_babel_utils41 = require("@marko/compiler/babel-utils");
 var import_path4 = __toESM(require("path"));
 var kChildScopeBinding = Symbol("custom tag child scope");
@@ -9028,9 +9168,9 @@ function translateHTML(tag) {
   let tagIdentifier;
   flushInto(tag);
   writeHTMLResumeStatements(tagBody);
-  if (import_compiler53.types.isStringLiteral(node.name)) {
+  if (import_compiler54.types.isStringLiteral(node.name)) {
     const relativePath = getTagRelativePath(tag);
-    tagIdentifier = isCircularRequest(tag.hub.file, relativePath) ? import_compiler53.types.identifier(getTemplateContentName()) : (0, import_babel_utils41.importDefault)(tag.hub.file, relativePath, getTagName(tag));
+    tagIdentifier = isCircularRequest(tag.hub.file, relativePath) ? import_compiler54.types.identifier(getTemplateContentName()) : (0, import_babel_utils41.importDefault)(tag.hub.file, relativePath, getTagName(tag));
   } else {
     tagIdentifier = node.name;
   }
@@ -9041,37 +9181,32 @@ function translateHTML(tag) {
     properties: [],
     statements: []
   };
-  let providesStatefulAttrs = false;
-  for (const expr of tagExtra[kChildAttrExprs]) {
-    if (isReferencedExtra(expr) && isStatefulReferences(expr.referencedBindings)) {
-      providesStatefulAttrs = true;
-      break;
-    }
-  }
-  if (providesStatefulAttrs || tagVar) {
+  const serializeReason = !!tagVar || getDynamicSourcesForExtras(tagExtra[kChildAttrExprs]);
+  if (serializeReason) {
     const childScopeBinding = tagExtra[kChildScopeBinding];
     const peekScopeId = tag.scope.generateUidIdentifier(
       childScopeBinding?.name
     );
     tag.insertBefore(
-      import_compiler53.types.variableDeclaration("const", [
-        import_compiler53.types.variableDeclarator(peekScopeId, callRuntime("peekNextScope"))
+      import_compiler54.types.variableDeclaration("const", [
+        import_compiler54.types.variableDeclarator(peekScopeId, callRuntime("peekNextScope"))
       ])
     );
     setSerializedProperty(
       section,
       getScopeAccessor(childScopeBinding),
-      callRuntime("writeExistingScope", peekScopeId)
+      callRuntime("writeExistingScope", peekScopeId),
+      serializeReason
     );
     if (tagVar) {
       statements.push(
-        import_compiler53.types.expressionStatement(
+        import_compiler54.types.expressionStatement(
           callRuntime(
             "setTagVar",
             getScopeIdIdentifier(section),
             getScopeAccessorLiteral(tag.node.extra[kChildOffsetScopeBinding]),
             peekScopeId,
-            import_compiler53.types.stringLiteral(
+            import_compiler54.types.stringLiteral(
               getResumeRegisterId(
                 section,
                 node.var.extra?.binding,
@@ -9091,8 +9226,8 @@ function translateHTML(tag) {
       const contentExpression = contentProp.value;
       contentProp.value = contentId = tag.scope.generateUidIdentifier("content");
       const [contentPath] = tag.insertBefore(
-        import_compiler53.types.variableDeclaration("const", [
-          import_compiler53.types.variableDeclarator(
+        import_compiler54.types.variableDeclaration("const", [
+          import_compiler54.types.variableDeclarator(
             contentId,
             // TODO: only register if needed (child template analysis)
             contentExpression
@@ -9106,13 +9241,13 @@ function translateHTML(tag) {
       propsToExpression(properties)
     );
     if (tagVar) {
-      translateVar(tag, import_compiler53.types.unaryExpression("void", import_compiler53.types.numericLiteral(0)), "let");
-      renderTagExpr = import_compiler53.types.assignmentExpression("=", tagVar, renderTagExpr);
+      translateVar(tag, import_compiler54.types.unaryExpression("void", import_compiler54.types.numericLiteral(0)), "let");
+      renderTagExpr = import_compiler54.types.assignmentExpression("=", tagVar, renderTagExpr);
     }
     statements.push(
-      import_compiler53.types.ifStatement(
+      import_compiler54.types.ifStatement(
         tagIdentifier,
-        import_compiler53.types.expressionStatement(renderTagExpr),
+        import_compiler54.types.expressionStatement(renderTagExpr),
         contentId && callStatement(contentId)
       )
     );
@@ -9121,7 +9256,7 @@ function translateHTML(tag) {
       tag,
       callExpression(tagIdentifier, propsToExpression(properties))
     );
-    setForceResumeScope(section);
+    serializeSectionIfNeeded(section, true);
   } else {
     statements.push(
       callStatement(tagIdentifier, propsToExpression(properties))
@@ -9138,7 +9273,7 @@ function translateDOM(tag) {
   const childScopeBinding = extra[kChildScopeBinding];
   const write2 = writeTo(tag);
   const { file } = tag.hub;
-  const tagName = import_compiler53.types.isIdentifier(node.name) ? node.name.name : import_compiler53.types.isStringLiteral(node.name) ? node.name.value : "tag";
+  const tagName = import_compiler54.types.isIdentifier(node.name) ? node.name.name : import_compiler54.types.isStringLiteral(node.name) ? node.name.value : "tag";
   const relativePath = getTagRelativePath(tag);
   const childFile = (0, import_babel_utils41.loadFileForTag)(tag);
   const childExports = childFile.ast.program.extra.domExports;
@@ -9170,7 +9305,7 @@ function translateDOM(tag) {
     );
     source.register = true;
     source.buildAssignment = (valueSection, value) => {
-      return import_compiler53.types.callExpression(importRuntime("tagVarSignalChange"), [
+      return import_compiler54.types.callExpression(importRuntime("tagVarSignalChange"), [
         createScopeReadExpression(valueSection, childScopeBinding),
         value
       ]);
@@ -9179,7 +9314,7 @@ function translateDOM(tag) {
       "render",
       tagSection,
       void 0,
-      import_compiler53.types.expressionStatement(
+      import_compiler54.types.expressionStatement(
         callRuntime(
           "setTagVar",
           scopeIdentifier,
@@ -9193,8 +9328,8 @@ function translateDOM(tag) {
     "render",
     tagSection,
     void 0,
-    import_compiler53.types.expressionStatement(
-      import_compiler53.types.callExpression(tagIdentifier, [
+    import_compiler54.types.expressionStatement(
+      import_compiler54.types.callExpression(tagIdentifier, [
         createScopeReadExpression(tagSection, childScopeBinding)
       ])
     )
@@ -9207,7 +9342,7 @@ function getTagRelativePath(tag) {
     hub: { file }
   } = tag;
   let relativePath;
-  if (import_compiler53.types.isStringLiteral(node.name)) {
+  if (import_compiler54.types.isStringLiteral(node.name)) {
     const template = (0, import_babel_utils41.getTagTemplate)(tag);
     relativePath = template && (0, import_babel_utils41.resolveRelativePath)(file, template);
   } else if (node.extra?.tagNameImported) {
@@ -9300,7 +9435,7 @@ function analyzeAttrs(rootTagExtra, section, tag, templateExport) {
   let spreadReferenceNodes;
   for (let i = attributes.length; i--; ) {
     const attr2 = attributes[i];
-    if (import_compiler53.types.isMarkoAttribute(attr2)) {
+    if (import_compiler54.types.isMarkoAttribute(attr2)) {
       if (seen.has(attr2.name) || !templateExport.props[attr2.name]) {
         dropReferences(attr2.value);
         continue;
@@ -9309,7 +9444,7 @@ function analyzeAttrs(rootTagExtra, section, tag, templateExport) {
     }
     if (spreadReferenceNodes) {
       spreadReferenceNodes.push(attr2.value);
-    } else if (import_compiler53.types.isMarkoSpreadAttribute(attr2)) {
+    } else if (import_compiler54.types.isMarkoSpreadAttribute(attr2)) {
       spreadReferenceNodes = [attr2.value];
     } else {
       rootTagExtra[kChildAttrExprs].add(attr2.value.extra ??= {});
@@ -9334,7 +9469,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
       // but we should probably ensure all other references are dropped in this case before we do that.
       tag.node.extra?.referencedBindings,
       identifierToSignal(tagInputIdentifier),
-      import_compiler53.types.isSpreadElement(arg) ? import_compiler53.types.memberExpression(arg.argument, import_compiler53.types.numericLiteral(0), true) : arg,
+      import_compiler54.types.isSpreadElement(arg) ? import_compiler54.types.memberExpression(arg.argument, import_compiler54.types.numericLiteral(0), true) : arg,
       createScopeReadExpression(info.tagSection, info.childScopeBinding)
     );
     return;
@@ -9382,7 +9517,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
         } else {
           attrTagCallsForTag.set(
             attrTagName,
-            translatedProps = import_compiler53.types.parenthesizedExpression(
+            translatedProps = import_compiler54.types.parenthesizedExpression(
               callRuntime("attrTag", translatedProps)
             )
           );
@@ -9467,7 +9602,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
           childAttrExports.id,
           `${importAlias}_${attrTagMeta.name}`
         );
-        decls.push(import_compiler53.types.variableDeclarator(getAttrTagIdentifier(attrTagMeta)));
+        decls.push(import_compiler54.types.variableDeclarator(getAttrTagIdentifier(attrTagMeta)));
         addValue(
           info.tagSection,
           referencedBindings,
@@ -9477,7 +9612,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
         );
       }
       addStatement("render", info.tagSection, referencedBindings, [
-        import_compiler53.types.variableDeclaration("let", decls),
+        import_compiler54.types.variableDeclaration("let", decls),
         ...statements
       ]);
     }
@@ -9497,7 +9632,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
         void 0,
         // TODO: pretty sure content needs to have the reference group of it's param defaults.
         identifierToSignal(contentExportIdentifier),
-        import_compiler53.types.callExpression(import_compiler53.types.identifier(bodySection.name), [scopeIdentifier]),
+        import_compiler54.types.callExpression(import_compiler54.types.identifier(bodySection.name), [scopeIdentifier]),
         createScopeReadExpression(info.tagSection, info.childScopeBinding)
       );
     }
@@ -9507,7 +9642,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
   let spreadProps;
   for (let i = attributes.length; i--; ) {
     const attr2 = attributes[i];
-    if (import_compiler53.types.isMarkoAttribute(attr2)) {
+    if (import_compiler54.types.isMarkoAttribute(attr2)) {
       const childAttrExports = templateExport.props[attr2.name];
       if (!childAttrExports || seen.has(attr2.name)) continue;
       seen.add(attr2.name);
@@ -9517,9 +9652,9 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
       }
       staticAttrs.push(attr2);
     } else if (spreadProps) {
-      spreadProps.push(import_compiler53.types.spreadElement(attr2.value));
+      spreadProps.push(import_compiler54.types.spreadElement(attr2.value));
     } else {
-      spreadProps = [import_compiler53.types.spreadElement(attr2.value)];
+      spreadProps = [import_compiler54.types.spreadElement(attr2.value)];
     }
   }
   for (const attr2 of staticAttrs.reverse()) {
@@ -9548,8 +9683,8 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
       spreadProps.reverse();
       getMissingPropValue = (name2) => toMemberExpression(spreadId, name2);
       addStatement("render", info.tagSection, referencedBindings, [
-        import_compiler53.types.variableDeclaration("const", [
-          import_compiler53.types.variableDeclarator(spreadId, propsToExpression(spreadProps))
+        import_compiler54.types.variableDeclaration("const", [
+          import_compiler54.types.variableDeclarator(spreadId, propsToExpression(spreadProps))
         ])
       ]);
     }
@@ -9573,7 +9708,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
 }
 function importOrSelfReferenceName(file, request, name2, nameHint) {
   if (isCircularRequest(file, request)) {
-    return import_compiler53.types.identifier(name2);
+    return import_compiler54.types.identifier(name2);
   }
   return (0, import_babel_utils41.importNamed)(file, request, name2, nameHint);
 }
@@ -9582,10 +9717,10 @@ function isCircularRequest(file, request) {
   return request === filename || request[0] === "." && import_path4.default.resolve(filename, "..", request) === filename;
 }
 function callStatement(id, ...args) {
-  return import_compiler53.types.expressionStatement(callExpression(id, ...args));
+  return import_compiler54.types.expressionStatement(callExpression(id, ...args));
 }
 function callExpression(id, ...args) {
-  return import_compiler53.types.callExpression(id, args.filter(Boolean));
+  return import_compiler54.types.callExpression(id, args.filter(Boolean));
 }
 function identifierToSignal(identifier) {
   return {
@@ -9594,14 +9729,14 @@ function identifierToSignal(identifier) {
   };
 }
 function buildUndefined2() {
-  return import_compiler53.types.unaryExpression("void", import_compiler53.types.numericLiteral(0));
+  return import_compiler54.types.unaryExpression("void", import_compiler54.types.numericLiteral(0));
 }
 function always() {
   return true;
 }
 // src/translator/visitors/tag/dynamic-tag.ts
-var import_compiler54 = require("@marko/compiler");
+var import_compiler55 = require("@marko/compiler");
 var import_babel_utils42 = require("@marko/compiler/babel-utils");
 var kDOMBinding3 = Symbol("dynamic tag dom binding");
 var kChildOffsetScopeBinding2 = Symbol("custom tag scope offset");
@@ -9657,7 +9792,7 @@ var dynamic_tag_default = {
       const isClassAPI = tagExtra.featureType === "class";
       const referencedBindings = tagExtra.referencedBindings;
       let tagExpression = node.name;
-      if (import_compiler54.types.isStringLiteral(tagExpression)) {
+      if (import_compiler55.types.isStringLiteral(tagExpression)) {
         tagExpression = (0, import_babel_utils42.importDefault)(
           tag.hub.file,
           getTagRelativePath(tag),
@@ -9668,14 +9803,14 @@ var dynamic_tag_default = {
         if (isOutputHTML()) {
           currentProgramPath.pushContainer(
             "body",
-            import_compiler54.types.markoScriptlet(
+            import_compiler55.types.markoScriptlet(
               [
-                import_compiler54.types.expressionStatement(
-                  import_compiler54.types.callExpression(
+                import_compiler55.types.expressionStatement(
+                  import_compiler55.types.callExpression(
                     (0, import_babel_utils42.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"),
                     [
-                      import_compiler54.types.identifier(tagExpression.name),
-                      import_compiler54.types.stringLiteral((0, import_babel_utils42.loadFileForTag)(tag).metadata.marko.id)
+                      import_compiler55.types.identifier(tagExpression.name),
+                      import_compiler55.types.stringLiteral((0, import_babel_utils42.loadFileForTag)(tag).metadata.marko.id)
                     ]
                   )
                 )
@@ -9686,11 +9821,11 @@ var dynamic_tag_default = {
         } else {
           currentProgramPath.pushContainer(
             "body",
-            import_compiler54.types.expressionStatement(
+            import_compiler55.types.expressionStatement(
               callRuntime(
                 "register",
-                import_compiler54.types.stringLiteral((0, import_babel_utils42.loadFileForTag)(tag).metadata.marko.id),
-                import_compiler54.types.identifier(tagExpression.name)
+                import_compiler55.types.stringLiteral((0, import_babel_utils42.loadFileForTag)(tag).metadata.marko.id),
+                import_compiler55.types.identifier(tagExpression.name)
               )
             )
           );
@@ -9710,7 +9845,7 @@ var dynamic_tag_default = {
           hasMultipleArgs = true;
           args.push(propsToExpression(properties));
         } else {
-          hasMultipleArgs = node.arguments.length > 1 || import_compiler54.types.isSpreadElement(node.arguments[0]);
+          hasMultipleArgs = node.arguments.length > 1 || import_compiler55.types.isSpreadElement(node.arguments[0]);
         }
       } else {
         const contentProp = getTranslatedBodyContentProperty(properties);
@@ -9726,7 +9861,7 @@ var dynamic_tag_default = {
         writeHTMLResumeStatements(tag.get("body"));
         if (node.var) {
           if (!hasMultipleArgs && args.length === 1) {
-            args.push(import_compiler54.types.unaryExpression("void", import_compiler54.types.numericLiteral(0)));
+            args.push(import_compiler55.types.unaryExpression("void", import_compiler55.types.numericLiteral(0)));
           }
         }
         const dynamicScopeIdentifier = currentProgramPath.scope.generateUidIdentifier("dynamicScope");
@@ -9735,7 +9870,7 @@ var dynamic_tag_default = {
           getScopeIdIdentifier(section),
           getScopeAccessorLiteral(nodeRef2),
           tagExpression,
-          import_compiler54.types.arrayExpression(args)
+          import_compiler55.types.arrayExpression(args)
         ) : callRuntime(
           "dynamicTagInput",
           getScopeIdIdentifier(section),
@@ -9744,8 +9879,8 @@ var dynamic_tag_default = {
           ...args
         );
         statements.push(
-          import_compiler54.types.variableDeclaration("const", [
-            import_compiler54.types.variableDeclarator(
+          import_compiler55.types.variableDeclaration("const", [
+            import_compiler55.types.variableDeclarator(
               dynamicScopeIdentifier,
               callRuntime("peekNextScope")
             )
@@ -9753,10 +9888,10 @@ var dynamic_tag_default = {
         );
         if (node.var) {
           statements.push(
-            import_compiler54.types.variableDeclaration("const", [
-              import_compiler54.types.variableDeclarator(node.var, dynamicTagExpr)
+            import_compiler55.types.variableDeclaration("const", [
+              import_compiler55.types.variableDeclarator(node.var, dynamicTagExpr)
             ]),
-            import_compiler54.types.expressionStatement(
+            import_compiler55.types.expressionStatement(
               callRuntime(
                 "setTagVar",
                 getScopeIdIdentifier(section),
@@ -9764,7 +9899,7 @@ var dynamic_tag_default = {
                   tag.node.extra[kChildOffsetScopeBinding2]
                 ),
                 dynamicScopeIdentifier,
-                import_compiler54.types.stringLiteral(
+                import_compiler55.types.stringLiteral(
                   getResumeRegisterId(
                     section,
                     node.var.extra?.binding,
@@ -9776,21 +9911,26 @@ var dynamic_tag_default = {
             )
           );
         } else {
-          statements.push(import_compiler54.types.expressionStatement(dynamicTagExpr));
+          statements.push(import_compiler55.types.expressionStatement(dynamicTagExpr));
+        }
+        const serializeReason = isClassAPI || !!node.var || getDynamicSourcesForReferences(referencedBindings);
+        if (serializeReason) {
+          setSerializedProperty(
+            section,
+            getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2),
+            callRuntime("writeExistingScope", dynamicScopeIdentifier),
+            serializeReason
+          );
+          setSerializedProperty(
+            section,
+            getAccessorPrefix().ConditionalRenderer + getScopeAccessor(nodeRef2),
+            callRuntime(
+              "dynamicTagId",
+              import_compiler55.types.isIdentifier(tagExpression) ? import_compiler55.types.identifier(tagExpression.name) : tagExpression
+            ),
+            serializeReason
+          );
         }
-        setSerializedProperty(
-          section,
-          getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2),
-          callRuntime("writeExistingScope", dynamicScopeIdentifier)
-        );
-        setSerializedProperty(
-          section,
-          getAccessorPrefix().ConditionalRenderer + getScopeAccessor(nodeRef2),
-          callRuntime(
-            "dynamicTagId",
-            import_compiler54.types.isIdentifier(tagExpression) ? import_compiler54.types.identifier(tagExpression.name) : tagExpression
-          )
-        );
         for (const replacement of tag.replaceWithMultiple(statements)) {
           replacement.skip();
         }
@@ -9806,10 +9946,10 @@ var dynamic_tag_default = {
           );
           tagVarSignal.register = true;
           tagVarSignal.buildAssignment = (valueSection, value) => {
-            return import_compiler54.types.callExpression(importRuntime("tagVarSignalChange"), [
-              import_compiler54.types.memberExpression(
+            return import_compiler55.types.callExpression(importRuntime("tagVarSignalChange"), [
+              import_compiler55.types.memberExpression(
                 getScopeExpression(tagVarSignal.section, valueSection),
-                import_compiler54.types.stringLiteral(
+                import_compiler55.types.stringLiteral(
                   getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2)
                 ),
                 true
@@ -9822,19 +9962,19 @@ var dynamic_tag_default = {
           return callRuntime(
             "dynamicTag",
             getScopeAccessorLiteral(nodeRef2),
-            bodySection && import_compiler54.types.identifier(bodySection.name),
-            tagVarSignal ? import_compiler54.types.arrowFunctionExpression([], tagVarSignal.identifier) : void 0,
-            hasMultipleArgs && import_compiler54.types.numericLiteral(1)
+            bodySection && import_compiler55.types.identifier(bodySection.name),
+            tagVarSignal ? import_compiler55.types.arrowFunctionExpression([], tagVarSignal.identifier) : void 0,
+            hasMultipleArgs && import_compiler55.types.numericLiteral(1)
           );
         };
         if (args.length) {
-          const argsOrInput = hasMultipleArgs ? import_compiler54.types.arrayExpression(args) : args[0];
-          if (!import_compiler54.types.isObjectExpression(argsOrInput) || argsOrInput.properties.length) {
+          const argsOrInput = hasMultipleArgs ? import_compiler55.types.arrayExpression(args) : args[0];
+          if (!import_compiler55.types.isObjectExpression(argsOrInput) || argsOrInput.properties.length) {
             signal.extraArgs = [
-              import_compiler54.types.arrowFunctionExpression(
+              import_compiler55.types.arrowFunctionExpression(
                 [],
-                statements.length ? import_compiler54.types.blockStatement(
-                  statements.concat(import_compiler54.types.returnStatement(argsOrInput))
+                statements.length ? import_compiler55.types.blockStatement(
+                  statements.concat(import_compiler55.types.returnStatement(argsOrInput))
                 ) : argsOrInput
               )
             ];
@@ -9857,16 +9997,16 @@ var tag_default = {
       const { node } = tag;
       const { name: name2, attributes } = tag.node;
       let crawl = false;
-      if (import_compiler55.types.isStringLiteral(name2)) {
+      if (import_compiler56.types.isStringLiteral(name2)) {
         const tagName = name2.value;
         if (tag.scope.getBinding(tagName) && TAG_NAME_IDENTIFIER_REG.test(tagName)) {
-          node.name = withPreviousLocation(import_compiler55.types.identifier(tagName), name2);
+          node.name = withPreviousLocation(import_compiler56.types.identifier(tagName), name2);
           crawl = true;
         }
       }
       for (let i = 0; i < attributes.length; i++) {
         const attr2 = attributes[i];
-        if (import_compiler55.types.isMarkoAttribute(attr2) && attr2.bound) {
+        if (import_compiler56.types.isMarkoAttribute(attr2) && attr2.bound) {
           attr2.bound = false;
           attributes.splice(++i, 0, getChangeHandler(tag, attr2));
           crawl = true;
@@ -9942,8 +10082,8 @@ var tag_default = {
       if (extra.tagNameDynamic && extra.tagNameNullable && !tag.get("name").isIdentifier() && isOutputHTML()) {
         const tagNameId = tag.scope.generateUidIdentifier("tagName");
         const [tagNameVarPath] = tag.insertBefore(
-          import_compiler55.types.variableDeclaration("const", [
-            import_compiler55.types.variableDeclarator(tagNameId, tag.node.name)
+          import_compiler56.types.variableDeclaration("const", [
+            import_compiler56.types.variableDeclarator(tagNameId, tag.node.name)
           ])
         );
         tagNameVarPath.skip();
@@ -9990,16 +10130,16 @@ var tag_default = {
 function getChangeHandler(tag, attr2) {
   const attrName = attr2.name;
   const changeAttrName = attrName + "Change";
-  if (import_compiler55.types.isIdentifier(attr2.value)) {
+  if (import_compiler56.types.isIdentifier(attr2.value)) {
     const binding = tag.scope.getBinding(attr2.value.name);
     if (!binding)
-      return import_compiler55.types.markoAttribute(
+      return import_compiler56.types.markoAttribute(
         changeAttrName,
         buildChangeHandlerFunction(attr2.value)
       );
     const existingChangedAttr = BINDING_CHANGE_HANDLER.get(binding.identifier);
     if (!existingChangedAttr) {
-      const changeHandlerAttr = import_compiler55.types.markoAttribute(
+      const changeHandlerAttr = import_compiler56.types.markoAttribute(
         changeAttrName,
         buildChangeHandlerFunction(attr2.value)
       );
@@ -10007,10 +10147,10 @@ function getChangeHandler(tag, attr2) {
       return changeHandlerAttr;
     }
     if (existingChangedAttr.type === "Identifier") {
-      return import_compiler55.types.markoAttribute(
+      return import_compiler56.types.markoAttribute(
         changeAttrName,
         withPreviousLocation(
-          import_compiler55.types.identifier(existingChangedAttr.name),
+          import_compiler56.types.identifier(existingChangedAttr.name),
           attr2.value
         )
       );
@@ -10020,37 +10160,37 @@ function getChangeHandler(tag, attr2) {
       throw tag.hub.buildError(attr2.value, "Unable to bind to value.");
     }
     const changeHandlerId = markoRoot.scope.generateUid(changeAttrName);
-    const changeHandlerConst = import_compiler55.types.markoTag(
-      import_compiler55.types.stringLiteral("const"),
-      [import_compiler55.types.markoAttribute("value", existingChangedAttr.value, null, null, true)],
-      import_compiler55.types.markoTagBody([]),
+    const changeHandlerConst = import_compiler56.types.markoTag(
+      import_compiler56.types.stringLiteral("const"),
+      [import_compiler56.types.markoAttribute("value", existingChangedAttr.value, null, null, true)],
+      import_compiler56.types.markoTagBody([]),
       null,
-      import_compiler55.types.identifier(changeHandlerId)
+      import_compiler56.types.identifier(changeHandlerId)
     );
     BINDING_CHANGE_HANDLER.set(
       binding.identifier,
-      existingChangedAttr.value = import_compiler55.types.identifier(changeHandlerId)
+      existingChangedAttr.value = import_compiler56.types.identifier(changeHandlerId)
     );
     if (markoRoot.isMarkoTag()) {
       markoRoot.insertAfter(changeHandlerConst);
     } else {
       markoRoot.unshiftContainer("body", changeHandlerConst);
     }
-    return import_compiler55.types.markoAttribute(
+    return import_compiler56.types.markoAttribute(
       changeAttrName,
-      withPreviousLocation(import_compiler55.types.identifier(changeHandlerId), attr2.value)
+      withPreviousLocation(import_compiler56.types.identifier(changeHandlerId), attr2.value)
     );
-  } else if (import_compiler55.types.isMemberExpression(attr2.value)) {
+  } else if (import_compiler56.types.isMemberExpression(attr2.value)) {
     const prop = attr2.value.property;
-    if (!import_compiler55.types.isPrivateName(attr2.value.property)) {
-      return import_compiler55.types.markoAttribute(
+    if (!import_compiler56.types.isPrivateName(attr2.value.property)) {
+      return import_compiler56.types.markoAttribute(
         changeAttrName,
-        import_compiler55.types.memberExpression(
-          import_compiler55.types.cloneNode(attr2.value.object),
-          prop.type === "Identifier" ? withPreviousLocation(import_compiler55.types.identifier(prop.name + "Change"), prop) : import_compiler55.types.binaryExpression(
+        import_compiler56.types.memberExpression(
+          import_compiler56.types.cloneNode(attr2.value.object),
+          prop.type === "Identifier" ? withPreviousLocation(import_compiler56.types.identifier(prop.name + "Change"), prop) : import_compiler56.types.binaryExpression(
             "+",
-            import_compiler55.types.cloneNode(prop),
-            import_compiler55.types.stringLiteral("Change")
+            import_compiler56.types.cloneNode(prop),
+            import_compiler56.types.stringLiteral("Change")
           ),
           prop.type !== "Identifier"
         )
@@ -10064,14 +10204,14 @@ function getChangeHandler(tag, attr2) {
 }
 function buildChangeHandlerFunction(id) {
   const newId = "_new_" + id.name;
-  return import_compiler55.types.arrowFunctionExpression(
-    [withPreviousLocation(import_compiler55.types.identifier(newId), id)],
-    import_compiler55.types.blockStatement([
-      import_compiler55.types.expressionStatement(
-        import_compiler55.types.assignmentExpression(
+  return import_compiler56.types.arrowFunctionExpression(
+    [withPreviousLocation(import_compiler56.types.identifier(newId), id)],
+    import_compiler56.types.blockStatement([
+      import_compiler56.types.expressionStatement(
+        import_compiler56.types.assignmentExpression(
           "=",
-          withPreviousLocation(import_compiler55.types.identifier(id.name), id),
-          withPreviousLocation(import_compiler55.types.identifier(newId), id)
+          withPreviousLocation(import_compiler56.types.identifier(id.name), id),
+          withPreviousLocation(import_compiler56.types.identifier(newId), id)
         )
       )
     ])
@@ -10079,7 +10219,7 @@ function buildChangeHandlerFunction(id) {
 }
 // src/translator/visitors/text.ts
-var import_compiler56 = require("@marko/compiler");
+var import_compiler57 = require("@marko/compiler");
 var text_default = {
   translate: {
     exit(text) {