@marko/runtime-tags 0.3.50 → 0.3.51

package/dist/debug/dom.js

@@ -1406,21 +1406,6 @@ function getDebugKey(index, node) {
 }
 
 // src/dom/renderer.ts
-function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
-  const branch = createBranch(
-    $global,
-    tagNameOrRenderer,
-    parentScope,
-    parentNode
-  );
-  if (typeof tagNameOrRenderer === "string") {
-    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
-      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
-      tagNameOrRenderer
-    );
-  }
-  return branch;
-}
 function createBranch($global, renderer, parentScope, parentNode) {
   const branch = createScope($global);
   const parentBranch = parentScope?.___closestBranch;
@@ -1433,7 +1418,7 @@ function createBranch($global, renderer, parentScope, parentNode) {
   if (true) {
     branch.___renderer = renderer;
   }
-  renderer.___init?.(
+  renderer.___clone?.(
     branch,
     parentNode.namespaceURI
   );
@@ -1442,24 +1427,23 @@ function createBranch($global, renderer, parentScope, parentNode) {
 function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
   let args;
-  const init2 = template ? (branch, ns) => {
+  const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
     ))(branch, walks);
-    setup && queueRender(branch, setup, -1);
   } : (branch) => {
     walk(
       branch.___startNode = branch.___endNode = new Text(),
       walks,
       branch
     );
-    setup && queueRender(branch, setup, -1);
   };
   return (owner) => {
     return {
       ___id: id,
-      ___init: init2,
+      ___clone: clone,
+      ___setup: setup,
       ___owner: owner,
       ___accessor: dynamicScopesAccessor,
       get ___args() {
@@ -1733,7 +1717,7 @@ function conditional(nodeAccessor, ...branches) {
         scope,
         nodeAccessor,
         branches[scope[branchAccessor] = newBranch],
-        createBranch
+        createAndSetupBranch
       );
     }
   };
@@ -1763,7 +1747,7 @@ var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, input
             scope[childScopeAccessor],
             true ? `#${normalizedRenderer}/0` : 0,
             content,
-            createBranch
+            createAndSetupBranch
           );
           if (content.___accessor) {
             subscribeToScopeSet(
@@ -1876,7 +1860,7 @@ function loop(nodeAccessor, renderer, forEach) {
     const newMap = scope[nodeAccessor + "(" /* LoopScopeMap */] = /* @__PURE__ */ new Map();
     const newArray = scope[nodeAccessor + "!" /* LoopScopeArray */] = [];
     forEach(value2, (key, args) => {
-      const branch = oldMap?.get(key) || createBranch(scope.$global, renderer, scope, parentNode);
+      const branch = oldMap?.get(key) || createAndSetupBranch(scope.$global, renderer, scope, parentNode);
       params?.(branch, args);
       newMap.set(key, branch);
       newArray.push(branch);
@@ -1896,6 +1880,28 @@ function loop(nodeAccessor, renderer, forEach) {
     reconcile(parentNode, oldArray, newArray, afterReference);
   };
 }
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  const branch = createBranch($global, renderer, parentScope, parentNode);
+  renderer.___setup && queueRender(branch, renderer.___setup, -1);
+  return branch;
+}
+function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
+  const branch = createBranch(
+    $global,
+    tagNameOrRenderer,
+    parentScope,
+    parentNode
+  );
+  if (typeof tagNameOrRenderer === "string") {
+    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
+      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
+      tagNameOrRenderer
+    );
+  } else if (tagNameOrRenderer.___setup) {
+    queueRender(branch, tagNameOrRenderer.___setup, -1);
+  }
+  return branch;
+}
 function bySecondArg(_item, index) {
   return index;
 }
@@ -1918,7 +1924,7 @@ var compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.___init;
+    return renderer.___clone;
   },
   getStartNode(branch) {
     return branch.___startNode;
@@ -1949,7 +1955,7 @@ var compat = {
   },
   createRenderer(args, clone) {
     const renderer = createRenderer(0, 0, 0, () => args);
-    renderer.___init = (branch) => {
+    renderer.___clone = (branch) => {
       const cloned = clone();
       branch.___startNode = cloned.startNode;
       branch.___endNode = cloned.endNode;
@@ -1982,6 +1988,7 @@ var compat = {
           renderer.___owner,
           document.body
         );
+        renderer.___setup && renderer.___setup(branch);
       } else {
         existing = true;
       }
@@ -2054,7 +2061,8 @@ function mount(input = {}, reference, position) {
       void 0,
       parentNode
     );
-    args?.(branch, input);
+    this.___setup && this.___setup(branch);
+    args && args(branch, input);
   });
   insertChildNodes(
     parentNode,

package/dist/debug/dom.mjs

@@ -1321,21 +1321,6 @@ function getDebugKey(index, node) {
 }
 
 // src/dom/renderer.ts
-function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
-  const branch = createBranch(
-    $global,
-    tagNameOrRenderer,
-    parentScope,
-    parentNode
-  );
-  if (typeof tagNameOrRenderer === "string") {
-    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
-      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
-      tagNameOrRenderer
-    );
-  }
-  return branch;
-}
 function createBranch($global, renderer, parentScope, parentNode) {
   const branch = createScope($global);
   const parentBranch = parentScope?.___closestBranch;
@@ -1348,7 +1333,7 @@ function createBranch($global, renderer, parentScope, parentNode) {
   if (true) {
     branch.___renderer = renderer;
   }
-  renderer.___init?.(
+  renderer.___clone?.(
     branch,
     parentNode.namespaceURI
   );
@@ -1357,24 +1342,23 @@ function createBranch($global, renderer, parentScope, parentNode) {
 function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
   let args;
-  const init2 = template ? (branch, ns) => {
+  const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
     ))(branch, walks);
-    setup && queueRender(branch, setup, -1);
   } : (branch) => {
     walk(
       branch.___startNode = branch.___endNode = new Text(),
       walks,
       branch
     );
-    setup && queueRender(branch, setup, -1);
   };
   return (owner) => {
     return {
       ___id: id,
-      ___init: init2,
+      ___clone: clone,
+      ___setup: setup,
       ___owner: owner,
       ___accessor: dynamicScopesAccessor,
       get ___args() {
@@ -1648,7 +1632,7 @@ function conditional(nodeAccessor, ...branches) {
         scope,
         nodeAccessor,
         branches[scope[branchAccessor] = newBranch],
-        createBranch
+        createAndSetupBranch
       );
     }
   };
@@ -1678,7 +1662,7 @@ var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, input
             scope[childScopeAccessor],
             true ? `#${normalizedRenderer}/0` : 0,
             content,
-            createBranch
+            createAndSetupBranch
           );
           if (content.___accessor) {
             subscribeToScopeSet(
@@ -1791,7 +1775,7 @@ function loop(nodeAccessor, renderer, forEach) {
     const newMap = scope[nodeAccessor + "(" /* LoopScopeMap */] = /* @__PURE__ */ new Map();
     const newArray = scope[nodeAccessor + "!" /* LoopScopeArray */] = [];
     forEach(value2, (key, args) => {
-      const branch = oldMap?.get(key) || createBranch(scope.$global, renderer, scope, parentNode);
+      const branch = oldMap?.get(key) || createAndSetupBranch(scope.$global, renderer, scope, parentNode);
       params?.(branch, args);
       newMap.set(key, branch);
       newArray.push(branch);
@@ -1811,6 +1795,28 @@ function loop(nodeAccessor, renderer, forEach) {
     reconcile(parentNode, oldArray, newArray, afterReference);
   };
 }
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  const branch = createBranch($global, renderer, parentScope, parentNode);
+  renderer.___setup && queueRender(branch, renderer.___setup, -1);
+  return branch;
+}
+function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
+  const branch = createBranch(
+    $global,
+    tagNameOrRenderer,
+    parentScope,
+    parentNode
+  );
+  if (typeof tagNameOrRenderer === "string") {
+    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
+      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
+      tagNameOrRenderer
+    );
+  } else if (tagNameOrRenderer.___setup) {
+    queueRender(branch, tagNameOrRenderer.___setup, -1);
+  }
+  return branch;
+}
 function bySecondArg(_item, index) {
   return index;
 }
@@ -1833,7 +1839,7 @@ var compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.___init;
+    return renderer.___clone;
   },
   getStartNode(branch) {
     return branch.___startNode;
@@ -1864,7 +1870,7 @@ var compat = {
   },
   createRenderer(args, clone) {
     const renderer = createRenderer(0, 0, 0, () => args);
-    renderer.___init = (branch) => {
+    renderer.___clone = (branch) => {
       const cloned = clone();
       branch.___startNode = cloned.startNode;
       branch.___endNode = cloned.endNode;
@@ -1897,6 +1903,7 @@ var compat = {
           renderer.___owner,
           document.body
         );
+        renderer.___setup && renderer.___setup(branch);
       } else {
         existing = true;
       }
@@ -1969,7 +1976,8 @@ function mount(input = {}, reference, position) {
       void 0,
       parentNode
     );
-    args?.(branch, input);
+    this.___setup && this.___setup(branch);
+    args && args(branch, input);
   });
   insertChildNodes(
     parentNode,

package/dist/dom/renderer.d.ts

@@ -2,13 +2,13 @@ import { type Accessor, type BranchScope, type Scope } from "../common/types";
 import type { Signal } from "./signals";
 export type Renderer = {
     ___id: string;
-    ___init: (branch: BranchScope, ns: string) => void;
+    ___setup: undefined | 0 | ((branch: BranchScope) => void);
+    ___clone: (branch: BranchScope, ns: string) => void;
     ___args: Signal<unknown> | undefined;
     ___owner: Scope | undefined;
     ___accessor: Accessor | undefined;
 };
 type SetupFn = (scope: Scope) => void;
-export declare function createBranchWithTagNameOrRenderer($global: Scope["$global"], tagNameOrRenderer: Renderer | string, parentScope: Scope, parentNode: ParentNode): BranchScope;
 export declare function createBranch($global: Scope["$global"], renderer: Renderer | string, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function createContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, getArgs?: (() => Signal<unknown>) | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
 export declare function registerContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, getArgs?: (() => Signal<unknown>) | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;

package/dist/dom.js

@@ -199,19 +199,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  p = [];
-  q = {};
-  B = {
+  q = [];
+  s = {};
+  C = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.C = renders, this.D = runtimeId, this.s = renderId, this.t = renders[renderId], this.u();
+    this.D = renders, this.E = runtimeId, this.t = renderId, this.u = renders[renderId], this.x();
   }
   w() {
-    this.t.w(), this.u();
+    this.u.w(), this.x();
   }
-  u() {
-    let data2 = this.t, serializeContext = this.B, scopeLookup = this.q, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  x() {
+    let data2 = this.u, serializeContext = this.C, scopeLookup = this.s, 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 = [];
@@ -227,22 +227,22 @@ var registeredValues = {}, Render = class {
         let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = commentText.slice(
           commentPrefixLen + 1,
           dataIndex ? dataIndex - 1 : commentText.length
-        ), scope = scopeLookup[scopeId] ||= { d: +scopeId }, data3 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
+        ), scope = scopeLookup[scopeId] ||= { e: +scopeId }, data3 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
         if (token === "*" /* Node */) {
           let node = scope[data3] = visit.previousSibling;
           scope[data3 + ">" /* Getter */] = () => node;
         } else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
-          this.f && (dataIndex && branchEnd(this.f, visit, visit), this.p.push(this.f)), this.f = scopeId, scope.a = visit;
+          this.g && (dataIndex && branchEnd(this.g, visit, visit), this.q.push(this.g)), this.g = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
-            this.f,
+            this.g,
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.p.pop();
+          curParent !== startNode.parentNode && curParent.prepend(startNode), this.g = this.q.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; ) {
@@ -263,21 +263,21 @@ 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.D, $global.renderId = this.s, $global.g = 1e6);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.E, $global.renderId = this.t, $global.h = 1e6);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
-                scope.$global = $global, scope.d = +scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
+                scope.$global = $global, scope.e = +scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
                   scope,
                   prevScope
                 ));
                 let parentBranchId = parentBranchIds.get(scopeId);
                 if (parentBranchId && (scope.c = scopes[parentBranchId]), branchIds.has(scopeId)) {
                   let branch = scope, parentBranch = branch.c;
-                  scope.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
+                  scope.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.o ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.C[this.s] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.D[this.t] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -713,28 +713,28 @@ function toInsertNode(startNode, endNode) {
 var pendingScopes = [];
 function createScope($global, closestBranch) {
   let scope = {
-    d: $global.g++,
-    h: 1,
+    e: $global.h++,
+    j: 1,
     c: closestBranch,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function skipScope(scope) {
-  return scope.$global.g++;
+  return scope.$global.h++;
 }
 function finishPendingScopes() {
   for (let scope of pendingScopes)
-    scope.h = 0;
+    scope.j = 0;
   pendingScopes = [];
 }
 function destroyBranch(branch) {
-  branch.x?.n?.delete(branch), destroyNestedBranches(branch);
+  branch.y?.o?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.E?.forEach((scope) => {
-    for (let id in scope.k)
-      scope.k[id]?.abort();
+  branch.z = 1, branch.o?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
+    for (let id in scope.l)
+      scope.l[id]?.abort();
   });
 }
 function removeAndDestroyBranch(branch) {
@@ -751,20 +751,20 @@ function insertBranchBefore(branch, parentNode, nextSibling) {
 
 // src/dom/queue.ts
 var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendingEffects = [], rendering = !1, scopeKeyOffset = 1e3;
-function queueRender(scope, signal, signalKey, value2, scopeKey = scope.d) {
+function queueRender(scope, signal, signalKey, value2, scopeKey = scope.e) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
-    existingRender.z = value2;
+    existingRender.A = value2;
   else {
     let render = {
-      j: key,
-      A: scope,
-      F: signal,
-      z: value2
+      k: key,
+      B: scope,
+      G: signal,
+      A: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.j >= 0) break;
+      if (key - parent.k >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -803,27 +803,27 @@ function runRenders() {
   for (; pendingRenders.length; ) {
     let render = pendingRenders[0], item = pendingRenders.pop();
     if (render !== item) {
-      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).j;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).k;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].j - pendingRenders[bestChild].j < 0 && (bestChild = right), pendingRenders[bestChild].j - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].k - pendingRenders[bestChild].k < 0 && (bestChild = right), pendingRenders[bestChild].k - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.A.c?.y || render.F(render.A, render.z);
+    render.B.c?.z || render.G(render.B, render.A);
   }
   finishPendingScopes();
 }
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.k?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.k[id] = void 0);
+  let ctrl = scope.l?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.l[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.E ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.F ||= /* @__PURE__ */ new Set()).add(scope), ((scope.l ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -947,45 +947,34 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 }
 
 // src/dom/renderer.ts
-function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
-  let branch = createBranch(
-    $global,
-    tagNameOrRenderer,
-    parentScope,
-    parentNode
-  );
-  return typeof tagNameOrRenderer == "string" && (branch[0] = branch.a = branch.b = document.createElementNS(
-    tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
-    tagNameOrRenderer
-  )), branch;
-}
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.c;
-  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
+  return branch._ = renderer.m || parentScope, branch.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.o ||= /* @__PURE__ */ new Set()).add(branch)), renderer.p?.(
     branch,
     parentNode.namespaceURI
   ), branch;
 }
 function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
-  let args, init2 = template ? (branch, ns) => {
+  let args, clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
-    ))(branch, walks), setup && queueRender(branch, setup, -1);
+    ))(branch, walks);
   } : (branch) => {
     walk(
       branch.a = branch.b = new Text(),
       walks,
       branch
-    ), setup && queueRender(branch, setup, -1);
+    );
   };
   return (owner) => ({
-    d: id,
-    o: init2,
-    l: owner,
-    m: dynamicScopesAccessor,
-    get e() {
+    e: id,
+    p: clone,
+    d: setup,
+    m: owner,
+    n: dynamicScopesAccessor,
+    get f() {
       return args ||= getArgs ? getArgs() : void 0;
     }
   });
@@ -1052,9 +1041,9 @@ function value(valueAccessor, fn = () => {
   };
 }
 var accessorId = 0;
-function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "d") {
+function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "e") {
   return (scope) => {
-    scope.h ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+    scope.j ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
@@ -1064,11 +1053,11 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.h && !scope.y && childSignal(scope);
+          !scope.j && !scope.z && childSignal(scope);
       },
       -1,
       0,
-      firstScope.d
+      firstScope.e
     );
   };
   return ownerSignal._ = childSignal, ownerSignal;
@@ -1076,7 +1065,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.h && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.j && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }
@@ -1092,8 +1081,8 @@ function dynamicClosure(valueAccessor, fn, getOwnerScope) {
     let subscribers = ownerScope[subscribersAccessor];
     if (subscribers)
       for (let subscriber of subscribers)
-        subscriber.h || queueRender(subscriber, childSignal, -1);
-  }, subscribe = ownerSignal.G = (scope) => subscribeToScopeSet(
+        subscriber.j || queueRender(subscriber, childSignal, -1);
+  }, subscribe = ownerSignal.H = (scope) => subscribeToScopeSet(
     getOwnerScope ? getOwnerScope(scope) : scope._,
     subscribersAccessor,
     scope
@@ -1104,7 +1093,7 @@ function dynamicClosure(valueAccessor, fn, getOwnerScope) {
 }
 function registerDynamicClosure(registryId, valueAccessor, fn, getOwnerScope) {
   let signal = dynamicClosure(valueAccessor, fn, getOwnerScope);
-  return register(registryId, signal.G), signal;
+  return register(registryId, signal.H), signal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {
@@ -1150,7 +1139,7 @@ function conditional(nodeAccessor, ...branches) {
       scope,
       nodeAccessor,
       branches[scope[branchAccessor] = newBranch],
-      createBranch
+      createAndSetupBranch
     );
   };
 }
@@ -1161,7 +1150,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
   let childScopeAccessor = nodeAccessor + "!" /* ConditionalScope */, rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
   return (scope, newRenderer, getInput) => {
     let normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.d || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
+    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.e || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
       if (setConditionalRenderer(
         scope,
         nodeAccessor,
@@ -1174,16 +1163,16 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             scope[childScopeAccessor],
             0,
             content,
-            createBranch
-          ), content.m && subscribeToScopeSet(
-            content.l,
+            createAndSetupBranch
+          ), content.n && subscribeToScopeSet(
             content.m,
+            content.n,
             scope[childScopeAccessor][0 + "!" /* ConditionalScope */]
           );
         }
-      } else normalizedRenderer?.m && subscribeToScopeSet(
-        normalizedRenderer.l,
+      } else normalizedRenderer?.n && subscribeToScopeSet(
         normalizedRenderer.m,
+        normalizedRenderer.n,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1194,9 +1183,9 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
           0,
           (inputIsArgs ? args[0] : args) || {}
         );
-      else if (normalizedRenderer.e)
+      else if (normalizedRenderer.f)
         if (inputIsArgs)
-          normalizedRenderer.e(
+          normalizedRenderer.f(
             scope[childScopeAccessor],
             normalizedRenderer._ ? args[0] : args
           );
@@ -1205,7 +1194,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             ...args,
             content: getContent(scope)
           } : args || {};
-          normalizedRenderer.e(
+          normalizedRenderer.f(
             scope[childScopeAccessor],
             normalizedRenderer._ ? inputWithContent : [inputWithContent]
           );
@@ -1244,19 +1233,35 @@ function loopTo(nodeAccessor, renderer) {
   );
 }
 function loop(nodeAccessor, renderer, forEach) {
-  let params = renderer.e;
+  let params = renderer.f;
   return (scope, value2) => {
     let referenceNode = scope[nodeAccessor], oldMap = scope[nodeAccessor + "(" /* LoopScopeMap */], oldArray = oldMap ? scope[nodeAccessor + "!" /* LoopScopeArray */] || [
       ...oldMap.values()
     ] : [], parentNode = referenceNode.nodeType > 1 /* Element */ ? referenceNode.parentNode || oldArray[0].a.parentNode : referenceNode, newMap = scope[nodeAccessor + "(" /* LoopScopeMap */] = /* @__PURE__ */ new Map(), newArray = scope[nodeAccessor + "!" /* LoopScopeArray */] = [];
     forEach(value2, (key, args) => {
-      let branch = oldMap?.get(key) || createBranch(scope.$global, renderer, scope, parentNode);
+      let branch = oldMap?.get(key) || createAndSetupBranch(scope.$global, renderer, scope, parentNode);
       params?.(branch, args), newMap.set(key, branch), newArray.push(branch);
     });
     let afterReference = null;
     referenceNode !== parentNode && (oldArray.length ? (afterReference = oldArray[oldArray.length - 1].b.nextSibling, newArray.length || parentNode.insertBefore(referenceNode, afterReference)) : newArray.length && (afterReference = referenceNode.nextSibling, referenceNode.remove())), reconcile(parentNode, oldArray, newArray, afterReference);
   };
 }
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  let branch = createBranch($global, renderer, parentScope, parentNode);
+  return renderer.d && queueRender(branch, renderer.d, -1), branch;
+}
+function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
+  let branch = createBranch(
+    $global,
+    tagNameOrRenderer,
+    parentScope,
+    parentNode
+  );
+  return typeof tagNameOrRenderer == "string" ? branch[0] = branch.a = branch.b = document.createElementNS(
+    tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
+    tagNameOrRenderer
+  ) : tagNameOrRenderer.d && queueRender(branch, tagNameOrRenderer.d, -1), branch;
+}
 function bySecondArg(_item, index) {
   return index;
 }
