marko 6.0.119 → 6.0.120

package/dist/dom.js

@@ -179,7 +179,7 @@ function normalizeDynamicRenderer(value) {
   if (value) {
     if (typeof value == "string") return value;
     let normalized = value.content || value.default || value;
-    if (/* @__KEY__ */ "g" in normalized)
+    if (/* @__KEY__ */ "f" in normalized)
       return normalized;
   }
 }
@@ -237,6 +237,13 @@ function stripSpacesAndPunctuation(str) {
   return str.replace(/[^\p{L}\p{N}]/gu, "");
 }
 
+// src/dom/parse-html.ts
+var parsers = {};
+function parseHTML(html, ns) {
+  let parser = parsers[ns] ||= document.createElementNS(ns, "template");
+  return parser.innerHTML = html, parser.content || parser;
+}
+
 // src/dom/scope.ts
 var nextScopeId = 1e6;
 function createScope($global, closestBranch) {
@@ -292,6 +299,133 @@ function tempDetachBranch(branch) {
   );
 }
 
+// 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 _let(id, fn) {
+  let valueAccessor = decodeAccessor(id), valueChangeAccessor = "M" /* TagVariableChange */ + valueAccessor;
+  return (scope, value, valueChange) => (rendering ? ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.H) && (scope[valueAccessor] = value, fn?.(scope)) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value) : scope[valueAccessor] !== (scope[valueAccessor] = value) && fn && (schedule(), queueRender(scope, fn, id)), value);
+}
+function _const(valueAccessor, fn) {
+  return valueAccessor = decodeAccessor(valueAccessor), (scope, value) => {
+    (!(valueAccessor in scope) || scope[valueAccessor] !== value) && (scope[valueAccessor] = value, fn?.(scope));
+  };
+}
+function _or(id, fn, defaultPending = 1, scopeIdAccessor = "L" /* Id */) {
+  return (scope) => {
+    scope.H ? id in scope ? --scope[id] || fn(scope) : scope[id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+  };
+}
+function _for_closure(ownerLoopNodeAccessor, fn) {
+  ownerLoopNodeAccessor = decodeAccessor(ownerLoopNodeAccessor);
+  let scopeAccessor = "A" /* BranchScopes */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
+    let scopes = toArray(ownerScope[scopeAccessor]);
+    scopes.length && queueRender(
+      ownerScope,
+      () => {
+        for (let scope of scopes)
+          !scope.H && !scope.I && fn(scope);
+      },
+      -1,
+      0,
+      scopes[0].L
+    );
+  };
+  return ownerSignal._ = fn, ownerSignal;
+}
+function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
+  ownerConditionalNodeAccessor = decodeAccessor(
+    ownerConditionalNodeAccessor
+  );
+  let scopeAccessor = "A" /* BranchScopes */ + ownerConditionalNodeAccessor, branchAccessor = "D" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
+    let ifScope = scope[scopeAccessor];
+    ifScope && !ifScope.H && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, fn, -1);
+  };
+  return ownerSignal._ = fn, ownerSignal;
+}
+function subscribeToScopeSet(ownerScope, accessor, scope) {
+  let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
+  subscribers.has(scope) || (subscribers.add(scope), $signal(scope, -1).addEventListener(
+    "abort",
+    () => ownerScope[accessor].delete(scope)
+  ));
+}
+function _closure(...closureSignals) {
+  let [{ k: ___scopeInstancesAccessor, l: ___signalIndexAccessor }] = closureSignals;
+  for (let i = closureSignals.length; i--; )
+    closureSignals[i].q = i;
+  return (scope) => {
+    if (scope[___scopeInstancesAccessor])
+      for (let childScope of scope[___scopeInstancesAccessor])
+        childScope.H || queueRender(
+          childScope,
+          closureSignals[childScope[___signalIndexAccessor]],
+          -1
+        );
+  };
+}
+function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
+  valueAccessor = decodeAccessor(valueAccessor);
+  let closureSignal = ((scope) => {
+    scope[closureSignal.l] = closureSignal.q, fn(scope), subscribeToScopeSet(
+      getOwnerScope ? getOwnerScope(scope) : scope._,
+      closureSignal.k,
+      scope
+    );
+  });
+  return closureSignal.k = "B" /* ClosureScopes */ + valueAccessor, closureSignal.l = "C" /* ClosureSignalIndex */ + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
+}
+function _child_setup(setup) {
+  return setup._ = (scope, owner) => {
+    scope._ = owner, queueRender(scope, setup, -1);
+  }, setup;
+}
+function _var(scope, childAccessor, signal) {
+  scope[decodeAccessor(childAccessor)].T = (value) => signal(scope, value);
+}
+var _return = (scope, value) => scope.T?.(value);
+function _return_change(scope, changeHandler) {
+  changeHandler && (scope.U = changeHandler);
+}
+var _var_change = (scope, value) => scope.U?.(value), tagIdsByGlobal = /* @__PURE__ */ new WeakMap();
+function _id({ ["$" /* Global */]: $global }) {
+  let id = tagIdsByGlobal.get($global) || 0;
+  return tagIdsByGlobal.set($global, id + 1), "c" + $global.runtimeId + $global.renderId + id.toString(36);
+}
+function _script(id, fn) {
+  return _resume(id, fn), (scope) => {
+    queueEffect(scope, fn);
+  };
+}
+function _el_read(value) {
+  return rendering && void 0, value;
+}
+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 path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (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) {
@@ -334,6 +468,79 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
     }
 }
 
