marko 6.0.0-next.3.18 → 6.0.0-next.3.19

package/dist/debug/html.js

@@ -64,8 +64,7 @@ __export(html_exports, {
   register: () => register2,
   styleAttr: () => styleAttr,
   toString: () => toString,
-  tryCatch: () => tryCatch,
-  tryPlaceholder: () => tryPlaceholder,
+  tryContent: () => tryContent,
   write: () => write,
   writeEffect: () => writeEffect,
   writeExistingScope: () => writeExistingScope,
@@ -181,12 +180,14 @@ function escapeStyle(val) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = true ? `((runtimeId) =>
+var WALKER_RUNTIME_CODE = true ? (
+  /* js */
+  `((runtimeId) =>
 (self[runtimeId] =
   self[runtimeId] ||
   ((renderId) => {
     let id,
-      markers = {},
+      lookup = {},
       visits = [],
       doc = document,
       walker = doc.createTreeWalker(
@@ -196,7 +197,7 @@ var WALKER_RUNTIME_CODE = true ? `((runtimeId) =>
       op = (self[runtimeId][renderId] = {
         i: (renderId = runtimeId + renderId),
         d: doc,
-        l: markers,
+        l: lookup,
         v: visits,
         x() {},
         w(node) {
@@ -205,7 +206,7 @@ var WALKER_RUNTIME_CODE = true ? `((runtimeId) =>
               (op =
                 (op = node.data) &&
                 !op.indexOf(renderId) &&
-                ((markers[(id = op.slice(prefix + 1))] = node), op[prefix])),
+                ((lookup[(id = op.slice(prefix + 1))] = node), op[prefix])),
               id,
               node,
             );
@@ -217,12 +218,14 @@ var WALKER_RUNTIME_CODE = true ? `((runtimeId) =>
         },
       }),
       prefix = renderId.length;
-  })))` : `(e=>self[e]=self[e]||(l=>{let t,d={},f=[],s=document,a=s.createTreeWalker(s,129),r=self[e][l]={i:l=e+l,d:s,l:d,v:f,x(){},w(e){for(;e=a.nextNode();)this.x(r=(r=e.data)&&!r.indexOf(l)&&(d[t=r.slice(x+1)]=e,r[x]),t,e),r>"#"&&f.push(e)}},x=l.length}))`;
-var REORDER_RUNTIME_CODE = true ? `((runtime) => {
-let insertOne,
+  })))`
+) : `(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))`;
+var REORDER_RUNTIME_CODE = true ? (
+  /* js */
+  `((runtime) => {
+let onNextSibling,
   placeholder,
   nextSibling,
-  previousSibling,
   placeholders = {},
   replace = (marker, container) => {
     marker.replaceWith(...container.childNodes);
@@ -233,21 +236,19 @@ runtime.d.head.append(
 );
 runtime.j = {};
 runtime.x = (op, id, node, start, placeholderCallback) => {
-  // "node" and "end" are all closed over and can't be repurposed. "start" is too but only in the new placeholder case
-
   if (op == "#") {
     (placeholders[id] = placeholder).i++;
   } else if (node == nextSibling) {
-    insertOne();
+    onNextSibling();
   }
 
   if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
     start = runtime.l["^" + id];
 
     if (start) {
-      placeholder = placeholders[id] = {
-        i: 0,
-        c(end = runtime.l[id] || previousSibling || node) {
+      placeholders[id] = {
+        i: 1,
+        c(end = runtime.l[id] || node) {
           while (end.parentNode !== start.parentNode) {
             end = end.parentNode;
           }
@@ -260,29 +261,26 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
           replace(start, node);
         },
       };
-    } else {
-      insertOne = () => {
-        previousSibling = node.previousSibling;
-        replace(runtime.l[id], node);
-        if (!--start.i) {
-          start.c();
-        }
-      };
-
-      // repurpose "start" to hold this placeholder
-      start = placeholder = placeholders[id];
-      nextSibling = node.nextElementSibling || insertOne();
     }
 
-    // repurpose "op" for callbacks ...carefully
-    placeholderCallback = placeholder.c;
-    (op = runtime.j[id]) &&
-      (placeholder.c = () => placeholderCallback() + op(runtime));
+    nextSibling = node.nextSibling;
+    placeholder = placeholders[id];
+    onNextSibling = () => {
+      start || replace(runtime.l[id], node);
+      if (!--placeholder.i) {
+        placeholder.c();
+      }
+    };
 
-    if (node.attributes.c) placeholder.c();
+    // repurpose "op" for callbacks ...carefully
+    if (op = runtime.j[id]) {
+      placeholderCallback = placeholder.c;
+      placeholder.c = () => placeholderCallback() + op(runtime);
+    }
   }
 };
-})` : `(e=>{let i,t,r,l,d={},n=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(o,a,c,p,b)=>{"#"==o?(d[a]=t).i++:c==r&&i(),"T"==c.tagName&&(a=c.getAttribute(e.i))&&((p=e.l["^"+a])?t=d[a]={i:0,c(i=e.l[a]||l||c){for(;i.parentNode!==p.parentNode;)i=i.parentNode;for(;i!=r;(r=p.nextSibling).remove());n(p,c)}}:(i=()=>{l=c.previousSibling,n(e.l[a],c),--p.i||p.c()},p=t=d[a],r=c.nextElementSibling||i()),b=t.c,(o=e.j[a])&&(t.c=()=>b()+o(e)),c.attributes.c&&t.c())}})`;
+})`
+) : `(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)))}})`;
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {};
@@ -1577,6 +1575,23 @@ function fork(promise, content) {
     }
   );
 }
+function tryContent(input) {
+  const content = input.content;
+  if (content) {
+    const catchContent = input.catch?.content;
+    const placeholderContent = input.placeholder?.content;
+    if (catchContent) {
+      tryCatch(
+        placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+        catchContent
+      );
+    } else if (placeholderContent) {
+      tryPlaceholder(content, placeholderContent);
+    } else {
+      content();
+    }
+  }
+}
 function tryPlaceholder(content, placeholder) {
   const chunk = $chunk;
   const { boundary } = chunk;
@@ -1885,14 +1900,15 @@ function prepareChunk(chunk) {
     }
     for (const reorderedChunk of state.writeReorders) {
       const { reorderId } = reorderedChunk;
-      let isSync = true;
       let reorderHTML = "";
       let reorderEffects = "";
       let reorderScripts = "";
       let cur = reorderedChunk;
       reorderedChunk.reorderId = null;
       for (; ; ) {
+        const { next } = cur;
         cur.flushPlaceholder();
+        cur.consumed = true;
         reorderHTML += cur.html;
         reorderEffects = concatEffects(reorderEffects, cur.effects);
         reorderScripts = concatScripts(reorderScripts, cur.scripts);
@@ -1902,10 +1918,10 @@ function prepareChunk(chunk) {
             cur.reorderId = state.nextReorderId()
           );
           cur.html = cur.effects = cur.scripts = "";
-          isSync = false;
+          cur.next = null;
         }
-        if (cur.next) {
-          cur = cur.next;
+        if (next) {
+          cur = next;
         } else {
           break;
         }
@@ -1927,7 +1943,7 @@ function prepareChunk(chunk) {
         scripts,
         reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
       );
-      html += "<t " + (isSync ? "c " : "") + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
+      html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
     }
     state.writeReorders = null;
   }
@@ -2735,8 +2751,7 @@ var ServerRenderResult = class {
   register,
   styleAttr,
   toString,
-  tryCatch,
-  tryPlaceholder,
+  tryContent,
   write,
   writeEffect,
   writeExistingScope,

package/dist/debug/html.mjs

@@ -105,12 +105,14 @@ function escapeStyle(val) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = true ? `((runtimeId) =>
+var WALKER_RUNTIME_CODE = true ? (
+  /* js */
+  `((runtimeId) =>
 (self[runtimeId] =
   self[runtimeId] ||
   ((renderId) => {
     let id,
-      markers = {},
+      lookup = {},
       visits = [],
       doc = document,
       walker = doc.createTreeWalker(
@@ -120,7 +122,7 @@ var WALKER_RUNTIME_CODE = true ? `((runtimeId) =>
       op = (self[runtimeId][renderId] = {
         i: (renderId = runtimeId + renderId),
         d: doc,
-        l: markers,
+        l: lookup,
         v: visits,
         x() {},
         w(node) {
@@ -129,7 +131,7 @@ var WALKER_RUNTIME_CODE = true ? `((runtimeId) =>
               (op =
                 (op = node.data) &&
                 !op.indexOf(renderId) &&
-                ((markers[(id = op.slice(prefix + 1))] = node), op[prefix])),
+                ((lookup[(id = op.slice(prefix + 1))] = node), op[prefix])),
               id,
               node,
             );
@@ -141,12 +143,14 @@ var WALKER_RUNTIME_CODE = true ? `((runtimeId) =>
         },
       }),
       prefix = renderId.length;
-  })))` : `(e=>self[e]=self[e]||(l=>{let t,d={},f=[],s=document,a=s.createTreeWalker(s,129),r=self[e][l]={i:l=e+l,d:s,l:d,v:f,x(){},w(e){for(;e=a.nextNode();)this.x(r=(r=e.data)&&!r.indexOf(l)&&(d[t=r.slice(x+1)]=e,r[x]),t,e),r>"#"&&f.push(e)}},x=l.length}))`;
-var REORDER_RUNTIME_CODE = true ? `((runtime) => {
-let insertOne,
+  })))`
+) : `(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))`;
+var REORDER_RUNTIME_CODE = true ? (
+  /* js */
+  `((runtime) => {
+let onNextSibling,
   placeholder,
   nextSibling,
-  previousSibling,
   placeholders = {},
   replace = (marker, container) => {
     marker.replaceWith(...container.childNodes);
@@ -157,21 +161,19 @@ runtime.d.head.append(
 );
 runtime.j = {};
 runtime.x = (op, id, node, start, placeholderCallback) => {
-  // "node" and "end" are all closed over and can't be repurposed. "start" is too but only in the new placeholder case
-
   if (op == "#") {
     (placeholders[id] = placeholder).i++;
   } else if (node == nextSibling) {
-    insertOne();
+    onNextSibling();
   }
 
   if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
     start = runtime.l["^" + id];
 
     if (start) {
-      placeholder = placeholders[id] = {
-        i: 0,
-        c(end = runtime.l[id] || previousSibling || node) {
+      placeholders[id] = {
+        i: 1,
+        c(end = runtime.l[id] || node) {
           while (end.parentNode !== start.parentNode) {
             end = end.parentNode;
           }
@@ -184,29 +186,26 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
           replace(start, node);
         },
       };
-    } else {
-      insertOne = () => {
-        previousSibling = node.previousSibling;
-        replace(runtime.l[id], node);
-        if (!--start.i) {
-          start.c();
-        }
-      };
-
-      // repurpose "start" to hold this placeholder
-      start = placeholder = placeholders[id];
-      nextSibling = node.nextElementSibling || insertOne();
     }
 
-    // repurpose "op" for callbacks ...carefully
-    placeholderCallback = placeholder.c;
-    (op = runtime.j[id]) &&
-      (placeholder.c = () => placeholderCallback() + op(runtime));
+    nextSibling = node.nextSibling;
+    placeholder = placeholders[id];
+    onNextSibling = () => {
+      start || replace(runtime.l[id], node);
+      if (!--placeholder.i) {
+        placeholder.c();
+      }
+    };
 
-    if (node.attributes.c) placeholder.c();
+    // repurpose "op" for callbacks ...carefully
+    if (op = runtime.j[id]) {
+      placeholderCallback = placeholder.c;
+      placeholder.c = () => placeholderCallback() + op(runtime);
+    }
   }
 };
-})` : `(e=>{let i,t,r,l,d={},n=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(o,a,c,p,b)=>{"#"==o?(d[a]=t).i++:c==r&&i(),"T"==c.tagName&&(a=c.getAttribute(e.i))&&((p=e.l["^"+a])?t=d[a]={i:0,c(i=e.l[a]||l||c){for(;i.parentNode!==p.parentNode;)i=i.parentNode;for(;i!=r;(r=p.nextSibling).remove());n(p,c)}}:(i=()=>{l=c.previousSibling,n(e.l[a],c),--p.i||p.c()},p=t=d[a],r=c.nextElementSibling||i()),b=t.c,(o=e.j[a])&&(t.c=()=>b()+o(e)),c.attributes.c&&t.c())}})`;
+})`
+) : `(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)))}})`;
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {};
@@ -1501,6 +1500,23 @@ function fork(promise, content) {
     }
   );
 }
