marko 6.0.0-next.3.38 → 6.0.0-next.3.39

package/dist/dom.mjs

@@ -28,23 +28,6 @@ function forTo(to, from, step, cb) {
     cb(start + i * delta);
 }
 
-// src/dom/schedule.ts
-var port2 = /* @__PURE__ */ (() => {
-  let { port1, port2: port22 } = new MessageChannel();
-  return port1.onmessage = () => {
-    isScheduled = !1, run();
-  }, port22;
-})(), isScheduled;
-function schedule() {
-  isScheduled || (isScheduled = !0, queueMicrotask(flushAndWaitFrame));
-}
-function flushAndWaitFrame() {
-  run(), requestAnimationFrame(triggerMacroTask);
-}
-function triggerMacroTask() {
-  port2.postMessage(0);
-}
-
 // src/common/helpers.ts
 function classValue(value2) {
   return toDelimitedString(value2, " ", stringifyClassObject);
@@ -141,19 +124,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  m = [];
-  n = {};
-  A = {
+  l = [];
+  m = {};
+  C = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.B = renders, this.C = runtimeId, this.o = renderId, this.p = renders[renderId], this.q();
+    this.D = renders, this.E = runtimeId, this.n = renderId, this.o = renders[renderId], this.p();
   }
   w() {
-    this.p.w(), this.q();
+    this.o.w(), this.p();
   }
-  q() {
-    let data2 = this.p, serializeContext = this.A, scopeLookup = this.n, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  p() {
+    let data2 = this.o, serializeContext = this.C, scopeLookup = this.m, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
       let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
       data2.v = [];
@@ -175,7 +158,7 @@ var registeredValues = {}, Render = class {
         else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
-          this.e && (dataIndex && branchEnd(this.e, visit, visit), this.m.push(this.e)), this.e = scopeId, scope.a = visit;
+          this.e && (dataIndex && branchEnd(this.e, visit, visit), this.l.push(this.e)), this.e = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
@@ -183,7 +166,7 @@ var registeredValues = {}, Render = class {
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.e = this.m.pop();
+          curParent !== startNode.parentNode && curParent.prepend(startNode), this.e = this.l.pop();
         } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
           let next = data3.indexOf(" "), curNode = visit;
           for (scope[~next ? data3.slice(0, next) : data3] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
@@ -204,7 +187,7 @@ var registeredValues = {}, Render = class {
           let resumeData = resumes[i++];
           if (typeof resumeData == "function") {
             let scopes = resumeData(serializeContext), { $global } = scopeLookup;
-            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.C, $global.renderId = this.o);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.E, $global.renderId = this.n);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -215,10 +198,10 @@ var registeredValues = {}, Render = class {
                 let parentBranchId = parentBranchIds.get(scopeId);
                 if (parentBranchId && (scope.c = scopes[parentBranchId]), branchIds.has(scopeId)) {
                   let branch = scope, parentBranch = branch.c;
-                  branch.f = +scopeId, scope.c = branch, parentBranch && (branch.s = parentBranch, (parentBranch.j ||= /* @__PURE__ */ new Set()).add(branch));
+                  branch.f = +scopeId, scope.c = branch, parentBranch && (branch.q = parentBranch, (parentBranch.j ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.B[this.o] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.D[this.n] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -255,9 +238,6 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
     });
   }
 }
-function registerSubscriber(id, signal) {
-  return register(id, signal.D), signal;
-}
 function nodeRef(id, key) {
   return register(id, (scope) => () => scope[key]);
 }
@@ -640,9 +620,10 @@ function toInsertNode(startNode, endNode) {
 
 // src/dom/scope.ts
 var pendingScopes = [];
-function createScope($global) {
+function createScope($global, closestBranch) {
   let scope = {
     g: 1,
+    c: closestBranch,
     $global
   };
   return pendingScopes.push(scope), scope;
@@ -657,10 +638,10 @@ function getEmptyBranch(marker) {
   return emptyBranch.a = emptyBranch.b = marker, emptyBranch;
 }
 function destroyBranch(branch) {
-  branch.s?.j?.delete(branch), destroyNestedBranches(branch);
+  branch.q?.j?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.E = 1, branch.j?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
+  branch.F = 1, branch.j?.forEach(destroyNestedBranches), branch.G?.forEach((scope) => {
     for (let id in scope.h)
       scope.h[id]?.abort();
   });
@@ -762,9 +743,9 @@ function trimWalkString(walkString) {
   return walkString.slice(0, end + 1);
 }
 function walk(startNode, walkCodes, branch) {
-  walker.currentNode = startNode, walkInternal(walkCodes, branch, 0), walker.currentNode = document;
+  walker.currentNode = startNode, walkInternal(0, walkCodes, branch), walker.currentNode = document;
 }
-function walkInternal(walkCodes, scope, currentWalkIndex) {
+function walkInternal(currentWalkIndex, walkCodes, scope) {
   let value2, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
   for (; value2 = walkCodes.charCodeAt(currentWalkIndex++); )
     if (currentMultiplier = storedMultiplier, storedMultiplier = 0, value2 >= 117 /* Multiplier */)
@@ -779,10 +760,13 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
     else if (value2 >= 67 /* Next */)
       for (value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */; value2--; )
         walker.nextNode();
-    else if (value2 === 47 /* BeginChild */) {
-      let childScope = scope[currentScopeIndex++] = createScope(scope.$global);
-      childScope.c = scope.c, currentWalkIndex = walkInternal(walkCodes, childScope, currentWalkIndex);
-    } else {
+    else if (value2 === 47 /* BeginChild */)
+      currentWalkIndex = walkInternal(
+        currentWalkIndex,
+        walkCodes,
+        scope[currentScopeIndex++] = createScope(scope.$global, scope.c)
+      );
+    else {
       if (value2 === 38 /* EndChild */)
         return currentWalkIndex;
       if (value2 === 32 /* Get */)
@@ -799,7 +783,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
 function createBranchScopeWithRenderer(renderer, $global, parentScope, parentNode) {
   let branch = createBranch(
     $global,
-    renderer.t || parentScope,
+    renderer.s || parentScope,
     parentScope
   );
   return initBranch(renderer, branch, parentNode), branch;
@@ -820,11 +804,11 @@ function createBranchScopeWithTagNameOrRenderer(tagNameOrRenderer, $global, pare
 }
 function createBranch($global, ownerScope, parentScope) {
   let branch = createScope($global), parentBranch = parentScope.c;
-  return branch._ = ownerScope, branch.c = branch, parentBranch ? (branch.f = parentBranch.f + 1, branch.s = parentBranch, (parentBranch.j ||= /* @__PURE__ */ new Set()).add(branch)) : branch.f = 1, branch;
+  return branch._ = ownerScope, branch.c = branch, parentBranch ? (branch.f = parentBranch.f + 1, branch.q = parentBranch, (parentBranch.j ||= /* @__PURE__ */ new Set()).add(branch)) : branch.f = 1, branch;
 }
 function initBranch(renderer, branch, parentNode) {
   let clone = renderer.k(parentNode.namespaceURI), cloneParent = clone.parentNode;
-  walk(cloneParent?.firstChild || clone, renderer.G, branch), branch.a = cloneParent?.firstChild || clone, branch.b = cloneParent?.lastChild || clone, renderer.u && queueRender(branch, renderer.u);
+  cloneParent ? (walk(cloneParent.firstChild, renderer.t, branch), branch.a = cloneParent.firstChild, branch.b = cloneParent.lastChild) : (walk(clone, renderer.t, branch), branch.a = branch.b = clone), renderer.u && queueRender(branch, renderer.u);
 }
 function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
   return (scope, attrsOrOp) => {
@@ -861,10 +845,10 @@ function createRendererWithOwner(template, rawWalks, setup, getArgs) {
   return (owner) => ({
     x: id,
     y: template,
-    G: walks,
+    t: walks,
     u: setup,
     k: _clone,
-    t: owner,
+    s: owner,
     get d() {
       return args ||= getArgs?.();
     }
@@ -998,6 +982,23 @@ function isDifferentRenderer(a, b) {
   return a !== b && (a?.x || 0) !== b?.x;
 }
 
+// src/dom/schedule.ts
+var port2 = /* @__PURE__ */ (() => {
+  let { port1, port2: port22 } = new MessageChannel();
+  return port1.onmessage = () => {
+    isScheduled = !1, run();
+  }, port22;
+})(), isScheduled;
+function schedule() {
+  isScheduled || (isScheduled = !0, queueMicrotask(flushAndWaitFrame));
+}
+function flushAndWaitFrame() {
+  run(), requestAnimationFrame(triggerMacroTask);
+}
+function triggerMacroTask() {
+  port2.postMessage(0);
+}
+
 // src/dom/signals.ts
 var MARK = {}, CLEAN = {}, DIRTY = {};
 function state(valueAccessor, fn, getIntersection) {
@@ -1005,63 +1006,81 @@ function state(valueAccessor, fn, getIntersection) {
   return (scope, valueOrOp, valueChange) => (rendering ? valueSignal(
     scope,
     valueOrOp === MARK || valueOrOp === CLEAN || valueOrOp === DIRTY || (scope[valueChangeAccessor] = valueChange) || scope[markAccessor] === void 0 ? valueOrOp : CLEAN
-  ) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](valueOrOp) : queueSource(scope, valueSignal, valueOrOp), valueOrOp);
+  ) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](valueOrOp) : (schedule(), queueSource(scope, valueSignal, valueOrOp)), valueOrOp);
 }
 function value(valueAccessor, fn, getIntersection) {
-  let markAccessor = valueAccessor + "#" /* Mark */, intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
+  let markAccessor = valueAccessor + "#" /* Mark */, intersection2;
   return (scope, valueOrOp) => {
     if (valueOrOp === MARK)
-      (scope[markAccessor] = (scope[markAccessor] ?? 0) + 1) === 1 && intersection2?.(scope, MARK);
+      (scope[markAccessor] = (scope[markAccessor] ?? 0) + 1) === 1 && getIntersection && (intersection2 ||= getIntersection())(scope, MARK);
     else if (valueOrOp !== DIRTY) {
       let existing = scope[markAccessor] !== void 0;
-      (scope[markAccessor] ||= 1) === 1 && (valueOrOp === CLEAN || existing && scope[valueAccessor] === valueOrOp ? intersection2?.(scope, CLEAN) : (scope[valueAccessor] = valueOrOp, fn && fn(scope, valueOrOp), intersection2?.(scope, DIRTY))), scope[markAccessor]--;
+      (scope[markAccessor] ||= 1) === 1 && (valueOrOp === CLEAN || existing && scope[valueAccessor] === valueOrOp ? getIntersection && (intersection2 ||= getIntersection())(scope, CLEAN) : (scope[valueAccessor] = valueOrOp, fn && fn(scope, valueOrOp), getIntersection && (intersection2 ||= getIntersection())(scope, DIRTY))), scope[markAccessor]--;
     }
   };
 }
 var accessorId = 0;
 function intersection(count, fn, getIntersection) {
-  let dirtyAccessor = "?" /* Dynamic */ + accessorId++, markAccessor = dirtyAccessor + "#" /* Mark */, intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
+  let dirtyAccessor = "?" /* Dynamic */ + accessorId++, markAccessor = dirtyAccessor + "#" /* Mark */, intersection2;
   return (scope, op) => {
-    op === MARK ? (scope[markAccessor] = (scope[markAccessor] ?? 0) + 1) === 1 && intersection2?.(scope, MARK) : scope[markAccessor] === void 0 ? (scope[markAccessor] = count - 1, scope[dirtyAccessor] = !0) : --scope[markAccessor] === 0 ? op === DIRTY || scope[dirtyAccessor] ? (scope[dirtyAccessor] = !1, fn(scope, 0), intersection2?.(scope, DIRTY)) : intersection2?.(scope, CLEAN) : scope[dirtyAccessor] ||= op === DIRTY;
+    op === MARK ? (scope[markAccessor] = (scope[markAccessor] ?? 0) + 1) === 1 && getIntersection && (intersection2 ||= getIntersection())(scope, MARK) : scope[markAccessor] === void 0 ? (scope[markAccessor] = count - 1, scope[dirtyAccessor] = !0) : --scope[markAccessor] === 0 ? op === DIRTY || scope[dirtyAccessor] ? (scope[dirtyAccessor] = !1, fn(scope), getIntersection && (intersection2 ||= getIntersection())(scope, DIRTY)) : getIntersection && (intersection2 ||= getIntersection())(scope, CLEAN) : scope[dirtyAccessor] ||= op === DIRTY;
   };
 }
-function closure(fn, getIntersection) {
-  let intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
-  return (scope, valueOrOp) => {
-    valueOrOp === MARK ? intersection2?.(scope, MARK) : (fn && fn(scope, valueOrOp), intersection2?.(scope, DIRTY));
-  };
-}
-function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
-  let signal = closure(fn, getIntersection), loopScopeAccessor = ownerLoopNodeAccessor + "!" /* LoopScopeArray */, loopScopeMapAccessor = ownerLoopNodeAccessor + "(" /* LoopScopeMap */, helperSignal = (ownerScope, value2) => {
+function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn, getIntersection) {
+  let childSignal = closure(valueAccessor, fn, getIntersection), loopScopeAccessor = ownerLoopNodeAccessor + "!" /* LoopScopeArray */, loopScopeMapAccessor = ownerLoopNodeAccessor + "(" /* LoopScopeMap */, ownerSignal = (ownerScope) => {
     let loopScopes = ownerScope[loopScopeAccessor] ?? ownerScope[loopScopeMapAccessor]?.values() ?? [];
     if (loopScopes !== emptyMarkerArray)
       for (let scope of loopScopes)
-        scope.g || queueSource(scope, signal, value2);
+        scope.g || queueSource(scope, childSignal);
   };
-  return helperSignal._ = signal, helperSignal;
+  return ownerSignal._ = childSignal, ownerSignal;
 }
-function conditionalClosure(ownerConditionalNodeAccessor, branch, fn, getIntersection) {
-  let signal = closure(fn, getIntersection), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, helperSignal = (scope, value2) => {
+function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn, getIntersection) {
+  let childSignal = closure(valueAccessor, fn, getIntersection), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.g && scope[branchAccessor] === branch && queueSource(ifScope, signal, value2);
+    ifScope && !ifScope.g && scope[branchAccessor] === branch && queueSource(ifScope, childSignal);
   };
-  return helperSignal._ = signal, helperSignal;
-}
-var defaultGetOwnerScope = (scope) => scope._;
-function dynamicClosure(fn, getOwnerScope = defaultGetOwnerScope, getIntersection) {
-  let ownerSubscribersAccessor = "?" /* Dynamic */ + accessorId++, _signal = closure(fn, getIntersection), helperSignal = (ownerScope, value2) => {
-    let subscribers = ownerScope[ownerSubscribersAccessor];
+  return ownerSignal._ = childSignal, ownerSignal;
+}
+function dynamicClosure(valueAccessor, fn, getIntersection, getOwnerScope) {
+  let subscribersAccessor = "?" /* Dynamic */ + accessorId++, childSignal = closure(
+    valueAccessor,
+    fn,
+    getIntersection,
+    getOwnerScope
+  ), ownerSignal = (ownerScope) => {
+    let subscribers = ownerScope[subscribersAccessor];
     if (subscribers)
       for (let subscriber of subscribers)
-        subscriber.g || queueSource(subscriber, _signal, value2);
-  }, setupSignal = (scope, value2) => {
-    _signal(scope, value2), subscribe(scope);
+        subscriber.g || queueSource(subscriber, childSignal);
   }, subscribe = (scope) => {
-    (getOwnerScope(scope)[ownerSubscribersAccessor] ||= /* @__PURE__ */ new Set()).add(scope), getAbortSignal(scope, -1).addEventListener("abort", () => {
-      getOwnerScope(scope)[ownerSubscribersAccessor].delete(scope);
-    });
+    let owner = getOwnerScope ? getOwnerScope(scope) : scope._, subscribers = owner[subscribersAccessor] ||= /* @__PURE__ */ new Set();
+    subscribers.has(scope) || (subscribers.add(scope), getAbortSignal(scope, -1).addEventListener(
+      "abort",
+      () => owner[subscribersAccessor].delete(scope)
+    ));
+  };
+  return ownerSignal.H = subscribe, ownerSignal._ = (scope) => {
+    childSignal(scope), subscribe(scope);
+  }, ownerSignal;
+}
+function registerDynamicClosure(id, valueAccessor, fn, getIntersection, getOwnerScope) {
+  let signal = dynamicClosure(
+    valueAccessor,
+    fn,
+    getIntersection,
+    getOwnerScope
+  );
+  return register(id, signal.H), signal;
+}
+function closure(valueAccessor, fn, getIntersection, getOwnerScope) {
+  let intersection2;
+  return (scope, op) => {
+    op || fn && fn(
+      scope,
+      (getOwnerScope ? getOwnerScope(scope) : scope._)[valueAccessor]
+    ), getIntersection && (intersection2 ||= getIntersection())(scope, op ? MARK : DIRTY);
   };
-  return helperSignal._ = setupSignal, helperSignal.D = subscribe, helperSignal;
 }
 function setTagVar(scope, childAccessor, tagVarSignal2) {
   scope[childAccessor]["/" /* TagVariable */] = (valueOrOp) => tagVarSignal2(scope, valueOrOp);
@@ -1096,16 +1115,16 @@ function effect(id, fn) {
 // src/dom/queue.ts
 var pendingRenders = [], pendingEffects = [], rendering = !1;
 function queueSource(scope, signal, value2) {
-  schedule();
   let prevRendering = rendering;
-  return rendering = !0, signal(scope, MARK), rendering = prevRendering, queueRender(scope, signal, value2), value2;
+  rendering = !0, signal(scope, MARK), rendering = prevRendering, queueRender(scope, signal, value2);
 }
 function queueRender(scope, signal, value2) {
   let i = pendingRenders.length, render = {
-    l: scope,
-    H: signal,
-    I: value2,
-    z: i
+    z: scope,
+    I: signal,
+    J: value2,
+    A: scope.c?.f || 0,
+    B: i
   };
   for (pendingRenders.push(render); i; ) {
     let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
@@ -1136,7 +1155,7 @@ function prepareEffects(fn) {
   }
   return preparedEffects;
 }
-function runEffects(effects = pendingEffects) {
+function runEffects(effects) {
   for (let i = 0; i < effects.length; i += 2 /* Total */) {
     let scope = effects[i], fn = effects[i + 1];
     fn(scope, scope);
@@ -1158,15 +1177,12 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.l.c?.E || render.H(render.l, render.I);
+    render.z.c?.F || render.I(render.z, render.J);
   }
   finishPendingScopes();
 }
 function comparePendingRenders(a, b) {
-  return getBranchDepth(a) - getBranchDepth(b) || a.z - b.z;
-}
-function getBranchDepth(render) {
-  return render.l.c?.f || 0;
+  return a.A - b.A || a.B - b.B;
 }
 
 // src/dom/abort-signal.ts
@@ -1175,7 +1191,7 @@ function resetAbortSignal(scope, id) {
   ctrl && (queueEffect(ctrl, abort), scope.h[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.F ||= /* @__PURE__ */ new Set()).add(scope), ((scope.h ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.G ||= /* @__PURE__ */ new Set()).add(scope), ((scope.h ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1220,7 +1236,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   }) {
     return Array.isArray(value2) && typeof value2[0] == "string" ? getRegisteredWithScope(
       value2[0],
-      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.n[value2[1]]
+      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.m[value2[1]]
     ) : value2;
   },
   createRenderer(setup, clone, args) {
@@ -1237,7 +1253,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? (applyArgs(branch, MARK), existing = !0) : (branch = component.scope = createScope(out.global), branch._ = renderer.t, initBranch(renderer, branch, document.body)), applyArgs(branch, args);
+      branch ? (applyArgs(branch, MARK), existing = !0) : (branch = component.scope = createScope(out.global), branch._ = renderer.s, initBranch(renderer, branch, document.body)), applyArgs(branch, args);
     }), !existing)
       return toInsertNode(branch.a, branch.b);
   }
@@ -1279,14 +1295,14 @@ function mount(input = {}, reference, position) {
     branch.a,
     branch.b
   ), runEffects(effects), {
-    update: (newInput) => {
+    update(newInput) {
       args && runEffects(
         prepareEffects(() => {
           args(branch, MARK), args(branch, [newInput]);
         })
       );
     },
-    destroy: () => {
+    destroy() {
       removeAndDestroyBranch(branch);
     }
   };
@@ -1342,7 +1358,7 @@ export {
   props,
   register,
   registerBoundSignal,
-  registerSubscriber,
+  registerDynamicClosure,
   resetAbortSignal,
   run,
   setTagVar,

package/dist/translator/index.js

@@ -2084,13 +2084,26 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
           scopeIdentifier,
           import_compiler17.types.identifier(referencedBindings.name)
         ]);
-        signal.isDynamicClosure = isDynamicClosure;
         const intersection = buildSignalIntersections(signal);
-        return isDynamicClosure ? callRuntime(
+        return isDynamicClosure ? isStatefulReferences(referencedBindings) ? callRuntime(
+          "registerDynamicClosure",
+          import_compiler17.types.stringLiteral(
+            getResumeRegisterId(
+              section,
+              signal.referencedBindings,
+              "subscriber"
+            )
+          ),
+          getScopeAccessorLiteral(referencedBindings),
+          render,
+          intersection,
+          isImmediateOwner ? void 0 : import_compiler17.types.arrowFunctionExpression([scopeIdentifier], ownerScope)
+        ) : callRuntime(
           "dynamicClosure",
+          getScopeAccessorLiteral(referencedBindings),
           render,
-          isImmediateOwner ? null : import_compiler17.types.arrowFunctionExpression([scopeIdentifier], ownerScope),
-          intersection
+          intersection,
+          isImmediateOwner ? void 0 : import_compiler17.types.arrowFunctionExpression([scopeIdentifier], ownerScope)
         ) : builder(signal, render, intersection);
       };
       addStatement(
@@ -2100,10 +2113,7 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         import_compiler17.types.expressionStatement(
           import_compiler17.types.callExpression(
             import_compiler17.types.memberExpression(signal.identifier, import_compiler17.types.identifier("_")),
-            [
-              scopeIdentifier,
-              createScopeReadExpression(section, referencedBindings)
-            ]
+            [scopeIdentifier]
           )
         )
       );
@@ -2191,10 +2201,7 @@ function getSignalFn(signal, params, referencedBindings) {
       if (isStatefulReferences(closureSignal.referencedBindings)) {
         signal.render.push(
           import_compiler17.types.expressionStatement(
-            import_compiler17.types.callExpression(closureSignal.identifier, [
-              scopeIdentifier2,
-              valueIdentifier
-            ])
+            import_compiler17.types.callExpression(closureSignal.identifier, [scopeIdentifier2])
           )
         );
       }
@@ -2288,7 +2295,7 @@ function generateSignalName(referencedBindings) {
   return name2;
 }
 function finalizeSignalArgs(args) {
-  for (let i = args.length - 1; i >= 0; i--) {
+  for (let i = args.length; i--; ) {
     const arg = args[i];
     if (import_compiler17.types.isArrowFunctionExpression(arg) && import_compiler17.types.isBlockStatement(arg.body)) {
       const body = arg.body.body;
@@ -2297,9 +2304,11 @@ function finalizeSignalArgs(args) {
       } else if (body.length === 1 && import_compiler17.types.isExpressionStatement(body[0])) {
         arg.body = toParenthesizedExpressionIfNeeded(body[0].expression);
       }
+    } else if (import_compiler17.types.isNullLiteral(arg) || import_compiler17.types.isUnaryExpression(arg) && arg.operator === "void") {
+      args[i] = import_compiler17.types.numericLiteral(0);
     }
   }
-  for (let i = args.length - 1; import_compiler17.types.isNullLiteral(args[i]); ) {
+  for (let i = args.length - 1; import_compiler17.types.isNumericLiteral(args[i]) && args[i].value === 0; ) {
     args.length = i--;
   }
 }
@@ -2437,15 +2446,6 @@ function writeSignals(section) {
         value
       );
     }
-    if (signal.isDynamicClosure && isStatefulReferences(signal.referencedBindings)) {
-      value = callRuntime(
-        "registerSubscriber",
-        import_compiler17.types.stringLiteral(
-          getResumeRegisterId(section, signal.referencedBindings, "subscriber")
-        ),
-        value
-      );
-    }
     const signalDeclarator = import_compiler17.types.variableDeclarator(signal.identifier, value);
     let signalDeclaration = !section.parent && !signal.referencedBindings && (import_compiler17.types.isFunctionExpression(value) || import_compiler17.types.isArrowFunctionExpression(value)) ? import_compiler17.types.functionDeclaration(
       signal.identifier,
@@ -3973,7 +3973,7 @@ function isStatefulBinding(binding) {
     case 2 /* input */:
       return true;
     default:
-      return !binding.upstreamExpression || isStatefulReferences(binding.upstreamExpression.referencedBindings);
+      return binding.upstreamAlias ? isStatefulBinding(binding.upstreamAlias) : !binding.upstreamExpression || isStatefulReferences(binding.upstreamExpression.referencedBindings);
   }
 }
 
@@ -5265,9 +5265,12 @@ var for_default = {
         const tagExtra = node.extra;
         const { referencedBindings } = tagExtra;
         const nodeRef2 = getOptimizedOnlyChildNodeRef(tag, tagSection);
-        setClosureSignalBuilder(tag, (_closureSignal, render, intersection) => {
+        setClosureSignalBuilder(tag, (closureSignal, render, intersection) => {
           return callRuntime(
             "loopClosure",
+            getScopeAccessorLiteral(
+              closureSignal.referencedBindings
+            ),
             getScopeAccessorLiteral(nodeRef2),
             render,
             intersection
@@ -7150,9 +7153,12 @@ var IfTag = {
               rendererIdentifiers.push(import_compiler39.types.identifier(branchBodySection.name));
               setClosureSignalBuilder(
                 branchTag,
-                (_closureSignal, render, intersection) => {
+                (closureSignal, render, intersection) => {
                   return callRuntime(
                     "conditionalClosure",
+                    getScopeAccessorLiteral(
+                      closureSignal.referencedBindings
+                    ),
                     getScopeAccessorLiteral(nodeRef2),
                     import_compiler39.types.numericLiteral(i),
                     render,

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

@@ -2,8 +2,6 @@ import { types as t } from "@marko/compiler";
 import { type Opt } from "./optional";
 import { type Binding, type ReferencedBindings } from "./references";
 import { type Section } from "./sections";
-export type closureSignalBuilder = (signal: Signal, render: t.Expression, intersection?: t.Expression) => t.Expression;
-export type registerScopeBuilder = (scope: t.Expression) => t.Expression;
 export type Signal = {
     identifier: t.Identifier;
     valueAccessor?: t.Expression;
@@ -11,7 +9,6 @@ export type Signal = {
     section: Section;
     build: () => t.Expression;
     register?: boolean;
-    isDynamicClosure?: boolean;
     values: Array<{
         signal: {
             identifier: t.Identifier | t.MemberExpression;
@@ -35,6 +32,7 @@ export type Signal = {
     extraArgs?: t.Expression[];
     buildAssignment?: (valueSection: Section, value: t.Expression) => t.Expression;
 };
+type closureSignalBuilder = (signal: Signal, render: t.Expression, intersection?: t.Expression) => t.Expression;
 export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;
 export declare function setForceResumeScope(section: Section): void;
 export declare const getSerializedScopeProperties: (section: Section) => Map<t.StringLiteral | t.NumericLiteral, t.Expression>;
@@ -60,3 +58,4 @@ export declare function addHTMLEffectCall(section: Section, referencedBindings?:
 export declare function writeHTMLResumeStatements(path: t.NodePath<t.MarkoTagBody | t.Program>): void;
 export declare function getSetup(section: Section): t.Identifier | undefined;
 export declare function replaceRegisteredFunctionNode(node: t.Node): t.CallExpression | t.ClassPrivateProperty | t.ClassProperty | t.VariableDeclaration | t.Identifier | t.ObjectProperty | undefined;
+export {};

package/package.json

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