marko 6.0.112 → 6.0.114

package/dist/dom.mjs

@@ -76,7 +76,7 @@ function normalizeDynamicRenderer(value) {
   if (value) {
     if (typeof value == "string") return value;
     let normalized = value.content || value.default || value;
-    if (/* @__KEY__ */ "e" in normalized)
+    if (/* @__KEY__ */ "g" in normalized)
       return normalized;
   }
 }
@@ -272,35 +272,30 @@ function init(runtimeId = "M") {
           endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0])), visitType === "[" /* BranchStart */ && (endedBranches || (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit));
         })(), $global, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, lastScopeId = 0, nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
-          // eslint-disable-next-line no-cond-assign
-          (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
+          (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1 || visitText.length + 1) - 1
         );
-        return render.w = (effects = []) => {
-          try {
-            walk2(), isResuming = 1;
-            for (let serialized of resumes = render.r || [])
-              if (typeof serialized == "string")
-                lastEffect = serialized;
-              else if (typeof serialized == "number")
-                effects.push(
-                  registeredValues[lastEffect],
-                  scopeLookup[serialized] ||= {
-                    L: serialized
+        return render.m = (effects = []) => {
+          for (let serialized of resumes = render.r || [])
+            if (typeof serialized == "string")
+              for (lastTokenIndex = 0, visitText = serialized; nextToken(); )
+                /\D/.test(lastToken) ? lastEffect = registeredValues[lastToken] : effects.push(
+                  lastEffect,
+                  scopeLookup[lastToken] ||= {
+                    L: +lastToken
                   }
                 );
-              else
-                for (let scope of serialized(serializeContext))
-                  $global ? typeof scope == "number" ? lastScopeId += scope : (scopeLookup[scope.L = ++lastScopeId] = scope, scope.$ = $global, branchesEnabled && (scope.F = scopeLookup[scope.G])) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId);
-            for (visit of visits = render.v)
-              lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = scopeLookup[+nextToken(
-                /* read scope id */
-              )] ||= {
-                L: +lastToken
-              }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
-            runEffects(effects);
-          } finally {
-            isResuming = visits.length = resumes.length = 0;
-          }
+            else
+              for (let scope of serialized(serializeContext))
+                $global ? typeof scope == "number" ? lastScopeId += scope : (scopeLookup[scope.L = ++lastScopeId] = scope, scope.$ = $global, branchesEnabled && (scope.F = scopeLookup[scope.G])) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId);
+          for (visit of visits = render.v)
+            lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = scopeLookup[+nextToken(
+              /* read scope id */
+            )] ||= {
+              L: +lastToken
+            }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
+          return visits.length = resumes.length = 0, effects;
+        }, render.w = () => {
+          walk2(), runResumeEffects(render);
         }, render;
       })
     });
