marko 6.0.0-next.3.66 → 6.0.0-next.3.68

package/dist/debug/dom.js

@@ -277,6 +277,8 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const branchIds = /* @__PURE__ */ new Set();
         const parentBranchIds = /* @__PURE__ */ new Map();
         let currentBranchId;
+        let $global;
+        let lastScopeId = 0;
         render.w = () => {
           walk2.call(render);
           const visits = render.v;
@@ -303,12 +305,12 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             for (const visit of visitNodes) {
               const commentText = visit.data;
               const dataIndex = commentText.indexOf(" ") + 1;
-              const scopeId = commentText.slice(
+              const scopeId = +commentText.slice(
                 commentPrefixLen + 1,
                 dataIndex ? dataIndex - 1 : commentText.length
               );
               const scope = scopeLookup[scopeId] ||= {
-                ___id: +scopeId
+                ___id: scopeId
               };
               const data2 = dataIndex ? commentText.slice(dataIndex) : "";
               const token = commentText[commentPrefixLen];
@@ -344,7 +346,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 while (~next) {
                   const start = next + 1;
                   next = data2.indexOf(" ", start);
-                  const childScopeId = data2.slice(
+                  const childScopeId = +data2.slice(
                     start,
                     ~next ? next : data2.length
                   );
@@ -361,20 +363,19 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               for (let i = 0; i < resumes.length; i++) {
                 const serialized = resumes[i];
                 if (typeof serialized === "function") {
-                  const scopes = serialized(serializeContext);
-                  let { $global } = scopeLookup;
-                  if (!$global) {
-                    scopeLookup.$global = $global = scopes.$ || {};
-                    $global.runtimeId = runtimeId;
-                    $global.renderId = renderId;
-                    $global.___nextScopeId = 1e6;
-                  }
-                  for (const scopeId in scopes) {
-                    if (scopeId !== "$") {
-                      const scope = scopes[scopeId];
+                  for (const scope of serialized(serializeContext)) {
+                    if (!$global) {
+                      $global = scope || {};
+                      $global.runtimeId = runtimeId;
+                      $global.renderId = renderId;
+                      $global.___nextScopeId = 1e6;
+                    } else if (typeof scope === "number") {
+                      lastScopeId += scope;
+                    } else {
+                      const scopeId = ++lastScopeId;
                       const prevScope = scopeLookup[scopeId];
                       scope.$global = $global;
-                      scope.___id = +scopeId;
+                      scope.___id = scopeId;
                       if (prevScope !== scope) {
                         scopeLookup[scopeId] = Object.assign(
                           scope,
@@ -383,7 +384,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                       }
                       const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
                       if (parentBranchId) {
-                        scope.___closestBranch = scopes[parentBranchId];
+                        scope.___closestBranch = scopeLookup[parentBranchId];
                       }
                       if (branchIds.has(scopeId)) {
                         const branch = scope;
@@ -1653,7 +1654,6 @@ function awaitTag(nodeAccessor, renderer) {
         })
       );
       if (tryWithPlaceholder) {
-        tryWithPlaceholder;
         if (!--tryWithPlaceholder.___pendingAsyncCount) {
           const placeholderBranch = tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */];
           tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */] = void 0;
@@ -1664,12 +1664,6 @@ function awaitTag(nodeAccessor, renderer) {
               placeholderBranch.___startNode
             );
             removeAndDestroyBranch(placeholderBranch);
-          } else {
-            insertBranchBefore(
-              tryWithPlaceholder,
-              referenceNode.parentNode,
-              referenceNode
-            );
           }
           if (tryWithPlaceholder.___effects) {
             runEffects(tryWithPlaceholder.___effects, true);

package/dist/debug/dom.mjs

@@ -189,6 +189,8 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const branchIds = /* @__PURE__ */ new Set();
         const parentBranchIds = /* @__PURE__ */ new Map();
         let currentBranchId;
+        let $global;
+        let lastScopeId = 0;
         render.w = () => {
           walk2.call(render);
           const visits = render.v;
@@ -215,12 +217,12 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             for (const visit of visitNodes) {
               const commentText = visit.data;
               const dataIndex = commentText.indexOf(" ") + 1;
-              const scopeId = commentText.slice(
+              const scopeId = +commentText.slice(
                 commentPrefixLen + 1,
                 dataIndex ? dataIndex - 1 : commentText.length
               );
               const scope = scopeLookup[scopeId] ||= {
-                ___id: +scopeId
+                ___id: scopeId
               };
               const data2 = dataIndex ? commentText.slice(dataIndex) : "";
               const token = commentText[commentPrefixLen];
@@ -256,7 +258,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 while (~next) {
                   const start = next + 1;
                   next = data2.indexOf(" ", start);
-                  const childScopeId = data2.slice(
+                  const childScopeId = +data2.slice(
                     start,
                     ~next ? next : data2.length
                   );
@@ -273,20 +275,19 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               for (let i = 0; i < resumes.length; i++) {
                 const serialized = resumes[i];
                 if (typeof serialized === "function") {
-                  const scopes = serialized(serializeContext);
-                  let { $global } = scopeLookup;
-                  if (!$global) {
-                    scopeLookup.$global = $global = scopes.$ || {};
-                    $global.runtimeId = runtimeId;
-                    $global.renderId = renderId;
-                    $global.___nextScopeId = 1e6;
-                  }
-                  for (const scopeId in scopes) {
-                    if (scopeId !== "$") {
-                      const scope = scopes[scopeId];
+                  for (const scope of serialized(serializeContext)) {
+                    if (!$global) {
+                      $global = scope || {};
+                      $global.runtimeId = runtimeId;
+                      $global.renderId = renderId;
+                      $global.___nextScopeId = 1e6;
+                    } else if (typeof scope === "number") {
+                      lastScopeId += scope;
+                    } else {
+                      const scopeId = ++lastScopeId;
                       const prevScope = scopeLookup[scopeId];
                       scope.$global = $global;
-                      scope.___id = +scopeId;
+                      scope.___id = scopeId;
                       if (prevScope !== scope) {
                         scopeLookup[scopeId] = Object.assign(
                           scope,
@@ -295,7 +296,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                       }
                       const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
                       if (parentBranchId) {
-                        scope.___closestBranch = scopes[parentBranchId];
+                        scope.___closestBranch = scopeLookup[parentBranchId];
                       }
                       if (branchIds.has(scopeId)) {
                         const branch = scope;
@@ -1565,7 +1566,6 @@ function awaitTag(nodeAccessor, renderer) {
         })
       );
       if (tryWithPlaceholder) {
-        tryWithPlaceholder;
         if (!--tryWithPlaceholder.___pendingAsyncCount) {
           const placeholderBranch = tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */];
           tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */] = void 0;
@@ -1576,12 +1576,6 @@ function awaitTag(nodeAccessor, renderer) {
               placeholderBranch.___startNode
             );
             removeAndDestroyBranch(placeholderBranch);
-          } else {
-            insertBranchBefore(
-              tryWithPlaceholder,
-              referenceNode.parentNode,
-              referenceNode
-            );
           }
           if (tryWithPlaceholder.___effects) {
             runEffects(tryWithPlaceholder.___effects, true);

package/dist/debug/html.js

@@ -279,16 +279,12 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
       placeholders[id] = {
         i: 1,
         c(end = runtime.l[id] || node) {
-          while (end.parentNode !== start.parentNode) {
-            end = end.parentNode;
-          }
-
           for (
             ;
-            end != nextSibling;
-            (nextSibling = start.nextSibling).remove()
+            (nextSibling = end.previousSibling || start).remove(),
+            start != nextSibling;
           );
-          replace(start, node);
+          replace(end, node);
         },
       };
     }
@@ -310,7 +306,7 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
   }
 };
 })`
-) : `(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e.r)))}})`;
+) : `(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})`;
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {};
@@ -1891,14 +1887,8 @@ var writeScope = (scopeId, partialScope) => {
   }
   if (state.writeScopes) {
     state.writeScopes[scopeId] = scope;
-  } else if (state.hasGlobals) {
-    state.writeScopes = { [scopeId]: scope };
   } else {
-    state.hasGlobals = true;
-    state.writeScopes = {
-      $: getFilteredGlobals(state.$global),
-      [scopeId]: scope
-    };
+    state.writeScopes = { [scopeId]: scope };
   }
   return scope;
 };
@@ -2099,6 +2089,7 @@ var State2 = class {
   tagId = 1;
   scopeId = 1;
   reorderId = 1;
+  lastSerializedScopeId = this.scopeId;
   hasGlobals = false;
   needsMainRuntime = false;
   hasMainRuntime = false;
@@ -2292,8 +2283,23 @@ function prepareChunk(chunk) {
   }
   let resumes = "";
   if (state.writeScopes || serializer.flushed) {
-    resumes = state.serializer.stringify(state.writeScopes || {}, boundary);
+    let { lastSerializedScopeId } = state;
+    const serializeData = [];
+    if (!state.hasGlobals) {
+      state.hasGlobals = true;
+      serializeData.push(getFilteredGlobals(state.$global));
+    }
+    for (const key in state.writeScopes) {
+      const scope = state.writeScopes[key];
+      const scopeId = getScopeId(scope);
+      const scopeIdDelta = scopeId - lastSerializedScopeId;
+      lastSerializedScopeId = scopeId + 1;
+      if (scopeIdDelta) serializeData.push(scopeIdDelta);
+      serializeData.push(scope);
+    }
+    resumes = state.serializer.stringify(serializeData, boundary);
     state.writeScopes = null;
+    state.lastSerializedScopeId = lastSerializedScopeId;
   }
   if (effects) {
     hasWalk = true;
@@ -2331,8 +2337,8 @@ function prepareChunk(chunk) {
       let cur = reorderedChunk;
       reorderedChunk.reorderId = null;
       for (; ; ) {
-        const { next } = cur;
         cur.flushPlaceholder();
+        const { next } = cur;
         cur.consumed = true;
         reorderHTML += cur.html;
         reorderEffects = concatEffects(reorderEffects, cur.effects);
@@ -2432,10 +2438,10 @@ function isPromise(value) {
   return value != null && typeof value.then === "function";
 }
 function getFilteredGlobals($global2) {
-  if (!$global2) return void 0;
+  if (!$global2) return 0;
   const serializedGlobals = $global2.serializedGlobals;
-  if (!serializedGlobals) return void 0;
-  let filtered;
+  if (!serializedGlobals) return 0;
+  let filtered = 0;
   if (Array.isArray(serializedGlobals)) {
     for (const key of serializedGlobals) {
       const value = $global2[key];

package/dist/debug/html.mjs

@@ -195,16 +195,12 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
       placeholders[id] = {
         i: 1,
         c(end = runtime.l[id] || node) {
-          while (end.parentNode !== start.parentNode) {
-            end = end.parentNode;
-          }
-
           for (
             ;
-            end != nextSibling;
-            (nextSibling = start.nextSibling).remove()
+            (nextSibling = end.previousSibling || start).remove(),
+            start != nextSibling;
           );
-          replace(start, node);
+          replace(end, node);
         },
       };
     }
@@ -226,7 +222,7 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
   }
 };
 })`
-) : `(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e.r)))}})`;
+) : `(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})`;
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {};
@@ -1807,14 +1803,8 @@ var writeScope = (scopeId, partialScope) => {
   }
   if (state.writeScopes) {
     state.writeScopes[scopeId] = scope;
-  } else if (state.hasGlobals) {
-    state.writeScopes = { [scopeId]: scope };
   } else {
-    state.hasGlobals = true;
-    state.writeScopes = {
-      $: getFilteredGlobals(state.$global),
-      [scopeId]: scope
-    };
+    state.writeScopes = { [scopeId]: scope };
   }
   return scope;
 };
@@ -2015,6 +2005,7 @@ var State2 = class {
   tagId = 1;
   scopeId = 1;
   reorderId = 1;
+  lastSerializedScopeId = this.scopeId;
   hasGlobals = false;
   needsMainRuntime = false;
   hasMainRuntime = false;
@@ -2208,8 +2199,23 @@ function prepareChunk(chunk) {
   }
   let resumes = "";
   if (state.writeScopes || serializer.flushed) {
-    resumes = state.serializer.stringify(state.writeScopes || {}, boundary);
+    let { lastSerializedScopeId } = state;
+    const serializeData = [];
+    if (!state.hasGlobals) {
+      state.hasGlobals = true;
+      serializeData.push(getFilteredGlobals(state.$global));
+    }
+    for (const key in state.writeScopes) {
+      const scope = state.writeScopes[key];
+      const scopeId = getScopeId(scope);
+      const scopeIdDelta = scopeId - lastSerializedScopeId;
+      lastSerializedScopeId = scopeId + 1;
+      if (scopeIdDelta) serializeData.push(scopeIdDelta);
+      serializeData.push(scope);
+    }
+    resumes = state.serializer.stringify(serializeData, boundary);
     state.writeScopes = null;
+    state.lastSerializedScopeId = lastSerializedScopeId;
   }
   if (effects) {
     hasWalk = true;
@@ -2247,8 +2253,8 @@ function prepareChunk(chunk) {
       let cur = reorderedChunk;
       reorderedChunk.reorderId = null;
       for (; ; ) {
-        const { next } = cur;
         cur.flushPlaceholder();
+        const { next } = cur;
         cur.consumed = true;
         reorderHTML += cur.html;
         reorderEffects = concatEffects(reorderEffects, cur.effects);
@@ -2348,10 +2354,10 @@ function isPromise(value) {
   return value != null && typeof value.then === "function";
 }
 function getFilteredGlobals($global2) {
-  if (!$global2) return void 0;
+  if (!$global2) return 0;
   const serializedGlobals = $global2.serializedGlobals;
-  if (!serializedGlobals) return void 0;
-  let filtered;
+  if (!serializedGlobals) return 0;
+  let filtered = 0;
   if (Array.isArray(serializedGlobals)) {
     for (const key of serializedGlobals) {
       const value = $global2[key];

package/dist/dom.js

@@ -213,7 +213,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
       value: resumeRender = (renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, branchStack = [], scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), currentBranchId;
+        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), currentBranchId, $global, lastScopeId = 0;
         return render.w = () => {
           walk2.call(render);
           let visits = render.v, resumes = render.r;
@@ -229,11 +229,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               )), branch.j = lastEndNode = endNode, branch.h ||= endNode, branchIds.add(branchId), branch;
             };
             for (let visit of visitNodes) {
-              let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = commentText.slice(
+              let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = +commentText.slice(
                 commentPrefixLen + 1,
                 dataIndex ? dataIndex - 1 : commentText.length
               ), scope = scopeLookup[scopeId] ||= {
-                m: +scopeId
+                m: scopeId
               }, data2 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
               if (token === "*" /* Node */) {
                 let node = scope[data2] = visit.previousSibling;
@@ -252,7 +252,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 for (scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
                   let start = next + 1;
                   next = data2.indexOf(" ", start);
-                  let childScopeId = data2.slice(
+                  let childScopeId = +data2.slice(
                     start,
                     ~next ? next : data2.length
                   );
@@ -266,25 +266,27 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               render.r = [], isResuming = !0;
               for (let i = 0; i < resumes.length; i++) {
                 let serialized = resumes[i];
-                if (typeof serialized == "function") {
-                  let scopes = serialized(serializeContext), { $global } = scopeLookup;
-                  $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.n = 1e6);
-                  for (let scopeId in scopes)
-                    if (scopeId !== "$") {
-                      let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
-                      scope.$global = $global, scope.m = +scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
+                if (typeof serialized == "function")
+                  for (let scope of serialized(serializeContext))
+                    if (!$global)
+                      $global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.n = 1e6;
+                    else if (typeof scope == "number")
+                      lastScopeId += scope;
+                    else {
+                      let scopeId = ++lastScopeId, prevScope = scopeLookup[scopeId];
+                      scope.$global = $global, scope.m = scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
                         scope,
                         prevScope
                       ));
                       let parentBranchId = scope.g || parentBranchIds.get(scopeId);
-                      if (parentBranchId && (scope.k = scopes[parentBranchId]), branchIds.has(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
                         ));
                       }
                     }
-                } else
+                else
                   registeredValues[resumes[++i]](
                     scopeLookup[serialized],
                     scopeLookup[serialized]
@@ -1110,15 +1112,11 @@ function awaitTag(nodeAccessor, renderer) {
         })
       ), tryWithPlaceholder && !--tryWithPlaceholder.q)) {
         let placeholderBranch = tryWithPlaceholder.c;
-        tryWithPlaceholder.c = void 0, placeholderBranch ? (insertBranchBefore(
+        tryWithPlaceholder.c = void 0, placeholderBranch && (insertBranchBefore(
           tryWithPlaceholder,
           placeholderBranch.h.parentNode,
           placeholderBranch.h
-        ), removeAndDestroyBranch(placeholderBranch)) : insertBranchBefore(
-          tryWithPlaceholder,
-          referenceNode.parentNode,
-          referenceNode
-        ), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
+        ), removeAndDestroyBranch(placeholderBranch)), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
       }
     }).catch((error) => {
       renderCatch(scope, error, !0);

package/dist/dom.mjs

@@ -128,7 +128,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
       value: resumeRender = (renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, branchStack = [], scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), currentBranchId;
+        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), currentBranchId, $global, lastScopeId = 0;
         return render.w = () => {
           walk2.call(render);
           let visits = render.v, resumes = render.r;
@@ -144,11 +144,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               )), branch.j = lastEndNode = endNode, branch.h ||= endNode, branchIds.add(branchId), branch;
             };
             for (let visit of visitNodes) {
-              let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = commentText.slice(
+              let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = +commentText.slice(
                 commentPrefixLen + 1,
                 dataIndex ? dataIndex - 1 : commentText.length
               ), scope = scopeLookup[scopeId] ||= {
-                m: +scopeId
+                m: scopeId
               }, data2 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
               if (token === "*" /* Node */) {
                 let node = scope[data2] = visit.previousSibling;
@@ -167,7 +167,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 for (scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
                   let start = next + 1;
                   next = data2.indexOf(" ", start);
-                  let childScopeId = data2.slice(
+                  let childScopeId = +data2.slice(
                     start,
                     ~next ? next : data2.length
                   );
@@ -181,25 +181,27 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               render.r = [], isResuming = !0;
               for (let i = 0; i < resumes.length; i++) {
                 let serialized = resumes[i];
-                if (typeof serialized == "function") {
-                  let scopes = serialized(serializeContext), { $global } = scopeLookup;
-                  $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.n = 1e6);
-                  for (let scopeId in scopes)
-                    if (scopeId !== "$") {
-                      let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
-                      scope.$global = $global, scope.m = +scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
+                if (typeof serialized == "function")
+                  for (let scope of serialized(serializeContext))
+                    if (!$global)
+                      $global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.n = 1e6;
+                    else if (typeof scope == "number")
+                      lastScopeId += scope;
+                    else {
+                      let scopeId = ++lastScopeId, prevScope = scopeLookup[scopeId];
+                      scope.$global = $global, scope.m = scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
                         scope,
                         prevScope
                       ));
                       let parentBranchId = scope.g || parentBranchIds.get(scopeId);
-                      if (parentBranchId && (scope.k = scopes[parentBranchId]), branchIds.has(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
                         ));
                       }
                     }
-                } else
+                else
                   registeredValues[resumes[++i]](
                     scopeLookup[serialized],
                     scopeLookup[serialized]
@@ -1025,15 +1027,11 @@ function awaitTag(nodeAccessor, renderer) {
         })
       ), tryWithPlaceholder && !--tryWithPlaceholder.q)) {
         let placeholderBranch = tryWithPlaceholder.c;
-        tryWithPlaceholder.c = void 0, placeholderBranch ? (insertBranchBefore(
+        tryWithPlaceholder.c = void 0, placeholderBranch && (insertBranchBefore(
           tryWithPlaceholder,
           placeholderBranch.h.parentNode,
           placeholderBranch.h
-        ), removeAndDestroyBranch(placeholderBranch)) : insertBranchBefore(
-          tryWithPlaceholder,
-          referenceNode.parentNode,
-          referenceNode
-        ), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
+        ), removeAndDestroyBranch(placeholderBranch)), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
       }
     }).catch((error) => {
       renderCatch(scope, error, !0);

package/dist/html/writer.d.ts

@@ -63,6 +63,7 @@ export declare class State {
     tagId: number;
     scopeId: number;
     reorderId: number;
+    lastSerializedScopeId: number;
     hasGlobals: boolean;
     needsMainRuntime: boolean;
     hasMainRuntime: boolean;
@@ -73,9 +74,7 @@ export declare class State {
     serializer: Serializer;
     writeReorders: Chunk[] | null;
     scopes: Map<number, PartialScope>;
-    writeScopes: null | (Record<number, PartialScope> & {
-        $?: unknown;
-    });
+    writeScopes: null | Record<number, PartialScope>;
     constructor($global: $Global & {
         renderId: string;
         runtimeId: string;