marko 6.0.39 → 6.0.41

package/dist/dom.mjs

@@ -151,11 +151,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 }
               }
             },
-            o(scope) {
+            p(scope) {
               let parentBranchId = scope.g || parentBranchIds.get(scopeId);
               if (parentBranchId && (scope.k = scopeLookup[parentBranchId]), branchIds.has(scopeId)) {
                 let branch = scope, parentBranch = branch.k;
-                scope.k = branch, parentBranch && (branch.u = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch));
+                scope.k = branch, parentBranch && (branch.y = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch));
               }
             }
           };
@@ -185,7 +185,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                   $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.l = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
                     scope,
                     scopeLookup[scopeId]
-                  )), branches && branches.o(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.p = 1e6);
+                  )), branches && branches.p(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.q = 1e6);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }
@@ -410,6 +410,294 @@ function parseHTML(html2, ns) {
   return parser.innerHTML = html2, parser.content || parser;
 }
 
+// src/dom/scope.ts
+function createScope($global, closestBranch) {
+  let scope = {
+    l: $global.q++,
+    t: 1,
+    k: closestBranch,
+    $global
+  };
+  return pendingScopes.push(scope), scope;
+}
+function skipScope(scope) {
+  return scope.$global.q++;
+}
+function findBranchWithKey(scope, key) {
+  let branch = scope.k;
+  for (; branch && !branch[key]; )
+    branch = branch.y;
+  return branch;
+}
+function destroyBranch(branch) {
+  branch.y?.A?.delete(branch), destroyNestedBranches(branch);
+}
+function destroyNestedBranches(branch) {
+  branch.B = 1, branch.A?.forEach(destroyNestedBranches), branch.K?.forEach((scope) => {
+    for (let id in scope.z)
+      scope.z[id]?.abort();
+  });
+}
+function removeAndDestroyBranch(branch) {
+  destroyBranch(branch), removeChildNodes(branch.h, branch.j);
+}
+function insertBranchBefore(branch, parentNode, nextSibling) {
+  insertChildNodes(
+    parentNode,
+    nextSibling,
+    branch.h,
+    branch.j
+  );
+}
+function tempDetachBranch(branch) {
+  let fragment = new DocumentFragment();
+  fragment.namespaceURI = branch.h.parentNode.namespaceURI, insertChildNodes(fragment, null, branch.h, branch.j);
+}
+
+// src/dom/schedule.ts
+var isScheduled, channel;
+function schedule() {
+  isScheduled || (isScheduled = 1, queueMicrotask(flushAndWaitFrame));
+}
+function flushAndWaitFrame() {
+  run(), requestAnimationFrame(triggerMacroTask);
+}
+function triggerMacroTask() {
+  channel || (channel = new MessageChannel(), channel.port1.onmessage = () => {
+    isScheduled = 0, run();
+  }), channel.port2.postMessage(0);
+}
+
+// src/dom/signals.ts
+function state(valueAccessor, fn) {
+  if (0)
+    var id;
+  let valueChangeAccessor = "o" /* TagVariableChange */ + valueAccessor, update = (scope, value2) => {
+    scope[valueAccessor] !== value2 && (scope[valueAccessor] = value2, fn(scope, value2));
+  };
+  return (scope, value2, valueChange) => (rendering ? ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value2 || !(valueAccessor in scope)) && (scope[valueAccessor] = value2, fn(scope, value2)) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value2) : (schedule(), queueRender(
+    scope,
+    update,
+    valueAccessor,
+    value2
+  )), value2);
+}
+function value(valueAccessor, fn = () => {
+}) {
+  return (scope, value2) => {
+    (!(valueAccessor in scope) || scope[valueAccessor] !== value2) && (scope[valueAccessor] = value2, fn(scope, value2));
+  };
+}
+function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
+  return (scope) => {
+    scope.t ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+  };
+}
+function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
+  let childSignal = closure(valueAccessor, fn), loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
+    let scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [], [firstScope] = scopes;
+    firstScope && queueRender(
+      ownerScope,
+      () => {
+        for (let scope of scopes)
+          !scope.t && !scope.B && childSignal(scope);
+      },
+      -1,
+      0,
+      firstScope.l
+    );
+  };
+  return ownerSignal._ = childSignal, ownerSignal;
+}
+function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
+  let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
+    let ifScope = scope[scopeAccessor];
+    ifScope && !ifScope.t && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+  };
+  return ownerSignal._ = childSignal, ownerSignal;
+}
+function subscribeToScopeSet(ownerScope, accessor, scope) {
+  let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
+  subscribers.has(scope) || (subscribers.add(scope), getAbortSignal(scope, -1).addEventListener(
+    "abort",
+    () => ownerScope[accessor].delete(scope)
+  ));
+}
+function dynamicClosure(...closureSignals) {
+  let [{ E: ___scopeInstancesAccessor, F: ___signalIndexAccessor }] = closureSignals;
+  for (let i = closureSignals.length; i--; )
+    closureSignals[i].L = i;
+  return (scope) => {
+    if (scope[___scopeInstancesAccessor])
+      for (let childScope of scope[___scopeInstancesAccessor])
+        childScope.t || queueRender(
+          childScope,
+          closureSignals[childScope[___signalIndexAccessor]],
+          -1
+        );
+  };
+}
+function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
+  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
+    scope[closureSignal.F] = closureSignal.L, childSignal(scope), subscribeToScopeSet(
+      getOwnerScope ? getOwnerScope(scope) : scope._,
+      closureSignal.E,
+      scope
+    );
+  };
+  return closureSignal.E = "a" /* ClosureScopes */ + valueAccessor, closureSignal.F = "b" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
+}
+function closure(valueAccessor, fn, getOwnerScope) {
+  return (scope) => {
+    fn(
+      scope,
+      (getOwnerScope ? getOwnerScope(scope) : scope._)[valueAccessor]
+    );
+  };
+}
+function setTagVar(scope, childAccessor, tagVarSignal2) {
+  scope[childAccessor].e = (value2) => tagVarSignal2(scope, value2);
+}
+var tagVarSignal = (scope, value2) => scope.e?.(value2);
+function setTagVarChange(scope, changeHandler) {
+  scope.f = changeHandler;
+}
+var tagVarSignalChange = (scope, value2) => scope.f?.(value2), tagIdsByGlobal = /* @__PURE__ */ new WeakMap();
+function nextTagId({ $global }) {
+  let id = tagIdsByGlobal.get($global) || 0;
+  return tagIdsByGlobal.set($global, id + 1), "c" + $global.runtimeId + $global.renderId + id.toString(36);
+}
+function effect(id, fn) {
+  return register(id, fn), (scope) => {
+    queueEffect(scope, fn);
+  };
+}
+function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
+  if (scope)
+    if (Symbol.iterator in scope)
+      for (let s of scope instanceof Map ? scope.values() : scope)
+        yield* traverseAllHoisted(s, path, curIndex);
+    else curIndex ? yield* traverseAllHoisted(scope[path[curIndex]], path, curIndex - 1) : yield scope[path[0]];
+}
+function hoist(...path) {
+  return (scope) => {
+    let getOne = (...args) => iterator().next().value(...args), iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
+    return getOne;
+  };
+}
+
+// src/dom/walker.ts
+var walker = /* @__PURE__ */ document.createTreeWalker(document);
+function walk(startNode, walkCodes, branch) {
+  walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
+}
+function walkInternal(currentWalkIndex, walkCodes, scope) {
+  let value2, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
+  for (; currentWalkIndex < walkCodes.length; )
+    if (value2 = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value2 === 32 /* Get */) {
+      let node = walker.currentNode;
+      scope[currentScopeIndex] = node, scope["j" /* Getter */ + currentScopeIndex++] = () => node;
+    } else if (value2 === 37 /* Replace */ || value2 === 49 /* DynamicTagWithVar */)
+      walker.currentNode.replaceWith(
+        walker.currentNode = scope[currentScopeIndex++] = new Text()
+      ), value2 === 49 /* DynamicTagWithVar */ && (scope[currentScopeIndex++] = skipScope(scope));
+    else {
+      if (value2 === 38 /* EndChild */)
+        return currentWalkIndex;
+      if (value2 === 47 /* BeginChild */ || value2 === 48 /* BeginChildWithVar */)
+        currentWalkIndex = walkInternal(
+          currentWalkIndex,
+          walkCodes,
+          scope[currentScopeIndex++] = createScope(scope.$global, scope.k)
+        ), value2 === 48 /* BeginChildWithVar */ && (scope[currentScopeIndex++] = skipScope(scope));
+      else if (value2 < 92)
+        for (value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */; value2--; )
+          walker.nextNode();
+      else if (value2 < 107)
+        for (value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */; value2--; )
+          walker.nextSibling();
+      else if (value2 < 117) {
+        for (value2 = 10 /* Out */ * currentMultiplier + value2 - 107 /* Out */; value2--; )
+          walker.parentNode();
+        walker.nextSibling();
+      } else
+        storedMultiplier = currentMultiplier * 10 /* Multiplier */ + value2 - 117 /* Multiplier */;
+    }
+}
+
+// src/dom/renderer.ts
+function createBranch($global, renderer, parentScope, parentNode) {
+  let branch = createScope($global), parentBranch = parentScope?.k;
+  return branch._ = renderer.u || parentScope, branch.k = branch, parentBranch && (branch.y = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch)), renderer.C?.(
+    branch,
+    parentNode.namespaceURI
+  ), branch;
+}
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  return setupBranch(
+    renderer,
+    createBranch($global, renderer, parentScope, parentNode)
+  );
+}
+function setupBranch(renderer, branch) {
+  return renderer.D && queueRender(branch, renderer.D, -1), branch;
+}
+function createContent(id, template, walks, setup, params, dynamicScopesAccessor) {
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup = setup ? setup._ || setup : void 0, params ||= void 0;
+  let clone = template ? (branch, ns) => {
+    ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
+      template,
+      ns
+    ))(branch, walks);
+  } : (branch) => {
+    walk(
+      branch.h = branch.j = new Text(),
+      walks,
+      branch
+    );
+  };
+  return (owner) => ({
+    l: id,
+    C: clone,
+    u: owner,
+    D: setup,
+    m: params,
+    n: dynamicScopesAccessor
+  });
+}
+function registerContent(id, template, walks, setup, params, dynamicScopesAccessor) {
+  return register(
+    id,
+    createContent(id, template, walks, setup, params, dynamicScopesAccessor)
+  );
+}
+function localClosures(renderer, closureFns) {
+  let closureSignals = {};
+  for (let key in closureFns)
+    closureSignals[key] = value(key, closureFns[key]);
+  return (owner, closureValues) => {
+    let instance = renderer(owner);
+    return instance.G = closureSignals, instance.M = closureValues, instance;
+  };
+}
+function createRenderer(template, walks, setup, params) {
+  return createContent("", template, walks, setup, params)();
+}
+var cloneCache = {};
+function createCloneableHTML(html2, ns) {
+  let { firstChild, lastChild } = parseHTML(html2, ns), parent = document.createElementNS(ns, "t");
+  return insertChildNodes(parent, null, firstChild, lastChild), firstChild === lastChild && firstChild.nodeType < 8 /* Comment */ ? (branch, walks) => {
+    walk(
+      branch.h = branch.j = firstChild.cloneNode(!0),
+      walks,
+      branch
+    );
+  } : (branch, walks) => {
+    let clone = parent.cloneNode(!0);
+    walk(clone.firstChild, walks, branch), branch.h = clone.firstChild, branch.j = clone.lastChild;
+  };
+}
+
 // src/dom/dom.ts
 function attr(element, name, value2) {
   setAttribute(element, name, normalizeAttrValue(value2));
@@ -453,6 +741,9 @@ function attrs(scope, nodeAccessor, nextAttrs) {
   }
   attrsInternal(scope, nodeAccessor, nextAttrs);
 }