+// src/dom/renderer.ts
+function createBranch($global, renderer, parentScope, parentNode) {
+  let branch = createScope($global);
+  return branch._ = renderer.e || parentScope, setParentBranch(branch, parentScope?.F), renderer.h?.(
+    branch,
+    parentNode.namespaceURI
+  ), branch;
+}
+function setParentBranch(branch, parentBranch) {
+  parentBranch && (branch.N = parentBranch, (parentBranch.D ||= /* @__PURE__ */ new Set()).add(branch)), branch.F = branch;
+}
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  return setupBranch(
+    renderer,
+    createBranch($global, renderer, parentScope, parentNode)
+  );
+}
+function setupBranch(renderer, branch) {
+  return renderer.j && queueRender(branch, renderer.j, -1), branch;
+}
+function _content(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.S = branch.K = new Text(),
+      walks,
+      branch
+    );
+  };
+  return (owner) => ({
+    f: id,
+    h: clone,
+    e: owner,
+    j: setup,
+    b: params,
+    d: dynamicScopesAccessor
+  });
+}
+function _content_resume(id, template, walks, setup, params, dynamicScopesAccessor) {
+  return _resume(
+    id,
+    _content(id, template, walks, setup, params, dynamicScopesAccessor)
+  );
+}
+function _content_closures(renderer, closureFns) {
+  let closureSignals = {};
+  for (let key in closureFns)
+    closureSignals[key] = _const(+key, closureFns[key]);
+  return (owner, closureValues) => {
+    let instance = renderer(owner);
+    return instance.n = closureSignals, instance.t = closureValues, instance;
+  };
+}
+var cloneCache = {};
+function createCloneableHTML(html, ns) {
+  let { firstChild, lastChild } = parseHTML(html, ns), parent = document.createElementNS(ns, "t");
+  return insertChildNodes(parent, null, firstChild, lastChild), firstChild === lastChild && firstChild.nodeType < 8 /* Comment */ ? (branch, walks) => {
+    walk(
+      branch.S = branch.K = firstChild.cloneNode(!0),
+      walks,
+      branch
+    );
+  } : (branch, walks) => {
+    let clone = parent.cloneNode(!0);
+    walk(clone.firstChild, walks, branch), branch.S = clone.firstChild, branch.K = clone.lastChild;
+  };
+}
+
 // src/dom/resume.ts
 var registeredValues = {}, branchesEnabled;
 function enableBranches() {
@@ -345,7 +552,7 @@ function init(runtimeId = "M") {
       value: resumeRender = ((renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+        }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
           for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
             /* read accessor */
           )] = /* @__PURE__ */ ((node) => () => node)(
@@ -357,7 +564,7 @@ function init(runtimeId = "M") {
               branch = scopeLookup[branchId] ||= {
                 L: branchId
               }
-            ), branch.F = branch, singleNode) {
+            ), setParentBranch(branch, branch.F), (branch.O = render.p?.[branchId]) && (branch.O.m = render.m), singleNode) {
               for (; startVisit.previousSibling && ~visits.indexOf(
                 startVisit = startVisit.previousSibling
               ); ) ;
@@ -365,9 +572,7 @@ function init(runtimeId = "M") {
             } else
               curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
             for (; i && orphanBranches[--i].L > branchId; )
-              (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
-                childBranch
-              );
+              setParentBranch(orphanBranches.pop(), branch);
             nextToken(
               /* read optional next branchId */
             );
@@ -621,210 +826,6 @@ function toValueProp(it) {
   return it.value;
 }
 
-// src/dom/parse-html.ts
-var parsers = {};
-function parseHTML(html, ns) {
-  let parser = parsers[ns] ||= document.createElementNS(ns, "template");
-  return parser.innerHTML = html, parser.content || parser;
-}
-
-// 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 _let(id, fn) {
-  let valueAccessor = decodeAccessor(id), valueChangeAccessor = "M" /* TagVariableChange */ + valueAccessor;
-  return (scope, value, valueChange) => (rendering ? ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.H) && (scope[valueAccessor] = value, fn?.(scope)) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value) : scope[valueAccessor] !== (scope[valueAccessor] = value) && fn && (schedule(), queueRender(scope, fn, id)), value);
-}
-function _const(valueAccessor, fn) {
-  return valueAccessor = decodeAccessor(valueAccessor), (scope, value) => {
-    (!(valueAccessor in scope) || scope[valueAccessor] !== value) && (scope[valueAccessor] = value, fn?.(scope));
-  };
-}
-function _or(id, fn, defaultPending = 1, scopeIdAccessor = "L" /* Id */) {
-  return (scope) => {
-    scope.H ? id in scope ? --scope[id] || fn(scope) : scope[id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
-  };
-}
-function _for_closure(ownerLoopNodeAccessor, fn) {
-  ownerLoopNodeAccessor = decodeAccessor(ownerLoopNodeAccessor);
-  let scopeAccessor = "A" /* BranchScopes */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
-    let scopes = toArray(ownerScope[scopeAccessor]);
-    scopes.length && queueRender(
-      ownerScope,
-      () => {
-        for (let scope of scopes)
-          !scope.H && !scope.I && fn(scope);
-      },
-      -1,
-      0,
-      scopes[0].L
-    );
-  };
-  return ownerSignal._ = fn, ownerSignal;
-}
-function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
-  ownerConditionalNodeAccessor = decodeAccessor(
-    ownerConditionalNodeAccessor
-  );
-  let scopeAccessor = "A" /* BranchScopes */ + ownerConditionalNodeAccessor, branchAccessor = "D" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
-    let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.H && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, fn, -1);
-  };
-  return ownerSignal._ = fn, ownerSignal;
-}
-function subscribeToScopeSet(ownerScope, accessor, scope) {
-  let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
-  subscribers.has(scope) || (subscribers.add(scope), $signal(scope, -1).addEventListener(
-    "abort",
-    () => ownerScope[accessor].delete(scope)
-  ));
-}
-function _closure(...closureSignals) {
-  let [{ l: ___scopeInstancesAccessor, n: ___signalIndexAccessor }] = closureSignals;
-  for (let i = closureSignals.length; i--; )
-    closureSignals[i].t = i;
-  return (scope) => {
-    if (scope[___scopeInstancesAccessor])
-      for (let childScope of scope[___scopeInstancesAccessor])
-        childScope.H || queueRender(
-          childScope,
-          closureSignals[childScope[___signalIndexAccessor]],
-          -1
-        );
-  };
-}
-function _closure_get(valueAccessor, fn, getOwnerScope) {
-  valueAccessor = decodeAccessor(valueAccessor);
-  let closureSignal = ((scope) => {
-    scope[closureSignal.n] = closureSignal.t, fn(scope), subscribeToScopeSet(
-      getOwnerScope ? getOwnerScope(scope) : scope._,
-      closureSignal.l,
-      scope
-    );
-  });
-  return closureSignal.l = "B" /* ClosureScopes */ + valueAccessor, closureSignal.n = "C" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
-}
-function _child_setup(setup) {
-  return setup._ = (scope, owner) => {
-    scope._ = owner, queueRender(scope, setup, -1);
-  }, setup;
-}
-function _var(scope, childAccessor, signal) {
-  scope[decodeAccessor(childAccessor)].T = (value) => signal(scope, value);
-}
-var _return = (scope, value) => scope.T?.(value);
-function _return_change(scope, changeHandler) {
-  changeHandler && (scope.U = changeHandler);
-}
-var _var_change = (scope, value) => scope.U?.(value), tagIdsByGlobal = /* @__PURE__ */ new WeakMap();
-function _id({ ["$" /* Global */]: $global }) {
-  let id = tagIdsByGlobal.get($global) || 0;
-  return tagIdsByGlobal.set($global, id + 1), "c" + $global.runtimeId + $global.renderId + id.toString(36);
-}
-function _script(id, fn) {
-  return _resume(id, fn), (scope) => {
-    queueEffect(scope, fn);
-  };
-}
-function _el_read(value) {
-  return rendering && void 0, value;
-}
-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 path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (scope) => {
-    let getOne = (...args) => iterator().next().value?.(...args), iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
-    return getOne;
-  };
-}
-
-// src/dom/renderer.ts
-function createBranch($global, renderer, parentScope, parentNode) {
-  let branch = createScope($global), parentBranch = parentScope?.F;
-  return branch._ = renderer.e || parentScope, branch.F = branch, parentBranch && (branch.N = parentBranch, (parentBranch.D ||= /* @__PURE__ */ new Set()).add(branch)), renderer.h?.(
-    branch,
-    parentNode.namespaceURI
-  ), branch;
-}
-function createAndSetupBranch($global, renderer, parentScope, parentNode) {
-  return setupBranch(
-    renderer,
-    createBranch($global, renderer, parentScope, parentNode)
-  );
-}
-function setupBranch(renderer, branch) {
-  return renderer.j && queueRender(branch, renderer.j, -1), branch;
-}
-function _content(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.S = branch.K = new Text(),
-      walks,
-      branch
-    );
-  };
-  return (owner) => ({
-    g: id,
-    h: clone,
-    e: owner,
-    j: setup,
-    a: params,
-    b: dynamicScopesAccessor
-  });
-}
-function _content_resume(id, template, walks, setup, params, dynamicScopesAccessor) {
-  return _resume(
-    id,
-    _content(id, template, walks, setup, params, dynamicScopesAccessor)
-  );
-}
-function _content_closures(renderer, closureFns) {
-  let closureSignals = {};
-  for (let key in closureFns)
-    closureSignals[key] = _const(+key, closureFns[key]);
-  return (owner, closureValues) => {
-    let instance = renderer(owner);
-    return instance.o = closureSignals, instance.u = closureValues, instance;
-  };
-}
-var cloneCache = {};
-function createCloneableHTML(html, ns) {
-  let { firstChild, lastChild } = parseHTML(html, ns), parent = document.createElementNS(ns, "t");
-  return insertChildNodes(parent, null, firstChild, lastChild), firstChild === lastChild && firstChild.nodeType < 8 /* Comment */ ? (branch, walks) => {
-    walk(
-      branch.S = branch.K = firstChild.cloneNode(!0),
-      walks,
-      branch
-    );
-  } : (branch, walks) => {
-    let clone = parent.cloneNode(!0);
-    walk(clone.firstChild, walks, branch), branch.S = clone.firstChild, branch.K = clone.lastChild;
-  };
-}
-
 // src/dom/dom.ts
 function _to_text(value) {
   return value || value === 0 ? value + "" : "";
@@ -967,9 +968,9 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
 }
 function _attr_content(scope, nodeAccessor, value) {
   let content = normalizeClientRender(value), rendererAccessor = "D" /* ConditionalRenderer */ + nodeAccessor;
-  scope[rendererAccessor] !== (scope[rendererAccessor] = content?.g) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.b && subscribeToScopeSet(
+  scope[rendererAccessor] !== (scope[rendererAccessor] = content?.f) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.d && subscribeToScopeSet(
     content.e,
-    content.b,
+    content.d,
     scope["A" /* BranchScopes */ + nodeAccessor]
   ));
 }
