marko 6.0.78 → 6.0.80

package/dist/debug/html.mjs

@@ -1707,6 +1707,14 @@ function getScopeById(scopeId) {
     return $chunk.boundary.state.scopes.get(scopeId);
   }
 }
+function _set_serialize_reason(reason) {
+  $chunk.boundary.state.serializeReason = reason;
+}
+function _get_serialize_reason() {
+  const reason = $chunk.boundary.state.serializeReason;
+  $chunk.boundary.state.serializeReason = void 0;
+  return reason;
+}
 function _serialize_if(condition, key) {
   return condition && (condition === 1 || condition[key]) ? 1 : void 0;
 }
@@ -2202,6 +2210,7 @@ var State2 = class {
   writeReorders = null;
   scopes = /* @__PURE__ */ new Map();
   writeScopes = null;
+  serializeReason;
   get runtimePrefix() {
     const { $global: $global2 } = this;
     return $global2.runtimeId + "." + $global2.renderId;
@@ -2843,245 +2852,6 @@ var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
 var DEFAULT_RUNTIME_ID = "M";
 var DEFAULT_RENDER_ID = "_";
 
-// src/html/template.ts
-var _template = (templateId, renderer) => {
-  renderer.render = render;
-  renderer._ = renderer;
-  if (true) {
-    renderer.mount = () => {
-      throw new Error(
-        `mount() is not implemented for the HTML compilation of a Marko template`
-      );
-    };
-  }
-  return _content_resume(templateId, renderer);
-};
-function isTemplate(renderer) {
-  return !!renderer._;
-}
-function render(input = {}) {
-  let { $global: $global2 } = input;
-  if ($global2) {
-    ({ $global: $global2, ...input } = input);
-    $global2 = {
-      runtimeId: DEFAULT_RUNTIME_ID,
-      renderId: DEFAULT_RENDER_ID,
-      ...$global2
-    };
-    if (true) {
-      if (!String($global2.runtimeId).match(/^[_$a-z][_$a-z0-9]*$/i)) {
-        throw new Error(
-          `Invalid runtimeId: "${$global2.runtimeId}". The runtimeId must be a valid JavaScript identifier.`
-        );
-      }
-      if (!String($global2.renderId).match(/^[_$a-z][_$a-z0-9]*$/i)) {
-        throw new Error(
-          `Invalid renderId: "${$global2.renderId}". The renderId must be a valid JavaScript identifier.`
-        );
-      }
-    }
-  } else {
-    $global2 = { runtimeId: DEFAULT_RUNTIME_ID, renderId: DEFAULT_RENDER_ID };
-  }
-  const head = new Chunk(
-    new Boundary(new State2($global2), $global2.signal),
-    null,
-    null
-  );
-  head.render(this, input);
-  return new ServerRendered(head);
-}
-var ServerRendered = class {
-  #head;
-  #cachedPromise = null;
-  constructor(head) {
-    this.#head = head;
-  }
-  [Symbol.asyncIterator]() {
-    let resolve;
-    let reject;
-    let value = "";
-    let done = false;
-    let aborted = false;
-    let reason;
-    const boundary = this.#read(
-      (html) => {
-        value += html;
-        if (resolve) {
-          resolve({ value, done });
-          value = "";
-        }
-      },
-      (err) => {
-        aborted = true;
-        reason = err;
-        if (reject) {
-          reject(err);
-        }
-      },
-      () => {
-        done = true;
-        if (resolve) {
-          resolve({ value, done: !value });
-          value = "";
-        }
-      }
-    );
-    return {
-      next() {
-        if (aborted) {
-          return Promise.reject(reason);
-        } else if (value) {
-          const result = { value, done: false };
-          value = "";
-          return Promise.resolve(result);
-        } else if (done) {
-          return Promise.resolve({ value: "", done });
-        } else {
-          return new Promise(exec);
-        }
-      },
-      throw(error) {
-        if (!(done || aborted)) {
-          boundary?.abort(error);
-        }
-        return Promise.resolve({ value: "", done: true });
-      },
-      return(value2) {
-        if (!(done || aborted)) {
-          boundary?.abort(new Error("Iterator returned before consumed."));
-        }
-        return Promise.resolve({ value: value2, done: true });
-      }
-    };
-    function exec(_resolve, _reject) {
-      resolve = _resolve;
-      reject = _reject;
-    }
-  }
-  pipe(stream) {
-    this.#read(
-      (html) => {
-        stream.write(html);
-      },
-      (err) => {
-        const socket = "socket" in stream && stream.socket;
-        if (socket && typeof socket.destroySoon === "function") {
-          socket.destroySoon();
-        }
-        if (!stream.emit?.("error", err)) {
-          throw err;
-        }
-      },
-      () => {
-        stream.end();
-      }
-    );
-  }
-  toReadable() {
-    let cancelled = false;
-    let boundary;
-    const encoder = new TextEncoder();
-    return new ReadableStream({
-      start: (ctrl) => {
-        boundary = this.#read(
-          (html) => {
-            ctrl.enqueue(encoder.encode(html));
-          },
-          (err) => {
-            boundary = void 0;
-            if (!cancelled) {
-              ctrl.error(err);
-            }
-          },
-          () => {
-            boundary = void 0;
-            ctrl.close();
-          }
-        );
-      },
-      cancel: (reason) => {
-        cancelled = true;
-        boundary?.abort(reason);
-      }
-    });
-  }
-  then(onfulfilled, onrejected) {
-    return this.#promise().then(onfulfilled, onrejected);
-  }
-  catch(onrejected) {
-    return this.#promise().catch(onrejected);
-  }
-  finally(onfinally) {
-    return this.#promise().finally(onfinally);
-  }
-  #promise() {
-    return this.#cachedPromise ||= new Promise((resolve, reject) => {
-      const head = this.#head;
-      this.#head = null;
-      if (!head) {
-        return reject(new Error("Cannot read from a consumed render result"));
-      }
-      const { boundary } = head;
-      (boundary.onNext = () => {
-        if (boundary.signal.aborted) {
-          boundary.onNext = NOOP2;
-          reject(boundary.signal.reason);
-        } else if (!boundary.count && boundary.done) {
-          resolve(head.consume().flushHTML());
-        }
-      })();
-    });
-  }
-  #read(onWrite, onAbort, onClose) {
-    let tick2 = true;
-    let head = this.#head;
-    this.#head = null;
-    if (!head) {
-      onAbort(new Error("Cannot read from a consumed render result"));
-      return;
-    }
-    const { boundary } = head;
-    const onNext = boundary.onNext = (write) => {
-      if (boundary.signal.aborted) {
-        if (!tick2) offTick(onNext);
-        boundary.onNext = NOOP2;
-        onAbort(boundary.signal.reason);
-      } else {
-        const { done } = boundary;
-        if (done || write) {
-          const html = (head = head.consume()).flushHTML();
-          if (html) onWrite(html);
-          if (done) {
-            if (!tick2) offTick(onNext);
-            onClose();
-          } else {
-            tick2 = true;
-          }
-        } else if (tick2) {
-          tick2 = false;
-          queueTick(onNext);
-        }
-      }
-    };
-    onNext();
-    return boundary;
-  }
-  toString() {
-    const head = this.#head;
-    this.#head = null;
-    if (!head) throw new Error("Cannot read from a consumed render result");
-    const { boundary } = head;
-    if (!boundary.done) {
-      throw new Error("Cannot consume asynchronous render with 'toString'");
-    }
-    if (boundary.signal.aborted) throw boundary.signal.reason;
-    return head.consume().flushHTML();
-  }
-};
-function NOOP2() {
-}
-
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
 var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
