marko 6.0.0-next.3.37 → 6.0.0-next.3.38

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,
@@ -224,19 +224,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  n = [];
-  o = {};
+  m = [];
+  n = {};
   A = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.B = renders, this.C = runtimeId, this.p = renderId, this.q = renders[renderId], this.s();
+    this.B = renders, this.C = runtimeId, this.o = renderId, this.p = renders[renderId], this.q();
   }
   w() {
-    this.q.w(), this.s();
+    this.p.w(), this.q();
   }
-  s() {
-    let data2 = this.q, serializeContext = this.A, scopeLookup = this.o, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  q() {
+    let data2 = this.p, serializeContext = this.A, scopeLookup = this.n, 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 +258,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.m.push(this.e)), this.e = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
@@ -266,7 +266,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.m.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 +287,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.C, $global.renderId = this.o);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -298,10 +298,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.s = 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.B[this.o] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -740,10 +740,10 @@ function getEmptyBranch(marker) {
   return emptyBranch.a = emptyBranch.b = marker, emptyBranch;
 }
 function destroyBranch(branch) {
-  branch.t?.k?.delete(branch), destroyNestedBranches(branch);
+  branch.s?.j?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.E = 1, branch.k?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
+  branch.E = 1, branch.j?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
     for (let id in scope.h)
       scope.h[id]?.abort();
   });
@@ -882,7 +882,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
 function createBranchScopeWithRenderer(renderer, $global, parentScope, parentNode) {
   let branch = createBranch(
     $global,
-    renderer.u || parentScope,
+    renderer.t || parentScope,
     parentScope
   );
   return initBranch(renderer, branch, parentNode), branch;
@@ -903,11 +903,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.s = 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;
+  walk(cloneParent?.firstChild || clone, renderer.G, branch), branch.a = cloneParent?.firstChild || clone, branch.b = cloneParent?.lastChild || clone, renderer.u && queueRender(branch, renderer.u);
 }
 function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
   return (scope, attrsOrOp) => {
@@ -919,7 +919,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 +942,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,
+    u: setup,
+    k: _clone,
+    t: owner,
     get d() {
       return args ||= getArgs?.();
     }
@@ -964,57 +969,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 +1078,7 @@ 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/signals.ts
@@ -1123,10 +1123,10 @@ function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
   };
   return helperSignal._ = signal, helperSignal;
 }
-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(ownerConditionalNodeAccessor, branch, fn, getIntersection) {
+  let signal = closure(fn, getIntersection), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, helperSignal = (scope, value2) => {
+    let ifScope = scope[scopeAccessor];
+    ifScope && !ifScope.g && scope[branchAccessor] === branch && queueSource(ifScope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
@@ -1185,7 +1185,7 @@ function queueSource(scope, signal, value2) {
 }
 function queueRender(scope, signal, value2) {
   let i = pendingRenders.length, render = {
-    m: scope,
+    l: scope,
     H: signal,
     I: value2,
     z: i
@@ -1241,7 +1241,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.m.c?.E || render.H(render.m, render.I);
+    render.l.c?.E || render.H(render.l, render.I);
   }
   finishPendingScopes();
 }
@@ -1249,7 +1249,7 @@ function comparePendingRenders(a, b) {
   return getBranchDepth(a) - getBranchDepth(b) || a.z - b.z;
 }
 function getBranchDepth(render) {
-  return render.m.c?.f || 0;
+  return render.l.c?.f || 0;
 }
 
 // src/dom/abort-signal.ts
@@ -1269,7 +1269,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 +1283,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 +1303,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]?.n[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 +1320,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.t, initBranch(renderer, branch, document.body)), applyArgs(branch, args);
     }), !existing)
       return toInsertNode(branch.a, branch.b);
   }

package/dist/dom.mjs

@@ -141,19 +141,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  n = [];
-  o = {};
+  m = [];
+  n = {};
   A = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.B = renders, this.C = runtimeId, this.p = renderId, this.q = renders[renderId], this.s();
+    this.B = renders, this.C = runtimeId, this.o = renderId, this.p = renders[renderId], this.q();
   }
   w() {
-    this.q.w(), this.s();
+    this.p.w(), this.q();
   }