+function tryContent(input) {
+  const content = input.content;
+  if (content) {
+    const catchContent = input.catch?.content;
+    const placeholderContent = input.placeholder?.content;
+    if (catchContent) {
+      tryCatch(
+        placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+        catchContent
+      );
+    } else if (placeholderContent) {
+      tryPlaceholder(content, placeholderContent);
+    } else {
+      content();
+    }
+  }
+}
 function tryPlaceholder(content, placeholder) {
   const chunk = $chunk;
   const { boundary } = chunk;
@@ -1809,14 +1825,15 @@ function prepareChunk(chunk) {
     }
     for (const reorderedChunk of state.writeReorders) {
       const { reorderId } = reorderedChunk;
-      let isSync = true;
       let reorderHTML = "";
       let reorderEffects = "";
       let reorderScripts = "";
       let cur = reorderedChunk;
       reorderedChunk.reorderId = null;
       for (; ; ) {
+        const { next } = cur;
         cur.flushPlaceholder();
+        cur.consumed = true;
         reorderHTML += cur.html;
         reorderEffects = concatEffects(reorderEffects, cur.effects);
         reorderScripts = concatScripts(reorderScripts, cur.scripts);
@@ -1826,10 +1843,10 @@ function prepareChunk(chunk) {
             cur.reorderId = state.nextReorderId()
           );
           cur.html = cur.effects = cur.scripts = "";
-          isSync = false;
+          cur.next = null;
         }
-        if (cur.next) {
-          cur = cur.next;
+        if (next) {
+          cur = next;
         } else {
           break;
         }
@@ -1851,7 +1868,7 @@ function prepareChunk(chunk) {
         scripts,
         reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
       );
-      html += "<t " + (isSync ? "c " : "") + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
+      html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
     }
     state.writeReorders = null;
   }
@@ -2658,8 +2675,7 @@ export {
   register2 as register,
   styleAttr,
   toString,
-  tryCatch,
-  tryPlaceholder,
+  tryContent,
   write,
   writeEffect,
   writeExistingScope,

package/dist/html/writer.d.ts

@@ -41,8 +41,15 @@ export declare function $global(): $Global & {
     runtimeId: string;
 };
 export declare function fork<T>(promise: Promise<T> | T, content: (value: T) => void): void;
-export declare function tryPlaceholder(content: () => void, placeholder: () => void): void;
-export declare function tryCatch(content: () => void, catchContent: (err: unknown) => void): void;
+export declare function tryContent(input: {
+    content?(): void;
+    placeholder?: {
+        content?(): void;
+    };
+    catch?: {
+        content?(err: unknown): void;
+    };
+}): void;
 export declare class State {
     $global: $Global & {
         renderId: string;

package/dist/html.d.ts

@@ -6,4 +6,4 @@ export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
 export { createRenderer, dynamicTagArgs, dynamicTagInput, } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
 export { createTemplate } from "./html/template";
-export { $global, ensureScopeWithId, fork, getScopeById, markResumeCleanup, markResumeControlEnd, markResumeControlSingleNodeEnd, markResumeNode, markResumeScopeStart, nextScopeId, nextTagId, nodeRef, peekNextScope, register, tryCatch, tryPlaceholder, write, writeEffect, writeExistingScope, writeScope, writeTrailers, } from "./html/writer";
+export { $global, ensureScopeWithId, fork, getScopeById, markResumeCleanup, markResumeControlEnd, markResumeControlSingleNodeEnd, markResumeNode, markResumeScopeStart, nextScopeId, nextTagId, nodeRef, peekNextScope, register, tryContent, write, writeEffect, writeExistingScope, writeScope, writeTrailers, } from "./html/writer";

package/dist/html.js

@@ -61,8 +61,7 @@ __export(html_exports, {
   register: () => register2,
   styleAttr: () => styleAttr,
   toString: () => toString,
-  tryCatch: () => tryCatch,
-  tryPlaceholder: () => tryPlaceholder,
+  tryContent: () => tryContent,
   write: () => write,
   writeEffect: () => writeEffect,
   writeExistingScope: () => writeExistingScope,
@@ -153,7 +152,7 @@ function escapeStyle(val) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},f=[],s=document,a=s.createTreeWalker(s,129),r=self[e][l]={i:l=e+l,d:s,l:d,v:f,x(){},w(e){for(;e=a.nextNode();)this.x(r=(r=e.data)&&!r.indexOf(l)&&(d[t=r.slice(x+1)]=e,r[x]),t,e),r>"#"&&f.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l,d={},n=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(o,a,c,p,b)=>{"#"==o?(d[a]=t).i++:c==r&&i(),"T"==c.tagName&&(a=c.getAttribute(e.i))&&((p=e.l["^"+a])?t=d[a]={i:0,c(i=e.l[a]||l||c){for(;i.parentNode!==p.parentNode;)i=i.parentNode;for(;i!=r;(r=p.nextSibling).remove());n(p,c)}}:(i=()=>{l=c.previousSibling,n(e.l[a],c),--p.i||p.c()},p=t=d[a],r=c.nextElementSibling||i()),b=t.c,(o=e.j[a])&&(t.c=()=>b()+o(e)),c.attributes.c&&t.c())}})';
+var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(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)))}})';
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {}, Generator = function* () {
@@ -1058,6 +1057,16 @@ function fork(promise, content) {
     }
   );
 }