+function attrsAndContent(scope, nodeAccessor, nextAttrs) {
+  attrs(scope, nodeAccessor, nextAttrs), insertContent(scope, nodeAccessor, nextAttrs?.content);
+}
 function hasAttrAlias(element, attr2, nextAttrs) {
   return attr2 === "checked" && element.tagName === "INPUT" && "checkedValue" in nextAttrs;
 }
@@ -466,6 +757,9 @@ function partialAttrs(scope, nodeAccessor, nextAttrs, skip) {
     skip[key] || (partial[key] = nextAttrs[key]);
   attrsInternal(scope, nodeAccessor, partial);
 }
+function partialAttrsAndContent(scope, nodeAccessor, nextAttrs, skip) {
+  partialAttrs(scope, nodeAccessor, nextAttrs, skip), insertContent(scope, nodeAccessor, nextAttrs?.content);
+}
 function attrsInternal(scope, nodeAccessor, nextAttrs) {
   let el = scope[nodeAccessor], events, skip;
   switch (el.tagName) {
@@ -538,6 +832,14 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
     }
   }
 }
+function insertContent(scope, nodeAccessor, value2) {
+  let content = normalizeClientRender(value2), rendererAccessor = "c" /* ConditionalRenderer */ + nodeAccessor;
+  scope[rendererAccessor] !== (scope[rendererAccessor] = content?.l) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.n && subscribeToScopeSet(
+    content.u,
+    content.n,
+    scope["d" /* ConditionalScope */ + nodeAccessor]
+  ));
+}
 function attrsEvents(scope, nodeAccessor) {
   let el = scope[nodeAccessor], events = scope["i" /* EventAttributes */ + nodeAccessor];
   switch (scope["f" /* ControlledType */ + nodeAccessor]) {
@@ -572,6 +874,11 @@ function html(scope, value2, accessor) {
     scope["h" /* DynamicPlaceholderLastChild */ + accessor] = newContent.lastChild
   ), removeChildNodes(firstChild, lastChild);
 }
+function normalizeClientRender(value2) {
+  let renderer = normalizeDynamicRenderer(value2);
+  if (renderer && renderer.l)
+    return renderer;
+}
 function props(scope, nodeIndex, index) {
   let nextProps = scope[index], prevProps = scope[index + "-"], node = scope[nodeIndex];
   if (prevProps)
@@ -596,67 +903,23 @@ function lifecycle(scope, index, thisObj) {
   ).onabort = () => thisObj.onDestroy?.());
 }
 function removeChildNodes(startNode, endNode) {
-  let stop = endNode.nextSibling, current = startNode;
-  for (; current !== stop; ) {
-    let next = current.nextSibling;
-    current.remove(), current = next;
-  }
-}
-function insertChildNodes(parentNode, referenceNode, startNode, endNode) {
-  parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
-}
-function toInsertNode(startNode, endNode) {
-  if (startNode === endNode) return startNode;
-  let parent = new DocumentFragment(), stop = endNode.nextSibling, current = startNode;
-  for (; current !== stop; ) {
-    let next = current.nextSibling;
-    parent.appendChild(current), current = next;
-  }
-  return parent;
-}
-
-// src/dom/scope.ts
-function createScope($global, closestBranch) {
-  let scope = {
-    l: $global.p++,
-    q: 1,
-    k: closestBranch,
-    $global
-  };
-  return pendingScopes.push(scope), scope;
-}
-function skipScope(scope) {
-  return scope.$global.p++;
-}
-function findBranchWithKey(scope, key) {
-  let branch = scope.k;
-  for (; branch && !branch[key]; )
-    branch = branch.u;
-  return branch;
-}
-function destroyBranch(branch) {
-  branch.u?.A?.delete(branch), destroyNestedBranches(branch);
-}
-function destroyNestedBranches(branch) {
-  branch.B = 1, branch.A?.forEach(destroyNestedBranches), branch.K?.forEach((scope) => {
-    for (let id in scope.x)
-      scope.x[id]?.abort();
-  });
-}
-function removeAndDestroyBranch(branch) {
-  destroyBranch(branch), removeChildNodes(branch.h, branch.j);
-}
-function insertBranchBefore(branch, parentNode, nextSibling) {
-  insertChildNodes(
-    parentNode,
-    nextSibling,
-    branch.h,
-    branch.j
-  );
+  let stop = endNode.nextSibling, current = startNode;
+  for (; current !== stop; ) {
+    let next = current.nextSibling;
+    current.remove(), current = next;
+  }
 }