@@ -1277,7 +1282,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.o;
+    return renderer.p;
   },
   getStartNode(branch) {
     return branch.a;
@@ -1297,12 +1302,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]?.q[value2[1]]
+      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.s[value2[1]]
     ) : value2;
   },
   createRenderer(args, clone) {
     let renderer = createRenderer(0, 0, 0, () => args);
-    return renderer.o = (branch) => {
+    return renderer.p = (branch) => {
       let cloned = clone();
       branch.a = cloned.startNode, branch.b = cloned.endNode;
     }, renderer;
@@ -1317,12 +1322,12 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = !0 : (out.global.g ||= 0, branch = component.scope = createBranch(
+      branch ? existing = !0 : (out.global.h ||= 0, branch = component.scope = createBranch(
         out.global,
         renderer,
-        renderer.l,
+        renderer.m,
         document.body
-      )), renderer.e?.(branch, renderer._ ? args[0] : args);
+      ), renderer.d && renderer.d(branch)), renderer.f?.(branch, renderer._ ? args[0] : args);
     }), !existing)
       return toInsertNode(branch.a, branch.b);
   }
@@ -1342,12 +1347,12 @@ var createTemplate = (id, template, walks, setup, inputSignal) => {
 function mount(input = {}, reference, position) {
   let branch, parentNode = reference, nextSibling = null, { $global } = input;
   switch ($global ? ({ $global, ...input } = input, $global = {
-    g: 0,
+    h: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global
   }) : $global = {
-    g: 0,
+    h: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   }, position) {
@@ -1361,13 +1366,13 @@ function mount(input = {}, reference, position) {
       parentNode = reference.parentNode, nextSibling = reference.nextSibling;
       break;
   }
-  let args = this.e, effects = prepareEffects(() => {
+  let args = this.f, effects = prepareEffects(() => {
     branch = createBranch(
       $global,
       this,
       void 0,
       parentNode
-    ), args?.(branch, input);
+    ), this.d && this.d(branch), args && args(branch, input);
   });
   return insertChildNodes(
     parentNode,

package/dist/dom.mjs

@@ -117,19 +117,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  p = [];
-  q = {};
-  B = {
+  q = [];
+  s = {};
+  C = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.C = renders, this.D = runtimeId, this.s = renderId, this.t = renders[renderId], this.u();
+    this.D = renders, this.E = runtimeId, this.t = renderId, this.u = renders[renderId], this.x();
   }
   w() {
-    this.t.w(), this.u();
+    this.u.w(), this.x();
   }
-  u() {
-    let data2 = this.t, serializeContext = this.B, scopeLookup = this.q, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  x() {
+    let data2 = this.u, serializeContext = this.C, scopeLookup = this.s, 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 = [];
@@ -145,22 +145,22 @@ var registeredValues = {}, Render = class {
         let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = commentText.slice(
           commentPrefixLen + 1,
           dataIndex ? dataIndex - 1 : commentText.length
-        ), scope = scopeLookup[scopeId] ||= { d: +scopeId }, data3 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
+        ), scope = scopeLookup[scopeId] ||= { e: +scopeId }, data3 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
         if (token === "*" /* Node */) {
           let node = scope[data3] = visit.previousSibling;
           scope[data3 + ">" /* Getter */] = () => node;
         } else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
-          this.f && (dataIndex && branchEnd(this.f, visit, visit), this.p.push(this.f)), this.f = scopeId, scope.a = visit;
+          this.g && (dataIndex && branchEnd(this.g, visit, visit), this.q.push(this.g)), this.g = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
-            this.f,
+            this.g,
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.p.pop();
+          curParent !== startNode.parentNode && curParent.prepend(startNode), this.g = this.q.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; ) {
@@ -181,21 +181,21 @@ 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.D, $global.renderId = this.s, $global.g = 1e6);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.E, $global.renderId = this.t, $global.h = 1e6);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
-                scope.$global = $global, scope.d = +scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
+                scope.$global = $global, scope.e = +scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
                   scope,
                   prevScope
                 ));
                 let parentBranchId = parentBranchIds.get(scopeId);
                 if (parentBranchId && (scope.c = scopes[parentBranchId]), branchIds.has(scopeId)) {
                   let branch = scope, parentBranch = branch.c;
-                  scope.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
+                  scope.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.o ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.C[this.s] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.D[this.t] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -631,28 +631,28 @@ function toInsertNode(startNode, endNode) {
 var pendingScopes = [];
 function createScope($global, closestBranch) {
   let scope = {
-    d: $global.g++,
-    h: 1,
+    e: $global.h++,
+    j: 1,
     c: closestBranch,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function skipScope(scope) {
-  return scope.$global.g++;
+  return scope.$global.h++;
 }
 function finishPendingScopes() {
   for (let scope of pendingScopes)
-    scope.h = 0;
+    scope.j = 0;
   pendingScopes = [];
 }
 function destroyBranch(branch) {
-  branch.x?.n?.delete(branch), destroyNestedBranches(branch);
+  branch.y?.o?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.E?.forEach((scope) => {
-    for (let id in scope.k)
-      scope.k[id]?.abort();
+  branch.z = 1, branch.o?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
+    for (let id in scope.l)
+      scope.l[id]?.abort();
   });
 }
 function removeAndDestroyBranch(branch) {
@@ -669,20 +669,20 @@ function insertBranchBefore(branch, parentNode, nextSibling) {
 
 // src/dom/queue.ts
 var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendingEffects = [], rendering = !1, scopeKeyOffset = 1e3;
-function queueRender(scope, signal, signalKey, value2, scopeKey = scope.d) {
+function queueRender(scope, signal, signalKey, value2, scopeKey = scope.e) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
-    existingRender.z = value2;
+    existingRender.A = value2;
   else {
     let render = {
-      j: key,
-      A: scope,
-      F: signal,
-      z: value2
+      k: key,
+      B: scope,
+      G: signal,
+      A: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.j >= 0) break;
+      if (key - parent.k >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -721,27 +721,27 @@ function runRenders() {
   for (; pendingRenders.length; ) {
     let render = pendingRenders[0], item = pendingRenders.pop();
     if (render !== item) {
-      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).j;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).k;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].j - pendingRenders[bestChild].j < 0 && (bestChild = right), pendingRenders[bestChild].j - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].k - pendingRenders[bestChild].k < 0 && (bestChild = right), pendingRenders[bestChild].k - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.A.c?.y || render.F(render.A, render.z);
+    render.B.c?.z || render.G(render.B, render.A);
   }
   finishPendingScopes();
 }
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.k?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.k[id] = void 0);
+  let ctrl = scope.l?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.l[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.E ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.F ||= /* @__PURE__ */ new Set()).add(scope), ((scope.l ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -865,45 +865,34 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 }
 
 // src/dom/renderer.ts
-function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
-  let branch = createBranch(
-    $global,
-    tagNameOrRenderer,
-    parentScope,
-    parentNode
-  );
-  return typeof tagNameOrRenderer == "string" && (branch[0] = branch.a = branch.b = document.createElementNS(
-    tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
-    tagNameOrRenderer
-  )), branch;
-}
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.c;
-  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
+  return branch._ = renderer.m || parentScope, branch.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.o ||= /* @__PURE__ */ new Set()).add(branch)), renderer.p?.(
     branch,
     parentNode.namespaceURI
   ), branch;
 }
 function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
-  let args, init2 = template ? (branch, ns) => {
+  let args, clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
-    ))(branch, walks), setup && queueRender(branch, setup, -1);
+    ))(branch, walks);
   } : (branch) => {
     walk(
       branch.a = branch.b = new Text(),
       walks,
       branch
-    ), setup && queueRender(branch, setup, -1);
+    );
   };
   return (owner) => ({
-    d: id,
-    o: init2,
-    l: owner,
-    m: dynamicScopesAccessor,
-    get e() {
+    e: id,
+    p: clone,
+    d: setup,
+    m: owner,
+    n: dynamicScopesAccessor,
+    get f() {
       return args ||= getArgs ? getArgs() : void 0;
     }
   });
@@ -970,9 +959,9 @@ function value(valueAccessor, fn = () => {
   };
 }
 var accessorId = 0;
-function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "d") {
+function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "e") {
   return (scope) => {
-    scope.h ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+    scope.j ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
@@ -982,11 +971,11 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.h && !scope.y && childSignal(scope);
+          !scope.j && !scope.z && childSignal(scope);
       },
       -1,
       0,
-      firstScope.d
+      firstScope.e
     );
   };
   return ownerSignal._ = childSignal, ownerSignal;
