marko 6.0.126 → 6.0.128

package/dist/translator/index.js

@@ -133,33 +133,33 @@ var AccessorPrefix = /* @__PURE__ */ ((AccessorPrefix4) => {
   AccessorPrefix4["TagVariableChange"] = "TagVariableChange:";
   return AccessorPrefix4;
 })(AccessorPrefix || {});
-var AccessorProp = /* @__PURE__ */ ((AccessorProp4) => {
-  AccessorProp4["Global"] = "$global";
-  AccessorProp4["Owner"] = "_";
-  AccessorProp4["AbortControllers"] = "#AbortControllers";
-  AccessorProp4["AbortScopes"] = "#AbortScopes";
-  AccessorProp4["AwaitCounter"] = "#AwaitCounter";
-  AccessorProp4["BranchAccessor"] = "#BranchAccessor";
-  AccessorProp4["BranchScopes"] = "#BranchScopes";
-  AccessorProp4["CatchContent"] = "#CatchContent";
-  AccessorProp4["ClosestBranch"] = "#ClosestBranch";
-  AccessorProp4["ClosestBranchId"] = "#ClosestBranchId";
-  AccessorProp4["Creating"] = "#Creating";
-  AccessorProp4["Destroyed"] = "#Destroyed";
-  AccessorProp4["DetachedAwait"] = "#DetachedAwait";
-  AccessorProp4["EndNode"] = "#EndNode";
-  AccessorProp4["Id"] = "#Id";
-  AccessorProp4["LoopKey"] = "#LoopKey";
-  AccessorProp4["ParentBranch"] = "#ParentBranch";
-  AccessorProp4["PendingEffects"] = "#PendingEffects";
-  AccessorProp4["PendingRenders"] = "#PendingRenders";
-  AccessorProp4["PlaceholderBranch"] = "#PlaceholderBranch";
-  AccessorProp4["PlaceholderContent"] = "#PlaceholderContent";
-  AccessorProp4["Renderer"] = "#Renderer";
-  AccessorProp4["StartNode"] = "#StartNode";
-  AccessorProp4["TagVariable"] = "#TagVariable";
-  AccessorProp4["TagVariableChange"] = "#TagVariableChange";
-  return AccessorProp4;
+var AccessorProp = /* @__PURE__ */ ((AccessorProp5) => {
+  AccessorProp5["Global"] = "$global";
+  AccessorProp5["Owner"] = "_";
+  AccessorProp5["AbortControllers"] = "#AbortControllers";
+  AccessorProp5["AbortScopes"] = "#AbortScopes";
+  AccessorProp5["AwaitCounter"] = "#AwaitCounter";
+  AccessorProp5["BranchAccessor"] = "#BranchAccessor";
+  AccessorProp5["BranchScopes"] = "#BranchScopes";
+  AccessorProp5["CatchContent"] = "#CatchContent";
+  AccessorProp5["ClosestBranch"] = "#ClosestBranch";
+  AccessorProp5["ClosestBranchId"] = "#ClosestBranchId";
+  AccessorProp5["Creating"] = "#Creating";
+  AccessorProp5["Destroyed"] = "#Destroyed";
+  AccessorProp5["DetachedAwait"] = "#DetachedAwait";
+  AccessorProp5["EndNode"] = "#EndNode";
+  AccessorProp5["Id"] = "#Id";
+  AccessorProp5["LoopKey"] = "#LoopKey";
+  AccessorProp5["ParentBranch"] = "#ParentBranch";
+  AccessorProp5["PendingEffects"] = "#PendingEffects";
+  AccessorProp5["PendingRenders"] = "#PendingRenders";
+  AccessorProp5["PlaceholderBranch"] = "#PlaceholderBranch";
+  AccessorProp5["PlaceholderContent"] = "#PlaceholderContent";
+  AccessorProp5["Renderer"] = "#Renderer";
+  AccessorProp5["StartNode"] = "#StartNode";
+  AccessorProp5["TagVariable"] = "#TagVariable";
+  AccessorProp5["TagVariableChange"] = "#TagVariableChange";
+  return AccessorProp5;
 })(AccessorProp || {});
 
 // src/translator/util/evaluate.ts
@@ -587,19 +587,19 @@ function isTranslate() {
 // src/translator/util/traverse.ts
 var import_compiler2 = require("@marko/compiler");
 var skip = Symbol("skip");
-function traverseReplace(container, key, enter3) {
+function traverseReplace(container, key, enter3, state) {
   const node = container[key];
   if (node) {
     if (Array.isArray(node)) {
       for (let i = node.length; i--; ) {
-        traverseReplace(node, i, enter3);
+        traverseReplace(node, i, enter3, state);
       }
     } else {
       const keys = import_compiler2.types.VISITOR_KEYS[node.type];
       for (let i = keys.length; i--; ) {
-        traverseReplace(node, keys[i], enter3);
+        traverseReplace(node, keys[i], enter3, state);
       }
-      const replacement = enter3(node, container, key);
+      const replacement = enter3(node, state);
       if (replacement) container[key] = replacement;
     }
   }
@@ -952,12 +952,12 @@ var Sorted = class {
     this.compare = compare;
   }
   add(data, item) {
-    return data ? Array.isArray(data) ? addSorted(this.compare, data, item) : joinRepeatable(this.compare, data, item) : item;
+    return data !== void 0 ? Array.isArray(data) ? addSorted(this.compare, data, item) : joinRepeatable(this.compare, data, item) : item;
   }
   union(a, b) {
-    if (a) {
+    if (a !== void 0) {
       if (Array.isArray(a)) {
-        if (b) {
+        if (b !== void 0) {
           if (Array.isArray(b)) {
             return unionSortedRepeatable(this.compare, a, b);
           } else {
@@ -966,7 +966,7 @@ var Sorted = class {
         }
         return a;
       }
-      if (b) {
+      if (b !== void 0) {
         if (Array.isArray(b)) {
           return addSorted(this.compare, b, a);
         }
@@ -977,7 +977,7 @@ var Sorted = class {
     return b;
   }
   find(data, item) {
-    if (data) {
+    if (data !== void 0) {
       if (Array.isArray(data)) {
         return findSorted(this.compare, data, item);
       } else if (this.compare(data, item) === 0) {
@@ -989,7 +989,7 @@ var Sorted = class {
     return this.findIndex(data, item) !== -1;
   }
   findIndex(data, item) {
-    if (data) {
+    if (data !== void 0) {
       if (Array.isArray(data)) {
         return findIndexSorted(this.compare, data, item);
       } else if (this.compare(data, item) === 0) {
@@ -1000,7 +1000,7 @@ var Sorted = class {
   }
   groupBy(data, cb) {
     const group = /* @__PURE__ */ new Map();
-    if (data) {
+    if (data !== void 0) {
       if (Array.isArray(data)) {
         for (const item of data) {
           const key = cb(item);
@@ -1013,7 +1013,7 @@ var Sorted = class {
     return group;
   }
   isSuperset(superset, subset) {
-    if (!subset) {
+    if (subset === void 0) {
       return true;
     }
     if (!Array.isArray(subset)) {
@@ -1035,7 +1035,7 @@ var Sorted = class {
   }
 };
 function push(data, item) {
-  if (data) {
+  if (data !== void 0) {
     if (Array.isArray(data)) {
       data.push(item);
       return data;
@@ -1045,8 +1045,8 @@ function push(data, item) {
   return item;
 }
 function concat(a, b) {
-  if (a) {
-    if (b) {
+  if (a !== void 0) {
+    if (b !== void 0) {
       if (Array.isArray(a)) {
         return a.concat(b);
       } else if (Array.isArray(b)) {
@@ -1060,7 +1060,7 @@ function concat(a, b) {
   return b;
 }
 function filter(data, cb) {
-  if (data) {
+  if (data !== void 0) {
     if (Array.isArray(data)) {
       const len = data.length;
       let result;
@@ -1091,10 +1091,9 @@ function filter(data, cb) {
       return data;
     }
   }
-  return void 0;
 }
 function forEach(data, cb) {
-  if (data) {
+  if (data !== void 0) {
     if (Array.isArray(data)) {
       let i = 0;
       for (const item of data) {
@@ -1119,8 +1118,11 @@ function fromIter(data) {
   }
   return many || one;
 }
+function includes(data, item) {
+  return data !== void 0 ? Array.isArray(data) ? data.includes(item) : data === item : false;
+}
 function find(data, cb) {
-  if (data) {
+  if (data !== void 0) {
     if (Array.isArray(data)) {
       return data.find(cb);
     }
@@ -1130,13 +1132,13 @@ function find(data, cb) {
   }
 }
 function some(data, cb) {
-  return data ? Array.isArray(data) ? data.some(cb) : !!cb(data, 0) : false;
+  return data !== void 0 ? Array.isArray(data) ? data.some(cb) : !!cb(data, 0) : false;
 }
 function toArray(data, cb) {
-  return data ? Array.isArray(data) ? data.map(cb) : [cb(data, 0)] : [];
+  return data !== void 0 ? Array.isArray(data) ? data.map(cb) : [cb(data, 0)] : [];
 }
 function mapToString(data, sep, cb) {
-  if (data) {
+  if (data !== void 0) {
     if (Array.isArray(data)) {
       let str = "";
       let curSep = "";
@@ -1151,22 +1153,22 @@ function mapToString(data, sep, cb) {
   return "";
 }
 function filterMap(data, cb) {
-  if (data) {
+  if (data !== void 0) {
     if (Array.isArray(data)) {
       const len = data.length;
       let result;
       let i = 0;
       while (i < len) {
         let item = cb(data[i++]);
-        if (item) {
+        if (item !== void 0) {
           result = item;
           while (i < len) {
             item = cb(data[i++]);
-            if (item) {
+            if (item !== void 0) {
               result = [result, item];
               while (i < len) {
                 item = cb(data[i++]);
-                if (item) {
+                if (item !== void 0) {
                   result.push(item);
                 }
               }
@@ -1177,9 +1179,8 @@ function filterMap(data, cb) {
         }
       }
       return result;
-    } else {
-      return cb(data);
     }
+    return cb(data);
   }
 }
 function findSorted(compare, data, item) {
@@ -1288,33 +1289,33 @@ var AccessorPrefix2 = /* @__PURE__ */ ((AccessorPrefix4) => {
   AccessorPrefix4["TagVariableChange"] = "M";
   return AccessorPrefix4;
 })(AccessorPrefix2 || {});
-var AccessorProp2 = /* @__PURE__ */ ((AccessorProp4) => {
-  AccessorProp4["Global"] = "$";
-  AccessorProp4["Owner"] = "_";
-  AccessorProp4["AbortControllers"] = "A";
-  AccessorProp4["AbortScopes"] = "B";
-  AccessorProp4["AwaitCounter"] = "O";
-  AccessorProp4["BranchAccessor"] = "C";
-  AccessorProp4["BranchScopes"] = "D";
-  AccessorProp4["CatchContent"] = "E";
-  AccessorProp4["ClosestBranch"] = "F";
-  AccessorProp4["ClosestBranchId"] = "G";
-  AccessorProp4["Creating"] = "H";
-  AccessorProp4["Destroyed"] = "I";
-  AccessorProp4["DetachedAwait"] = "V";
-  AccessorProp4["EndNode"] = "K";
-  AccessorProp4["Id"] = "L";
-  AccessorProp4["LoopKey"] = "M";
-  AccessorProp4["ParentBranch"] = "N";
-  AccessorProp4["PendingEffects"] = "J";
-  AccessorProp4["PendingRenders"] = "W";
-  AccessorProp4["PlaceholderBranch"] = "P";
-  AccessorProp4["PlaceholderContent"] = "Q";
-  AccessorProp4["Renderer"] = "R";
-  AccessorProp4["StartNode"] = "S";
-  AccessorProp4["TagVariable"] = "T";
-  AccessorProp4["TagVariableChange"] = "U";
-  return AccessorProp4;
+var AccessorProp2 = /* @__PURE__ */ ((AccessorProp5) => {
+  AccessorProp5["Global"] = "$";
+  AccessorProp5["Owner"] = "_";
+  AccessorProp5["AbortControllers"] = "A";
+  AccessorProp5["AbortScopes"] = "B";
+  AccessorProp5["AwaitCounter"] = "O";
+  AccessorProp5["BranchAccessor"] = "C";
+  AccessorProp5["BranchScopes"] = "D";
+  AccessorProp5["CatchContent"] = "E";
+  AccessorProp5["ClosestBranch"] = "F";
+  AccessorProp5["ClosestBranchId"] = "G";
+  AccessorProp5["Creating"] = "H";
+  AccessorProp5["Destroyed"] = "I";
+  AccessorProp5["DetachedAwait"] = "V";
+  AccessorProp5["EndNode"] = "K";
+  AccessorProp5["Id"] = "L";
+  AccessorProp5["LoopKey"] = "M";
+  AccessorProp5["ParentBranch"] = "N";
+  AccessorProp5["PendingEffects"] = "J";
+  AccessorProp5["PendingRenders"] = "W";
+  AccessorProp5["PlaceholderBranch"] = "P";
+  AccessorProp5["PlaceholderContent"] = "Q";
+  AccessorProp5["Renderer"] = "R";
+  AccessorProp5["StartNode"] = "S";
+  AccessorProp5["TagVariable"] = "T";
+  AccessorProp5["TagVariableChange"] = "U";
+  return AccessorProp5;
 })(AccessorProp2 || {});
 
 // src/translator/util/marko-config.ts
@@ -2290,6 +2291,13 @@ function hasSupersetExcludeProperties(binding, excludeProperties) {
   }
   return true;
 }
+function getBindingPropTreeProp(propTree, name2) {
+  return propTree.props?.[name2] || propTree.rest?.props?.[name2];
+}
+function getAllBindingPropTreePropKeys(propTree) {
+  const keys = propTree.props ? Object.keys(propTree.props) : [];
+  return propTree.rest?.props ? keys.concat(Object.keys(propTree.rest.props)) : keys;
+}
 
 // src/translator/util/entry-builder.ts
 var import_compiler9 = require("@marko/compiler");
@@ -2438,6 +2446,7 @@ function _escape_style(val) {
 
 // src/html/writer.ts
 var K_SCOPE_ID = Symbol("Scope ID");
+var K_SCOPE_REFERENCED = Symbol("Scope Referenced");
 var kPendingContexts = Symbol("Pending Contexts");
 var kBranchId = Symbol("Branch Id");
 var kIsAsync = Symbol("Is Async");
@@ -3283,11 +3292,16 @@ function getScopeExpression(section, targetSection) {
 }
 function createScopeReadExpression(reference, section) {
   const propName = toPropertyName(getScopeAccessor(reference));
-  return import_compiler19.types.memberExpression(
-    section && reference.type !== 4 /* local */ ? getScopeExpression(section, reference.section) : scopeIdentifier,
+  const scope = section && reference.type !== 4 /* local */ ? getScopeExpression(section, reference.section) : scopeIdentifier;
+  const expr = import_compiler19.types.memberExpression(
+    scope,
     propName,
     propName.type !== "Identifier"
   );
+  if (scope === scopeIdentifier) {
+    (expr.extra ??= {}).read = createRead(reference, void 0);
+  }
+  return expr;
 }
 
 // src/translator/util/simplify-fn.ts
@@ -3396,6 +3410,9 @@ function getBindingGetterIdentifier(binding) {
   return identifier;
 }
 function getSignal(section, referencedBindings, name2 = generateSignalName(referencedBindings)) {
+  if (!Array.isArray(referencedBindings) && referencedBindings?.type === 7 /* constant */) {
+    return getSignal(section, void 0);
+  }
   const signals = getSignals(section);
   let signal = signals.get(referencedBindings);
   if (!signal) {
@@ -3474,7 +3491,7 @@ function initValue(binding, isLet = false) {
   signal.build = () => {
     const fn = getSignalFn(signal);
     const isDirectAlias = binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0;
-    if (isDirectAlias || !signalHasStatements(signal)) {
+    if (isDirectAlias || !signal.hasSideEffect || !signalHasStatements(signal)) {
       return fn;
     }
     return callRuntime(
@@ -3484,10 +3501,14 @@ function initValue(binding, isLet = false) {
     );
   };
   for (const alias of binding.aliases) {
-    initValue(alias);
+    if (alias.type !== 7 /* constant */) {
+      initValue(alias);
+    }
   }
   for (const alias of binding.propertyAliases.values()) {
-    initValue(alias);
+    if (alias.type !== 7 /* constant */) {
+      initValue(alias);
+    }
   }
   return signal;
 }
@@ -3497,7 +3518,7 @@ function signalHasStatements(signal) {
   }
   const binding = signal.referencedBindings;
   if (binding) {
-    if (!Array.isArray(binding) && (binding.closureSections || binding.type === 0 /* dom */ || binding.section === signal.section && (binding.hoists.size || binding.aliases.size || binding.propertyAliases.size))) {
+    if (!Array.isArray(binding) && (binding.closureSections || binding.type === 0 /* dom */ || binding.section === signal.section && (binding.hoists.size || binding.aliases.size || hasNonConstantPropertyAlias(binding)))) {
       return true;
     }
   } else if (signal.section.referencedClosures) {
@@ -3561,20 +3582,22 @@ function getSignalFn(signal) {
       }
     }
     for (const [key, alias] of binding.propertyAliases) {
-      const aliasSignal = getSignal(alias.section, alias);
-      signal.render.push(
-        import_compiler22.types.expressionStatement(
-          import_compiler22.types.callExpression(aliasSignal.identifier, [
-            scopeIdentifier,
-            toMemberExpression(
-              createScopeReadExpression(binding),
-              key,
-              binding.nullable
-            ),
-            ...getTranslatedExtraArgs(aliasSignal)
-          ])
-        )
-      );
+      if (alias.type !== 7 /* constant */) {
+        const aliasSignal = getSignal(alias.section, alias);
+        signal.render.push(
+          import_compiler22.types.expressionStatement(
+            import_compiler22.types.callExpression(aliasSignal.identifier, [
+              scopeIdentifier,
+              toMemberExpression(
+                createScopeReadExpression(binding),
+                key,
+                binding.nullable
+              ),
+              ...getTranslatedExtraArgs(aliasSignal)
+            ])
+          )
+        );
+      }
     }
     if (assertsHoists) {
       signal.render.push(
@@ -3655,20 +3678,27 @@ function getSignalFn(signal) {
   }
   if (signal.effect.length) {
     const effectIdentifier = import_compiler22.types.identifier(`${signal.identifier.name}__script`);
+    signal.hasSideEffect = true;
     signal.render.push(
       import_compiler22.types.expressionStatement(
         import_compiler22.types.callExpression(effectIdentifier, [scopeIdentifier])
       )
     );
   }
+  if (!signal.hasSideEffect) {
+    return import_compiler22.types.arrowFunctionExpression(
+      isValue ? [scopeIdentifier, getSignalValueIdentifier(signal)] : [scopeIdentifier],
+      toFirstExpressionOrBlock(signal.render)
+    );
+  }
   if (signal.render.length === 1) {
     const render = signal.render[0];
     if (render.type === "ExpressionStatement") {
       const { expression } = render;
       if (expression.type === "CallExpression") {
         const args = expression.arguments;
-        if (args.length === 1 && args[0].type === "Identifier" && args[0].name === scopeIdentifier.name) {
-          if (expression.callee.type === "MemberExpression" && expression.callee.property.type === "Identifier" && expression.callee.property.name === "_") {
+        if (args.length === 1 && args[0] === scopeIdentifier) {
+          if (expression.callee.type === "MemberExpression" && expression.callee.property.type === "Identifier" && expression.callee.property.name === getAccessorProp().Owner) {
             return expression.callee.object;
           }
           return expression.callee;
@@ -3693,15 +3723,23 @@ function getTranslatedExtraArgs(signal) {
   }
   return emptyExtraArgs;
 }
+function getSignalValueIdentifier(signal) {
+  const canonicalBinding = getCanonicalBinding(
+    signal.referencedBindings
+  );
+  return import_compiler22.types.identifier(canonicalBinding.name);
+}
 function subscribe(references, subscriber) {
   if (references) {
     forEach(references, (binding) => {
-      const source = binding.property === void 0 && binding.excludeProperties === void 0 && binding.upstreamAlias || binding;
-      const providerSignal = getSignal(subscriber.section, source);
-      providerSignal.intersection = push(
-        providerSignal.intersection,
-        subscriber
-      );
+      if (binding.type !== 7 /* constant */) {
+        const source = binding.property === void 0 && binding.excludeProperties === void 0 && binding.upstreamAlias || binding;
+        const providerSignal = getSignal(subscriber.section, source);
+        providerSignal.intersection = push(
+          providerSignal.intersection,
+          subscriber
+        );
+      }
     });
   }
 }
@@ -3755,7 +3793,7 @@ function replaceNullishAndEmptyFunctionsWith0(args) {
   args.length = finalLen || 0;
   return args;
 }
-function addStatement(type, targetSection, referencedBindings, statement, usedReferences) {
+function addStatement(type, targetSection, referencedBindings, statement, usedReferences, isPure) {
   const signal = getSignal(targetSection, referencedBindings);
   const statements = signal[type] ??= [];
   const add = type === "effect" ? addEffectReferences : addRenderReferences;
@@ -3773,6 +3811,9 @@ function addStatement(type, targetSection, referencedBindings, statement, usedRe
       add(signal, referencedBindings);
     }
   }
+  if (!isPure || type === "effect") {
+    signal.hasSideEffect = true;
+  }
 }
 function addEffectReferences(signal, referencedBindings) {
   signal.effectReferencedBindings = bindingUtil.union(
@@ -3793,6 +3834,9 @@ function addValue(targetSection, referencedBindings, signal, value) {
     signal,
     value
   });
+  if (value.extra?.referencedBindingsInFunction) {
+    parentSignal.hasSideEffect = true;
+  }
 }
 function getResumeRegisterId(section, referencedBindings, type) {
   const {
@@ -3853,7 +3897,12 @@ function writeSignals(section) {
       traverseReplace(value, "value", replaceRenderNode);
     }
     forEach(signal.intersection, writeSignal);
-    traverseReplace(signal, "render", replaceRenderNode);
+    if (!signal.hasSideEffect) {
+      const binding = signal.referencedBindings;
+      if (binding && (signal.intersection || Array.isArray(binding) || binding.type === 1 /* let */ || binding.closureSections || binding.hoists.size || binding.section !== signal.section)) {
+        signal.hasSideEffect = true;
+      }
+    }
     let effectDeclarator;
     if (signal.effect.length) {
       traverseReplace(signal, "effect", replaceEffectNode);
@@ -3902,6 +3951,7 @@ function writeSignals(section) {
         signalDeclaration = import_compiler22.types.exportNamedDeclaration(signalDeclaration);
       }
     }
+    traverseReplace(signal, "render", replaceRenderNode, signal);
     const signalStatements = signal.prependStatements || [];
     if (effectDeclarator) {
       signalStatements.push(import_compiler22.types.variableDeclaration("const", [effectDeclarator]));
@@ -4227,18 +4277,18 @@ function writeHTMLResumeStatements(path7) {
 function getSetup(section) {
   return section.hoistedTo ? getSignal(section, void 0).identifier : getSignals(section).get(void 0)?.identifier;
 }
-function replaceRenderNode(node) {
-  return replaceAssignedNode(node) || replaceBindingReadNode(node) || replaceRegisteredFunctionNode(node);
+function replaceRenderNode(node, signal) {
+  return replaceAssignedNode(node) || replaceBindingReadNode(node, signal) || replaceRegisteredFunctionNode(node);
 }
 function replaceEffectNode(node) {
   return replaceAssignedNode(node) || replaceBindingReadNode(node);
 }
-function replaceBindingReadNode(node) {
+function replaceBindingReadNode(node, signal) {
   switch (node.type) {
     case "Identifier":
     case "MemberExpression":
     case "OptionalMemberExpression": {
-      return getReadReplacement(node);
+      return getReadReplacement(node, signal);
     }
     case "CallExpression": {
       const { extra } = node.callee;
@@ -4453,22 +4503,24 @@ var dom_default = {
       forEachSectionReverse((childSection) => {
         if (childSection !== section) {
           forEach(childSection.referencedClosures, (closure) => {
-            const closureSignal = getSignal(childSection, closure);
-            if (signalHasStatements(closureSignal)) {
-              addStatement(
-                "render",
-                childSection,
-                void 0,
-                import_compiler23.types.expressionStatement(
-                  import_compiler23.types.callExpression(
-                    isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler23.types.memberExpression(
-                      closureSignal.identifier,
-                      import_compiler23.types.identifier("_")
-                    ),
-                    [scopeIdentifier]
+            if (closure.type !== 7 /* constant */) {
+              const closureSignal = getSignal(childSection, closure);
+              if (signalHasStatements(closureSignal)) {
+                addStatement(
+                  "render",
+                  childSection,
+                  void 0,
+                  import_compiler23.types.expressionStatement(
+                    import_compiler23.types.callExpression(
+                      isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler23.types.memberExpression(
+                        closureSignal.identifier,
+                        import_compiler23.types.identifier("_")
+                      ),
+                      [scopeIdentifier]
+                    )
                   )
-                )
-              );
+                );
+              }
             }
           });
           const tagParamsSignal = childSection.params && initValue(childSection.params);
@@ -4723,8 +4775,8 @@ var html_default = {
     }
   }
 };
-function replaceNode(node, container) {
-  return replaceBindingReadNode2(node) || replaceRegisteredFunctionNode2(node, container);
+function replaceNode(node) {
+  return replaceBindingReadNode2(node) || replaceRegisteredFunctionNode2(node);
 }
 function replaceBindingReadNode2(node) {
   switch (node.type) {
@@ -4756,7 +4808,7 @@ function replaceBindingReadNode2(node) {
     }
   }
 }
-function replaceRegisteredFunctionNode2(node, container) {
+function replaceRegisteredFunctionNode2(node) {
   switch (node.type) {
     case "ClassMethod": {
       const replacement = getRegisteredFnExpression2(node);
@@ -4770,25 +4822,6 @@ function replaceRegisteredFunctionNode2(node, container) {
       const replacement = getRegisteredFnExpression2(node);
       return replacement && import_compiler24.types.objectProperty(node.key, replacement);
     }
-    case "FunctionDeclaration": {
-      const { extra } = node;
-      if (isRegisteredFnExtra(extra)) {
-        let registeredFnDeclarations = registeredFnDeclarationsByBody.get(
-          container
-        );
-        if (!registeredFnDeclarations) {
-          registeredFnDeclarationsByBody.set(
-            container,
-            registeredFnDeclarations = []
-          );
-        }
-        registeredFnDeclarations.push({
-          id: node.id.name,
-          registerId: extra.registerId
-        });
-      }
-      break;
-    }
     case "ArrowFunctionExpression":
     case "FunctionExpression": {
       return getRegisteredFnExpression2(node);
@@ -4799,14 +4832,18 @@ function replaceRegisteredFunctionNode2(node, container) {
       break;
   }
 }
-var registeredFnDeclarationsByBody = /* @__PURE__ */ new WeakMap();
 function addRegisteredDeclarations(body) {
-  const registeredFnDeclarations = registeredFnDeclarationsByBody.get(body);
-  if (registeredFnDeclarations) {
-    for (const { id, registerId } of registeredFnDeclarations) {
+  const len = body.length;
+  for (let i = 0; i < len; i++) {
+    const child = body[i];
+    if (child.type === "FunctionDeclaration" && isRegisteredFnExtra(child.extra)) {
       body.push(
         import_compiler24.types.expressionStatement(
-          callRuntime("_resume", import_compiler24.types.identifier(id), import_compiler24.types.stringLiteral(registerId))
+          callRuntime(
+            "_resume",
+            import_compiler24.types.identifier(child.id.name),
+            import_compiler24.types.stringLiteral(child.extra.registerId)
+          )
         )
       );
     }
@@ -5127,7 +5164,6 @@ function buildUndefined() {
 }
 
 // src/translator/visitors/program/index.ts
-var cleanIdentifier;
 var scopeIdentifier;
 function isScopeIdentifier(node) {
   return node === scopeIdentifier;
@@ -5181,7 +5217,6 @@ var program_default = {
   translate: {
     enter(program) {
       scopeIdentifier = isOutputDOM() ? generateUidIdentifier("scope") : null;
-      cleanIdentifier = isOutputDOM() ? generateUidIdentifier("clean") : null;
       if (getMarkoOpts().output === "hydrate") {
         const entryFile = program.hub.file;
         const visitedFiles = /* @__PURE__ */ new Set([
@@ -5989,7 +6024,9 @@ var native_tag_default = {
                 scopeIdentifier,
                 getScopeAccessorLiteral(nodeBinding)
               )
-            )
+            ),
+            void 0,
+            true
           );
         }
         if (staticControllable) {
@@ -6075,7 +6112,14 @@ var native_tag_default = {
                   }
                 }
                 if (stmt) {
-                  addStatement("render", tagSection, valueReferences, stmt);
+                  addStatement(
+                    "render",
+                    tagSection,
+                    valueReferences,
+                    stmt,
+                    void 0,
+                    !!meta.dynamicItems
+                  );
                 }
               }
               break;
@@ -6109,7 +6153,9 @@ var native_tag_default = {
                       import_compiler33.types.stringLiteral(name2),
                       value
                     )
-                  )
+                  ),
+                  void 0,
+                  true
                 );
               }
               break;
@@ -6169,7 +6215,9 @@ var native_tag_default = {
                 visitAccessor,
                 staticContentAttr.value
               )
-            )
+            ),
+            void 0,
+            true
           );
         }
         if (isOpenOnly) {
@@ -6209,7 +6257,9 @@ var native_tag_default = {
                     createScopeReadExpression(nodeBinding),
                     textLiteral
                   )
-                )
+                ),
+                void 0,
+                true
               );
             }
           } else {
@@ -6537,7 +6587,8 @@ var for_default = {
     (0, import_babel_utils23.assertNoVar)(tag);
     (0, import_babel_utils23.assertNoArgs)(tag);
     assertNoSpreadAttrs(tag);
-    switch (getForType(tag.node)) {
+    const forType = getForType(tag.node);
+    switch (forType) {
       case "of":
         allowAttrs = ["of"];
         break;
@@ -6574,6 +6625,13 @@ var for_default = {
     addSerializeExpr(tagSection, tagExtra, kStatefulReason);
     if (paramsBinding) {
       setBindingDownstream(paramsBinding, tagExtra);
+      const keyBinding = paramsBinding.propertyAliases.get(
+        forType === "of" ? "1" : "0"
+      );
+      if (keyBinding) {
+        keyBinding.type = 7 /* constant */;
+        keyBinding.scopeAccessor = getAccessorProp().LoopKey;
+      }
     }
     bodySection.sectionAccessor = {
       binding: nodeBinding,
@@ -7612,11 +7670,9 @@ function analyzeAttrs(rootTagExtra, section, tag, propTree, rootAttrExprs) {
         }
         bindings = bindingUtil.add(bindings, templateExportAttr.binding);
       }
-      if (bindings) {
-        forEach(bindings, (binding) => {
-          setBindingDownstream(binding, groupExtra);
-        });
-      }
+      forEach(bindings, (binding) => {
+        setBindingDownstream(binding, groupExtra);
+      });
       for (const name2 of group) {
         known[attrTagLookup[name2].name] = groupKnownValue;
       }
@@ -7629,65 +7685,97 @@ function analyzeAttrs(rootTagExtra, section, tag, propTree, rootAttrExprs) {
       known.content = { value: void 0 };
     }
   }
-  const { attributes } = tag.node;
+  let knownSpreadBinding;
   let spreadReferenceNodes;
+  const { attributes } = tag.node;
   for (let i = attributes.length; i--; ) {
     const attr = attributes[i];
     if (import_compiler37.types.isMarkoAttribute(attr)) {
-      const templateExportAttr = propTree.props[attr.name];
+      const templateExportAttr = getBindingPropTreeProp(propTree, attr.name);
       if (!templateExportAttr || seen.has(attr.name)) {
         unknownReferences.push(attr.value);
         continue;
       }
+      const attrExtra = attr.value.extra ??= {};
       seen.add(attr.name);
-      setBindingDownstream(
-        templateExportAttr.binding,
-        attr.value.extra ??= {}
-      );
+      setBindingDownstream(templateExportAttr.binding, attrExtra);
+      if (knownSpreadBinding && !includes(knownSpreadBinding.excludeProperties, attr.name)) {
+        const propBinding = getOrCreatePropertyAlias(
+          knownSpreadBinding,
+          attr.name
+        );
+        addRead(attrExtra, void 0, propBinding, section);
+      }
     }
     if (spreadReferenceNodes) {
       spreadReferenceNodes.push(attr.value);
     } else if (import_compiler37.types.isMarkoSpreadAttribute(attr)) {
-      spreadReferenceNodes = [attr.value];
+      knownSpreadBinding = getSingleKnownSpreadBinding(attributes);
+      if (knownSpreadBinding) {
+        dropRead(attr.value.extra);
+      } else {
+        spreadReferenceNodes = [attr.value];
+      }
     } else {
       const attrValueExtra = attr.value.extra ??= {};
       known[attr.name] = { value: attrValueExtra };
       rootAttrExprs.add(attrValueExtra);
     }
   }
-  if (spreadReferenceNodes) {
-    const extra = inputExpr.value = mergeReferences(
-      section,
-      tag.node,
-      spreadReferenceNodes
-    );
-    let spreadBinding = propTree.binding;
-    if (seen.size) {
-      spreadBinding = createBinding(
+  if (knownSpreadBinding) {
+    for (const prop of getAllBindingPropTreePropKeys(propTree)) {
+      if (!seen.has(prop)) {
+        const propBinding = getOrCreatePropertyAlias(knownSpreadBinding, prop);
+        const propExtra = { section };
+        known[prop] = { value: propExtra };
+        rootAttrExprs.add(propExtra);
+        addRead(propExtra, propExtra, propBinding, section);
+        setBindingDownstream(propBinding, propExtra);
+      }
+    }
+  } else if (spreadReferenceNodes) {
+    setBindingDownstream(
+      seen.size ? createBinding(
         generateUid(`${getTagName(tag)}_attrs`),
-        spreadBinding.type,
-        spreadBinding.section,
-        spreadBinding,
+        propTree.binding.type,
+        propTree.binding.section,
+        propTree.binding,
         void 0,
         fromIter(seen),
         spreadReferenceNodes[0].loc,
         true
-      );
-    }
-    setBindingDownstream(spreadBinding, extra);
+      ) : propTree.binding,
+      inputExpr.value = mergeReferences(
+        section,
+        tag.node,
+        spreadReferenceNodes
+      )
+    );
   }
   if (propTree.rest) {
-    const extra = inputExpr.value = mergeReferences(
-      section,
-      tag.node,
-      unknownReferences.flat()
+    setBindingDownstream(
+      propTree.binding,
+      inputExpr.value = mergeReferences(
+        section,
+        tag.node,
+        unknownReferences.flat()
+      )
     );
-    setBindingDownstream(propTree.binding, extra);
   } else {
     unknownReferences.forEach(dropReferences);
   }
   return inputExpr;
 }
+function getSingleKnownSpreadBinding(attributes) {
+  let binding;
+  for (let i = attributes.length; i--; ) {
+    const attr = attributes[i];
+    if (attr.type === "MarkoSpreadAttribute" ? binding || !(binding = attr.value.extra?.spreadFrom) : binding && !includes(binding.excludeProperties, attr.name)) {
+      return;
+    }
+  }
+  return binding;
+}
 function writeParamsToSignals(tag, propTree, importAlias, info) {
   if (!propTree.props || tag.node.arguments?.some((node) => import_compiler37.types.isSpreadElement(node))) {
     const referencedBindings = tag.node.extra?.referencedBindings;
@@ -7745,7 +7833,9 @@ function writeParamsToSignals(tag, propTree, importAlias, info) {
               ),
               arg
             ])
-          )
+          ),
+          void 0,
+          true
         );
       }
       i++;
@@ -7871,20 +7961,20 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
                 scopeIdentifier
               ])
             ])
-          )
+          ),
+          void 0,
+          true
         );
       }
     }
-    const { attributes } = tag.node;
-    const staticAttrs = [];
+    let knownSpreadBinding;
     let spreadProps;
+    const staticAttrs = [];
+    const { attributes } = tag.node;
     for (let i = attributes.length; i--; ) {
       const attr = attributes[i];
       if (import_compiler37.types.isMarkoAttribute(attr)) {
-        const childAttrExports = propTree.props[attr.name];
-        if (!childAttrExports || seen.has(attr.name)) continue;
-        if (spreadProps) {
-          spreadProps.push(toObjectProperty(attr.name, attr.value));
+        if (!getBindingPropTreeProp(propTree, attr.name) || seen.has(attr.name) || spreadProps?.push(toObjectProperty(attr.name, attr.value))) {
           continue;
         }
         seen.add(attr.name);
@@ -7892,11 +7982,14 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
       } else if (spreadProps) {
         spreadProps.push(import_compiler37.types.spreadElement(attr.value));
       } else {
-        spreadProps = [import_compiler37.types.spreadElement(attr.value)];
+        knownSpreadBinding = getSingleKnownSpreadBinding(attributes);
+        if (!knownSpreadBinding) {
+          spreadProps = [import_compiler37.types.spreadElement(attr.value)];
+        }
       }
     }
     for (const attr of staticAttrs.reverse()) {
-      const childAttrExports = propTree.props[attr.name];
+      const childAttrExports = getBindingPropTreeProp(propTree, attr.name);
       const attrExportIdentifier = info.getBindingIdentifier(
         childAttrExports.binding,
         `${importAlias}_${attr.name}`
@@ -7908,65 +8001,95 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
         import_compiler37.types.expressionStatement(
           import_compiler37.types.callExpression(attrExportIdentifier, [
             createScopeReadExpression(info.childScopeBinding, info.tagSection),
+            // TODO: use spreadBinding property alias after we optimize `in`
             attr.value
           ])
-        )
+        ),
+        void 0,
+        true
       );
     }
-    const missing = new Set(Object.keys(propTree.props));
+    const missing = new Set(getAllBindingPropTreePropKeys(propTree));
     for (const name2 of seen) missing.delete(name2);
     if (missing.size) {
-      const referencedBindings = tag.node.extra?.referencedBindings;
-      if (spreadProps) {
-        const spreadExpr = propsToExpression(
-          propTree.rest ? (translatedAttrs = translateAttrs(tag, propTree, seen)).properties : spreadProps.reverse()
-        );
-        if (isSimpleReference(spreadExpr)) {
-          spreadId = spreadExpr;
-        } else {
-          spreadId = generateUidIdentifier(`${importAlias}_spread`);
-          if (translatedAttrs) {
-            translatedAttrs.properties = [import_compiler37.types.spreadElement(spreadId)];
-          }
-          addStatement("render", info.tagSection, referencedBindings, [
-            import_compiler37.types.variableDeclaration("const", [
-              import_compiler37.types.variableDeclarator(spreadId, spreadExpr)
-            ])
-          ]);
-        }
-      }
-      for (const name2 of missing) {
-        const childAttrExports = propTree.props[name2];
-        const attrExportIdentifier = info.getBindingIdentifier(
-          childAttrExports.binding,
-          `${importAlias}_${name2}`
-        );
-        addStatement(
-          "render",
-          info.tagSection,
-          referencedBindings,
-          import_compiler37.types.expressionStatement(
-            import_compiler37.types.callExpression(
-              attrExportIdentifier,
-              spreadId ? [
+      if (knownSpreadBinding) {
+        for (const prop of missing) {
+          const childAttrExports = getBindingPropTreeProp(propTree, prop);
+          const attrExportIdentifier = info.getBindingIdentifier(
+            childAttrExports.binding,
+            `${importAlias}_${prop}`
+          );
+          const propBinding = knownSpreadBinding.propertyAliases.get(prop);
+          addStatement(
+            "render",
+            info.tagSection,
+            propBinding,
+            import_compiler37.types.expressionStatement(
+              import_compiler37.types.callExpression(attrExportIdentifier, [
                 createScopeReadExpression(
                   info.childScopeBinding,
                   info.tagSection
                 ),
-                toMemberExpression(import_compiler37.types.cloneNode(spreadId, true), name2)
-              ] : [
-                createScopeReadExpression(
-                  info.childScopeBinding,
-                  info.tagSection
-                )
-              ]
+                createScopeReadExpression(propBinding, info.tagSection)
+              ])
+            ),
+            void 0,
+            true
+          );
+        }
+      } else {
+        const referencedBindings = tag.node.extra?.referencedBindings;
+        if (spreadProps) {
+          const spreadExpr = propsToExpression(
+            propTree.rest ? (translatedAttrs = translateAttrs(tag, propTree, seen)).properties : spreadProps.reverse()
+          );
+          if (isSimpleReference(spreadExpr)) {
+            spreadId = spreadExpr;
+          } else {
+            spreadId = generateUidIdentifier(`${importAlias}_spread`);
+            if (translatedAttrs) {
+              translatedAttrs.properties = [import_compiler37.types.spreadElement(spreadId)];
+            }
+            addStatement("render", info.tagSection, referencedBindings, [
+              import_compiler37.types.variableDeclaration("const", [
+                import_compiler37.types.variableDeclarator(spreadId, spreadExpr)
+              ])
+            ]);
+          }
+        }
+        for (const name2 of missing) {
+          const childAttrExports = getBindingPropTreeProp(propTree, name2);
+          const attrExportIdentifier = info.getBindingIdentifier(
+            childAttrExports.binding,
+            `${importAlias}_${name2}`
+          );
+          addStatement(
+            "render",
+            info.tagSection,
+            spreadProps && referencedBindings,
+            import_compiler37.types.expressionStatement(
+              import_compiler37.types.callExpression(
+                attrExportIdentifier,
+                spreadId ? [
+                  createScopeReadExpression(
+                    info.childScopeBinding,
+                    info.tagSection
+                  ),
+                  toMemberExpression(import_compiler37.types.cloneNode(spreadId, true), name2)
+                ] : [
+                  createScopeReadExpression(
+                    info.childScopeBinding,
+                    info.tagSection
+                  )
+                ]
+              )
             )
-          )
-        );
+          );
+        }
       }
     }
   }
-  if (!propTree.props || propTree.rest) {
+  if (!propTree.props || propTree.rest && !propTree.rest.props) {
     if (!translatedAttrs) {
       if (propTree.rest) {
         seen ||= /* @__PURE__ */ new Set();
@@ -8127,6 +8250,7 @@ function createBinding(name2, type, section, upstreamAlias, property, excludePro
     upstreamAlias,
     downstreamExpressions: /* @__PURE__ */ new Set(),
     scopeOffset: void 0,
+    scopeAccessor: void 0,
     export: void 0,
     nullable: excludeProperties === void 0
   };
@@ -8147,6 +8271,15 @@ function createBinding(name2, type, section, upstreamAlias, property, excludePro
   getBindings().add(binding);
   return binding;
 }
+function getOrCreatePropertyAlias(binding, property) {
+  return binding.propertyAliases.get(property) || createBinding(
+    `${binding.name}_${property.replace(/[^a-zA-Z0-9_$]/g, "_")}`,
+    binding.type,
+    binding.section,
+    binding,
+    property
+  );
+}
 function trackDomVarReferences(tag, binding) {
   const tagVar = tag.node.var;
   if (!tagVar) {
@@ -8517,7 +8650,6 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
 function trackReference(referencePath, binding) {
   let root = referencePath;
   let reference = binding;
-  let propPath = binding.name;
   while (true) {
     const { parent } = root;
     if (!import_compiler38.types.isMemberExpression(parent) && !import_compiler38.types.isOptionalMemberExpression(parent))
@@ -8527,23 +8659,11 @@ function trackReference(referencePath, binding) {
     if (reference.upstreamAlias && reference.excludeProperties !== void 0 && !propsUtil.has(reference.excludeProperties, prop)) {
       reference = reference.upstreamAlias;
     }
-    if (reference.propertyAliases.has(prop)) {
-      root = root.parentPath;
-      reference = reference.propertyAliases.get(prop);
-      propPath = reference.name;
-      continue;
-    }
     if (isInvokedFunction(root.parentPath) && !isEventOrChangeHandler(prop)) {
       break;
     }
     root = root.parentPath;
-    reference = createBinding(
-      propPath += `_${prop.replace(/[^a-zA-Z0-9_$]/g, "_")}`,
-      reference.type,
-      reference.section,
-      reference,
-      prop
-    );
+    reference = getOrCreatePropertyAlias(reference, prop);
   }
   addReadToExpression(root, reference);
 }
@@ -8618,7 +8738,8 @@ function finalizeReferences() {
   const intersectionsBySection = /* @__PURE__ */ new Map();
   for (const [expr, reads] of readsByExpression) {
     if (isReferencedExtra(expr)) {
-      const referencedBindings = expr.referencedBindings = resolveReferencedBindings(expr, reads, intersectionsBySection);
+      const { referencedBindings, constantBindings } = resolveReferencedBindings(expr, reads, intersectionsBySection);
+      expr.referencedBindings = referencedBindings;
       if (referencedBindings) {
         forEach(referencedBindings, (binding) => {
           binding.downstreamExpressions.add(expr);
@@ -8637,6 +8758,11 @@ function finalizeReferences() {
           }
         }
       }
+      if (constantBindings) {
+        forEach(constantBindings, (binding) => {
+          binding.downstreamExpressions.add(expr);
+        });
+      }
     }
   }
   for (const binding of bindings) {
@@ -9028,18 +9154,32 @@ var [getReadsByExpression] = createProgramState(
 var [getFunctionReadsByExpression] = createProgramState(
   () => /* @__PURE__ */ new Map()
 );
-function addReadToExpression(root, binding) {
-  const { node } = root;
-  const fnRoot = getFnRoot(root);
-  const exprRoot = getExprRoot(fnRoot || root);
-  const exprExtra = exprRoot.node.extra ??= {};
+function addRead(exprExtra, readExtra, binding, section) {
   const readsByExpression = getReadsByExpression();
-  const section = exprExtra.section = getOrCreateSection(exprRoot);
-  const read = { binding, node };
+  const read = {
+    binding,
+    extra: readExtra
+  };
+  exprExtra.section = section;
   readsByExpression.set(
     exprExtra,
     push(readsByExpression.get(exprExtra), read)
   );
+  return read;
+}
+function dropRead(exprExtra) {
+  getReadsByExpression().delete(exprExtra);
+}
+function addReadToExpression(root, binding) {
+  const { node } = root;
+  const fnRoot = getFnRoot(root);
+  const exprRoot = getExprRoot(fnRoot || root);
+  const exprExtra = exprRoot.node.extra ??= {};
+  const section = getOrCreateSection(exprRoot);
+  const read = addRead(exprExtra, node.extra ??= {}, binding, section);
+  if (root.parent.type === "MarkoSpreadAttribute") {
+    exprExtra.spreadFrom = binding;
+  }
   if (fnRoot) {
     const fnReadsByExpr = getFunctionReadsByExpression();
     let exprFnReads = fnReadsByExpr.get(exprExtra);
@@ -9092,21 +9232,29 @@ function getAllTagReferenceNodes(tag, referenceNodes = []) {
 }
 function getScopeAccessorLiteral(binding, encoded, includeId) {
   const canonicalBinding = getCanonicalBinding(binding);
-  if (isOptimize()) {
+  if (canonicalBinding.type === 7 /* constant */) {
+    return import_compiler38.types.stringLiteral(
+      canonicalBinding.scopeAccessor ?? canonicalBinding.name
+    );
+  } else if (isOptimize()) {
     return encoded ? import_compiler38.types.numericLiteral(canonicalBinding.id) : import_compiler38.types.stringLiteral(decodeAccessor(canonicalBinding.id));
   } else if (includeId || canonicalBinding.type === 0 /* dom */) {
     return import_compiler38.types.stringLiteral(`${canonicalBinding.name}/${canonicalBinding.id}`);
   }
-  return import_compiler38.types.stringLiteral(canonicalBinding.name);
+  return import_compiler38.types.stringLiteral(
+    canonicalBinding.scopeAccessor ?? canonicalBinding.name
+  );
 }
 function getScopeAccessor(binding, encoded, includeId) {
   const canonicalBinding = getCanonicalBinding(binding);
-  if (isOptimize()) {
+  if (canonicalBinding.type === 7 /* constant */) {
+    return canonicalBinding.scopeAccessor ?? canonicalBinding.name;
+  } else if (isOptimize()) {
     return encoded ? canonicalBinding.id + "" : decodeAccessor(canonicalBinding.id);
   } else if (includeId || canonicalBinding.type === 0 /* dom */) {
     return `${canonicalBinding.name}/${canonicalBinding.id}`;
   }
-  return canonicalBinding.name;
+  return canonicalBinding.scopeAccessor ?? canonicalBinding.name;
 }
 function getDebugScopeAccess(binding) {
   let root = binding;
@@ -9147,7 +9295,7 @@ function getSectionInstancesAccessorLiteral(section) {
   const accessor = getSectionInstancesAccessor(section);
   return accessor ? typeof accessor === "number" ? import_compiler38.types.numericLiteral(accessor) : import_compiler38.types.stringLiteral(accessor) : void 0;
 }
-function getReadReplacement(node) {
+function getReadReplacement(node, signal) {
   const { extra } = node;
   if (!extra || extra.assignment) return;
   const { read, binding } = extra;
@@ -9156,7 +9304,9 @@ function getReadReplacement(node) {
     let replacement;
     if (read.props === void 0) {
       if (isOutputDOM()) {
-        if (readBinding.type === 0 /* dom */) {
+        if (signal?.referencedBindings === readBinding && !signal.hasSideEffect) {
+          replacement = getSignalValueIdentifier(signal);
+        } else if (readBinding.type === 0 /* dom */) {
           if (!extra[kIsInvoked] && readBinding.section.domGetterBindings.has(readBinding)) {
             replacement = import_compiler38.types.callExpression(
               getBindingGetterIdentifier(readBinding),
@@ -9181,9 +9331,17 @@ function getReadReplacement(node) {
     } else {
       const props = read.props ? Array.isArray(read.props) ? read.props.slice() : [read.props] : [];
       let curNode = node;
-      let curBinding = read.binding;
+      let curBinding = readBinding;
       let replaceMember;
-      replacement = isOutputDOM() ? createScopeReadExpression(read.binding, extra.section) : import_compiler38.types.identifier(read.binding.name);
+      if (isOutputDOM()) {
+        if (signal?.referencedBindings === readBinding && !signal.hasSideEffect) {
+          replacement = getSignalValueIdentifier(signal);
+        } else {
+          replacement = createScopeReadExpression(readBinding, extra.section);
+        }
+      } else {
+        replacement = import_compiler38.types.identifier(readBinding.name);
+      }
       while (props.length && (curNode.type === "MemberExpression" || curNode.type === "OptionalMemberExpression")) {
         const prop = props.pop();
         const memberProp = getMemberExpressionPropString(curNode);
@@ -9202,7 +9360,7 @@ function getReadReplacement(node) {
         );
       }
       if (replaceMember) {
-        if (read.binding.nullable && replaceMember.object.type !== replacement.type) {
+        if (readBinding.nullable && replaceMember.object.type !== replacement.type) {
           replaceMember.type = "OptionalMemberExpression";
           replaceMember.optional = true;
         }
@@ -9218,6 +9376,14 @@ function getReadReplacement(node) {
     node.name = binding.name;
   }
 }
+function hasNonConstantPropertyAlias(ref) {
+  for (const alias of ref.propertyAliases.values()) {
+    if (alias.type !== 7 /* constant */) {
+      return true;
+    }
+  }
+  return false;
+}
 function pruneBinding(bindings, binding) {
   let shouldPrune = !binding.downstreamExpressions.size;
   if (binding.hoists.size) {
@@ -9226,14 +9392,14 @@ function pruneBinding(bindings, binding) {
   for (const alias of binding.aliases) {
     if (pruneBinding(bindings, alias)) {
       binding.aliases.delete(alias);
-    } else {
+    } else if (alias.type !== 7 /* constant */) {
       shouldPrune = false;
     }
   }
   for (const [key, alias] of binding.propertyAliases) {
     if (pruneBinding(bindings, alias)) {
       binding.propertyAliases.delete(key);
-    } else {
+    } else if (alias.type !== 7 /* constant */) {
       shouldPrune = false;
     }
   }
@@ -9300,12 +9466,13 @@ function getRootBindings(reads) {
 }
 function resolveReferencedBindings(expr, reads, intersectionsBySection) {
   let referencedBindings;
+  let constantBindings;
   if (Array.isArray(reads)) {
     const rootBindings = getRootBindings(reads);
     for (const read of reads) {
       let { binding } = read;
-      if (read.node) {
-        const readExtra = read.node.extra ??= {};
+      const readExtra = read.extra;
+      if (readExtra) {
         if (readExtra.assignmentTo !== binding) {
           readExtra.section = expr.section;
           ({ binding } = readExtra.read ??= resolveExpressionReference(
@@ -9314,15 +9481,22 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
           ));
         }
       }
-      referencedBindings = bindingUtil.add(referencedBindings, binding);
+      if (binding.type === 7 /* constant */) {
+        constantBindings = bindingUtil.add(constantBindings, binding);
+      } else {
+        referencedBindings = bindingUtil.add(referencedBindings, binding);
+      }
     }
   } else if (reads) {
-    if (reads.node) {
-      const readExtra = reads.node.extra ??= {};
-      readExtra.section = expr.section;
-      readExtra.read = createRead(reads.binding, void 0);
+    if (reads.extra) {
+      reads.extra.section = expr.section;
+      reads.extra.read = createRead(reads.binding, void 0);
+    }
+    if (reads.binding.type === 7 /* constant */) {
+      constantBindings = reads.binding;
+    } else {
+      referencedBindings = reads.binding;
     }
-    referencedBindings = reads.binding;
   }
   if (Array.isArray(referencedBindings)) {
     const intersections = intersectionsBySection.get(expr.section) || [];
@@ -9340,7 +9514,28 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
       );
     }
   }
-  return referencedBindings;
+  if (referencedBindings && constantBindings) {
+    const intersections = intersectionsBySection.get(expr.section) || [];
+    const combined = concat(
+      referencedBindings,
+      constantBindings
+    );
+    const intersection = findSorted(
+      compareIntersections,
+      intersections,
+      combined
+    );
+    if (!intersection) {
+      intersectionsBySection.set(
+        expr.section,
+        addSorted(compareIntersections, intersections, combined)
+      );
+    }
+  }
+  return {
+    referencedBindings,
+    constantBindings
+  };
 }
 function resolveExpressionReference(rootBindings, readBinding) {
   const upstreamRoot = readBinding.upstreamAlias && findClosestReference(readBinding.upstreamAlias, rootBindings);
@@ -11470,7 +11665,9 @@ var placeholder_default = {
                 value,
                 getScopeAccessorLiteral(nodeBinding)
               )
-            )
+            ),
+            void 0,
+            true
           );
         }
       }