marko 6.0.0-next.3.37 → 6.0.0-next.3.39

package/dist/dom.d.ts

@@ -2,12 +2,12 @@ export { attrTag, attrTags } from "./common/attr-tag";
 export { forIn, forOf, forTo } from "./common/for";
 export { getAbortSignal, resetAbortSignal } from "./dom/abort-signal";
 export { compat } from "./dom/compat";
-export { conditional, conditionalOnlyChild, loopIn, loopOf, loopTo, } from "./dom/control-flow";
+export { conditional, dynamicTag, loopIn, loopOf, loopTo, } from "./dom/control-flow";
 export { controllable_detailsOrDialog_open, controllable_detailsOrDialog_open_effect, controllable_input_checked, controllable_input_checked_effect, controllable_input_checkedValue, controllable_input_checkedValue_effect, controllable_input_value, controllable_input_value_effect, controllable_select_value, controllable_select_value_effect, controllable_textarea_value, controllable_textarea_value_effect, } from "./dom/controllable";
 export { attr, attrs, attrsEvents, classAttr, data, html, lifecycle, partialAttrs, props, styleAttr, textContent, } from "./dom/dom";
 export { on } from "./dom/event";
 export { run } from "./dom/queue";
 export { createRenderer, createRendererWithOwner, dynamicTagAttrs, } from "./dom/renderer";
-export { init, nodeRef, register, registerBoundSignal, registerSubscriber, } from "./dom/resume";
-export { conditionalClosure, dynamicClosure, effect, inChild, intersection, intersections, loopClosure, nextTagId, setTagVar, setTagVarChange, state, tagVarSignal, tagVarSignalChange, value, } from "./dom/signals";
+export { init, nodeRef, register, registerBoundSignal } from "./dom/resume";
+export { conditionalClosure, dynamicClosure, effect, inChild, intersection, intersections, loopClosure, nextTagId, registerDynamicClosure, setTagVar, setTagVarChange, state, tagVarSignal, tagVarSignalChange, value, } from "./dom/signals";
 export { createTemplate } from "./dom/template";

package/dist/dom.js

