marko 6.0.98 → 6.0.99

package/dist/common/helpers.d.ts

@@ -1,3 +1,4 @@
+export declare function _call<T>(fn: (v: T) => unknown, v: T): T;
 export declare function classValue(classValue: unknown): string;
 export declare function styleValue(styleValue: unknown): string;
 export declare function isEventHandler(name: string): name is `on${string}`;

package/dist/debug/dom.js

@@ -51,6 +51,7 @@ __export(dom_exports, {
   _attrs_partial_content: () => _attrs_partial_content,
   _attrs_script: () => _attrs_script,
   _await: () => _await,
+  _call: () => _call,
   _child_setup: () => _child_setup,
   _closure: () => _closure,
   _closure_get: () => _closure_get,
@@ -177,6 +178,10 @@ function forUntil(until, from, step, cb) {
 }
 
 // src/common/helpers.ts
+function _call(fn, v) {
+  fn(v);
+  return v;
+}
 function classValue(classValue2) {
   return toDelimitedString(classValue2, " ", stringifyClassObject);
 }
@@ -569,8 +574,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 registeredValues[lastEffect](
                   scopeLookup[serialized] ||= {
                     ___id: scopeId
-                  },
-                  scopeLookup[serialized]
+                  }
                 );
               } else {
                 for (const scope of serialized(serializeContext)) {
@@ -972,28 +976,17 @@ function _let(valueAccessor, fn) {
     );
   }
   const valueChangeAccessor = "TagVariableChange:" /* TagVariableChange */ + valueAccessor;
-  const update = (scope, value) => {
-    if (scope[valueAccessor] !== value) {
-      scope[valueAccessor] = value;
-      fn && fn(scope, value);
-    }
-  };
   return (scope, value, valueChange) => {
     if (rendering) {
       if ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.___creating) {
         scope[valueAccessor] = value;
-        fn && fn(scope, value);
+        fn && fn(scope);
       }
     } else if (scope[valueChangeAccessor]) {
       scope[valueChangeAccessor](value);
-    } else {
+    } else if (scope[valueAccessor] !== (scope[valueAccessor] = value) && fn) {
       schedule();
-      queueRender(
-        scope,
-        update,
-        true ? id : valueAccessor,
-        value
-      );
+      queueRender(scope, fn, true ? id : valueAccessor);
     }
     return value;
   };
@@ -1003,7 +996,7 @@ function _const(valueAccessor, fn = () => {
   return (scope, value) => {
     if (!(valueAccessor in scope) || scope[valueAccessor] !== value) {
       scope[valueAccessor] = value;
-      fn(scope, value);
+      fn(scope);
     }
   };
 }
@@ -1020,8 +1013,7 @@ function _or(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "___id
     }
   };
 }
-function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
-  const childSignal = closure(valueAccessor, fn);
+function _for_closure(ownerLoopNodeAccessor, fn) {
   const loopScopeAccessor = "LoopScopeArray:" /* LoopScopeArray */ + ownerLoopNodeAccessor;
   const loopScopeMapAccessor = "LoopScopeMap:" /* LoopScopeMap */ + ownerLoopNodeAccessor;
   const ownerSignal = (ownerScope) => {
@@ -1033,7 +1025,7 @@ function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
         () => {
           for (const scope of scopes) {
             if (!scope.___creating && !scope.___destroyed) {
-              childSignal(scope);
+              fn(scope);
             }
           }
         },
@@ -1043,20 +1035,19 @@ function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
       );
     }
   };
-  ownerSignal._ = childSignal;
+  ownerSignal._ = fn;
   return ownerSignal;
 }
-function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
-  const childSignal = closure(valueAccessor, fn);
+function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
   const scopeAccessor = "ConditionalScope:" /* ConditionalScope */ + ownerConditionalNodeAccessor;
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + ownerConditionalNodeAccessor;
   const ownerSignal = (scope) => {
     const ifScope = scope[scopeAccessor];
     if (ifScope && !ifScope.___creating && (scope[branchAccessor] || 0) === branch) {
-      queueRender(ifScope, childSignal, -1);
+      queueRender(ifScope, fn, -1);
     }
   };