@@ -994,7 +983,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.h && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.j && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }
@@ -1010,8 +999,8 @@ function dynamicClosure(valueAccessor, fn, getOwnerScope) {
     let subscribers = ownerScope[subscribersAccessor];
     if (subscribers)
       for (let subscriber of subscribers)
-        subscriber.h || queueRender(subscriber, childSignal, -1);
-  }, subscribe = ownerSignal.G = (scope) => subscribeToScopeSet(
+        subscriber.j || queueRender(subscriber, childSignal, -1);
+  }, subscribe = ownerSignal.H = (scope) => subscribeToScopeSet(
     getOwnerScope ? getOwnerScope(scope) : scope._,
     subscribersAccessor,
     scope
@@ -1022,7 +1011,7 @@ function dynamicClosure(valueAccessor, fn, getOwnerScope) {
 }
 function registerDynamicClosure(registryId, valueAccessor, fn, getOwnerScope) {
   let signal = dynamicClosure(valueAccessor, fn, getOwnerScope);
-  return register(registryId, signal.G), signal;
+  return register(registryId, signal.H), signal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {
@@ -1068,7 +1057,7 @@ function conditional(nodeAccessor, ...branches) {
       scope,
       nodeAccessor,
       branches[scope[branchAccessor] = newBranch],
-      createBranch
+      createAndSetupBranch
     );
   };
 }
@@ -1079,7 +1068,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
   let childScopeAccessor = nodeAccessor + "!" /* ConditionalScope */, rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
   return (scope, newRenderer, getInput) => {
     let normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.d || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
+    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.e || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
       if (setConditionalRenderer(
         scope,
         nodeAccessor,
@@ -1092,16 +1081,16 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             scope[childScopeAccessor],
             0,
             content,
-            createBranch
-          ), content.m && subscribeToScopeSet(
-            content.l,
+            createAndSetupBranch
+          ), content.n && subscribeToScopeSet(
             content.m,
+            content.n,
             scope[childScopeAccessor][0 + "!" /* ConditionalScope */]
           );
         }
-      } else normalizedRenderer?.m && subscribeToScopeSet(
-        normalizedRenderer.l,
+      } else normalizedRenderer?.n && subscribeToScopeSet(
         normalizedRenderer.m,
+        normalizedRenderer.n,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1112,9 +1101,9 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
           0,
           (inputIsArgs ? args[0] : args) || {}
         );
-      else if (normalizedRenderer.e)
+      else if (normalizedRenderer.f)
         if (inputIsArgs)
-          normalizedRenderer.e(
+          normalizedRenderer.f(
             scope[childScopeAccessor],
             normalizedRenderer._ ? args[0] : args
           );
@@ -1123,7 +1112,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             ...args,
             content: getContent(scope)
           } : args || {};
-          normalizedRenderer.e(
+          normalizedRenderer.f(
             scope[childScopeAccessor],
             normalizedRenderer._ ? inputWithContent : [inputWithContent]
           );
@@ -1162,19 +1151,35 @@ function loopTo(nodeAccessor, renderer) {
   );
 }
 function loop(nodeAccessor, renderer, forEach) {
-  let params = renderer.e;
+  let params = renderer.f;
   return (scope, value2) => {
     let referenceNode = scope[nodeAccessor], oldMap = scope[nodeAccessor + "(" /* LoopScopeMap */], oldArray = oldMap ? scope[nodeAccessor + "!" /* LoopScopeArray */] || [
       ...oldMap.values()
     ] : [], parentNode = referenceNode.nodeType > 1 /* Element */ ? referenceNode.parentNode || oldArray[0].a.parentNode : referenceNode, newMap = scope[nodeAccessor + "(" /* LoopScopeMap */] = /* @__PURE__ */ new Map(), newArray = scope[nodeAccessor + "!" /* LoopScopeArray */] = [];
     forEach(value2, (key, args) => {
-      let branch = oldMap?.get(key) || createBranch(scope.$global, renderer, scope, parentNode);
+      let branch = oldMap?.get(key) || createAndSetupBranch(scope.$global, renderer, scope, parentNode);
       params?.(branch, args), newMap.set(key, branch), newArray.push(branch);
     });
     let afterReference = null;
     referenceNode !== parentNode && (oldArray.length ? (afterReference = oldArray[oldArray.length - 1].b.nextSibling, newArray.length || parentNode.insertBefore(referenceNode, afterReference)) : newArray.length && (afterReference = referenceNode.nextSibling, referenceNode.remove())), reconcile(parentNode, oldArray, newArray, afterReference);
   };
 }
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  let branch = createBranch($global, renderer, parentScope, parentNode);
+  return renderer.d && queueRender(branch, renderer.d, -1), branch;
+}
+function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
+  let branch = createBranch(
+    $global,
+    tagNameOrRenderer,
+    parentScope,
+    parentNode
+  );
+  return typeof tagNameOrRenderer == "string" ? branch[0] = branch.a = branch.b = document.createElementNS(
+    tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
+    tagNameOrRenderer
+  ) : tagNameOrRenderer.d && queueRender(branch, tagNameOrRenderer.d, -1), branch;
+}
 function bySecondArg(_item, index) {
   return index;
 }
