@marko/runtime-tags 0.2.1 → 0.2.2

package/dist/debug/html.js

@@ -66,7 +66,8 @@ __export(html_exports, {
   write: () => write,
   writeEffect: () => writeEffect,
   writeExistingScope: () => writeExistingScope,
-  writeScope: () => writeScope
+  writeScope: () => writeScope,
+  writeTrailers: () => writeTrailers
 });
 module.exports = __toCommonJS(html_exports);
 
@@ -1676,6 +1677,7 @@ var State2 = class {
   hasMainRuntime = false;
   hasReorderRuntime = false;
   hasWrittenResume = false;
+  trailerHTML = "";
   serializer = new Serializer();
   writeReorders = null;
   scopes = /* @__PURE__ */ new Map();
@@ -1952,18 +1954,29 @@ function prepareChunk(chunk) {
   head.scripts = scripts;
   return head;
 }
-function flushChunk(head) {
+function flushChunk(head, last) {
+  const { boundary } = head;
+  const { state } = boundary;
   const { html, scripts } = head;
-  const { $global: $global2 } = head.boundary.state;
+  const { $global: $global2 } = state;
   const { __flush__ } = $global2;
-  const result = scripts ? html + "<script" + (head.boundary.state.$global.cspNonce ? " nonce=" + escapeAttrValue(head.boundary.state.$global.cspNonce + "") : "") + ">" + scripts + "</script>" : html;
+  let result = html;
   head.html = head.scripts = "";
+  if (scripts) {
+    result += ($global2.cspNonce ? "<script nonce=" + escapeAttrValue($global2.cspNonce + "") + ">" : "<script>") + scripts + "</script>";
+  }
   if (__flush__) {
     $global2.__flush__ = void 0;
-    return __flush__($global2, result);
+    result = __flush__($global2, result);
+  }
+  if (last && state.trailerHTML) {
+    result += state.trailerHTML;
   }
   return result;
 }
+function writeTrailers(html) {
+  $chunk.boundary.state.trailerHTML += html;
+}
 function concatEffects(a, b) {
   return a ? b ? a + "," + b : a : b;
 }
@@ -2561,7 +2574,7 @@ var ServerRenderResult = class {
             reject(boundary.signal.reason);
           } else {
             head = prepareChunk(head);
-            if (boundary.done) resolve(flushChunk(head));
+            if (boundary.done) resolve(flushChunk(head, true));
           }
         }
       })();