-  s() {
-    let data2 = this.q, serializeContext = this.A, scopeLookup = this.o, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  q() {
+    let data2 = this.p, serializeContext = this.A, scopeLookup = this.n, 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 +175,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.m.push(this.e)), this.e = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
@@ -183,7 +183,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.m.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 +204,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.C, $global.renderId = this.o);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -215,10 +215,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.s = 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.B[this.o] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -657,10 +657,10 @@ function getEmptyBranch(marker) {
   return emptyBranch.a = emptyBranch.b = marker, emptyBranch;
 }
 function destroyBranch(branch) {
-  branch.t?.k?.delete(branch), destroyNestedBranches(branch);
+  branch.s?.j?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.E = 1, branch.k?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
+  branch.E = 1, branch.j?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
     for (let id in scope.h)
       scope.h[id]?.abort();
   });
@@ -799,7 +799,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
 function createBranchScopeWithRenderer(renderer, $global, parentScope, parentNode) {
   let branch = createBranch(
     $global,
-    renderer.u || parentScope,
+    renderer.t || parentScope,
     parentScope
   );
   return initBranch(renderer, branch, parentNode), branch;
@@ -820,11 +820,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.s = 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;
+  walk(cloneParent?.firstChild || clone, renderer.G, branch), branch.a = cloneParent?.firstChild || clone, branch.b = cloneParent?.lastChild || clone, renderer.u && queueRender(branch, renderer.u);
 }
 function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
   return (scope, attrsOrOp) => {
@@ -836,7 +836,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(
@@ -854,12 +859,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,
+    u: setup,
+    k: _clone,
+    t: owner,
     get d() {
       return args ||= getArgs?.();
     }
@@ -881,57 +886,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([
@@ -995,7 +995,7 @@ 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/signals.ts
@@ -1040,10 +1040,10 @@ function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
   };
   return helperSignal._ = signal, helperSignal;
 }
-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(ownerConditionalNodeAccessor, branch, fn, getIntersection) {
+  let signal = closure(fn, getIntersection), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, helperSignal = (scope, value2) => {
+    let ifScope = scope[scopeAccessor];
+    ifScope && !ifScope.g && scope[branchAccessor] === branch && queueSource(ifScope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
@@ -1102,7 +1102,7 @@ function queueSource(scope, signal, value2) {
 }
 function queueRender(scope, signal, value2) {
   let i = pendingRenders.length, render = {
-    m: scope,
+    l: scope,
     H: signal,
     I: value2,
     z: i
@@ -1158,7 +1158,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.m.c?.E || render.H(render.m, render.I);
+    render.l.c?.E || render.H(render.l, render.I);
   }
   finishPendingScopes();
 }
@@ -1166,7 +1166,7 @@ function comparePendingRenders(a, b) {
   return getBranchDepth(a) - getBranchDepth(b) || a.z - b.z;
 }
 function getBranchDepth(render) {
-  return render.m.c?.f || 0;
+  return render.l.c?.f || 0;
 }
 
 // src/dom/abort-signal.ts
@@ -1186,7 +1186,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) => {
@@ -1200,7 +1200,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;
@@ -1220,12 +1220,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]?.n[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;
@@ -1237,7 +1237,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.t, initBranch(renderer, branch, document.body)), applyArgs(branch, args);
     }), !existing)
       return toInsertNode(branch.a, branch.b);
   }
@@ -1301,7 +1301,6 @@ export {
   compat,
   conditional,
   conditionalClosure,
-  conditionalOnlyChild,
   controllable_detailsOrDialog_open,
   controllable_detailsOrDialog_open_effect,
   controllable_input_checked,
@@ -1319,6 +1318,7 @@ export {
   createTemplate,
   data,
   dynamicClosure,
+  dynamicTag,
   dynamicTagAttrs,
   effect,
   forIn,

package/dist/translator/core/for.d.ts

@@ -1,14 +1,5 @@
 import { types as t } from "@marko/compiler";
-import { type Binding } from "../util/references";
 type ForType = "in" | "of" | "to";
-declare const kForMarkerBinding: unique symbol;
-declare const kOnlyChildInParent: unique symbol;
-declare module "@marko/compiler/dist/types" {
-    interface NodeExtra {
-        [kForMarkerBinding]?: Binding;
-        [kOnlyChildInParent]?: boolean;
-    }
-}
 declare const _default: {
     analyze(tag: t.NodePath<t.MarkoTag>): void;
     translate: {