@@ -308,7 +303,7 @@ function init(runtimeId = "M") {
   if (renders) {
     initRuntime(renders);
     for (let renderId in renders)
-      resumeRender(renderId).w();
+      runResumeEffects(resumeRender(renderId));
   } else
     defineRuntime({
       configurable: !0,
@@ -316,6 +311,13 @@ function init(runtimeId = "M") {
     });
 }
 var isResuming;
+function runResumeEffects(render) {
+  try {
+    isResuming = 1, runEffects(render.m(), 1);
+  } finally {
+    isResuming = 0;
+  }
+}
 function getRegisteredWithScope(id, scope) {
   let val = registeredValues[id];
   return scope ? val(scope) : val;
@@ -587,9 +589,9 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
   ));
 }
 function _closure(...closureSignals) {
-  let [{ j: ___scopeInstancesAccessor, k: ___signalIndexAccessor }] = closureSignals;
+  let [{ l: ___scopeInstancesAccessor, n: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].n = i;
+    closureSignals[i].t = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
@@ -603,13 +605,13 @@ function _closure(...closureSignals) {
 function _closure_get(valueAccessor, fn, getOwnerScope) {
   valueAccessor = decodeAccessor(valueAccessor);
   let closureSignal = ((scope) => {
-    scope[closureSignal.k] = closureSignal.n, fn(scope), subscribeToScopeSet(
+    scope[closureSignal.n] = closureSignal.t, fn(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
-      closureSignal.j,
+      closureSignal.l,
       scope
     );
   });
-  return closureSignal.j = "B" /* ClosureScopes */ + valueAccessor, closureSignal.k = "C" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
+  return closureSignal.l = "B" /* ClosureScopes */ + valueAccessor, closureSignal.n = "C" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
 }
 function _child_setup(setup) {
   return setup._ = (scope, owner) => {
@@ -653,7 +655,7 @@ function _hoist(...path) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.F;
-  return branch._ = renderer.c || parentScope, branch.F = branch, parentBranch && (branch.N = parentBranch, (parentBranch.D ||= /* @__PURE__ */ new Set()).add(branch)), renderer.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;
@@ -665,7 +667,7 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
   );
 }
 function setupBranch(renderer, branch) {
-  return renderer.g && queueRender(branch, renderer.g, -1), 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;
@@ -682,10 +684,10 @@ function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
     );
   };
   return (owner) => ({
-    e: id,
-    f: clone,
-    c: owner,
-    g: setup,
+    g: id,
+    h: clone,
+    e: owner,
+    j: setup,
     a: params,
     b: dynamicScopesAccessor
   });
@@ -702,7 +704,7 @@ function _content_closures(renderer, closureFns) {
     closureSignals[key] = _const(+key, closureFns[key]);
   return (owner, closureValues) => {
     let instance = renderer(owner);
-    return instance.l = closureSignals, instance.o = closureValues, instance;
+    return instance.o = closureSignals, instance.u = closureValues, instance;
   };
 }
 var cloneCache = {};
@@ -856,8 +858,8 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
 }
 function _attr_content(scope, nodeAccessor, value) {
   let content = normalizeClientRender(value), rendererAccessor = "D" /* ConditionalRenderer */ + nodeAccessor;
-  scope[rendererAccessor] !== (scope[rendererAccessor] = content?.e) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.b && subscribeToScopeSet(
-    content.c,
+  scope[rendererAccessor] !== (scope[rendererAccessor] = content?.g) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.b && subscribeToScopeSet(
+    content.e,
     content.b,
     scope["A" /* BranchScopes */ + nodeAccessor]
   ));
@@ -898,7 +900,7 @@ function _html(scope, value, accessor) {
 }
 function normalizeClientRender(value) {
   let renderer = normalizeDynamicRenderer(value);
-  if (renderer && renderer.e)
+  if (renderer && renderer.g)
     return renderer;
 }
 function normalizeAttrValue(value) {
@@ -1008,16 +1010,31 @@ function longestIncreasingSubsequence(a) {
 }
 
 // src/dom/control-flow.ts
-function _await(nodeAccessor, template, walks, setup, params) {
+function _await_promise(nodeAccessor, params) {
   nodeAccessor = decodeAccessor(nodeAccessor);
-  let promiseAccessor = "L" /* Promise */ + nodeAccessor, branchAccessor = "A" /* BranchScopes */ + nodeAccessor, renderer = _content("", template, walks, setup)();
-  return enableBranches(), (scope, promise) => {
-    let referenceNode = scope[nodeAccessor], tryWithPlaceholder = findBranchWithKey(
+  let promiseAccessor = "L" /* Promise */ + nodeAccessor, branchAccessor = "A" /* BranchScopes */ + nodeAccessor, rendererAccessor = "D" /* ConditionalRenderer */ + nodeAccessor;
+  return _enable_catch(), (scope, promise) => {
+    let awaitCounter, renderData, tryWithPlaceholder = findBranchWithKey(
       scope,
       "Q" /* PlaceholderContent */
-    ), awaitBranch = scope[branchAccessor];
-    tryWithPlaceholder ? (placeholderShown.add(pendingEffects), !scope[promiseAccessor] && (tryWithPlaceholder.O = (tryWithPlaceholder.O || 0) + 1) === 1 && requestAnimationFrame(
-      () => tryWithPlaceholder.O && runEffects(
+    );
+    tryWithPlaceholder ? (renderData = self[tryWithPlaceholder.$.runtimeId]?.[tryWithPlaceholder.$.renderId], awaitCounter = tryWithPlaceholder.O ||= renderData?.p?.[tryWithPlaceholder.L], awaitCounter?.i || (awaitCounter = tryWithPlaceholder.O = {
+      d: 1,
+      i: 0,
+      c() {
+        if (!--awaitCounter.i) {
+          let placeholderBranch = tryWithPlaceholder.P;
+          tryWithPlaceholder.P = 0, placeholderBranch && (placeholderBranch.S.parentNode.insertBefore(
+            tryWithPlaceholder.S.parentNode,
+            placeholderBranch.S
+          ), removeAndDestroyBranch(placeholderBranch)), queueEffect(tryWithPlaceholder, (scope2) => {
+            let pendingEffects2 = scope2.J;
+            pendingEffects2 && (scope2.J = [], runEffects(pendingEffects2, !0));
+          });
+        }
+      }
+    }), placeholderShown.add(pendingEffects), !scope[promiseAccessor] && !awaitCounter.i++ && requestAnimationFrame(
+      () => awaitCounter.i && runEffects(
         prepareEffects(
           () => queueRender(
             tryWithPlaceholder,
@@ -1037,46 +1054,53 @@ function _await(nodeAccessor, template, walks, setup, params) {
           )
         )
       )
-    )) : awaitBranch && !scope[promiseAccessor] && (awaitBranch.S.parentNode.insertBefore(
-      referenceNode,
-      awaitBranch.S
-    ), tempDetachBranch(awaitBranch));
+    )) : 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 (awaitBranch ? tryWithPlaceholder || referenceNode.replaceWith(
-              awaitBranch.S.parentNode
+            if (scope[branchAccessor] ? tryWithPlaceholder || scope[nodeAccessor].replaceWith(
+              scope[branchAccessor].S.parentNode
             ) : (insertBranchBefore(
-              awaitBranch = scope[branchAccessor] = createAndSetupBranch(
+              scope[branchAccessor] = createAndSetupBranch(
                 scope.$,
-                renderer,
+                scope[rendererAccessor],
                 scope,
-                referenceNode.parentNode
+                scope[nodeAccessor].parentNode
               ),
-              referenceNode.parentNode,
-              referenceNode
-            ), referenceNode.remove()), params?.(awaitBranch, [data]), tryWithPlaceholder && (placeholderShown.add(pendingEffects), !--tryWithPlaceholder.O)) {
-              let placeholderBranch = tryWithPlaceholder.P;
-              tryWithPlaceholder.P = 0, placeholderBranch && (placeholderBranch.S.parentNode.insertBefore(
-                tryWithPlaceholder.S.parentNode,
-                placeholderBranch.S
-              ), removeAndDestroyBranch(placeholderBranch)), queueEffect(tryWithPlaceholder, (scope2) => {
-                let pendingEffects2 = scope2.J;
-                pendingEffects2 && (scope2.J = [], runEffects(pendingEffects2, !0));
-              });
+              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);
+              }
             }
           },
           -1
         ));
       },
       (error) => {
-        thisPromise === scope[promiseAccessor] && (tryWithPlaceholder && (tryWithPlaceholder.O = 0), scope[promiseAccessor] = 0, schedule(), queueRender(scope, renderCatch, -1, error));
+        thisPromise === scope[promiseAccessor] && (awaitCounter && (awaitCounter.i = 0), 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)();
+  return (scope) => {
+    scope[rendererAccessor] = renderer;
+  };
+}
 function _try(nodeAccessor, template, walks, setup) {
   nodeAccessor = decodeAccessor(nodeAccessor);
   let branchAccessor = "A" /* BranchScopes */ + nodeAccessor, renderer = _content("", template, walks, setup)();
@@ -1097,7 +1121,7 @@ function renderCatch(scope, error) {
   let tryWithCatch = findBranchWithKey(scope, "E" /* CatchContent */);
   if (tryWithCatch) {
     let owner = tryWithCatch._, placeholderBranch = tryWithCatch.P;
-    placeholderBranch && (tryWithCatch.O = 0, owner["A" /* BranchScopes */ + tryWithCatch.C] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(
+    placeholderBranch && (tryWithCatch.O && (tryWithCatch.O.i = 0), owner["A" /* BranchScopes */ + tryWithCatch.C] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(
       owner,
       tryWithCatch.C,
       tryWithCatch.E,
@@ -1138,7 +1162,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?.e || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
+    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.g || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
       if (setConditionalRenderer(
         scope,
         nodeAccessor,
@@ -1153,13 +1177,13 @@ var _dynamic_tag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             content,
             createAndSetupBranch
           ), content.b && subscribeToScopeSet(
-            content.c,
+            content.e,
             content.b,
             scope[childScopeAccessor]["Aa"]
           );
         }
       } else normalizedRenderer?.b && subscribeToScopeSet(
-        normalizedRenderer.c,
+        normalizedRenderer.e,
         normalizedRenderer.b,
         scope[childScopeAccessor]
       );
@@ -1172,10 +1196,10 @@ 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.l)
-          normalizedRenderer.l[accessor](
+        for (let accessor in normalizedRenderer.o)
+          normalizedRenderer.o[accessor](
             childScope,
-            normalizedRenderer.o[accessor]
+            normalizedRenderer.u[accessor]
           );
         if (normalizedRenderer.a)
           if (inputIsArgs)
@@ -1273,17 +1297,17 @@ var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), caugh
 function queueRender(scope, signal, signalKey, value, scopeKey = scope.L) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
-    existingRender.m = value;
+    existingRender.q = value;
   else {
     let render = {
-      d: key,
-      h: scope,
-      p: signal,
-      m: value
+      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.d >= 0) break;
+      if (key - parent.f >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -1319,27 +1343,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).d;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).f;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].d - pendingRenders[bestChild].d < 0 && (bestChild = right), pendingRenders[bestChild].d - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].f - pendingRenders[bestChild].f < 0 && (bestChild = right), pendingRenders[bestChild].f - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.h.F?.I || runRender(render);
+    render.k.F?.I || runRender(render);
   }
   for (let scope of pendingScopes)
     scope.H = 0;
   pendingScopes = [];
 }
-var runRender = (render) => render.p(render.h, render.m), _enable_catch = () => {
+var runRender = (render) => render.x(render.k, render.q), _enable_catch = () => {
   _enable_catch = () => {
   }, enableBranches();
   let handlePendingTry = (fn, scope, branch) => {
     for (; branch; ) {
-      if (branch.O)
+      if (branch.O?.i)
         return (branch.J ||= []).push(fn, scope);
       branch = branch.N;
     }
@@ -1355,7 +1379,7 @@ var runRender = (render) => render.p(render.h, render.m), _enable_catch = () =>
     try {
       runRender2(render);
     } catch (error) {
-      renderCatch(render.h, error);
+      renderCatch(render.k, error);
     }
   })(runRender);
 };
@@ -1388,7 +1412,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     _resume(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.f;
+    return renderer.h;
   },
   getStartNode(branch) {
     return branch.S;
@@ -1410,7 +1434,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   },
   createRenderer(params, clone) {
     let renderer = _content("", 0, 0, 0, params)();
-    return renderer.f = (branch) => {
+    return renderer.h = (branch) => {
       let cloned = clone();
       branch.S = cloned.startNode, branch.K = cloned.endNode;
     }, renderer;
@@ -1426,7 +1450,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
       branch || (created = 1, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
-        renderer.c,
+        renderer.e,
         document.body
       )), renderer.a?.(branch, renderer._ ? args[0] : args);
     }), created)
@@ -1476,7 +1500,7 @@ function mount(input = {}, reference, position) {
       parentNode
     ), branch.T = (newValue) => {
       curValue = newValue;
-    }, this.g?.(branch), args?.(branch, input);
+    }, this.j?.(branch), args?.(branch, input);
   });
   return insertChildNodes(
     parentNode,
@@ -1533,7 +1557,8 @@ export {
   _attrs_partial,
   _attrs_partial_content,
   _attrs_script,
-  _await,
+  _await_content,
+  _await_promise,
   _call,
   _child_setup,
   _closure,

package/dist/html/writer.d.ts

@@ -22,6 +22,7 @@ export declare function _script(scopeId: number, registryId: string): void;
 export declare function _attr_content(nodeAccessor: Accessor, scopeId: number, content: unknown, serializeReason?: 1 | 0): void;
 export declare function normalizeServerRender(value: unknown): ServerRenderer | undefined;
 export declare function withContext<T>(key: PropertyKey, value: unknown, cb: () => T): T;
+export declare function withContext<T, U>(key: PropertyKey, value: unknown, cb: (value: U) => T, cbValue: U): T;
 export declare function _var(parentScopeId: number, scopeOffsetAccessor: Accessor, childScopeId: number, registryId: string): void;
 export declare function _resume<T extends WeakKey>(val: T, id: string, scopeId?: number): T;
 export declare function _id(): string;
@@ -126,6 +127,7 @@ export declare class Chunk {
     reorderId: string | null;
     placeholderBody: Chunk | null;
     placeholderRender: (() => void) | null;
+    placeholderBranchId: number | null;
     constructor(boundary: Boundary, next: Chunk | null, context: Record<string | symbol, unknown> | null);
     writeHTML(html: string): void;
     writeEffect(scopeId: number, registryId: string): void;

package/dist/html.js

@@ -212,7 +212,7 @@ function forStepBy(by, index) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})';
+var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})';
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {
@@ -1151,7 +1151,7 @@ function writeScript(script) {
   $chunk.writeScript(script);
 }
 function _script(scopeId, registryId) {
-  $chunk.boundary.state.needsMainRuntime = !0, $chunk.writeEffect(scopeId, registryId);
+  $chunk.context?.[kIsAsync] && _resume_branch(scopeId), $chunk.boundary.state.needsMainRuntime = !0, $chunk.writeEffect(scopeId, registryId);
 }
 function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = _peek_scope_id();
@@ -1166,11 +1166,11 @@ function normalizeServerRender(value) {
     return renderer;
 }
 var kPendingContexts = Symbol("Pending Contexts");
-function withContext(key, value, cb) {
+function withContext(key, value, cb, cbValue) {
   let ctx = $chunk.context ||= { [kPendingContexts]: 0 }, prev = ctx[key];
   ctx[kPendingContexts]++, ctx[key] = value;
   try {
-    return cb();
+    return cb(cbValue);
   } finally {
     ctx[kPendingContexts]--, ctx[key] = prev;
   }
@@ -1232,15 +1232,18 @@ function _hoist(scopeId, id) {
   return getter[Symbol.iterator] = _hoist_read_error, _resume(getter, id, scopeId);
 }
 function _resume_branch(scopeId) {
-  let branchId = $chunk.context?.[branchIdKey];
+  let branchId = $chunk.context?.[kBranchId];
   branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { G: branchId });
 }
-var branchIdKey = Symbol();
+var kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async");
 function isInResumedBranch() {
-  return $chunk?.context?.[branchIdKey] !== void 0;
+  return $chunk?.context?.[kBranchId] !== void 0;
 }
 function withBranchId(branchId, cb) {
-  return withContext(branchIdKey, branchId, cb);
+  return withContext(kBranchId, branchId, cb);
+}
+function withIsAsync(cb, value) {
+  return withContext(kIsAsync, !0, cb, value);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
@@ -1440,14 +1443,14 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
           let branchId = _peek_scope_id();
           $chunk.writeHTML(
             $chunk.boundary.state.mark("[" /* BranchStart */, "")
-          ), content(value), $chunk.writeHTML(
+          ), withIsAsync(content, value), $chunk.writeHTML(
             $chunk.boundary.state.mark(
               "]" /* BranchEnd */,
               scopeId + " " + accessor + " " + branchId
             )
           );
         } else
-          content(value);
+          withIsAsync(content, value);
       }), boundary.endAsync(chunk)));
     },
     (err) => {
@@ -1460,9 +1463,9 @@ function _try(scopeId, accessor, content, input) {
   $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
   let catchContent = normalizeDynamicRenderer(input.catch), placeholderContent = normalizeDynamicRenderer(input.placeholder);
   catchContent ? tryCatch(
-    placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+    placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId) : content,
     catchContent
-  ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content(), writeScope(branchId, {
+  ) : placeholderContent ? tryPlaceholder(content, placeholderContent, branchId) : content(), writeScope(branchId, {
     C: accessor,
     E: catchContent,
     Q: placeholderContent
@@ -1473,13 +1476,13 @@ function _try(scopeId, accessor, content, input) {
     )
   );
 }
-function tryPlaceholder(content, placeholder) {
+function tryPlaceholder(content, placeholder, branchId) {
   let chunk = $chunk, { boundary } = chunk, body = new Chunk(boundary, null, chunk.context);
   if (body === body.render(content)) {
     chunk.append(body);
     return;
   }
-  chunk.next = $chunk = new Chunk(boundary, chunk.next, body.context), chunk.placeholderBody = body, chunk.placeholderRender = placeholder;
+  chunk.next = $chunk = new Chunk(boundary, chunk.next, chunk.context), chunk.placeholderBody = body, chunk.placeholderRender = placeholder, chunk.placeholderBranchId = branchId;
 }
 function tryCatch(content, catchContent) {
   let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = new Chunk(catchBoundary, null, chunk.context), bodyEnd = body.render(content);
@@ -1589,14 +1592,12 @@ var Boundary = class extends AbortController {
   reorderId = null;
   placeholderBody = null;
   placeholderRender = null;
+  placeholderBranchId = null;
   writeHTML(html) {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
-    this.lastEffect === registryId ? this.effects += "," + scopeId : (this.lastEffect = registryId, this.effects = concatEffects(
-      this.effects,
-      '"' + registryId + '",' + scopeId
-    ));
+    this.lastEffect === registryId ? this.effects += " " + scopeId : (this.lastEffect = registryId, this.effects = concatEffects(this.effects, registryId + " " + scopeId));
   }
   writeScript(script) {
     this.scripts = concatScripts(this.scripts, script);
@@ -1608,8 +1609,8 @@ var Boundary = class extends AbortController {
     if (this.placeholderBody) {
       let body = this.placeholderBody.consume();
       if (body.async) {
-        let { state } = this.boundary, reorderId = body.reorderId = state.nextReorderId();
-        this.writeHTML(state.mark("!^" /* Placeholder */, reorderId));
+        let { state } = this.boundary, reorderId = body.reorderId = this.placeholderBranchId ? this.placeholderBranchId + "" : state.nextReorderId();
+        this.placeholderBranchId = null, this.writeHTML(state.mark("!^" /* Placeholder */, reorderId));
         let after = this.render(this.placeholderRender);
         after !== this && this.boundary.abort(
           new Error("An @placeholder cannot contain async content.")
@@ -1646,7 +1647,7 @@ var Boundary = class extends AbortController {
     if (needsWalk && (state.walkOnNextFlush = !1), state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
       scripts,
       WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
-    )), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + "," + effects : effects), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(
+    )), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + ',"' + effects + '"' : '"' + effects + '"'), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(
       scripts,
       runtimePrefix + ".r.push(" + state.resumes + ")"
     ) : (state.hasWrittenResume = !0, scripts = concatScripts(
@@ -1675,10 +1676,10 @@ var Boundary = class extends AbortController {
           runtimePrefix + ".r=[]"
         )), reorderScripts = concatScripts(
           reorderScripts,
-          "_.push(" + reorderEffects + ")"
+          '_.push("' + reorderEffects + '")'
         )), scripts = concatScripts(
           scripts,
-          reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
+          reorderScripts && runtimePrefix + ".j" /* Scripts */ + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"
         ), html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
       }
       state.writeReorders = null;
@@ -1701,7 +1702,7 @@ function flushSerializer(boundary) {
       let scope = writeScopes[key], scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
       lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope);
     }
-    state.resumes = concatEffects(
+    state.resumes = concatSequence(
       state.resumes,
       serializer.stringify(serializeData, boundary)
     ), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null, flushed && (state.walkOnNextFlush = !0);
@@ -1711,6 +1712,9 @@ function _trailers(html) {
   $chunk.boundary.state.trailerHTML += html;
 }
 function concatEffects(a, b) {
+  return a ? b ? a + " " + b : a : b;
+}
+function concatSequence(a, b) {
   return a ? b ? a + "," + b : a : b;
 }
 function concatScripts(a, b) {