@@ -26,7 +26,6 @@ __export(dom_exports, {
   compat: () => compat,
   conditional: () => conditional,
   conditionalClosure: () => conditionalClosure,
-  conditionalOnlyChild: () => conditionalOnlyChild,
   controllable_detailsOrDialog_open: () => controllable_detailsOrDialog_open,
   controllable_detailsOrDialog_open_effect: () => controllable_detailsOrDialog_open_effect,
   controllable_input_checked: () => controllable_input_checked,
@@ -44,6 +43,7 @@ __export(dom_exports, {
   createTemplate: () => createTemplate,
   data: () => data,
   dynamicClosure: () => dynamicClosure,
+  dynamicTag: () => dynamicTag,
   dynamicTagAttrs: () => dynamicTagAttrs,
   effect: () => effect,
   forIn: () => forIn,
@@ -67,7 +67,7 @@ __export(dom_exports, {
   props: () => props,
   register: () => register,
   registerBoundSignal: () => registerBoundSignal,
-  registerSubscriber: () => registerSubscriber,
+  registerDynamicClosure: () => registerDynamicClosure,
   resetAbortSignal: () => resetAbortSignal,
   run: () => run,
   setTagVar: () => setTagVar,
@@ -111,23 +111,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);
@@ -224,19 +207,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  n = [];
-  o = {};
-  A = {
+  l = [];
+  m = {};
+  C = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.B = renders, this.C = runtimeId, this.p = renderId, this.q = renders[renderId], this.s();
+    this.D = renders, this.E = runtimeId, this.n = renderId, this.o = renders[renderId], this.p();
   }
   w() {
-    this.q.w(), this.s();
+    this.o.w(), this.p();
   }
-  s() {
-    let data2 = this.q, serializeContext = this.A, scopeLookup = this.o, 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 = [];
@@ -258,7 +241,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.n.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(
@@ -266,7 +249,7 @@ var registeredValues = {}, Render = class {
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.e = this.n.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; ) {
@@ -287,7 +270,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.p);
+            $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];
@@ -298,10 +281,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.t = parentBranch, (parentBranch.k ||= /* @__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.p] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.D[this.n] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -338,9 +321,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]);
 }
@@ -723,9 +703,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;
@@ -740,10 +721,10 @@ function getEmptyBranch(marker) {
   return emptyBranch.a = emptyBranch.b = marker, emptyBranch;
 }
 function destroyBranch(branch) {
-  branch.t?.k?.delete(branch), destroyNestedBranches(branch);
+  branch.q?.j?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.E = 1, branch.k?.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();
   });
@@ -845,9 +826,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 */)
@@ -862,10 +843,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 */)
@@ -882,7 +866,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
 function createBranchScopeWithRenderer(renderer, $global, parentScope, parentNode) {
   let branch = createBranch(
     $global,
-    renderer.u || parentScope,
+    renderer.s || parentScope,
     parentScope
   );
   return initBranch(renderer, branch, parentNode), branch;
@@ -903,11 +887,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.t = parentBranch, (parentBranch.k ||= /* @__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.l(parentNode.namespaceURI), cloneParent = clone.parentNode;
-  walk(cloneParent?.firstChild || clone, renderer.G, branch), branch.a = cloneParent?.firstChild || clone, branch.b = cloneParent?.lastChild || clone, renderer.x && queueRender(branch, renderer.x);
+  let clone = renderer.k(parentNode.namespaceURI), cloneParent = clone.parentNode;
+  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) => {
@@ -919,7 +903,12 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
       return renderer.d?.(childScope, attrsOrOp);
     let content = getContent?.(scope);
     if (typeof renderer == "string")
-      setConditionalRendererOnlyChild(childScope, 0, content), attrs(childScope, 0, attrsOrOp());
+      setConditionalRendererOnlyChild(
+        childScope,
+        0,
+        content,
+        createBranchScopeWithTagNameOrRenderer
+      ), attrs(childScope, 0, attrsOrOp());
     else if (renderer.d) {
       let attributes = attrsOrOp();
       renderer.d(
@@ -937,12 +926,12 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
 function createRendererWithOwner(template, rawWalks, setup, getArgs) {
   let args, id = {}, walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : " ";
   return (owner) => ({
-    j: id,
+    x: id,
     y: template,
-    G: walks,
-    x: setup,
-    l: _clone,
-    u: owner,
+    t: walks,
+    u: setup,
+    k: _clone,
+    s: owner,
     get d() {
       return args ||= getArgs?.();
     }
@@ -964,57 +953,52 @@ function createCloneableHTML(html2, ns) {
 }
 
 // src/dom/control-flow.ts
-function patchConditionals(fn) {
-  conditional = fn(conditional), conditionalOnlyChild = fn(conditionalOnlyChild);
+function conditional(nodeAccessor, ...branches) {
+  let branchAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
+  return (scope, newBranchIndexOrOp) => {
+    newBranchIndexOrOp !== scope[branchAccessor] && newBranchIndexOrOp !== DIRTY && newBranchIndexOrOp !== MARK && newBranchIndexOrOp !== CLEAN && (scope[nodeAccessor].nodeType > 1 /* Element */ ? setConditionalRenderer : setConditionalRendererOnlyChild)(
+      scope,
+      nodeAccessor,
+      branches[scope[branchAccessor] = newBranchIndexOrOp],
+      createBranchScopeWithRenderer
+    );
+  };
 }
-var conditional = function(nodeAccessor, fn, getIntersection) {
+function patchDynamicTag(fn) {
+  dynamicTag = fn(dynamicTag);
+}
+var dynamicTag = function(nodeAccessor, fn, getIntersection) {
   let rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */, intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
   return (scope, newRendererOrOp) => {
     if (newRendererOrOp === DIRTY) return;
     let currentRenderer = scope[rendererAccessor], op = newRendererOrOp;
     if (newRendererOrOp !== MARK && newRendererOrOp !== CLEAN) {
       let normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
-      isDifferentRenderer(normalizedRenderer, currentRenderer) ? (scope[rendererAccessor] = normalizedRenderer, setConditionalRenderer(scope, nodeAccessor, normalizedRenderer), fn && fn(scope), op = DIRTY) : op = CLEAN;
+      isDifferentRenderer(normalizedRenderer, currentRenderer) ? (scope[rendererAccessor] = normalizedRenderer, setConditionalRenderer(
+        scope,
+        nodeAccessor,
+        normalizedRenderer,
+        createBranchScopeWithTagNameOrRenderer
+      ), fn && fn(scope), op = DIRTY) : op = CLEAN;
     }
     intersection2?.(scope, op);
   };
 };
-function setConditionalRenderer(scope, nodeAccessor, newRenderer) {
-  let prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */] || getEmptyBranch(scope[nodeAccessor]), newBranch = newRenderer ? createBranchScopeWithTagNameOrRenderer(
+function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch2) {
+  let prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */] || getEmptyBranch(scope[nodeAccessor]), newBranch = newRenderer ? createBranch2(
     newRenderer,
     scope.$global,
     scope,
     prevBranch.b.parentNode
   ) : getEmptyBranch(scope[nodeAccessor]);
-  insertBranchBefore(
+  prevBranch !== newBranch && (insertBranchBefore(
     newBranch,
     prevBranch.b.parentNode,
     prevBranch.b.nextSibling
-  ), removeAndDestroyBranch(prevBranch), scope[nodeAccessor + "!" /* ConditionalScope */] = newRenderer && newBranch;
+  ), removeAndDestroyBranch(prevBranch), scope[nodeAccessor + "!" /* ConditionalScope */] = newRenderer && newBranch);
 }
-var conditionalOnlyChild = function(nodeAccessor, fn, getIntersection) {
-  let rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */, intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
-  return (scope, newRendererOrOp) => {
-    if (newRendererOrOp === DIRTY) return;
-    let currentRenderer = scope[rendererAccessor], op = newRendererOrOp;
-    if (newRendererOrOp !== MARK && newRendererOrOp !== CLEAN) {
-      let normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
-      isDifferentRenderer(normalizedRenderer, currentRenderer) ? (currentRenderer = scope[rendererAccessor] = normalizedRenderer, setConditionalRendererOnlyChild(
-        scope,
-        nodeAccessor,
-        normalizedRenderer
-      ), fn && fn(scope), op = DIRTY) : op = CLEAN;
-    }
-    intersection2?.(scope, op);
-  };
-};
-function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
-  let prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */], referenceNode = scope[nodeAccessor], newBranch = newRenderer && createBranchScopeWithTagNameOrRenderer(
-    newRenderer,
-    scope.$global,
-    scope,
-    referenceNode
-  );
+function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer, createBranch2) {
+  let prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */], referenceNode = scope[nodeAccessor], newBranch = newRenderer && createBranch2(newRenderer, scope.$global, scope, referenceNode);
   referenceNode.textContent = "", newBranch && insertBranchBefore(newBranch, referenceNode, null), prevBranch && destroyBranch(prevBranch), scope[nodeAccessor + "!" /* ConditionalScope */] = newBranch;
 }
 var emptyMarkerMap = /* @__PURE__ */ new Map([
@@ -1078,7 +1062,24 @@ function byFirstArg(name) {
   return name;
 }
 function isDifferentRenderer(a, b) {
-  return a !== b && (a?.j || 0) !== b?.j;
+  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
@@ -1088,63 +1089,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;
-  };
-}
-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));
+    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 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, getRenderer, fn, getIntersection) {
-  let signal = closure(fn, getIntersection), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, rendererAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, helperSignal = (scope, value2) => {
-    let conditionalScope = scope[scopeAccessor];
-    conditionalScope && !conditionalScope.g && scope[rendererAccessor]?.j === getRenderer().j && queueSource(conditionalScope, signal, 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, 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);
@@ -1179,16 +1198,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 = {
-    m: 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];
@@ -1219,7 +1238,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);
@@ -1241,15 +1260,12 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.m.c?.E || render.H(render.m, 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.m.c?.f || 0;
+  return a.A - b.A || a.B - b.B;
 }
 
 // src/dom/abort-signal.ts
@@ -1258,7 +1274,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();
@@ -1269,7 +1285,7 @@ var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID =
 
 // src/dom/compat.ts
 var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
-  patchConditionals,
+  patchConditionals: patchDynamicTag,
   queueEffect,
   init(warp10Noop) {
     register(SET_SCOPE_REGISTER_ID, (branch) => {
@@ -1283,7 +1299,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     return value2 === MARK || value2 === CLEAN || value2 === DIRTY;
   },
   isRenderer(renderer) {
-    return renderer.l;
+    return renderer.k;
   },
   getStartNode(branch) {
     return branch.a;
@@ -1303,12 +1319,12 @@ 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]?.o[value2[1]]
+      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.m[value2[1]]
     ) : value2;
   },
   createRenderer(setup, clone, args) {
     let renderer = createRenderer("", 0, setup, args && (() => args));
-    return renderer.l = clone, renderer;
+    return renderer.k = clone, renderer;
   },
   render(out, component, renderer, args) {
     let branch = component.scope;
@@ -1320,7 +1336,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.u, 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);
   }
@@ -1362,14 +1378,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);
     }
   };