@@ -2586,7 +2599,7 @@ var ServerRenderResult = class {
         head = prepareChunk(head);
       }
       if (write2 || boundary.done) {
-        const html = flushChunk(head);
+        const html = flushChunk(head, boundary.done);
         if (html) onWrite(html);
         if (boundary.done) {
           if (!tick2) offTick(onNext);
@@ -2607,7 +2620,7 @@ var ServerRenderResult = class {
     if (!head) throw new Error("Cannot read from a consumed render result");
     if (head.next) throw new Error("Cannot fork in sync mode");
     this.#head = null;
-    return flushChunk(prepareChunk(head));
+    return flushChunk(prepareChunk(head), true);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
@@ -2658,5 +2671,6 @@ var ServerRenderResult = class {
   write,
   writeEffect,
   writeExistingScope,
-  writeScope
+  writeScope,
+  writeTrailers
 });

package/dist/debug/html.mjs

@@ -1604,6 +1604,7 @@ var State2 = class {
   hasMainRuntime = false;
   hasReorderRuntime = false;
   hasWrittenResume = false;
+  trailerHTML = "";
   serializer = new Serializer();
   writeReorders = null;
   scopes = /* @__PURE__ */ new Map();
@@ -1880,18 +1881,29 @@ function prepareChunk(chunk) {
   head.scripts = scripts;
   return head;
 }
-function flushChunk(head) {
+function flushChunk(head, last) {
+  const { boundary } = head;
+  const { state } = boundary;
   const { html, scripts } = head;
-  const { $global: $global2 } = head.boundary.state;
+  const { $global: $global2 } = state;
   const { __flush__ } = $global2;
-  const result = scripts ? html + "<script" + (head.boundary.state.$global.cspNonce ? " nonce=" + escapeAttrValue(head.boundary.state.$global.cspNonce + "") : "") + ">" + scripts + "</script>" : html;
+  let result = html;
   head.html = head.scripts = "";
+  if (scripts) {
+    result += ($global2.cspNonce ? "<script nonce=" + escapeAttrValue($global2.cspNonce + "") + ">" : "<script>") + scripts + "</script>";
+  }
   if (__flush__) {
     $global2.__flush__ = void 0;
-    return __flush__($global2, result);
+    result = __flush__($global2, result);
+  }
+  if (last && state.trailerHTML) {
+    result += state.trailerHTML;
   }
   return result;
 }
+function writeTrailers(html) {
+  $chunk.boundary.state.trailerHTML += html;
+}
 function concatEffects(a, b) {
   return a ? b ? a + "," + b : a : b;
 }
@@ -2489,7 +2501,7 @@ var ServerRenderResult = class {
             reject(boundary.signal.reason);
           } else {
             head = prepareChunk(head);
-            if (boundary.done) resolve(flushChunk(head));
+            if (boundary.done) resolve(flushChunk(head, true));
           }
         }
       })();
@@ -2514,7 +2526,7 @@ var ServerRenderResult = class {
         head = prepareChunk(head);
       }
       if (write2 || boundary.done) {
-        const html = flushChunk(head);
+        const html = flushChunk(head, boundary.done);
         if (html) onWrite(html);
         if (boundary.done) {
           if (!tick2) offTick(onNext);
@@ -2535,7 +2547,7 @@ var ServerRenderResult = class {
     if (!head) throw new Error("Cannot read from a consumed render result");
     if (head.next) throw new Error("Cannot fork in sync mode");
     this.#head = null;
-    return flushChunk(prepareChunk(head));
+    return flushChunk(prepareChunk(head), true);
   }
 };
 export {
@@ -2585,5 +2597,6 @@ export {
   write,
   writeEffect,
   writeExistingScope,
-  writeScope
+  writeScope,
+  writeTrailers
 };

package/dist/html/writer.d.ts

@@ -56,6 +56,7 @@ export declare class State {
     hasMainRuntime: boolean;
     hasReorderRuntime: boolean;
     hasWrittenResume: boolean;
+    trailerHTML: string;
     serializer: Serializer;
     writeReorders: Chunk[] | null;
     scopes: Map<number, PartialScope>;
@@ -104,7 +105,8 @@ export declare class Chunk {
     render<T>(renderBody: (val: T) => void, val: T): Chunk;
 }
 export declare function prepareChunk(chunk: Chunk): Chunk;
-export declare function flushChunk(head: Chunk): string;
+export declare function flushChunk(head: Chunk, last: boolean): string;
+export declare function writeTrailers(html: string): void;
 type QueueCallback = (ticked: true) => void;
 export declare function queueTick(cb: QueueCallback): void;
 export declare function offTick(cb: QueueCallback): void;

package/dist/html.d.ts

@@ -6,4 +6,4 @@ export { compat } from "./html/compat";
 export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
 export { createRenderer, dynamicTagArgs, dynamicTagInput, } from "./html/dynamic-tag";
 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, } from "./html/writer";
+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";

package/dist/html.js

@@ -63,7 +63,8 @@ __export(html_exports, {
   write: () => write,
   writeEffect: () => writeEffect,
   writeExistingScope: () => writeExistingScope,
-  writeScope: () => writeScope
+  writeScope: () => writeScope,
+  writeTrailers: () => writeTrailers
 });
 module.exports = __toCommonJS(html_exports);
 
@@ -1119,6 +1120,7 @@ var State2 = class {
   hasMainRuntime = !1;
   hasReorderRuntime = !1;
   hasWrittenResume = !1;
+  trailerHTML = "";
   serializer = new Serializer();
   writeReorders = null;
   scopes = /* @__PURE__ */ new Map();
@@ -1272,9 +1274,12 @@ function prepareChunk(chunk) {
   }
   return hasWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), head.html = html, head.scripts = scripts, head;
 }
-function flushChunk(head) {
-  let { html, scripts } = head, { $global: $global2 } = head.boundary.state, { __flush__ } = $global2, result = scripts ? html + "<script" + (head.boundary.state.$global.cspNonce ? " nonce=" + escapeAttrValue(head.boundary.state.$global.cspNonce + "") : "") + ">" + scripts + "</script>" : html;
-  return head.html = head.scripts = "", __flush__ ? ($global2.__flush__ = void 0, __flush__($global2, result)) : result;
+function flushChunk(head, last) {
+  let { boundary } = head, { state } = boundary, { html, scripts } = head, { $global: $global2 } = state, { __flush__ } = $global2, result = html;
+  return head.html = head.scripts = "", scripts && (result += ($global2.cspNonce ? "<script nonce=" + escapeAttrValue($global2.cspNonce + "") + ">" : "<script>") + scripts + "</script>"), __flush__ && ($global2.__flush__ = void 0, result = __flush__($global2, result)), last && state.trailerHTML && (result += state.trailerHTML), result;
+}
+function writeTrailers(html) {
+  $chunk.boundary.state.trailerHTML += html;
 }
 function concatEffects(a, b) {
   return a ? b ? a + "," + b : a : b;
@@ -1689,7 +1694,7 @@ var ServerRenderResult = class {
         return reject(new Error("Cannot read from a consumed render result"));
       let { boundary } = head;
       (boundary.onNext = () => {
-        boundary.done && (boundary.signal.aborted ? reject(boundary.signal.reason) : (head = prepareChunk(head), boundary.done && resolve(flushChunk(head))));
+        boundary.done && (boundary.signal.aborted ? reject(boundary.signal.reason) : (head = prepareChunk(head), boundary.done && resolve(flushChunk(head, !0))));
       })();
     });
   }
@@ -1708,7 +1713,7 @@ var ServerRenderResult = class {
         head = prepareChunk(head);
       }
       if (write2 || boundary.done) {
-        let html = flushChunk(head);
+        let html = flushChunk(head, boundary.done);
         html && onWrite(html), boundary.done ? (tick2 || offTick(onNext), onClose()) : tick2 = !0;
       } else tick2 && (tick2 = !1, queueTick(onNext));
     };
@@ -1718,7 +1723,7 @@ var ServerRenderResult = class {
     let head = this.#head;
     if (!head) throw new Error("Cannot read from a consumed render result");
     if (head.next) throw new Error("Cannot fork in sync mode");
-    return this.#head = null, flushChunk(prepareChunk(head));
+    return this.#head = null, flushChunk(prepareChunk(head), !0);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
@@ -1769,5 +1774,6 @@ var ServerRenderResult = class {
   write,
   writeEffect,
   writeExistingScope,
-  writeScope
+  writeScope,
+  writeTrailers
 });

package/dist/html.mjs

@@ -1050,6 +1050,7 @@ var State2 = class {
   hasMainRuntime = !1;
   hasReorderRuntime = !1;
   hasWrittenResume = !1;
+  trailerHTML = "";
   serializer = new Serializer();
   writeReorders = null;
   scopes = /* @__PURE__ */ new Map();
@@ -1203,9 +1204,12 @@ function prepareChunk(chunk) {
   }
   return hasWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), head.html = html, head.scripts = scripts, head;
 }