+function tryContent(input) {
+  let content = input.content;
+  if (content) {
+    let catchContent = input.catch?.content, placeholderContent = input.placeholder?.content;
+    catchContent ? tryCatch(
+      placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+      catchContent
+    ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content();
+  }
+}
 function tryPlaceholder(content, placeholder) {
   let chunk = $chunk, { boundary } = chunk, body = new Chunk(boundary, null, chunk.context);
   if (body === body.render(content)) {
@@ -1239,12 +1248,17 @@ function prepareChunk(chunk) {
       REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")"
     ));
     for (let reorderedChunk of state.writeReorders) {
-      let { reorderId } = reorderedChunk, isSync = !0, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
-      for (reorderedChunk.reorderId = null; cur.flushPlaceholder(), reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
-        "#" /* ReorderMarker */,
-        cur.reorderId = state.nextReorderId()
-      ), cur.html = cur.effects = cur.scripts = "", isSync = !1), cur.next; )
-        cur = cur.next;
+      let { reorderId } = reorderedChunk, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
+      for (reorderedChunk.reorderId = null; ; ) {
+        let { next } = cur;
+        if (cur.flushPlaceholder(), cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
+          "#" /* ReorderMarker */,
+          cur.reorderId = state.nextReorderId()
+        ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)
+          cur = next;
+        else
+          break;
+      }
       reorderEffects && (state.hasWrittenResume || (state.hasWrittenResume = !0, scripts = concatScripts(
         scripts,
         runtimePrefix + ".r=[]"
@@ -1254,7 +1268,7 @@ function prepareChunk(chunk) {
       )), scripts = concatScripts(
         scripts,
         reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
-      ), html += "<t " + (isSync ? "c " : "") + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
+      ), html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
     }
     state.writeReorders = null;
   }