-  ownerSignal._ = childSignal;
+  ownerSignal._ = fn;
   return ownerSignal;
 }
 function subscribeToScopeSet(ownerScope, accessor, scope) {
@@ -1089,10 +1080,9 @@ function _closure(...closureSignals) {
   };
 }
 function _closure_get(valueAccessor, fn, getOwnerScope) {
-  const childSignal = closure(valueAccessor, fn, getOwnerScope);
   const closureSignal = ((scope) => {
     scope[closureSignal.___signalIndexAccessor] = closureSignal.___index;
-    childSignal(scope);
+    fn(scope);
     subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope["_" /* Owner */],
       closureSignal.___scopeInstancesAccessor,
@@ -1103,14 +1093,6 @@ function _closure_get(valueAccessor, fn, getOwnerScope) {
   closureSignal.___signalIndexAccessor = "ClosureSignalIndex:" /* ClosureSignalIndex */ + valueAccessor;
   return closureSignal;
 }
-function closure(valueAccessor, fn, getOwnerScope) {
-  return (scope) => {
-    fn(
-      scope,
-      (getOwnerScope ? getOwnerScope(scope) : scope["_" /* Owner */])[valueAccessor]
-    );
-  };
-}
 function _child_setup(setup) {
   setup._ = (scope, owner) => {
     scope["_" /* Owner */] = owner;
@@ -2164,11 +2146,8 @@ function prepareEffects(fn) {
   return preparedEffects;
 }
 var runEffects = ((effects) => {
-  for (let i = 0, scope; i < effects.length; ) {
-    effects[i++](
-      scope = effects[i++],
-      scope
-    );
+  for (let i = 0; i < effects.length; ) {
+    effects[i++](effects[i++]);
   }
 });
 function runRenders() {
@@ -2227,7 +2206,7 @@ var _enable_catch = () => {
         scope = effects[i++];
         branch = scope.___closestBranch;
         if (!branch?.___destroyed && !(checkPending && handlePendingTry(fn, scope, branch))) {
-          fn(scope, scope);
+          fn(scope);
         }
       }
     } else {

package/dist/debug/dom.mjs

@@ -75,6 +75,10 @@ function forUntil(until, from, step, cb) {
 }
 
 // src/common/helpers.ts
+function _call(fn, v) {
+  fn(v);
+  return v;
+}
 function classValue(classValue2) {
   return toDelimitedString(classValue2, " ", stringifyClassObject);
 }
@@ -467,8 +471,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 registeredValues[lastEffect](
                   scopeLookup[serialized] ||= {
                     ___id: scopeId
-                  },
-                  scopeLookup[serialized]
+                  }
                 );
               } else {
                 for (const scope of serialized(serializeContext)) {
@@ -870,28 +873,17 @@ function _let(valueAccessor, fn) {
     );
   }
   const valueChangeAccessor = "TagVariableChange:" /* TagVariableChange */ + valueAccessor;
-  const update = (scope, value) => {
-    if (scope[valueAccessor] !== value) {
-      scope[valueAccessor] = value;
-      fn && fn(scope, value);
-    }
-  };
   return (scope, value, valueChange) => {
     if (rendering) {
       if ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.___creating) {
         scope[valueAccessor] = value;
-        fn && fn(scope, value);
+        fn && fn(scope);
       }
     } else if (scope[valueChangeAccessor]) {
       scope[valueChangeAccessor](value);
-    } else {
+    } else if (scope[valueAccessor] !== (scope[valueAccessor] = value) && fn) {
       schedule();
-      queueRender(
-        scope,
-        update,
-        true ? id : valueAccessor,
-        value
-      );
+      queueRender(scope, fn, true ? id : valueAccessor);
     }
     return value;
   };
@@ -901,7 +893,7 @@ function _const(valueAccessor, fn = () => {
   return (scope, value) => {
     if (!(valueAccessor in scope) || scope[valueAccessor] !== value) {
       scope[valueAccessor] = value;
-      fn(scope, value);
+      fn(scope);
     }
   };
 }
@@ -918,8 +910,7 @@ function _or(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "___id
     }
   };
 }
-function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
-  const childSignal = closure(valueAccessor, fn);
+function _for_closure(ownerLoopNodeAccessor, fn) {
   const loopScopeAccessor = "LoopScopeArray:" /* LoopScopeArray */ + ownerLoopNodeAccessor;
   const loopScopeMapAccessor = "LoopScopeMap:" /* LoopScopeMap */ + ownerLoopNodeAccessor;
   const ownerSignal = (ownerScope) => {
@@ -931,7 +922,7 @@ function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
         () => {
           for (const scope of scopes) {
             if (!scope.___creating && !scope.___destroyed) {
-              childSignal(scope);
+              fn(scope);
             }
           }
         },
@@ -941,20 +932,19 @@ function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
       );
     }
   };
-  ownerSignal._ = childSignal;
+  ownerSignal._ = fn;
   return ownerSignal;
 }
-function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
-  const childSignal = closure(valueAccessor, fn);
+function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
   const scopeAccessor = "ConditionalScope:" /* ConditionalScope */ + ownerConditionalNodeAccessor;
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + ownerConditionalNodeAccessor;
   const ownerSignal = (scope) => {
     const ifScope = scope[scopeAccessor];
     if (ifScope && !ifScope.___creating && (scope[branchAccessor] || 0) === branch) {
-      queueRender(ifScope, childSignal, -1);
+      queueRender(ifScope, fn, -1);
     }
   };
-  ownerSignal._ = childSignal;
+  ownerSignal._ = fn;
   return ownerSignal;
 }
 function subscribeToScopeSet(ownerScope, accessor, scope) {
@@ -987,10 +977,9 @@ function _closure(...closureSignals) {
   };
 }
 function _closure_get(valueAccessor, fn, getOwnerScope) {
-  const childSignal = closure(valueAccessor, fn, getOwnerScope);
   const closureSignal = ((scope) => {
     scope[closureSignal.___signalIndexAccessor] = closureSignal.___index;
-    childSignal(scope);
+    fn(scope);
     subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope["_" /* Owner */],
       closureSignal.___scopeInstancesAccessor,
@@ -1001,14 +990,6 @@ function _closure_get(valueAccessor, fn, getOwnerScope) {
   closureSignal.___signalIndexAccessor = "ClosureSignalIndex:" /* ClosureSignalIndex */ + valueAccessor;
   return closureSignal;
 }
-function closure(valueAccessor, fn, getOwnerScope) {
-  return (scope) => {
-    fn(
-      scope,
-      (getOwnerScope ? getOwnerScope(scope) : scope["_" /* Owner */])[valueAccessor]
-    );
-  };
-}
 function _child_setup(setup) {
   setup._ = (scope, owner) => {
     scope["_" /* Owner */] = owner;
@@ -2062,11 +2043,8 @@ function prepareEffects(fn) {
   return preparedEffects;
 }
 var runEffects = ((effects) => {
-  for (let i = 0, scope; i < effects.length; ) {
-    effects[i++](
-      scope = effects[i++],
-      scope
-    );
+  for (let i = 0; i < effects.length; ) {
+    effects[i++](effects[i++]);
   }
 });
 function runRenders() {
@@ -2125,7 +2103,7 @@ var _enable_catch = () => {
         scope = effects[i++];
         branch = scope.___closestBranch;
         if (!branch?.___destroyed && !(checkPending && handlePendingTry(fn, scope, branch))) {
-          fn(scope, scope);
+          fn(scope);
         }
       }
     } else {
@@ -2387,6 +2365,7 @@ export {
   _attrs_partial_content,
   _attrs_script,
   _await,
+  _call,
   _child_setup,
   _closure,
   _closure_get,

package/dist/dom/renderer.d.ts

@@ -18,6 +18,6 @@ export declare function _content(id: string, template: string | 0, walks?: strin
     _: Signal<unknown>;
 } | SetupFn | 0, params?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
 export declare function _content_resume(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function _content_closures(renderer: ReturnType<typeof _content>, closureFns: Record<Accessor, SignalFn<unknown>>): (owner: Scope, closureValues: Record<Accessor, unknown>) => Renderer;
+export declare function _content_closures(renderer: ReturnType<typeof _content>, closureFns: Record<Accessor, SignalFn>): (owner: Scope, closureValues: Record<Accessor, unknown>) => Renderer;
 export declare function _content_branch(template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0): Renderer;
 export {};

package/dist/dom/signals.d.ts

@@ -1,23 +1,23 @@
 import { type Accessor, type Scope } from "../common/types";
-export type SignalFn<T> = (scope: Scope, value?: T) => void;
-export type Signal<T> = SignalFn<T> & {
+export type SignalFn = (scope: Scope) => void;
+export type Signal<T> = ((scope: Scope, value: T) => void) & {
     ___subscribe?(scope: Scope): void;
 };
-export declare function _let<T>(valueAccessor: Accessor, fn?: SignalFn<T>): (scope: Scope, value: T, valueChange?: (v: T) => void) => T;
-export declare function _const<T>(valueAccessor: Accessor, fn?: SignalFn<T>): Signal<T>;
-export declare function _or(id: number, fn: SignalFn<never>, defaultPending?: number, scopeIdAccessor?: Accessor): Signal<never>;
-export declare function _for_closure<T>(valueAccessor: Accessor, ownerLoopNodeAccessor: Accessor, fn: SignalFn<T>): SignalFn<T>;
-export declare function _if_closure<T>(valueAccessor: Accessor, ownerConditionalNodeAccessor: Accessor, branch: number, fn: SignalFn<T>): SignalFn<T>;
+export declare function _let<T>(valueAccessor: Accessor, fn?: SignalFn): (scope: Scope, value: T, valueChange?: (v: T) => void) => T;
+export declare function _const<T>(valueAccessor: Accessor, fn?: SignalFn): Signal<T>;
+export declare function _or(id: number, fn: SignalFn, defaultPending?: number, scopeIdAccessor?: Accessor): Signal<never>;
+export declare function _for_closure(ownerLoopNodeAccessor: Accessor, fn: SignalFn): SignalFn;
+export declare function _if_closure(ownerConditionalNodeAccessor: Accessor, branch: number, fn: SignalFn): SignalFn;
 export declare function subscribeToScopeSet(ownerScope: Scope, accessor: Accessor, scope: Scope): void;
 export declare function _closure(...closureSignals: ReturnType<typeof _closure_get>[]): (scope: Scope) => void;
-export declare function _closure_get<T>(valueAccessor: Accessor, fn: Signal<T>, getOwnerScope?: (scope: Scope) => Scope): ((scope: Scope) => void) & {
+export declare function _closure_get(valueAccessor: Accessor, fn: SignalFn, getOwnerScope?: (scope: Scope) => Scope): SignalFn & {
     ___scopeInstancesAccessor: string;
     ___signalIndexAccessor: string;
     ___index: number;
 };
 export declare function _child_setup(setup: Signal<never> & {
     _: Signal<Scope>;
-}): SignalFn<never> & {
+}): ((scope: Scope, value: never) => void) & {
     ___subscribe?(scope: Scope): void;
 } & {
     _: Signal<Scope>;

package/dist/dom.d.ts

@@ -1,6 +1,7 @@
 export { attrTag, attrTags } from "./common/attr-tag";
 export { _assert_hoist } from "./common/errors";
 export { forIn, forOf, forTo, forUntil } from "./common/for";
+export { _call } from "./common/helpers";
 export { $signal, $signalReset } from "./dom/abort-signal";
 export { compat } from "./dom/compat";
 export { _await, _dynamic_tag, _for_in, _for_of, _for_to, _for_until, _if, _try, } from "./dom/control-flow";

package/dist/dom.js

@@ -48,6 +48,7 @@ __export(dom_exports, {
   _attrs_partial_content: () => _attrs_partial_content,
   _attrs_script: () => _attrs_script,
   _await: () => _await,
+  _call: () => _call,
   _child_setup: () => _child_setup,
   _closure: () => _closure,
   _closure_get: () => _closure_get,
@@ -137,6 +138,9 @@ function forUntil(until, from, step, cb) {
 }
 
 // src/common/helpers.ts
+function _call(fn, v) {
+  return fn(v), v;
+}
 function classValue(classValue2) {
   return toDelimitedString(classValue2, " ", stringifyClassObject);
 }
@@ -367,8 +371,7 @@ function init(runtimeId = "M") {
                 registeredValues[lastEffect](
                   scopeLookup[serialized] ||= {
                     l: scopeId
-                  },
-                  scopeLookup[serialized]
+                  }
                 );
               else
                 for (let scope of serialized(serializeContext))
@@ -618,20 +621,13 @@ function triggerMacroTask() {
 function _let(valueAccessor, fn) {
   if (0)
     var id;
-  let valueChangeAccessor = "o" /* TagVariableChange */ + valueAccessor, update = (scope, value) => {
-    scope[valueAccessor] !== value && (scope[valueAccessor] = value, fn && fn(scope, value));
-  };
-  return (scope, value, valueChange) => (rendering ? ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.n) && (scope[valueAccessor] = value, fn && fn(scope, value)) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value) : (schedule(), queueRender(
-    scope,
-    update,
-    valueAccessor,
-    value
-  )), value);
+  let valueChangeAccessor = "o" /* TagVariableChange */ + valueAccessor;
+  return (scope, value, valueChange) => (rendering ? ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.n) && (scope[valueAccessor] = value, fn && fn(scope)) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value) : scope[valueAccessor] !== (scope[valueAccessor] = value) && fn && (schedule(), queueRender(scope, fn, valueAccessor)), value);
 }
 function _const(valueAccessor, fn = () => {
 }) {
   return (scope, value) => {
-    (!(valueAccessor in scope) || scope[valueAccessor] !== value) && (scope[valueAccessor] = value, fn(scope, value));
+    (!(valueAccessor in scope) || scope[valueAccessor] !== value) && (scope[valueAccessor] = value, fn(scope));
   };
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
@@ -639,28 +635,28 @@ function _or(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
     scope.n ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
-function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
-  let childSignal = closure(valueAccessor, fn), loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
+function _for_closure(ownerLoopNodeAccessor, fn) {
+  let loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
     let scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [], [firstScope] = scopes;
     firstScope && queueRender(
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.n && !scope.z && childSignal(scope);
+          !scope.n && !scope.z && fn(scope);
       },
       -1,
       0,
       firstScope.l
     );
   };
-  return ownerSignal._ = childSignal, ownerSignal;
+  return ownerSignal._ = fn, ownerSignal;
 }
-function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
-  let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
+function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
+  let scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.n && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.n && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, fn, -1);
   };
-  return ownerSignal._ = childSignal, ownerSignal;
+  return ownerSignal._ = fn, ownerSignal;
 }
 function subscribeToScopeSet(ownerScope, accessor, scope) {
   let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
@@ -684,8 +680,8 @@ function _closure(...closureSignals) {
   };
 }
 function _closure_get(valueAccessor, fn, getOwnerScope) {
-  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = ((scope) => {
-    scope[closureSignal.E] = closureSignal.K, childSignal(scope), subscribeToScopeSet(
+  let closureSignal = ((scope) => {
+    scope[closureSignal.E] = closureSignal.K, fn(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
       closureSignal.D,
       scope
@@ -693,14 +689,6 @@ function _closure_get(valueAccessor, fn, getOwnerScope) {
   });
   return closureSignal.D = "a" /* ClosureScopes */ + valueAccessor, closureSignal.E = "b" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
 }
-function closure(valueAccessor, fn, getOwnerScope) {
-  return (scope) => {
-    fn(
-      scope,
-      (getOwnerScope ? getOwnerScope(scope) : scope._)[valueAccessor]
-    );
-  };
-}
 function _child_setup(setup) {
   return setup._ = (scope, owner) => {
     scope._ = owner, queueRender(scope, setup, -1);
@@ -1388,11 +1376,8 @@ function prepareEffects(fn) {
   return preparedEffects;
 }
 var runEffects = ((effects) => {
-  for (let i = 0, scope; i < effects.length; )
-    effects[i++](
-      scope = effects[i++],
-      scope
-    );
+  for (let i = 0; i < effects.length; )
+    effects[i++](effects[i++]);
 });
 function runRenders() {
   for (; pendingRenders.length; ) {
@@ -1427,7 +1412,7 @@ var runRender = (render) => render.M(render.q, render.H), _enable_catch = () =>
     if (checkPending || caughtError.has(effects)) {
       let i = 0, fn, scope, branch;
       for (; i < effects.length; )
-        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.z && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
+        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.z && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope);
     } else
       runEffects2(effects);
   })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {

package/dist/dom.mjs

@@ -38,6 +38,9 @@ function forUntil(until, from, step, cb) {
 }
 
 // src/common/helpers.ts
+function _call(fn, v) {
+  return fn(v), v;
+}
 function classValue(classValue2) {
   return toDelimitedString(classValue2, " ", stringifyClassObject);
 }
@@ -268,8 +271,7 @@ function init(runtimeId = "M") {
                 registeredValues[lastEffect](
                   scopeLookup[serialized] ||= {
                     l: scopeId
-                  },
-                  scopeLookup[serialized]
+                  }
                 );
               else
                 for (let scope of serialized(serializeContext))
@@ -519,20 +521,13 @@ function triggerMacroTask() {
 function _let(valueAccessor, fn) {
   if (0)
     var id;
-  let valueChangeAccessor = "o" /* TagVariableChange */ + valueAccessor, update = (scope, value) => {
-    scope[valueAccessor] !== value && (scope[valueAccessor] = value, fn && fn(scope, value));
-  };
-  return (scope, value, valueChange) => (rendering ? ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.n) && (scope[valueAccessor] = value, fn && fn(scope, value)) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value) : (schedule(), queueRender(
-    scope,
-    update,
-    valueAccessor,
-    value
-  )), value);
+  let valueChangeAccessor = "o" /* TagVariableChange */ + valueAccessor;
+  return (scope, value, valueChange) => (rendering ? ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.n) && (scope[valueAccessor] = value, fn && fn(scope)) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value) : scope[valueAccessor] !== (scope[valueAccessor] = value) && fn && (schedule(), queueRender(scope, fn, valueAccessor)), value);
 }
 function _const(valueAccessor, fn = () => {
 }) {
   return (scope, value) => {
-    (!(valueAccessor in scope) || scope[valueAccessor] !== value) && (scope[valueAccessor] = value, fn(scope, value));
+    (!(valueAccessor in scope) || scope[valueAccessor] !== value) && (scope[valueAccessor] = value, fn(scope));
   };
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
@@ -540,28 +535,28 @@ function _or(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
     scope.n ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
-function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
-  let childSignal = closure(valueAccessor, fn), loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
+function _for_closure(ownerLoopNodeAccessor, fn) {
+  let loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
     let scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [], [firstScope] = scopes;
     firstScope && queueRender(
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.n && !scope.z && childSignal(scope);
+          !scope.n && !scope.z && fn(scope);
       },
       -1,
       0,
       firstScope.l
     );
   };
-  return ownerSignal._ = childSignal, ownerSignal;
+  return ownerSignal._ = fn, ownerSignal;
 }
-function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
-  let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
+function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
+  let scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.n && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.n && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, fn, -1);
   };
-  return ownerSignal._ = childSignal, ownerSignal;
+  return ownerSignal._ = fn, ownerSignal;
 }
 function subscribeToScopeSet(ownerScope, accessor, scope) {
   let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
@@ -585,8 +580,8 @@ function _closure(...closureSignals) {
   };
 }
 function _closure_get(valueAccessor, fn, getOwnerScope) {
-  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = ((scope) => {
-    scope[closureSignal.E] = closureSignal.K, childSignal(scope), subscribeToScopeSet(
+  let closureSignal = ((scope) => {
+    scope[closureSignal.E] = closureSignal.K, fn(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
       closureSignal.D,
       scope
@@ -594,14 +589,6 @@ function _closure_get(valueAccessor, fn, getOwnerScope) {
   });
   return closureSignal.D = "a" /* ClosureScopes */ + valueAccessor, closureSignal.E = "b" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
 }
-function closure(valueAccessor, fn, getOwnerScope) {
-  return (scope) => {
-    fn(
-      scope,
-      (getOwnerScope ? getOwnerScope(scope) : scope._)[valueAccessor]
-    );
-  };
-}
 function _child_setup(setup) {
   return setup._ = (scope, owner) => {
     scope._ = owner, queueRender(scope, setup, -1);
@@ -1289,11 +1276,8 @@ function prepareEffects(fn) {
   return preparedEffects;
 }
 var runEffects = ((effects) => {
-  for (let i = 0, scope; i < effects.length; )
-    effects[i++](
-      scope = effects[i++],
-      scope
-    );
+  for (let i = 0; i < effects.length; )
+    effects[i++](effects[i++]);
 });
 function runRenders() {
   for (; pendingRenders.length; ) {
@@ -1328,7 +1312,7 @@ var runRender = (render) => render.M(render.q, render.H), _enable_catch = () =>
     if (checkPending || caughtError.has(effects)) {
       let i = 0, fn, scope, branch;
       for (; i < effects.length; )
-        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.z && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
+        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.z && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope);
     } else
       runEffects2(effects);
   })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {
@@ -1511,6 +1495,7 @@ export {
   _attrs_partial_content,
   _attrs_script,
   _await,
+  _call,
   _child_setup,
   _closure,
   _closure_get,

package/dist/translator/index.js

@@ -719,6 +719,20 @@ function getFnRoot(path5) {
   }
   return fnPath;
 }
+function getFnParent(path5) {
+  let curPath = path5;
+  while (!isMarko(curPath)) {
+    if (isFunction(curPath)) {
+      return curPath;
+    }
+    const parentPath = curPath.parentPath;
+    if (parentPath) {
+      curPath = parentPath;
+    } else {
+      break;
+    }
+  }
+}
 function getDeclarationRoot(path5) {
   let curPath = path5;
   let declPath;
@@ -3130,45 +3144,6 @@ function getDeclaredBindingExpression(binding) {
 
 // src/translator/util/scope-read.ts
 var import_compiler19 = require("@marko/compiler");
-function createScopeReadPattern(section, referencedBindings) {
-  const rootDepth = section.depth;
-  const rootPattern = import_compiler19.types.objectPattern([]);
-  let nestedPatterns;
-  forEach(referencedBindings, (ref) => {
-    const propertyValue = ref.name;
-    if (!isValidPropertyIdentifier(propertyValue)) return;
-    const propertyKey = getScopeAccessor(ref);
-    const isShorthand = propertyKey === propertyValue;
-    let pattern = rootPattern;
-    if (ref.section !== section && ref.type !== 4 /* local */) {
-      if (!nestedPatterns) nestedPatterns = [rootPattern];
-      const relativeDepth = rootDepth - ref.section.depth;
-      let i = nestedPatterns.length;
-      let prev = nestedPatterns[i - 1];
-      for (; i <= relativeDepth; i++) {
-        const nestedPattern = import_compiler19.types.objectPattern([]);
-        prev.properties.push(
-          import_compiler19.types.objectProperty(
-            import_compiler19.types.identifier(getAccessorProp().Owner),
-            nestedPattern
-          )
-        );
-        nestedPatterns.push(nestedPattern);
-        prev = nestedPattern;
-      }
-      pattern = nestedPatterns[relativeDepth];
-    }
-    pattern.properties.push(
-      import_compiler19.types.objectProperty(
-        toPropertyName(propertyKey),
-        import_compiler19.types.identifier(propertyValue),
-        false,
-        isShorthand
-      )
-    );
-  });
-  return rootPattern;
-}
 function getScopeExpression(section, targetSection) {
   let scope = scopeIdentifier ?? import_compiler19.types.identifier("undefined");
   const diff = section.depth - targetSection.depth;
@@ -3183,7 +3158,7 @@ function getScopeExpression(section, targetSection) {
 function createScopeReadExpression(section, reference) {
   const propName = toPropertyName(getScopeAccessor(reference));
   return import_compiler19.types.memberExpression(
-    getScopeExpression(section, reference.section),
+    reference.type === 4 /* local */ ? scopeIdentifier : getScopeExpression(section, reference.section),
     propName,
     propName.type !== "Identifier"
   );
@@ -3393,20 +3368,10 @@ function signalHasStatements(signal) {
 function getSignalFn(signal) {
   const section = signal.section;
   const binding = signal.referencedBindings;
-  const params = [scopeIdentifier];
   const isIntersection = Array.isArray(binding);
   const isBinding = binding && !isIntersection;
   const isValue = isBinding && binding.section === section;
   const assertsHoists = isValue && binding.hoists.size && !isOptimize();
-  if (isBinding && (signal.renderReferencedBindings || assertsHoists || binding.aliases.size || binding.propertyAliases.size)) {
-    const valueParam = import_compiler22.types.identifier(binding.name);
-    if (binding.loc) {
-      valueParam.loc = binding.loc;
-      valueParam.start = binding.loc.start.index;
-      valueParam.end = binding.loc.end.index;
-    }
-    params.push(valueParam);
-  }
   if (isValue) {
     for (const alias of binding.aliases) {
       const aliasSignal = getSignal(alias.section, alias);
@@ -3438,7 +3403,7 @@ function getSignalFn(signal) {
                     ...getTranslatedExtraArgs(aliasSignal)
                   ])
                 ),
-                [import_compiler22.types.identifier(binding.name)]
+                [createScopeReadExpression(binding.section, binding)]
               )
             )
           );
@@ -3447,7 +3412,7 @@ function getSignalFn(signal) {
             import_compiler22.types.expressionStatement(
               import_compiler22.types.callExpression(aliasSignal.identifier, [
                 scopeIdentifier,
-                import_compiler22.types.identifier(binding.name),
+                createScopeReadExpression(binding.section, binding),
                 ...getTranslatedExtraArgs(aliasSignal)
               ])
             )
@@ -3462,7 +3427,7 @@ function getSignalFn(signal) {
           import_compiler22.types.callExpression(aliasSignal.identifier, [
             scopeIdentifier,
             toMemberExpression(
-              import_compiler22.types.identifier(binding.name),
+              createScopeReadExpression(binding.section, binding),
               key,
               binding.nullable
             ),
@@ -3474,7 +3439,10 @@ function getSignalFn(signal) {
     if (assertsHoists) {
       signal.render.push(
         import_compiler22.types.expressionStatement(
-          callRuntime("_assert_hoist", import_compiler22.types.identifier(binding.name))
+          callRuntime(
+            "_assert_hoist",
+            createScopeReadExpression(binding.section, binding)
+          )
         )
       );
     }
@@ -3556,42 +3524,25 @@ function getSignalFn(signal) {
       )
     );
   }
-  if (isIntersection && signal.renderReferencedBindings) {
-    signal.render.unshift(
-      import_compiler22.types.variableDeclaration("let", [
-        import_compiler22.types.variableDeclarator(
-          createScopeReadPattern(section, signal.renderReferencedBindings),
-          scopeIdentifier
-        )
-      ])
-    );
-  }
   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 (params.length >= args.length) {
-          let i = args.length;
-          for (; i--; ) {
-            const param = params[i];
-            const arg = args[i];
-            if (arg.type !== "Identifier" || param.type !== "Identifier" || param.name !== arg.name) {
-              break;
-            }
-          }
-          if (i === -1) {
-            if (expression.callee.type === "MemberExpression" && expression.callee.property.type === "Identifier" && expression.callee.property.name === "_") {
-              return expression.callee.object;
-            }
-            return expression.callee;
+        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 === "_") {
+            return expression.callee.object;
           }
+          return expression.callee;
         }
       }
     }
   }
-  return import_compiler22.types.arrowFunctionExpression(params, import_compiler22.types.blockStatement(signal.render));
+  return import_compiler22.types.arrowFunctionExpression(
+    [scopeIdentifier],
+    import_compiler22.types.blockStatement(signal.render)
+  );
 }
 var hasTranslatedExtraArgs = /* @__PURE__ */ new WeakSet();
 var emptyExtraArgs = [];
@@ -3758,11 +3709,11 @@ function writeSignals(section) {
     writeSignal(signal);
   }
   function writeSignal(signal) {
-    if (!signal.build || seen.has(signal)) return;
+    if (seen.has(signal)) return;
     seen.add(signal);
-    for (const value2 of signal.values) {
-      writeSignal(value2.signal);
-      traverseReplace(value2, "value", replaceRenderNode);
+    for (const value of signal.values) {
+      writeSignal(value.signal);
+      traverseReplace(value, "value", replaceRenderNode);
     }
     forEach(signal.intersection, writeSignal);
     traverseReplace(signal, "render", replaceRenderNode);
@@ -3772,11 +3723,6 @@ function writeSignals(section) {
       const effectIdentifier = import_compiler22.types.identifier(
         `${signal.identifier.name}__script`
       );
-      const referencedBindings = signal.effectReferencedBindings;
-      const referencesScope = traverseContains(
-        signal.effect,
-        isScopeIdentifier
-      );
       effectDeclarator = import_compiler22.types.variableDeclarator(
         effectIdentifier,
         callRuntime(
@@ -3785,45 +3731,47 @@ function writeSignals(section) {
             getResumeRegisterId(section, signal.referencedBindings)
           ),
           import_compiler22.types.arrowFunctionExpression(
-            referencedBindings ? referencesScope ? [
-              scopeIdentifier,
-              createScopeReadPattern(section, referencedBindings)
-            ] : [createScopeReadPattern(section, referencedBindings)] : referencesScope ? [scopeIdentifier] : [],
+            [scopeIdentifier],
             toFirstExpressionOrBlock(signal.effect)
           )
         )
       );
     }
-    let value = signal.build();
-    if (!value || !signal.register && import_compiler22.types.isFunction(value) && import_compiler22.types.isBlockStatement(value.body) && !value.body.body.length) {
-      return;
-    }
-    if (import_compiler22.types.isCallExpression(value)) {
-      replaceNullishAndEmptyFunctionsWith0(value.arguments);
-    }
-    if (signal.register) {
-      value = callRuntime(
-        "_var_resume",
-        import_compiler22.types.stringLiteral(
-          getResumeRegisterId(section, signal.referencedBindings, "var")
-        ),
-        value
-      );
-    }
-    const signalDeclarator = import_compiler22.types.variableDeclarator(signal.identifier, value);
-    let signalDeclaration = !section.parent && !signal.referencedBindings && (import_compiler22.types.isFunctionExpression(value) || import_compiler22.types.isArrowFunctionExpression(value)) ? import_compiler22.types.functionDeclaration(
-      signal.identifier,
-      value.params,
-      import_compiler22.types.isExpression(value.body) ? import_compiler22.types.blockStatement([import_compiler22.types.expressionStatement(value.body)]) : value.body
-    ) : import_compiler22.types.variableDeclaration("const", [signalDeclarator]);
-    if (signal.export) {
-      signalDeclaration = import_compiler22.types.exportNamedDeclaration(signalDeclaration);
+    let signalDeclaration;
+    if (signal.build) {
+      let value = signal.build();
+      if (!value || !signal.register && import_compiler22.types.isFunction(value) && import_compiler22.types.isBlockStatement(value.body) && !value.body.body.length) {
+        return;
+      }
+      if (import_compiler22.types.isCallExpression(value)) {
+        replaceNullishAndEmptyFunctionsWith0(value.arguments);
+      }
+      if (signal.register) {
+        value = callRuntime(
+          "_var_resume",
+          import_compiler22.types.stringLiteral(
+            getResumeRegisterId(section, signal.referencedBindings, "var")
+          ),
+          value
+        );
+      }
+      const signalDeclarator = import_compiler22.types.variableDeclarator(signal.identifier, value);
+      signalDeclaration = !section.parent && !signal.referencedBindings && (import_compiler22.types.isFunctionExpression(value) || import_compiler22.types.isArrowFunctionExpression(value)) ? import_compiler22.types.functionDeclaration(
+        signal.identifier,
+        value.params,
+        import_compiler22.types.isExpression(value.body) ? import_compiler22.types.blockStatement([import_compiler22.types.expressionStatement(value.body)]) : value.body
+      ) : import_compiler22.types.variableDeclaration("const", [signalDeclarator]);
+      if (signal.export) {
+        signalDeclaration = import_compiler22.types.exportNamedDeclaration(signalDeclaration);
+      }
     }
     const signalStatements = signal.prependStatements || [];
     if (effectDeclarator) {
       signalStatements.push(import_compiler22.types.variableDeclaration("const", [effectDeclarator]));
     }
-    signalStatements.push(signalDeclaration);
+    if (signalDeclaration) {
+      signalStatements.push(signalDeclaration);
+    }
     (0, import_babel_utils15.getProgram)().node.body.push(...signalStatements);
   }
 }
@@ -3898,25 +3846,10 @@ function writeRegisteredFns() {
   if (registeredFns) {
     for (const registeredFn of registeredFns) {
       let fn;
-      const params = registeredFn.referencedBindings ? registeredFn.referencesScope ? [
-        scopeIdentifier,
-        import_compiler22.types.assignmentPattern(
-          createScopeReadPattern(
-            registeredFn.section,
-            registeredFn.referencedBindings
-          ),
-          scopeIdentifier
-        )
-      ] : [
-        createScopeReadPattern(
-          registeredFn.section,
-          registeredFn.referencedBindings
-        )
-      ] : registeredFn.referencesScope ? [scopeIdentifier] : void 0;
-      if (params) {
+      if (registeredFn.referencedBindings || registeredFn.referencesScope) {
         fn = import_compiler22.types.functionDeclaration(
           import_compiler22.types.identifier(registeredFn.id),
-          params,
+          [scopeIdentifier],
           import_compiler22.types.blockStatement(toReturnedFunction(registeredFn.node))
         );
       } else if (registeredFn.node.type === "FunctionDeclaration" && registeredFn.node.id?.name === registeredFn.id) {
@@ -4168,32 +4101,34 @@ var updateExpressions = /* @__PURE__ */ new WeakSet();
 function replaceAssignedNode(node) {
   switch (node.type) {
     case "ExpressionStatement": {
-      if (node.expression.type === "SequenceExpression" && updateExpressions.delete(node.expression)) {
-        node.expression = node.expression.expressions[0];
-        return node;
+      if (node.expression.type === "BinaryExpression" && updateExpressions.delete(node.expression)) {
+        node.expression = node.expression.left;
+      }
+      if (node.expression.type === "CallExpression" && updateExpressions.delete(node.expression)) {
+        node.expression.callee = node.expression.arguments[0];
+        node.expression.arguments = [node.expression.arguments[1]];
       }
       break;
     }
     case "UpdateExpression": {
       const { extra } = node.argument;
       if (isAssignedBindingExtra(extra)) {
-        const builtAssignment = getBuildAssignment(extra)?.(
+        let builtAssignment = getBuildAssignment(extra)?.(
           extra.section,
-          node
+          import_compiler22.types.binaryExpression(
+            node.operator === "++" ? "+" : "-",
+            createScopeReadExpression(extra.section, extra.assignment),
+            import_compiler22.types.numericLiteral(1)
+          )
         );
         if (builtAssignment) {
           if (!node.prefix) {
-            node.prefix = true;
-            const replacement = import_compiler22.types.sequenceExpression([
+            builtAssignment = import_compiler22.types.binaryExpression(
+              node.operator === "++" ? "-" : "+",
               builtAssignment,
-              import_compiler22.types.binaryExpression(
-                node.operator === "++" ? "-" : "+",
-                node.argument,
-                import_compiler22.types.numericLiteral(1)
-              )
-            ]);
-            updateExpressions.add(replacement);
-            return replacement;
+              import_compiler22.types.numericLiteral(1)
+            );
+            updateExpressions.add(builtAssignment);
           }
           return builtAssignment;
         }
@@ -4207,15 +4142,15 @@ function replaceAssignedNode(node) {
           if (isAssignedBindingExtra(extra)) {
             return getBuildAssignment(extra)?.(
               extra.section,
-              bindingUtil.has(
-                extra.assignmentFunction.referencedBindingsInFunction,
-                extra.assignment
-              ) ? node : node.operator === "=" ? node.right : import_compiler22.types.binaryExpression(
+              node.operator === "=" ? node.right : import_compiler22.types.binaryExpression(
                 node.operator.slice(
                   0,
                   -1
                 ),
-                node.left,
+                createScopeReadExpression(
+                  extra.section,
+                  extra.assignment
+                ),
                 node.right
               )
             ) || extra?.assignment && withLeadingComment(node.right, getDebugName(extra.assignment));
@@ -4237,12 +4172,7 @@ function replaceAssignedNode(node) {
                   import_compiler22.types.identifier(uid)
                 );
                 if (builtAssignment) {
-                  if (!bindingUtil.has(
-                    extra.assignmentFunction.referencedBindingsInFunction,
-                    extra.assignment
-                  )) {
-                    id.name = uid;
-                  }
+                  id.name = uid;
                   (params ||= []).push(import_compiler22.types.identifier(uid));
                   (assignments ||= []).push(builtAssignment);
                   return;
@@ -4280,8 +4210,14 @@ function replaceAssignedNode(node) {
 function getBuildAssignment(extra) {
   const { assignmentTo, assignment } = extra;
   if (assignmentTo) {
-    return (_section, value) => {
-      return import_compiler22.types.callExpression(import_compiler22.types.identifier(assignmentTo.name), [value]);
+    return (section, value) => {
+      const replacement = callRuntime(
+        "_call",
+        createScopeReadExpression(section, assignmentTo),
+        value
+      );
+      updateExpressions.add(replacement);
+      return replacement;
     };
   }
   return getSignal(assignment.section, assignment).buildAssignment;
@@ -6389,10 +6325,9 @@ var for_default = {
         const tagExtra = node.extra;
         const { referencedBindings } = tagExtra;
         const nodeRef = getOptimizedOnlyChildNodeBinding(tag, tagSection);
-        setClosureSignalBuilder(tag, (closure, render) => {
+        setClosureSignalBuilder(tag, (_closure, render) => {
           return callRuntime(
             "_for_closure",
-            getScopeAccessorLiteral(closure),
             getScopeAccessorLiteral(nodeRef),
             render
           );
@@ -7998,25 +7933,28 @@ function trackReferencesForBinding(babelBinding, binding) {
   }
 }
 function trackAssignment(assignment, binding) {
-  const fnRoot = getFnRoot(assignment);
+  const fnParent = getFnParent(assignment);
+  if (!fnParent) {
+    throw assignment.buildCodeFrameError(
+      `Assignments to a tag ${binding.type === 3 /* param */ ? "parameter" : "variable"} must be within a script or function.`
+    );
+  }
+  const fnRoot = getFnRoot(fnParent);
+  const fnExtra = fnRoot && (fnRoot.node.extra ??= {});
   const section = getOrCreateSection(assignment);
   setReferencesScope(assignment);
   forEachIdentifierPath(assignment, (id) => {
     if (id.node.name === binding.name) {
-      if (!fnRoot) {
-        throw id.buildCodeFrameError(
-          `Assignments to a tag ${binding.type === 3 /* param */ ? "parameter" : "variable"} must be within a script or function.`
-        );
-      }
-      const fnExtra = fnRoot && (fnRoot.node.extra ??= {});
       const idExtra = id.node.extra ??= {};
       idExtra.assignment = binding;
-      idExtra.assignmentFunction = fnExtra;
-      fnExtra.section = idExtra.section = section;
       binding.assignmentSections = sectionUtil.add(
         binding.assignmentSections,
         section
       );
+      if (fnExtra) {
+        idExtra.assignmentFunction = fnExtra;
+        fnExtra.section = idExtra.section = section;
+      }
       if (binding.upstreamAlias && binding.property !== void 0) {
         const changePropName = binding.property + "Change";
         const changeBinding = binding.upstreamAlias.propertyAliases.get(changePropName) || createBinding(
@@ -8780,78 +8718,74 @@ function getSectionInstancesAccessorLiteral(section) {
 }
 function getReadReplacement(node) {
   const { extra } = node;
-  if (!extra) return;
-  let { binding, read } = extra;
-  let replacement;
+  if (!extra || extra.assignment) return;
+  const { read, binding } = extra;
   if (read) {
+    const readBinding = read.binding;
+    let replacement;
     if (read.props === void 0) {
-      binding = read.binding;
-      read = void 0;
-    } else {
-      binding = void 0;
-    }
-  }
-  if (binding) {
-    if (node.type === "Identifier") {
-      if (binding.type === 0 /* dom */) {
-        if (binding.section.domGetterBindings.has(binding) && isOutputDOM()) {
-          replacement = import_compiler35.types.callExpression(getBindingGetterIdentifier(binding), [
-            getScopeExpression(node.extra.section, binding.section)
-          ]);
-        }
-      } else if (binding.type === 6 /* hoist */) {
-        if (node.extra?.[kIsInvoked]) {
-          if (isOutputDOM()) {
+      if (isOutputDOM()) {
+        if (readBinding.type === 0 /* dom */) {
+          if (!extra[kIsInvoked] && readBinding.section.domGetterBindings.has(readBinding)) {
             replacement = import_compiler35.types.callExpression(
-              getBindingGetterIdentifier(binding),
-              [getScopeExpression(node.extra.section, binding.section)]
+              getBindingGetterIdentifier(readBinding),
+              [getScopeExpression(extra.section, readBinding.section)]
             );
           }
+        } else if (readBinding.type === 6 /* hoist */ && extra[kIsInvoked]) {
+          replacement = import_compiler35.types.callExpression(
+            getBindingGetterIdentifier(readBinding),
+            [getScopeExpression(extra.section, readBinding.section)]
+          );
         } else {
-          replacement = import_compiler35.types.identifier(binding.name);
+          replacement = createScopeReadExpression(extra.section, readBinding);
+        }
+      } else {
+        if (node.type !== "Identifier") {
+          replacement = import_compiler35.types.identifier(readBinding.name);
+        } else if (readBinding.name !== node.name && readBinding.type !== 0 /* dom */ && (readBinding.type !== 6 /* hoist */ || !extra[kIsInvoked])) {
+          node.name = readBinding.name;
         }
-      } else if (binding.name !== node.name) {
-        node.name = binding.name;
       }
     } else {
-      replacement = import_compiler35.types.identifier(binding.name);
-    }
-  } else if (read) {
-    const props = read.props ? Array.isArray(read.props) ? read.props.slice() : [read.props] : [];
-    let curNode = node;
-    let curBinding = read.binding;
-    let replaceMember;
-    replacement = import_compiler35.types.identifier(read.binding.name);
-    while (props.length && (curNode.type === "MemberExpression" || curNode.type === "OptionalMemberExpression")) {
-      const prop = props.pop();
-      const memberProp = getMemberExpressionPropString(curNode);
-      if (memberProp !== prop) break;
-      replaceMember = curNode;
-      curNode = curNode.object;
-    }
-    for (const prop of props) {
-      if (curBinding) {
-        curBinding = curBinding.propertyAliases.get(prop);
-      }
-      replacement = toMemberExpression(
-        replacement,
-        prop,
-        !!curBinding?.nullable
-      );
-    }
-    if (replaceMember) {
-      if (read.binding.nullable && replaceMember.object.type !== replacement.type) {
-        replaceMember.type = "OptionalMemberExpression";
-        replaceMember.optional = true;
+      const props = read.props ? Array.isArray(read.props) ? read.props.slice() : [read.props] : [];
+      let curNode = node;
+      let curBinding = read.binding;
+      let replaceMember;
+      replacement = isOutputDOM() ? createScopeReadExpression(extra.section, read.binding) : import_compiler35.types.identifier(read.binding.name);
+      while (props.length && (curNode.type === "MemberExpression" || curNode.type === "OptionalMemberExpression")) {
+        const prop = props.pop();
+        const memberProp = getMemberExpressionPropString(curNode);
+        if (memberProp !== prop) break;
+        replaceMember = curNode;
+        curNode = curNode.object;
+      }
+      for (const prop of props) {
+        if (curBinding) {
+          curBinding = curBinding.propertyAliases.get(prop);
+        }
+        replacement = toMemberExpression(
+          replacement,
+          prop,
+          !!curBinding?.nullable
+        );
+      }
+      if (replaceMember) {
+        if (read.binding.nullable && replaceMember.object.type !== replacement.type) {
+          replaceMember.type = "OptionalMemberExpression";
+          replaceMember.optional = true;
+        }
+        replaceMember.object = withPreviousLocation(
+          replacement,
+          replaceMember.object
+        );
+        replacement = void 0;
       }
-      replaceMember.object = withPreviousLocation(
-        replacement,
-        replaceMember.object
-      );
-      replacement = void 0;
     }
+    return replacement && withPreviousLocation(replacement, node);
+  } else if (binding && node.type == "Identifier" && node.name !== binding.name) {
+    node.name = binding.name;
   }
-  return replacement && withPreviousLocation(replacement, node);
 }
 function pruneBinding(bindings, binding) {
   let shouldPrune = !binding.downstreamExpressions.size;
@@ -8939,14 +8873,23 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
     const rootBindings = getRootBindings(reads);
     for (const read of reads) {
       let { binding } = read;
-      if (read.node && read.node.extra?.assignmentTo !== binding) {
-        ({ binding } = (read.node.extra ??= {}).read ??= resolveExpressionReference(rootBindings, binding));
+      if (read.node) {
+        const readExtra = read.node.extra ??= {};
+        if (readExtra.assignmentTo !== binding) {
+          readExtra.section = expr.section;
+          ({ binding } = readExtra.read ??= resolveExpressionReference(
+            rootBindings,
+            binding
+          ));
+        }
       }
       referencedBindings = bindingUtil.add(referencedBindings, binding);
     }
   } else if (reads) {
     if (reads.node) {
-      (reads.node.extra ??= {}).read = createRead(reads.binding, void 0);
+      const readExtra = reads.node.extra ??= {};
+      readExtra.section = expr.section;
+      readExtra.read = createRead(reads.binding, void 0);
     }
     referencedBindings = reads.binding;
   }
@@ -10658,10 +10601,9 @@ var IfTag = {
             const consequent = import_compiler48.types.numericLiteral(branchBodySection ? i : -1);
             if (branchBodySection) {
               rendererIdentifiers.push(import_compiler48.types.identifier(branchBodySection.name));
-              setClosureSignalBuilder(branchTag, (closure, render) => {
+              setClosureSignalBuilder(branchTag, (_closure, render) => {
                 return callRuntime(
                   "_if_closure",
-                  getScopeAccessorLiteral(closure),
                   getScopeAccessorLiteral(nodeRef),
                   import_compiler48.types.numericLiteral(i),
                   render

package/dist/translator/util/get-root.d.ts

@@ -3,5 +3,6 @@ export type MarkoExprRootPath = t.NodePath<t.MarkoTag | t.MarkoTagBody | t.Marko
 export declare function getMarkoRoot(path: t.NodePath<t.Node>): MarkoExprRootPath | null;
 export declare function getExprRoot(path: t.NodePath<t.Node>): t.NodePath<t.Node>;
 export declare function getFnRoot(path: t.NodePath<t.Node>): t.NodePath<t.ArrowFunctionExpression | t.FunctionExpression | t.ObjectMember> | undefined;
+export declare function getFnParent(path: t.NodePath<t.Node>): t.NodePath<t.ArrowFunctionExpression | t.FunctionExpression | t.ObjectMember> | undefined;
 export declare function getDeclarationRoot(path: t.NodePath<t.Node>): t.NodePath<t.FunctionDeclaration | t.VariableDeclaration> | undefined;
 export declare function isMarko(path: t.NodePath<any>): path is MarkoExprRootPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.98",
+  "version": "6.0.99",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",