-function flushChunk(head) {
-  let { html, scripts } = head, { $global: $global2 } = head.boundary.state, { __flush__ } = $global2, result = scripts ? html + "<script" + (head.boundary.state.$global.cspNonce ? " nonce=" + escapeAttrValue(head.boundary.state.$global.cspNonce + "") : "") + ">" + scripts + "</script>" : html;
-  return head.html = head.scripts = "", __flush__ ? ($global2.__flush__ = void 0, __flush__($global2, result)) : result;
+function flushChunk(head, last) {
+  let { boundary } = head, { state } = boundary, { html, scripts } = head, { $global: $global2 } = state, { __flush__ } = $global2, result = html;
+  return head.html = head.scripts = "", scripts && (result += ($global2.cspNonce ? "<script nonce=" + escapeAttrValue($global2.cspNonce + "") + ">" : "<script>") + scripts + "</script>"), __flush__ && ($global2.__flush__ = void 0, result = __flush__($global2, result)), last && state.trailerHTML && (result += state.trailerHTML), result;
+}
+function writeTrailers(html) {
+  $chunk.boundary.state.trailerHTML += html;
 }
 function concatEffects(a, b) {
   return a ? b ? a + "," + b : a : b;
@@ -1620,7 +1624,7 @@ var ServerRenderResult = class {
         return reject(new Error("Cannot read from a consumed render result"));
       let { boundary } = head;
       (boundary.onNext = () => {
-        boundary.done && (boundary.signal.aborted ? reject(boundary.signal.reason) : (head = prepareChunk(head), boundary.done && resolve(flushChunk(head))));
+        boundary.done && (boundary.signal.aborted ? reject(boundary.signal.reason) : (head = prepareChunk(head), boundary.done && resolve(flushChunk(head, !0))));
       })();
     });
   }
@@ -1639,7 +1643,7 @@ var ServerRenderResult = class {
         head = prepareChunk(head);
       }
       if (write2 || boundary.done) {
-        let html = flushChunk(head);
+        let html = flushChunk(head, boundary.done);
         html && onWrite(html), boundary.done ? (tick2 || offTick(onNext), onClose()) : tick2 = !0;
       } else tick2 && (tick2 = !1, queueTick(onNext));
     };
@@ -1649,7 +1653,7 @@ var ServerRenderResult = class {
     let head = this.#head;
     if (!head) throw new Error("Cannot read from a consumed render result");
     if (head.next) throw new Error("Cannot fork in sync mode");
-    return this.#head = null, flushChunk(prepareChunk(head));
+    return this.#head = null, flushChunk(prepareChunk(head), !0);
   }
 };
 export {
@@ -1699,5 +1703,6 @@ export {
   write,
   writeEffect,
   writeExistingScope,
-  writeScope
+  writeScope,
+  writeTrailers
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",