@@ -1813,8 +1827,7 @@ var ServerRenderResult = class {
   register,
   styleAttr,
   toString,
-  tryCatch,
-  tryPlaceholder,
+  tryContent,
   write,
   writeEffect,
   writeExistingScope,

package/dist/html.mjs

@@ -80,7 +80,7 @@ function escapeStyle(val) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},f=[],s=document,a=s.createTreeWalker(s,129),r=self[e][l]={i:l=e+l,d:s,l:d,v:f,x(){},w(e){for(;e=a.nextNode();)this.x(r=(r=e.data)&&!r.indexOf(l)&&(d[t=r.slice(x+1)]=e,r[x]),t,e),r>"#"&&f.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l,d={},n=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(o,a,c,p,b)=>{"#"==o?(d[a]=t).i++:c==r&&i(),"T"==c.tagName&&(a=c.getAttribute(e.i))&&((p=e.l["^"+a])?t=d[a]={i:0,c(i=e.l[a]||l||c){for(;i.parentNode!==p.parentNode;)i=i.parentNode;for(;i!=r;(r=p.nextSibling).remove());n(p,c)}}:(i=()=>{l=c.previousSibling,n(e.l[a],c),--p.i||p.c()},p=t=d[a],r=c.nextElementSibling||i()),b=t.c,(o=e.j[a])&&(t.c=()=>b()+o(e)),c.attributes.c&&t.c())}})';
+var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(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)))}})';
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {}, Generator = function* () {
@@ -985,6 +985,16 @@ function fork(promise, content) {
     }
   );
 }