@@ -1009,7 +1010,7 @@ function _html(scope, value, accessor) {
 }
 function normalizeClientRender(value) {
   let renderer = normalizeDynamicRenderer(value);
-  if (renderer && renderer.g)
+  if (renderer && renderer.f)
     return renderer;
 }
 function normalizeAttrValue(value) {
@@ -1121,93 +1122,102 @@ function longestIncreasingSubsequence(a) {
 // src/dom/control-flow.ts
 function _await_promise(nodeAccessor, params) {
   nodeAccessor = decodeAccessor(nodeAccessor);
-  let promiseAccessor = "L" /* Promise */ + nodeAccessor, branchAccessor = "A" /* BranchScopes */ + nodeAccessor, rendererAccessor = "D" /* ConditionalRenderer */ + nodeAccessor;
+  let promiseAccessor = "L" /* Promise */ + nodeAccessor, branchAccessor = "A" /* BranchScopes */ + nodeAccessor;
   return _enable_catch(), (scope, promise) => {
-    let awaitCounter, renderData, tryWithPlaceholder = findBranchWithKey(
-      scope,
-      "Q" /* PlaceholderContent */
-    );
-    tryWithPlaceholder ? (renderData = self[tryWithPlaceholder.$.runtimeId]?.[tryWithPlaceholder.$.renderId], awaitCounter = tryWithPlaceholder.O ||= renderData?.p?.[tryWithPlaceholder.L], awaitCounter?.i || (awaitCounter = tryWithPlaceholder.O = {
-      d: 1,
+    let awaitBranch = scope[branchAccessor], tryBranch = findBranchWithKey(scope, "Q" /* PlaceholderContent */) || awaitBranch, awaitCounter = tryBranch.O;
+    awaitCounter?.i || (awaitCounter = tryBranch.O = {
       i: 0,
       c() {
-        if (!--awaitCounter.i) {
-          let placeholderBranch = tryWithPlaceholder.P;
-          tryWithPlaceholder.P = 0, placeholderBranch && (placeholderBranch.S.parentNode.insertBefore(
-            tryWithPlaceholder.S.parentNode,
+        if (--awaitCounter.i) return 1;
+        if (tryBranch === scope[branchAccessor])
+          scope[nodeAccessor].parentNode && scope[nodeAccessor].replaceWith(
+            scope[branchAccessor].S.parentNode
+          );
+        else {
+          let placeholderBranch = tryBranch.P;
+          placeholderBranch && (tryBranch.P = 0, placeholderBranch.S.parentNode.insertBefore(
+            tryBranch.S.parentNode,
             placeholderBranch.S
-          ), removeAndDestroyBranch(placeholderBranch)), queueEffect(tryWithPlaceholder, (scope2) => {
-            let pendingEffects2 = scope2.J;
-            pendingEffects2 && (scope2.J = [], runEffects(pendingEffects2, !0));
-          });
+          ), removeAndDestroyBranch(placeholderBranch));
         }
+        queueEffect(tryBranch, (scope2) => {
+          let pendingEffects2 = scope2.J;
+          pendingEffects2 && (scope2.J = [], runEffects(pendingEffects2, 1));
+        });
       }
-    }), placeholderShown.add(pendingEffects), !scope[promiseAccessor] && !awaitCounter.i++ && requestAnimationFrame(
+    }), placeholderShown.add(pendingEffects), scope[promiseAccessor] || (awaitBranch && (awaitBranch.W ||= []), awaitCounter.i++ || requestAnimationFrame(
       () => awaitCounter.i && runEffects(
         prepareEffects(
           () => queueRender(
-            tryWithPlaceholder,
+            tryBranch === awaitBranch ? scope : tryBranch,
             () => {
-              insertBranchBefore(
-                tryWithPlaceholder.P = createAndSetupBranch(
+              tryBranch.Q ? (insertBranchBefore(
+                tryBranch.P = createAndSetupBranch(
                   scope.$,
-                  tryWithPlaceholder.Q,
-                  tryWithPlaceholder._,
-                  tryWithPlaceholder.S.parentNode
+                  tryBranch.Q,
+                  tryBranch._,
+                  tryBranch.S.parentNode
                 ),
-                tryWithPlaceholder.S.parentNode,
-                tryWithPlaceholder.S
-              ), tempDetachBranch(tryWithPlaceholder);
+                tryBranch.S.parentNode,
+                tryBranch.S
+              ), tempDetachBranch(tryBranch)) : awaitBranch.V || (awaitBranch.S.parentNode.insertBefore(
+                scope[nodeAccessor],
+                awaitBranch.S
+              ), tempDetachBranch(tryBranch));
             },
             -1
           )
         )
       )
-    )) : scope[branchAccessor] && !scope[promiseAccessor] && (scope[branchAccessor].S.parentNode.insertBefore(
-      scope[nodeAccessor],
-      scope[branchAccessor].S
-    ), tempDetachBranch(scope[branchAccessor]));
+    ));
     let thisPromise = scope[promiseAccessor] = promise.then(
       (data) => {
-        thisPromise === scope[promiseAccessor] && (scope[promiseAccessor] = 0, schedule(), queueRender(
-          scope,
-          () => {
-            if (scope[branchAccessor] ? tryWithPlaceholder || scope[nodeAccessor].replaceWith(
-              scope[branchAccessor].S.parentNode
-            ) : (insertBranchBefore(
-              scope[branchAccessor] = createAndSetupBranch(
-                scope.$,
-                scope[rendererAccessor],
-                scope,
-                scope[nodeAccessor].parentNode
-              ),
-              scope[nodeAccessor].parentNode,
-              scope[nodeAccessor]
-            ), scope[nodeAccessor].remove()), params?.(scope[branchAccessor], [data]), awaitCounter && (placeholderShown.add(pendingEffects), awaitCounter.c(), !awaitCounter.d)) {
-              let fnScopes = /* @__PURE__ */ new Map(), effects = renderData.m();
-              for (let i = 0; i < pendingEffects.length; ) {
-                let fn = pendingEffects[i++], scopes = fnScopes.get(fn);
-                scopes || fnScopes.set(fn, scopes = /* @__PURE__ */ new Set()), scopes.add(pendingEffects[i++]);
-              }
-              for (let i = 0; i < effects.length; ) {
-                let fn = effects[i++], scope2 = effects[i++];
-                fnScopes.get(fn)?.has(scope2) || queueEffect(scope2, fn);
+        if (thisPromise === scope[promiseAccessor]) {
+          let referenceNode = scope[nodeAccessor];
+          scope[promiseAccessor] = 0, queueMicrotask(run), queueRender(
+            scope,
+            () => {
+              (awaitBranch = scope[branchAccessor]).V && (pendingScopes.push(awaitBranch), setupBranch(
+                awaitBranch.V,
+                awaitBranch
+              ), awaitBranch.V = 0, insertBranchBefore(
+                awaitBranch,
+                scope[nodeAccessor].parentNode,
+                scope[nodeAccessor]
+              ), referenceNode.remove()), params?.(awaitBranch, [data]);
+              let pendingRenders2 = awaitBranch.W;
+              if (awaitBranch.W = 0, pendingRenders2?.forEach(queuePendingRender), placeholderShown.add(pendingEffects), awaitCounter.c(), awaitCounter.m) {
+                let fnScopes = /* @__PURE__ */ new Map(), effects = awaitCounter.m();
+                for (let i = 0; i < pendingEffects.length; ) {
+                  let fn = pendingEffects[i++], scopes = fnScopes.get(fn);
+                  scopes || fnScopes.set(fn, scopes = /* @__PURE__ */ new Set()), scopes.add(pendingEffects[i++]);
+                }
+                for (let i = 0; i < effects.length; ) {
+                  let fn = effects[i++], scope2 = effects[i++];
+                  fnScopes.get(fn)?.has(scope2) || queueEffect(scope2, fn);
+                }
               }
-            }
-          },
-          -1
-        ));
+            },
+            -1
+          );
+        }
       },
       (error) => {
-        thisPromise === scope[promiseAccessor] && (awaitCounter && (awaitCounter.i = 0), scope[promiseAccessor] = 0, schedule(), queueRender(scope, renderCatch, -1, error));
+        thisPromise === scope[promiseAccessor] && (awaitCounter.i = scope[promiseAccessor] = 0, schedule(), queueRender(scope, renderCatch, -1, error));
       }
     );
   };
 }
 function _await_content(nodeAccessor, template, walks, setup) {
-  let rendererAccessor = "D" /* ConditionalRenderer */ + decodeAccessor(nodeAccessor), renderer = _content("", template, walks, setup)();
+  nodeAccessor = decodeAccessor(nodeAccessor);
+  let branchAccessor = "A" /* BranchScopes */ + nodeAccessor, renderer = _content("", template, walks, setup)();
   return (scope) => {
-    scope[rendererAccessor] = renderer;
+    (scope[branchAccessor] = createBranch(
+      scope.$,
+      renderer,
+      scope,
+      scope[nodeAccessor].parentNode
+    )).V = renderer, pendingScopes.pop();
   };
 }
 function _try(nodeAccessor, template, walks, setup) {
@@ -1235,7 +1245,7 @@ function renderCatch(scope, error) {
       tryWithCatch.C,
       tryWithCatch.E,
       createAndSetupBranch
-    ), tryWithCatch.E.a?.(
+    ), tryWithCatch.E.b?.(
       owner["A" /* BranchScopes */ + tryWithCatch.C],
       [error]
     );
@@ -1271,7 +1281,7 @@ var _dynamic_tag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
   let childScopeAccessor = "A" /* BranchScopes */ + nodeAccessor, rendererAccessor = "D" /* ConditionalRenderer */ + nodeAccessor;
   return enableBranches(), (scope, newRenderer, getInput) => {
     let normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.g || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
+    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.f || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
       if (setConditionalRenderer(
         scope,
         nodeAccessor,
@@ -1285,15 +1295,15 @@ var _dynamic_tag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             "a",
             content,
             createAndSetupBranch
-          ), content.b && subscribeToScopeSet(
+          ), content.d && subscribeToScopeSet(
             content.e,
-            content.b,
+            content.d,
             scope[childScopeAccessor]["Aa"]
           );
         }
-      } else normalizedRenderer?.b && subscribeToScopeSet(
+      } else normalizedRenderer?.d && subscribeToScopeSet(
         normalizedRenderer.e,
-        normalizedRenderer.b,
+        normalizedRenderer.d,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1305,20 +1315,20 @@ var _dynamic_tag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
           (inputIsArgs ? args[0] : args) || {}
         ), (childScope["Ia"] || childScope["Ea"]) && queueEffect(childScope, dynamicTagScript);
       else {
-        for (let accessor in normalizedRenderer.o)
-          normalizedRenderer.o[accessor](
+        for (let accessor in normalizedRenderer.n)
+          normalizedRenderer.n[accessor](
             childScope,
-            normalizedRenderer.u[accessor]
+            normalizedRenderer.t[accessor]
           );
-        if (normalizedRenderer.a)
+        if (normalizedRenderer.b)
           if (inputIsArgs)
-            normalizedRenderer.a(
+            normalizedRenderer.b(
               childScope,
               normalizedRenderer._ ? args[0] : args
             );
           else {
             let inputWithContent = getContent ? { ...args, content: getContent(scope) } : args || {};
-            normalizedRenderer.a(
+            normalizedRenderer.b(
               childScope,
               normalizedRenderer._ ? inputWithContent : [inputWithContent]
             );
@@ -1402,45 +1412,47 @@ function byFirstArg(name) {
 }
 
 // src/dom/queue.ts
-var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingScopes = [], rendering, scopeKeyOffset = 1e3;
+var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), asyncRendersLookup, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingScopes = [], rendering, scopeKeyOffset = 1e3;
 function queueRender(scope, signal, signalKey, value, scopeKey = scope.L) {
-  let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
-  if (existingRender)
-    existingRender.q = value;
-  else {
-    let render = {
-      f: key,
-      k: scope,
-      x: signal,
-      q: value
-    }, i = pendingRenders.push(render) - 1;
-    for (; i; ) {
-      let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.f >= 0) break;
-      pendingRenders[i] = parent, i = parentIndex;
+  let key = scopeKey * scopeKeyOffset + signalKey, render = signalKey >= 0 && pendingRendersLookup.get(key);
+  render ? render.o = value : (queuePendingRender(
+    render = {
+      a: key,
+      g: scope,
+      u: signal,
+      o: value
     }
-    signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
+  ), signalKey >= 0 && pendingRendersLookup.set(key, render));
+}
+function queuePendingRender(render) {
+  let i = pendingRenders.push(render) - 1;
+  for (; i; ) {
+    let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
+    if (render.a - parent.a >= 0) break;
+    pendingRenders[i] = parent, i = parentIndex;
   }
+  pendingRenders[i] = render;
 }
 function queueEffect(scope, fn) {
   pendingEffects.push(fn, scope);
 }
 function run() {
   let effects = pendingEffects;
+  asyncRendersLookup = /* @__PURE__ */ new Map();
   try {
     rendering = 1, runRenders();
   } finally {
-    pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendingEffects = [], rendering = 0;
+    pendingRendersLookup = asyncRendersLookup, asyncRendersLookup = rendering = 0, pendingRenders = [], pendingEffects = [];
   }
   runEffects(effects);
 }
 function prepareEffects(fn) {
-  let prevRenders = pendingRenders, prevRendersLookup = pendingRendersLookup, prevEffects = pendingEffects, preparedEffects = pendingEffects = [];
-  pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map();
+  let prevRenders = pendingRenders, prevEffects = pendingEffects, prevLookup = asyncRendersLookup, preparedEffects = pendingEffects = [];
+  pendingRenders = [], asyncRendersLookup = pendingRendersLookup, pendingRendersLookup = /* @__PURE__ */ new Map();
   try {
     rendering = 1, fn(), runRenders();
   } finally {
-    rendering = 0, pendingRenders = prevRenders, pendingRendersLookup = prevRendersLookup, pendingEffects = prevEffects;
+    rendering = 0, pendingRendersLookup = asyncRendersLookup, asyncRendersLookup = prevLookup, pendingRenders = prevRenders, pendingEffects = prevEffects;
   }
   return preparedEffects;
 }
@@ -1452,22 +1464,22 @@ 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).f;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).a;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].f - pendingRenders[bestChild].f < 0 && (bestChild = right), pendingRenders[bestChild].f - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].a - pendingRenders[bestChild].a < 0 && (bestChild = right), pendingRenders[bestChild].a - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.k.F?.I || runRender(render);
+    render.g.F?.I || runRender(render);
   }
   for (let scope of pendingScopes)
     scope.H = 0;
   pendingScopes = [];
 }
-var runRender = (render) => render.x(render.k, render.q), _enable_catch = () => {
+var runRender = (render) => render.u(render.g, render.o), _enable_catch = () => {
   _enable_catch = () => {
   }, enableBranches();
   let handlePendingTry = (fn, scope, branch) => {
@@ -1486,9 +1498,18 @@ var runRender = (render) => render.x(render.k, render.q), _enable_catch = () =>
       runEffects2(effects);
   })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {
     try {
+      let branch = render.g.F;
+      for (; branch; ) {
+        if (branch.W)
+          return asyncRendersLookup.set(
+            render.a,
+            render
+          ), branch.W.push(render);
+        branch = branch.N;
+      }
       runRender2(render);
     } catch (error) {
-      renderCatch(render.k, error);
+      renderCatch(render.g, error);
     }
   })(runRender);
 };
@@ -1561,7 +1582,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         renderer,
         renderer.e,
         document.body
-      )), renderer.a?.(branch, renderer._ ? args[0] : args);
+      )), renderer.b?.(branch, renderer._ ? args[0] : args);
     }), created)
       return toInsertNode(
         branch.S,
@@ -1601,7 +1622,7 @@ function mount(input = {}, reference, position) {
       parentNode = reference.parentNode, nextSibling = reference.nextSibling;
       break;
   }
-  let curValue, args = this.a, effects = prepareEffects(() => {
+  let curValue, args = this.b, effects = prepareEffects(() => {
     branch = createBranch(
       $global,
       this,