-function tempDetachBranch(branch) {
-  let fragment = new DocumentFragment();
-  fragment.namespaceURI = branch.h.parentNode.namespaceURI, insertChildNodes(fragment, null, branch.h, branch.j);
+function insertChildNodes(parentNode, referenceNode, startNode, endNode) {
+  parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+}
+function toInsertNode(startNode, endNode) {
+  if (startNode === endNode) return startNode;
+  let parent = new DocumentFragment(), stop = endNode.nextSibling, current = startNode;
+  for (; current !== stop; ) {
+    let next = current.nextSibling;
+    parent.appendChild(current), current = next;
+  }
+  return parent;
 }
 
 // src/dom/reconcile.ts
@@ -734,250 +997,6 @@ function longestIncreasingSubsequence(a) {
   return result;
 }
 
-// src/dom/schedule.ts
-var isScheduled, channel;
-function schedule() {
-  isScheduled || (isScheduled = 1, queueMicrotask(flushAndWaitFrame));
-}
-function flushAndWaitFrame() {
-  run(), requestAnimationFrame(triggerMacroTask);
-}
-function triggerMacroTask() {
-  channel || (channel = new MessageChannel(), channel.port1.onmessage = () => {
-    isScheduled = 0, run();
-  }), channel.port2.postMessage(0);
-}
-
-// src/dom/signals.ts
-function state(valueAccessor, fn) {
-  if (0)
-    var id;
-  let valueChangeAccessor = "o" /* TagVariableChange */ + valueAccessor, update = (scope, value2) => {
-    scope[valueAccessor] !== value2 && (scope[valueAccessor] = value2, fn(scope, value2));
-  };
-  return (scope, value2, valueChange) => (rendering ? ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value2 || !(valueAccessor in scope)) && (scope[valueAccessor] = value2, fn(scope, value2)) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value2) : (schedule(), queueRender(
-    scope,
-    update,
-    valueAccessor,
-    value2
-  )), value2);
-}
-function value(valueAccessor, fn = () => {
-}) {
-  return (scope, value2) => {
-    (!(valueAccessor in scope) || scope[valueAccessor] !== value2) && (scope[valueAccessor] = value2, fn(scope, value2));
-  };
-}
-function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
-  return (scope) => {
-    scope.q ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
-  };
-}
-function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
-  let childSignal = closure(valueAccessor, fn), loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
-    let scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [], [firstScope] = scopes;
-    firstScope && queueRender(
-      ownerScope,
-      () => {
-        for (let scope of scopes)
-          !scope.q && !scope.B && childSignal(scope);
-      },
-      -1,
-      0,
-      firstScope.l
-    );
-  };
-  return ownerSignal._ = childSignal, ownerSignal;
-}
-function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
-  let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
-    let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.q && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
-  };
-  return ownerSignal._ = childSignal, ownerSignal;
-}
-function subscribeToScopeSet(ownerScope, accessor, scope) {
-  let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
-  subscribers.has(scope) || (subscribers.add(scope), getAbortSignal(scope, -1).addEventListener(
-    "abort",
-    () => ownerScope[accessor].delete(scope)
-  ));
-}
-function dynamicClosure(...closureSignals) {
-  let [{ E: ___scopeInstancesAccessor, F: ___signalIndexAccessor }] = closureSignals;
-  for (let i = closureSignals.length; i--; )
-    closureSignals[i].L = i;
-  return (scope) => {
-    if (scope[___scopeInstancesAccessor])
-      for (let childScope of scope[___scopeInstancesAccessor])
-        childScope.q || queueRender(
-          childScope,
-          closureSignals[childScope[___signalIndexAccessor]],
-          -1
-        );
-  };
-}
-function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
-  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
-    scope[closureSignal.F] = closureSignal.L, childSignal(scope), subscribeToScopeSet(
-      getOwnerScope ? getOwnerScope(scope) : scope._,
-      closureSignal.E,
-      scope
-    );
-  };
-  return closureSignal.E = "a" /* ClosureScopes */ + valueAccessor, closureSignal.F = "b" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
-}
-function closure(valueAccessor, fn, getOwnerScope) {
-  return (scope) => {
-    fn(
-      scope,
-      (getOwnerScope ? getOwnerScope(scope) : scope._)[valueAccessor]
-    );
-  };
-}
-function setTagVar(scope, childAccessor, tagVarSignal2) {
-  scope[childAccessor].e = (value2) => tagVarSignal2(scope, value2);
-}
-var tagVarSignal = (scope, value2) => scope.e?.(value2);
-function setTagVarChange(scope, changeHandler) {
-  scope.f = changeHandler;
-}
-var tagVarSignalChange = (scope, value2) => scope.f?.(value2), tagIdsByGlobal = /* @__PURE__ */ new WeakMap();
-function nextTagId({ $global }) {
-  let id = tagIdsByGlobal.get($global) || 0;
-  return tagIdsByGlobal.set($global, id + 1), "c" + $global.runtimeId + $global.renderId + id.toString(36);
-}
-function effect(id, fn) {
-  return register(id, fn), (scope) => {
-    queueEffect(scope, fn);
-  };
-}
-function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
-  if (scope)
-    if (Symbol.iterator in scope)
-      for (let s of scope instanceof Map ? scope.values() : scope)
-        yield* traverseAllHoisted(s, path, curIndex);
-    else curIndex ? yield* traverseAllHoisted(scope[path[curIndex]], path, curIndex - 1) : yield scope[path[0]];
-}
-function hoist(...path) {
-  return (scope) => {
-    let getOne = (...args) => iterator().next().value(...args), iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
-    return getOne;
-  };
-}
-
-// src/dom/walker.ts
-var walker = /* @__PURE__ */ document.createTreeWalker(document);
-function walk(startNode, walkCodes, branch) {
-  walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
-}
-function walkInternal(currentWalkIndex, walkCodes, scope) {
-  let value2, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
-  for (; currentWalkIndex < walkCodes.length; )
-    if (value2 = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value2 === 32 /* Get */) {
-      let node = walker.currentNode;
-      scope[currentScopeIndex] = node, scope["j" /* Getter */ + currentScopeIndex++] = () => node;
-    } else if (value2 === 37 /* Replace */ || value2 === 49 /* DynamicTagWithVar */)
-      walker.currentNode.replaceWith(
-        walker.currentNode = scope[currentScopeIndex++] = new Text()
-      ), value2 === 49 /* DynamicTagWithVar */ && (scope[currentScopeIndex++] = skipScope(scope));
-    else {
-      if (value2 === 38 /* EndChild */)
-        return currentWalkIndex;
-      if (value2 === 47 /* BeginChild */ || value2 === 48 /* BeginChildWithVar */)
-        currentWalkIndex = walkInternal(
-          currentWalkIndex,
-          walkCodes,
-          scope[currentScopeIndex++] = createScope(scope.$global, scope.k)
-        ), value2 === 48 /* BeginChildWithVar */ && (scope[currentScopeIndex++] = skipScope(scope));
-      else if (value2 < 92)
-        for (value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */; value2--; )
-          walker.nextNode();
-      else if (value2 < 107)
-        for (value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */; value2--; )
-          walker.nextSibling();
-      else if (value2 < 117) {
-        for (value2 = 10 /* Out */ * currentMultiplier + value2 - 107 /* Out */; value2--; )
-          walker.parentNode();
-        walker.nextSibling();
-      } else
-        storedMultiplier = currentMultiplier * 10 /* Multiplier */ + value2 - 117 /* Multiplier */;
-    }
-}
-
-// src/dom/renderer.ts
-function createBranch($global, renderer, parentScope, parentNode) {
-  let branch = createScope($global), parentBranch = parentScope?.k;
-  return branch._ = renderer.y || parentScope, branch.k = branch, parentBranch && (branch.u = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch)), renderer.C?.(
-    branch,
-    parentNode.namespaceURI
-  ), branch;
-}
-function createAndSetupBranch($global, renderer, parentScope, parentNode) {
-  return setupBranch(
-    renderer,
-    createBranch($global, renderer, parentScope, parentNode)
-  );
-}
-function setupBranch(renderer, branch) {
-  return renderer.D && queueRender(branch, renderer.D, -1), branch;
-}
-function createContent(id, template, walks, setup, params, dynamicScopesAccessor) {
-  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup = setup ? setup._ || setup : void 0, params ||= void 0;
-  let clone = template ? (branch, ns) => {
-    ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
-      template,
-      ns
-    ))(branch, walks);
-  } : (branch) => {
-    walk(
-      branch.h = branch.j = new Text(),
-      walks,
-      branch
-    );
-  };
-  return (owner) => ({
-    l: id,
-    C: clone,
-    y: owner,
-    D: setup,
-    m: params,
-    z: dynamicScopesAccessor
-  });
-}
-function registerContent(id, template, walks, setup, params, dynamicScopesAccessor) {
-  return register(
-    id,
-    createContent(id, template, walks, setup, params, dynamicScopesAccessor)
-  );
-}
-function localClosures(renderer, closureFns) {
-  let closureSignals = {};
-  for (let key in closureFns)
-    closureSignals[key] = value(key, closureFns[key]);
-  return (owner, closureValues) => {
-    let instance = renderer(owner);
-    return instance.G = closureSignals, instance.M = closureValues, instance;
-  };
-}
-function createRenderer(template, walks, setup, params) {
-  return createContent("", template, walks, setup, params)();
-}
-var cloneCache = {};
-function createCloneableHTML(html2, ns) {
-  let { firstChild, lastChild } = parseHTML(html2, ns), parent = document.createElementNS(ns, "t");
-  return insertChildNodes(parent, null, firstChild, lastChild), firstChild === lastChild && firstChild.nodeType < 8 /* Comment */ ? (branch, walks) => {
-    walk(
-      branch.h = branch.j = firstChild.cloneNode(!0),
-      walks,
-      branch
-    );
-  } : (branch, walks) => {
-    let clone = parent.cloneNode(!0);
-    walk(clone.firstChild, walks, branch), branch.h = clone.firstChild, branch.j = clone.lastChild;
-  };
-}
-
 // src/dom/control-flow.ts
 function awaitTag(nodeAccessor, renderer) {
   let promiseAccessor = "n" /* Promise */ + nodeAccessor, branchAccessor = "d" /* ConditionalScope */ + nodeAccessor;
@@ -986,8 +1005,8 @@ function awaitTag(nodeAccessor, renderer) {
       scope,
       "d" /* PlaceholderContent */
     ), awaitBranch = scope[branchAccessor];
-    tryWithPlaceholder ? (placeholderShown.add(pendingEffects), !scope[promiseAccessor] && (tryWithPlaceholder.n = (tryWithPlaceholder.n || 0) + 1) === 1 && requestAnimationFrame(
-      () => tryWithPlaceholder.n && runEffects(
+    tryWithPlaceholder ? (placeholderShown.add(pendingEffects), !scope[promiseAccessor] && (tryWithPlaceholder.o = (tryWithPlaceholder.o || 0) + 1) === 1 && requestAnimationFrame(
+      () => tryWithPlaceholder.o && runEffects(
         prepareEffects(
           () => queueRender(
             tryWithPlaceholder,
@@ -1027,7 +1046,7 @@ function awaitTag(nodeAccessor, renderer) {
               ),
               referenceNode.parentNode,
               referenceNode
-            ), referenceNode.remove()), renderer.m?.(awaitBranch, [data2]), tryWithPlaceholder && (placeholderShown.add(pendingEffects), !--tryWithPlaceholder.n)) {
+            ), referenceNode.remove()), renderer.m?.(awaitBranch, [data2]), tryWithPlaceholder && (placeholderShown.add(pendingEffects), !--tryWithPlaceholder.o)) {
               let placeholderBranch = tryWithPlaceholder.c;
               tryWithPlaceholder.c = 0, placeholderBranch && (placeholderBranch.h.parentNode.insertBefore(
                 tryWithPlaceholder.h.parentNode,
@@ -1039,7 +1058,7 @@ function awaitTag(nodeAccessor, renderer) {
         ));
       },
       (error) => {
-        thisPromise === scope[promiseAccessor] && (tryWithPlaceholder && (tryWithPlaceholder.n = 0), scope[promiseAccessor] = 0, schedule(), queueRender(scope, renderCatch, -1, error));
+        thisPromise === scope[promiseAccessor] && (tryWithPlaceholder && (tryWithPlaceholder.o = 0), scope[promiseAccessor] = 0, schedule(), queueRender(scope, renderCatch, -1, error));
       }
     );
   };
@@ -1063,7 +1082,7 @@ function renderCatch(scope, error) {
   let tryWithCatch = findBranchWithKey(scope, "b" /* CatchContent */);
   if (tryWithCatch) {
     let owner = tryWithCatch._, placeholderBranch = tryWithCatch.c;
-    placeholderBranch && (tryWithCatch.n = 0, owner["d" /* ConditionalScope */ + tryWithCatch.a] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(
+    placeholderBranch && (tryWithCatch.o = 0, owner["d" /* ConditionalScope */ + tryWithCatch.a] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(
       owner,
       tryWithCatch.a,
       tryWithCatch.b,
@@ -1107,15 +1126,15 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             0,
             content,
             createAndSetupBranch
-          ), content.z && subscribeToScopeSet(
-            content.y,
-            content.z,
+          ), content.n && subscribeToScopeSet(
+            content.u,
+            content.n,
             scope[childScopeAccessor]["d" /* ConditionalScope */ + 0]
           );
         }
-      } else normalizedRenderer?.z && subscribeToScopeSet(
-        normalizedRenderer.y,
-        normalizedRenderer.z,
+      } else normalizedRenderer?.n && subscribeToScopeSet(
+        normalizedRenderer.u,
+        normalizedRenderer.n,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1220,14 +1239,14 @@ function queueRender(scope, signal, signalKey, value2, scopeKey = scope.l) {
     existingRender.I = value2;
   else {
     let render = {
-      t: key,
-      o: scope,
+      x: key,
+      p: scope,
       N: signal,
       I: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.t >= 0) break;
+      if (key - parent.x >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -1266,29 +1285,29 @@ 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).t;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).x;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].t - pendingRenders[bestChild].t < 0 && (bestChild = right), pendingRenders[bestChild].t - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].x - pendingRenders[bestChild].x < 0 && (bestChild = right), pendingRenders[bestChild].x - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.o.k?.B || runRender(render);
+    render.p.k?.B || runRender(render);
   }
   for (let scope of pendingScopes)
-    scope.q = 0;
+    scope.t = 0;
   pendingScopes = [];
 }
-var runRender = (render) => render.N(render.o, render.I), enableCatch = () => {
+var runRender = (render) => render.N(render.p, render.I), enableCatch = () => {
   enableCatch = () => {
   }, enableBranches();
   let handlePendingTry = (fn, scope, branch) => {
     for (; branch; ) {
-      if (branch.n)
+      if (branch.o)
         return (branch.H ||= []).push(fn, scope);
-      branch = branch.u;
+      branch = branch.y;
     }
   };
   runEffects = /* @__PURE__ */ ((runEffects2) => (effects, checkPending = placeholderShown.has(effects)) => {
@@ -1302,18 +1321,18 @@ var runRender = (render) => render.N(render.o, render.I), enableCatch = () => {
     try {
       runRender2(render);
     } catch (error) {
-      renderCatch(render.o, error);
+      renderCatch(render.p, error);
     }
   })(runRender);
 };
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.x?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.x[id] = void 0);
+  let ctrl = scope.z?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.z[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.k && (scope.k.K ||= /* @__PURE__ */ new Set()).add(scope), ((scope.x ||= {})[id] ||= new AbortController()).signal;
+  return scope.k && (scope.k.K ||= /* @__PURE__ */ new Set()).add(scope), ((scope.z ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1375,10 +1394,10 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = 1 : (out.global.p ||= 0, branch = component.scope = createAndSetupBranch(
+      branch ? existing = 1 : (out.global.q ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
-        renderer.y,
+        renderer.u,
         document.body
       )), renderer.m?.(branch, renderer._ ? args[0] : args);
     }), !existing)
@@ -1400,12 +1419,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 = {
-    p: 0,
+    q: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global
   }) : $global = {
-    p: 0,
+    q: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   }, position) {
@@ -1458,6 +1477,7 @@ export {
   attrTag,
   attrTags,
   attrs,
+  attrsAndContent,
   attrsEvents,
   awaitTag,
   classAttr,
@@ -1495,6 +1515,7 @@ export {
   hoist,
   html,
   init,
+  insertContent,
   intersection,
   lifecycle,
   localClosures,
@@ -1506,6 +1527,7 @@ export {
   nodeRef,
   on,
   partialAttrs,
+  partialAttrsAndContent,
   props,
   register,
   registerBoundSignal,