+function tryContent(input) {
+  let content = input.content;
+  if (content) {
+    let catchContent = input.catch?.content, placeholderContent = input.placeholder?.content;
+    catchContent ? tryCatch(
+      placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+      catchContent
+    ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content();
+  }
+}
 function tryPlaceholder(content, placeholder) {
   let chunk = $chunk, { boundary } = chunk, body = new Chunk(boundary, null, chunk.context);
   if (body === body.render(content)) {
@@ -1166,12 +1176,17 @@ function prepareChunk(chunk) {
       REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")"
     ));
     for (let reorderedChunk of state.writeReorders) {
-      let { reorderId } = reorderedChunk, isSync = !0, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
-      for (reorderedChunk.reorderId = null; cur.flushPlaceholder(), reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
-        "#" /* ReorderMarker */,
-        cur.reorderId = state.nextReorderId()
-      ), cur.html = cur.effects = cur.scripts = "", isSync = !1), cur.next; )
-        cur = cur.next;
+      let { reorderId } = reorderedChunk, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
+      for (reorderedChunk.reorderId = null; ; ) {
+        let { next } = cur;
+        if (cur.flushPlaceholder(), cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
+          "#" /* ReorderMarker */,
+          cur.reorderId = state.nextReorderId()
+        ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)
+          cur = next;
+        else
+          break;
+      }
       reorderEffects && (state.hasWrittenResume || (state.hasWrittenResume = !0, scripts = concatScripts(
         scripts,
         runtimePrefix + ".r=[]"
@@ -1181,7 +1196,7 @@ function prepareChunk(chunk) {
       )), scripts = concatScripts(
         scripts,
         reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
-      ), html += "<t " + (isSync ? "c " : "") + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
+      ), html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
     }
     state.writeReorders = null;
   }