@@ -1195,7 +1200,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.o;
+    return renderer.p;
   },
   getStartNode(branch) {
     return branch.a;
@@ -1215,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]?.q[value2[1]]
+      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.s[value2[1]]
     ) : value2;
   },
   createRenderer(args, clone) {
     let renderer = createRenderer(0, 0, 0, () => args);
-    return renderer.o = (branch) => {
+    return renderer.p = (branch) => {
       let cloned = clone();
       branch.a = cloned.startNode, branch.b = cloned.endNode;
     }, renderer;
@@ -1235,12 +1240,12 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = !0 : (out.global.g ||= 0, branch = component.scope = createBranch(
+      branch ? existing = !0 : (out.global.h ||= 0, branch = component.scope = createBranch(
         out.global,
         renderer,
-        renderer.l,
+        renderer.m,
         document.body
-      )), renderer.e?.(branch, renderer._ ? args[0] : args);
+      ), renderer.d && renderer.d(branch)), renderer.f?.(branch, renderer._ ? args[0] : args);
     }), !existing)
       return toInsertNode(branch.a, branch.b);
   }
@@ -1260,12 +1265,12 @@ var createTemplate = (id, template, walks, setup, inputSignal) => {
 function mount(input = {}, reference, position) {
   let branch, parentNode = reference, nextSibling = null, { $global } = input;
   switch ($global ? ({ $global, ...input } = input, $global = {
-    g: 0,
+    h: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global
   }) : $global = {
-    g: 0,
+    h: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   }, position) {
@@ -1279,13 +1284,13 @@ function mount(input = {}, reference, position) {
       parentNode = reference.parentNode, nextSibling = reference.nextSibling;
       break;
   }
-  let args = this.e, effects = prepareEffects(() => {
+  let args = this.f, effects = prepareEffects(() => {
     branch = createBranch(
       $global,
       this,
       void 0,
       parentNode
-    ), args?.(branch, input);
+    ), this.d && this.d(branch), args && args(branch, input);
   });
   return insertChildNodes(
     parentNode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "0.3.50",
+  "version": "0.3.51",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",