marko 6.0.0-next.3.84 → 6.0.0-next.3.86

package/dist/debug/html.mjs

@@ -1616,9 +1616,9 @@ function withContext(key, value, cb) {
     ctx[key] = prev;
   }
 }
-function setTagVar(parentScopeId, scopeOffsetAccessor, childScope, registryId) {
+function setTagVar(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
   ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId();
-  childScope["#TagVariable" /* TagVariable */] = register2(
+  ensureScopeWithId(childScopeId)["#TagVariable" /* TagVariable */] = register2(
     {},
     registryId,
     parentScopeId
@@ -1638,19 +1638,26 @@ function nextScopeId() {
 function peekNextScopeId() {
   return $chunk.boundary.state.scopeId;
 }
-function peekNextScope() {
-  return ensureScopeWithId(peekNextScopeId());
-}
 function getScopeById(scopeId) {
   if (scopeId !== void 0) {
     return $chunk.boundary.state.scopes.get(scopeId);
   }
 }
-function markResumeNode(scopeId, accessor) {
+function serializeIf(condition, key) {
+  return condition && (condition === 1 || condition[key]) ? 1 : void 0;
+}
+function serializeGuard(condition, key) {
+  return condition && (condition === 1 || condition[key]) ? 1 : 0;
+}
+function markResumeNode(scopeId, accessor, shouldResume) {
+  if (shouldResume === 0) return "";
   const { state } = $chunk.boundary;
   state.needsMainRuntime = true;
   return state.mark("*" /* Node */, scopeId + " " + accessor);
 }
+function commentSeparator(shouldResume) {
+  return shouldResume === 0 ? "" : "<!>";
+}
 function nodeRef(scopeId, id) {
   const getter = () => {
     if (true) {
@@ -1678,7 +1685,10 @@ var branchIdKey = Symbol();
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor) {
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch) {
+  if (serializeBranch === 0) {
+    return forOf(list, cb);
+  }
   const loopScopes = /* @__PURE__ */ new Map();
   forOf(list, (item, index) => {
     const branchId = peekNextScopeId();
@@ -1705,7 +1715,10 @@ function resumeForOf(list, cb, by, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, onlyChildInParent) {
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, onlyChildInParent) {
+  if (serializeBranch === 0) {
+    return forOf(list, cb);
+  }
   const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forOf(list, (item, index) => {
@@ -1737,7 +1750,10 @@ function forOfBy(by, item, index) {
   }
   return index;
 }
-function resumeForIn(obj, cb, by, scopeId, accessor) {
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch) {
+  if (serializeBranch === 0) {
+    return forIn(obj, cb);
+  }
   const loopScopes = /* @__PURE__ */ new Map();
   let sep = "";
   forIn(obj, (key, value) => {
@@ -1763,7 +1779,10 @@ function resumeForIn(obj, cb, by, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, onlyChild) {
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, onlyChild) {
+  if (serializeBranch === 0) {
+    return forIn(obj, cb);
+  }
   const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forIn(obj, (key, value) => {
@@ -1792,7 +1811,10 @@ function forInBy(by, name, value) {
   }
   return name;
 }
-function resumeForTo(to, from, step, cb, by, scopeId, accessor) {
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch) {
+  if (serializeBranch === 0) {
+    return forTo(to, from, step, cb);
+  }
   const loopScopes = /* @__PURE__ */ new Map();
   let sep = "";
   forTo(to, from, step, (index) => {
@@ -1818,7 +1840,10 @@ function resumeForTo(to, from, step, cb, by, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, onlyChild) {
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, onlyChild) {
+  if (serializeBranch === 0) {
+    return forTo(to, from, step, cb);
+  }
   const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forTo(to, from, step, (index) => {
@@ -1847,9 +1872,12 @@ function forToBy(by, index) {
   }
   return index;
 }
-function resumeConditional(cb, scopeId, accessor, dynamic) {
+function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker) {
+  if (serializeBranch === 0) {
+    return cb();
+  }
   const branchId = peekNextScopeId();
-  if (dynamic) {
+  if (serializeMarker) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
     );
@@ -1857,13 +1885,13 @@ function resumeConditional(cb, scopeId, accessor, dynamic) {
   const branchIndex = withBranchId(branchId, cb);
   if (branchIndex !== void 0) {
     writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: serializeMarker ? branchIndex : void 0,
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
   } else {
     nextScopeId();
   }
-  if (dynamic) {
+  if (serializeMarker) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark(
         "]" /* BranchEnd */,
@@ -1872,19 +1900,22 @@ function resumeConditional(cb, scopeId, accessor, dynamic) {
     );
   }
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, dynamic, onlyChild) {
+function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, onlyChild) {
+  if (serializeBranch === 0) {
+    return cb();
+  }
   const branchId = peekNextScopeId();
   const branchIndex = withBranchId(branchId, cb);
   const rendered = branchIndex !== void 0;
   if (rendered) {
     writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: serializeMarker ? branchIndex : void 0,
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
   } else {
     nextScopeId();
   }
-  if (dynamic) {
+  if (serializeMarker) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark(
         onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1921,8 +1952,8 @@ if (true) {
     return scope;
   })(writeScope);
 }
-function writeExistingScope(scope) {
-  return writeScope(scope[K_SCOPE_ID], scope);
+function writeExistingScope(scopeId) {
+  return writeScope(scopeId, ensureScopeWithId(scopeId));
 }
 function ensureScopeWithId(scopeId) {
   const { state } = $chunk.boundary;
@@ -2756,9 +2787,232 @@ var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
 var DEFAULT_RUNTIME_ID = "M";
 var DEFAULT_RENDER_ID = "_";
 
+// src/html/template.ts
+var createTemplate = (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 registerContent(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
+    };
+  } 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.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 = (write2) => {
+      if (boundary.signal.aborted) {
+        if (!tick2) offTick(onNext);
+        boundary.onNext = NOOP2;
+        onAbort(boundary.signal.reason);
+      } else {
+        const { done } = boundary;
+        if (done || write2) {
+          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");
+    if (!head.boundary.done) throw new Error("Cannot fork in sync mode");
+    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 dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
+var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, shouldResume) => {
   const renderer = normalizeDynamicRenderer(tag);
   if (true) {
     if (renderer && typeof renderer !== "function" && typeof renderer !== "string") {
@@ -2773,7 +3027,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
     nextScopeId();
     write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`);
     if (!voidElementsReg.test(renderer)) {
-      withBranchId(branchId, () => {
+      const renderNativeTag = () => {
         if (renderer === "textarea") {
           if (content) {
             throw new Error(
@@ -2801,12 +3055,17 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
             content();
           }
         }
-      });
+      };
+      if (shouldResume) {
+        withBranchId(branchId, renderNativeTag);
+      } else {
+        renderNativeTag();
+      }
       write(`</${renderer}>`);
     } else if (content) {
       throw new Error(`Body content is not supported for a "${renderer}" tag.`);
     }
-    if (resume) {
+    if (shouldResume) {
       write(
         state.mark(
           "|" /* BranchSingleNode */,
@@ -2815,25 +3074,33 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       );
     }
   } else {
-    if (resume) {
+    if (shouldResume) {
       write(state.mark("[" /* BranchStart */, branchId + ""));
     }
-    result = withBranchId(branchId, () => {
+    const render2 = () => {
       if (renderer) {
+        if (isTemplate(renderer)) {
+          const input = inputIsArgs ? inputOrArgs[0] : inputOrArgs;
+          return renderer(
+            content ? { ...input, content } : input,
+            shouldResume
+          );
+        }
         return inputIsArgs ? renderer(...inputOrArgs) : renderer(
           content ? { ...inputOrArgs, content } : inputOrArgs
         );
       } else if (content) {
         return content();
       }
-    });
-    if (resume) {
+    };
+    result = shouldResume ? withBranchId(branchId, render2) : render2();
+    if (shouldResume) {
       write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
     }
   }
   const rendered = peekNextScopeId() !== branchId;
   if (rendered) {
-    if (resume) {
+    if (shouldResume) {
       writeScope(scopeId, {
         ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
         ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: renderer?.___id || renderer
@@ -2928,7 +3195,11 @@ var compat = {
         writeScope(scopeId, { m5c: component.id });
         writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
       }
-      renderer(normalizedInput);
+      if (isTemplate(renderer) && willRerender) {
+        renderer(normalizedInput, 1);
+      } else {
+        renderer(normalizedInput);
+      }
     });
     const asyncOut = classAPIOut.beginAsync();
     queueMicrotask(
@@ -2979,216 +3250,6 @@ function forToBy2(by, index) {
   }
   return index;
 }
-
-// src/html/template.ts
-var createTemplate = (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 registerContent(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
-    };
-  } 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() {
-    const encoder = new TextEncoder();
-    return new ReadableStream({
-      start: (ctrl) => {
-        this.#read(
-          (html) => {
-            ctrl.enqueue(encoder.encode(html));
-          },
-          (err) => {
-            ctrl.error(err);
-          },
-          () => {
-            ctrl.close();
-          }
-        );
-      }
-    });
-  }
-  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.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 = (write2) => {
-      if (boundary.signal.aborted) {
-        if (!tick2) offTick(onNext);
-        boundary.onNext = NOOP2;
-        onAbort(boundary.signal.reason);
-      } else {
-        const { done } = boundary;
-        if (done || write2) {
-          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");
-    if (!head.boundary.done) throw new Error("Cannot fork in sync mode");
-    return head.consume().flushHTML();
-  }
-};
-function NOOP2() {
-}
 export {
   $global,
   attr,
@@ -3196,6 +3257,7 @@ export {
   attrTags,
   attrs,
   classAttr,
+  commentSeparator,
   compat,
   controllable_detailsOrDialog_open,
   controllable_input_checked,
@@ -3225,7 +3287,7 @@ export {
   nodeRef,
   optionValueAttr,
   partialAttrs,
-  peekNextScope,
+  peekNextScopeId,
   register2 as register,
   registerContent,
   resumeClosestBranch,
@@ -3237,6 +3299,8 @@ export {
   resumeSingleNodeForIn,
   resumeSingleNodeForOf,
   resumeSingleNodeForTo,
+  serializeGuard,
+  serializeIf,
   setTagVar,
   styleAttr,
   toString,