@@ -1739,8 +1754,7 @@ export {
   register2 as register,
   styleAttr,
   toString,
-  tryCatch,
-  tryPlaceholder,
+  tryContent,
   write,
   writeEffect,
   writeExistingScope,

package/dist/translator/core/await.d.ts

@@ -0,0 +1,3 @@
+import { type Tag } from "@marko/compiler/babel-utils";
+declare const _default: Tag;
+export default _default;

package/dist/translator/core/index.d.ts

@@ -1,6 +1,7 @@
 declare const _default: {
     taglibId: string;
     "<attrs>": import("@marko/compiler/babel-utils").Tag;
+    "<await>": import("@marko/compiler/babel-utils").Tag;
     "<client>": {
         parse(tag: import("@marko/compiler/babel-types").NodePath<import("@marko/compiler/babel-types").MarkoTag>): void;
         parseOptions: {
@@ -148,5 +149,6 @@ declare const _default: {
         }[];
     };
     "<style>": import("@marko/compiler/babel-utils").Tag;
+    "<try>": import("@marko/compiler/babel-utils").Tag;
 };
 export default _default;

package/dist/translator/core/try.d.ts

@@ -0,0 +1,3 @@
+import { type Tag } from "@marko/compiler/babel-utils";
+declare const _default: Tag;
+export default _default;

package/dist/translator/index.d.ts

@@ -7,6 +7,7 @@ export declare const taglibs: (string | {
     migrate: import("@marko/compiler/babel-types").Visitor<unknown>;
     taglibId: string;
     "<attrs>": import("@marko/compiler/babel-utils").Tag;
+    "<await>": import("@marko/compiler/babel-utils").Tag;
     "<client>": {
         parse(tag: import("@marko/compiler/babel-types").NodePath<import("@marko/compiler/babel-types").MarkoTag>): void;
         parseOptions: {
@@ -154,6 +155,7 @@ export declare const taglibs: (string | {
         }[];
     };
     "<style>": import("@marko/compiler/babel-utils").Tag;
+    "<try>": import("@marko/compiler/babel-utils").Tag;
 })[][];
 export declare function getRuntimeEntryFiles(output: Config["output"], optimize: boolean): string[];
 declare module "@marko/compiler/dist/types" {