@@ -3165,16 +2935,14 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
     }
     const render2 = () => {
       if (renderer) {
-        if (isTemplate(renderer)) {
-          const input = inputIsArgs ? inputOrArgs[0] : inputOrArgs;
-          return renderer(
-            content ? { ...input, content } : input,
-            shouldResume ? 1 : 0
+        try {
+          _set_serialize_reason(shouldResume ? 1 : 0);
+          return inputIsArgs ? renderer(...inputOrArgs) : renderer(
+            content ? { ...inputOrArgs, content } : inputOrArgs
           );
+        } finally {
+          _set_serialize_reason(void 0);
         }
-        return inputIsArgs ? renderer(...inputOrArgs) : renderer(
-          content ? { ...inputOrArgs, content } : inputOrArgs
-        );
       } else if (content) {
         return content();
       }
@@ -3308,19 +3076,20 @@ var compat = {
         writeScope(scopeId, { m5c: component.id });
         _script(scopeId, SET_SCOPE_REGISTER_ID);
       }
-      if (isTemplate(renderer) && willRerender) {
-        renderer(normalizedInput, 1);
-      } else {
+      _set_serialize_reason(willRerender ? 1 : 0);
+      try {
         renderer(normalizedInput);
+      } finally {
+        _set_serialize_reason(void 0);
       }
       const asyncOut = classAPIOut.beginAsync({ last: true, timeout: -1 });
       classAPIOut.onLast((next) => {
         (boundary.onNext = () => {
           if (boundary.signal.aborted) {
             asyncOut.error(boundary.signal.reason);
-            boundary.onNext = NOOP3;
+            boundary.onNext = NOOP2;
           } else if (!boundary.count) {
-            boundary.onNext = NOOP3;
+            boundary.onNext = NOOP2;
             head = head.consume();
             asyncOut.write(head.html);
             asyncOut.script(head.scripts);
@@ -3345,6 +3114,242 @@ var compat = {
     register(RENDER_BODY_ID, fn);
   }
 };
+function NOOP2() {
+}
+
+// src/html/template.ts
+var _template = (templateId, renderer) => {
+  renderer.render = render;
+  renderer._ = renderer;
+  if (true) {
+    renderer.mount = () => {
+      throw new Error(
+        `mount() is not implemented for the HTML compilation of a Marko template`
+      );
+    };
+  }
+  return _content_resume(templateId, renderer);
+};
+function render(input = {}) {
+  let { $global: $global2 } = input;
+  if ($global2) {
+    ({ $global: $global2, ...input } = input);
+    $global2 = {
+      runtimeId: DEFAULT_RUNTIME_ID,
+      renderId: DEFAULT_RENDER_ID,
+      ...$global2
+    };
+    if (true) {
+      if (!String($global2.runtimeId).match(/^[_$a-z][_$a-z0-9]*$/i)) {
+        throw new Error(
+          `Invalid runtimeId: "${$global2.runtimeId}". The runtimeId must be a valid JavaScript identifier.`
+        );
+      }
+      if (!String($global2.renderId).match(/^[_$a-z][_$a-z0-9]*$/i)) {
+        throw new Error(
+          `Invalid renderId: "${$global2.renderId}". The renderId must be a valid JavaScript identifier.`
+        );
+      }
+    }
+  } else {
+    $global2 = { runtimeId: DEFAULT_RUNTIME_ID, renderId: DEFAULT_RENDER_ID };
+  }
+  const head = new Chunk(
+    new Boundary(new State2($global2), $global2.signal),
+    null,
+    null
+  );
+  head.render(this, input);
+  return new ServerRendered(head);
+}
+var ServerRendered = class {
+  #head;
+  #cachedPromise = null;
+  constructor(head) {
+    this.#head = head;
+  }
+  [Symbol.asyncIterator]() {
+    let resolve;
+    let reject;
+    let value = "";
+    let done = false;
+    let aborted = false;
+    let reason;
+    const boundary = this.#read(
+      (html) => {
+        value += html;
+        if (resolve) {
+          resolve({ value, done });
+          value = "";
+        }
+      },
+      (err) => {
+        aborted = true;
+        reason = err;
+        if (reject) {
+          reject(err);
+        }
+      },
+      () => {
+        done = true;
+        if (resolve) {
+          resolve({ value, done: !value });
+          value = "";
+        }
+      }
+    );
+    return {
+      next() {
+        if (aborted) {
+          return Promise.reject(reason);
+        } else if (value) {
+          const result = { value, done: false };
+          value = "";
+          return Promise.resolve(result);
+        } else if (done) {
+          return Promise.resolve({ value: "", done });
+        } else {
+          return new Promise(exec);
+        }
+      },
+      throw(error) {
+        if (!(done || aborted)) {
+          boundary?.abort(error);
+        }
+        return Promise.resolve({ value: "", done: true });
+      },
+      return(value2) {
+        if (!(done || aborted)) {
+          boundary?.abort(new Error("Iterator returned before consumed."));
+        }
+        return Promise.resolve({ value: value2, done: true });
+      }
+    };
+    function exec(_resolve, _reject) {
+      resolve = _resolve;
+      reject = _reject;
+    }
+  }
+  pipe(stream) {
+    this.#read(
+      (html) => {
+        stream.write(html);
+      },
+      (err) => {
+        const socket = "socket" in stream && stream.socket;
+        if (socket && typeof socket.destroySoon === "function") {
+          socket.destroySoon();
+        }
+        if (!stream.emit?.("error", err)) {
+          throw err;
+        }
+      },
+      () => {
+        stream.end();
+      }
+    );
+  }
+  toReadable() {
+    let cancelled = false;
+    let boundary;
+    const encoder = new TextEncoder();
+    return new ReadableStream({
+      start: (ctrl) => {
+        boundary = this.#read(
+          (html) => {
+            ctrl.enqueue(encoder.encode(html));
+          },
+          (err) => {
+            boundary = void 0;
+            if (!cancelled) {
+              ctrl.error(err);
+            }
+          },
+          () => {
+            boundary = void 0;
+            ctrl.close();
+          }
+        );
+      },
+      cancel: (reason) => {
+        cancelled = true;
+        boundary?.abort(reason);
+      }
+    });
+  }
+  then(onfulfilled, onrejected) {
+    return this.#promise().then(onfulfilled, onrejected);
+  }
+  catch(onrejected) {
+    return this.#promise().catch(onrejected);
+  }
+  finally(onfinally) {
+    return this.#promise().finally(onfinally);
+  }
+  #promise() {
+    return this.#cachedPromise ||= new Promise((resolve, reject) => {
+      const head = this.#head;
+      this.#head = null;
+      if (!head) {
+        return reject(new Error("Cannot read from a consumed render result"));
+      }
+      const { boundary } = head;
+      (boundary.onNext = () => {
+        if (boundary.signal.aborted) {
+          boundary.onNext = NOOP3;
+          reject(boundary.signal.reason);
+        } else if (!boundary.count && boundary.done) {
+          resolve(head.consume().flushHTML());
+        }
+      })();
+    });
+  }
+  #read(onWrite, onAbort, onClose) {
+    let tick2 = true;
+    let head = this.#head;
+    this.#head = null;
+    if (!head) {
+      onAbort(new Error("Cannot read from a consumed render result"));
+      return;
+    }
+    const { boundary } = head;
+    const onNext = boundary.onNext = (write) => {
+      if (boundary.signal.aborted) {
+        if (!tick2) offTick(onNext);
+        boundary.onNext = NOOP3;
+        onAbort(boundary.signal.reason);
+      } else {
+        const { done } = boundary;
+        if (done || write) {
+          const html = (head = head.consume()).flushHTML();
+          if (html) onWrite(html);
+          if (done) {
+            if (!tick2) offTick(onNext);
+            onClose();
+          } else {
+            tick2 = true;
+          }
+        } else if (tick2) {
+          tick2 = false;
+          queueTick(onNext);
+        }
+      }
+    };
+    onNext();
+    return boundary;
+  }
+  toString() {
+    const head = this.#head;
+    this.#head = null;
+    if (!head) throw new Error("Cannot read from a consumed render result");
+    const { boundary } = head;
+    if (!boundary.done) {
+      throw new Error("Cannot consume asynchronous render with 'toString'");
+    }
+    if (boundary.signal.aborted) throw boundary.signal.reason;
+    return head.consume().flushHTML();
+  }
+};
 function NOOP3() {
 }
 export {
@@ -3380,6 +3385,7 @@ export {
   _for_of,
   _for_to,
   _for_until,
+  _get_serialize_reason,
   _hoist,
   _html,
   _id,
@@ -3394,6 +3400,7 @@ export {
   _sep,
   _serialize_guard,
   _serialize_if,
+  _set_serialize_reason,
   _subscribe,
   _template,
   _trailers,

package/dist/dom/signals.d.ts

@@ -15,6 +15,13 @@ export declare function _closure_get<T>(valueAccessor: Accessor, fn: Signal<T>,
     ___signalIndexAccessor: string;
     ___index: number;
 };
+export declare function _child_setup(setup: Signal<never> & {
+    _: Signal<Scope>;
+}): SignalFn<never> & {
+    ___subscribe?(scope: Scope): void;
+} & {
+    _: Signal<Scope>;
+};
 export declare function _var(scope: Scope, childAccessor: Accessor, signal: Signal<unknown>): void;
 export declare const _return: (scope: Scope, value: unknown) => any;
 export declare function _return_change(scope: Scope, changeHandler?: ((value: unknown) => void) | null | false): void;

package/dist/dom.d.ts

@@ -9,5 +9,5 @@ export { _on } from "./dom/event";
 export { _enable_catch as _enable_catch, run } from "./dom/queue";
 export { _content, _content_branch, _content_closures, _content_resume, } from "./dom/renderer";
 export { _el, _resume, _var_resume, init } from "./dom/resume";
-export { _closure, _closure_get, _const, _for_closure, _hoist, _id, _if_closure, _let, _or, _return, _return_change, _script, _var, _var_change, } from "./dom/signals";
+export { _child_setup, _closure, _closure_get, _const, _for_closure, _hoist, _id, _if_closure, _let, _or, _return, _return_change, _script, _var, _var_change, } from "./dom/signals";
 export { _template } from "./dom/template";

package/dist/dom.js

@@ -47,6 +47,7 @@ __export(dom_exports, {
   _attrs_partial_content: () => _attrs_partial_content,
   _attrs_script: () => _attrs_script,
   _await: () => _await,
+  _child_setup: () => _child_setup,
   _closure: () => _closure,
   _closure_get: () => _closure_get,
   _const: () => _const,
@@ -686,6 +687,11 @@ function closure(valueAccessor, fn, getOwnerScope) {
     );
   };
 }
+function _child_setup(setup) {
+  return setup._ = (scope, owner) => {
+    scope._ = owner, queueRender(scope, setup, -1);
+  }, setup;
+}
 function _var(scope, childAccessor, signal) {
   scope[childAccessor].e = (value) => signal(scope, value);
 }

package/dist/dom.mjs

@@ -590,6 +590,11 @@ function closure(valueAccessor, fn, getOwnerScope) {
     );
   };
 }
+function _child_setup(setup) {
+  return setup._ = (scope, owner) => {
+    scope._ = owner, queueRender(scope, setup, -1);
+  }, setup;
+}
 function _var(scope, childAccessor, signal) {
   scope[childAccessor].e = (value) => signal(scope, value);
 }
@@ -1489,6 +1494,7 @@ export {
   _attrs_partial_content,
   _attrs_script,
   _await,
+  _child_setup,
   _closure,
   _closure_get,
   _const,

package/dist/html/compat.d.ts

@@ -1,5 +1,5 @@
 import { patchDynamicTag } from "./dynamic-tag";
-import { type ServerRenderer } from "./template";
+import type { ServerRenderer } from "./template";
 import { _await, _html, _peek_scope_id, _scope_id, $global, Chunk, isInResumedBranch, State, writeScript } from "./writer";
 export declare const compat: {
     $global: typeof $global;

package/dist/html/dynamic-tag.d.ts

@@ -1,5 +1,5 @@
 import { type Accessor } from "../common/types";
-import { type ServerRenderer } from "./template";
+import type { ServerRenderer } from "./template";
 interface BodyContentObject {
     [x: PropertyKey]: unknown;
     content: ServerRenderer;

package/dist/html/writer.d.ts

@@ -27,6 +27,8 @@ export declare function _id(): string;
 export declare function _scope_id(): number;
 export declare function _peek_scope_id(): number;
 export declare function getScopeById(scopeId: number | undefined): PartialScope | undefined;
+export declare function _set_serialize_reason(reason: undefined | 0 | 1): void;
+export declare function _get_serialize_reason(): 0 | 1 | undefined;
 export declare function _serialize_if(condition: undefined | 1 | Record<string, 1>, key: string): 1 | undefined;
 export declare function _serialize_guard(condition: undefined | 1 | Record<string, 1>, key: string): 0 | 1;
 export declare function _el_resume(scopeId: number, accessor: Accessor, shouldResume?: 0 | 1): string;
@@ -84,6 +86,7 @@ export declare class State {
     writeReorders: Chunk[] | null;
     scopes: Map<number, PartialScope>;
     writeScopes: null | Record<number, PartialScope>;
+    serializeReason: undefined | 0 | 1;
     constructor($global: $Global & {
         renderId: string;
         runtimeId: string;

package/dist/html.d.ts

@@ -5,4 +5,4 @@ export { _escape, _escape_script, _escape_style, _escape_textarea_value, _unesca
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, } from "./html/for";
 export { _template } from "./html/template";
-export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _scope, _scope_id, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";
+export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _get_serialize_reason, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _scope, _scope_id, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";