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

package/dist/html.js

@@ -23,6 +23,7 @@ __export(html_exports, {
   attrTags: () => attrTags,
   attrs: () => attrs,
   classAttr: () => classAttr,
+  commentSeparator: () => commentSeparator,
   compat: () => compat,
   controllable_detailsOrDialog_open: () => controllable_detailsOrDialog_open,
   controllable_input_checked: () => controllable_input_checked,
@@ -52,7 +53,7 @@ __export(html_exports, {
   nodeRef: () => nodeRef,
   optionValueAttr: () => optionValueAttr,
   partialAttrs: () => partialAttrs,
-  peekNextScope: () => peekNextScope,
+  peekNextScopeId: () => peekNextScopeId,
   register: () => register2,
   registerContent: () => registerContent,
   resumeClosestBranch: () => resumeClosestBranch,
@@ -64,6 +65,8 @@ __export(html_exports, {
   resumeSingleNodeForIn: () => resumeSingleNodeForIn,
   resumeSingleNodeForOf: () => resumeSingleNodeForOf,
   resumeSingleNodeForTo: () => resumeSingleNodeForTo,
+  serializeGuard: () => serializeGuard,
+  serializeIf: () => serializeIf,
   setTagVar: () => setTagVar,
   styleAttr: () => styleAttr,
   toString: () => toString,
@@ -1111,8 +1114,8 @@ function withContext(key, value, cb) {
     ctx[kPendingContexts]--, ctx[key] = prev;
   }
 }
-function setTagVar(parentScopeId, scopeOffsetAccessor, childScope, registryId) {
-  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope.e = register2(
+function setTagVar(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
+  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), ensureScopeWithId(childScopeId).e = register2(
     {},
     registryId,
     parentScopeId
@@ -1131,17 +1134,24 @@ 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 "";
   let { state } = $chunk.boundary;
   return state.needsMainRuntime = !0, state.mark("*" /* Node */, scopeId + " " + accessor);
 }
+function commentSeparator(shouldResume) {
+  return shouldResume === 0 ? "" : "<!>";
+}
 function nodeRef(scopeId, id) {
   let getter = () => {
   };
@@ -1160,7 +1170,9 @@ 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);
   let loopScopes = /* @__PURE__ */ new Map();
   forOf(list, (item, index) => {
     let branchId = peekNextScopeId();
@@ -1181,7 +1193,9 @@ 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);
   let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forOf(list, (item, index) => {
     let branchId = peekNextScopeId();
@@ -1200,7 +1214,9 @@ function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, onlyChildInParen
 function forOfBy(by, item, index) {
   return by ? typeof by == "string" ? item[by] : by(item, index) : index;
 }
-function resumeForIn(obj, cb, by, scopeId, accessor) {
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch) {
+  if (serializeBranch === 0)
+    return forIn(obj, cb);
   let loopScopes = /* @__PURE__ */ new Map(), sep = "";
   forIn(obj, (key, value) => {
     let branchId = peekNextScopeId();
@@ -1218,7 +1234,9 @@ 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);
   let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forIn(obj, (key, value) => {
     let branchId = peekNextScopeId();
@@ -1237,7 +1255,9 @@ function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, onlyChild) {
 function forInBy(by, name, value) {
   return by ? by(name, value) : 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);
   let loopScopes = /* @__PURE__ */ new Map(), sep = "";
   forTo(to, from, step, (index) => {
     let branchId = peekNextScopeId();
@@ -1255,7 +1275,9 @@ 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);
   let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forTo(to, from, step, (index) => {
     let branchId = peekNextScopeId();
@@ -1274,28 +1296,32 @@ function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, onlyCh
 function forToBy(by, index) {
   return by ? by(index) : index;
 }
-function resumeConditional(cb, scopeId, accessor, dynamic) {
+function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker) {
+  if (serializeBranch === 0)
+    return cb();
   let branchId = peekNextScopeId();
-  dynamic && $chunk.writeHTML(
+  serializeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
   );
   let branchIndex = withBranchId(branchId, cb);
   branchIndex !== void 0 ? writeScope(scopeId, {
-    ["c" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+    ["c" /* ConditionalRenderer */ + accessor]: serializeMarker ? branchIndex : void 0,
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
-  }) : nextScopeId(), dynamic && $chunk.writeHTML(
+  }) : nextScopeId(), serializeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, dynamic, onlyChild) {
+function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, onlyChild) {
+  if (serializeBranch === 0)
+    return cb();
   let branchId = peekNextScopeId(), branchIndex = withBranchId(branchId, cb), rendered = branchIndex !== void 0;
   rendered ? writeScope(scopeId, {
-    ["c" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+    ["c" /* ConditionalRenderer */ + accessor]: serializeMarker ? branchIndex : void 0,
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
-  }) : nextScopeId(), dynamic && $chunk.writeHTML(
+  }) : nextScopeId(), serializeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + (rendered ? " " + branchId : "")
@@ -1306,8 +1332,8 @@ var writeScope = (scopeId, partialScope) => {
   let { state } = $chunk.boundary, { scopes } = state, scope = scopes.get(scopeId);
   return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.writeScopes = { [scopeId]: scope }, scope;
 };
-function writeExistingScope(scope) {
-  return writeScope(scope[K_SCOPE_ID], scope);
+function writeExistingScope(scopeId) {
+  return writeScope(scopeId, ensureScopeWithId(scopeId));
 }
 function ensureScopeWithId(scopeId) {
   let { state } = $chunk.boundary, scope = state.scopes.get(scopeId);
@@ -1855,153 +1881,11 @@ var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID =
 // src/common/meta.ts
 var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
-// src/html/dynamic-tag.ts
-var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
-  let renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
-  if (typeof renderer == "string") {
-    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
-    nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), voidElementsReg.test(renderer) || (withBranchId(branchId, () => {
-      renderer === "textarea" ? write(
-        controllable_textarea_value(
-          scopeId,
-          accessor,
-          input.value,
-          input.valueChange
-        )
-      ) : content && (renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
-        scopeId,
-        accessor,
-        input.value,
-        input.valueChange,
-        content
-      ) : content());
-    }), write(`</${renderer}>`)), resume && write(
-      state.mark(
-        "|" /* BranchSingleNode */,
-        scopeId + " " + accessor + " " + branchId
-      )
-    );
-  } else
-    resume && write(state.mark("[" /* BranchStart */, branchId + "")), result = withBranchId(branchId, () => {
-      if (renderer)
-        return inputIsArgs ? renderer(...inputOrArgs) : renderer(
-          content ? { ...inputOrArgs, content } : inputOrArgs
-        );
-      if (content)
-        return content();
-    }), resume && write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
-  return peekNextScopeId() !== branchId ? resume && writeScope(scopeId, {
-    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
-    ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
-  }) : nextScopeId(), result;
-};
-function createContent(id, fn) {
-  return fn.h = id, fn;
-}
-function registerContent(id, fn, scopeId) {
-  return register2(createContent(id, fn), id, scopeId);
-}
-function patchDynamicTag(patch) {
-  dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
-    let patched = patch(scopeId, accessor, tag);
-    return patched.h = tag, originalDynamicTag(
-      scopeId,
-      accessor,
-      patched,
-      input,
-      content,
-      inputIsArgs,
-      resume
-    );
-  })(dynamicTag);
-}
-
-// src/html/compat.ts
-var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap(), compat = {
-  fork,
-  write,
-  writeScript,
-  nextScopeId,
-  isTagsAPI(fn) {
-    return !!fn.h;
-  },
-  patchDynamicTag,
-  writeSetScopeForComponent(m5c) {
-    let scopeId = nextScopeId();
-    writeScope(scopeId, { m5c }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
-  },
-  toJSON() {
-    let compatRegistered = COMPAT_REGISTRY.get(this);
-    if (!compatRegistered) {
-      let registered = getRegistered(this);
-      if (registered) {
-        let scopeId = getScopeId(registered.scope);
-        scopeId !== void 0 && writeScope(scopeId, {}), COMPAT_REGISTRY.set(
-          this,
-          compatRegistered = [registered.id, scopeId]
-        );
-      }
-    }
-    return compatRegistered;
-  },
-  render(renderer, willRerender, classAPIOut, component, input) {
-    let $global2 = classAPIOut.global, state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
-    state || ($global2.runtimeId ||= DEFAULT_RUNTIME_ID, $global2.renderId ||= $global2.componentIdPrefix || DEFAULT_RENDER_ID, $global2[K_TAGS_API_STATE] = state = new State2($global2));
-    let boundary = new Boundary(state), head = new Chunk(
-      boundary,
-      null,
-      null
-    ), normalizedInput = input;
-    if ("renderBody" in input) {
-      normalizedInput = {};
-      for (let key in input)
-        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
-    }
-    head.render(() => {
-      if (willRerender) {
-        let scopeId = peekNextScopeId();
-        writeScope(scopeId, { m5c: component.id }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
-      }
-      renderer(normalizedInput);
-    });
-    let asyncOut = classAPIOut.beginAsync();
-    queueMicrotask(
-      boundary.onNext = () => {
-        if (boundary.signal.aborted)
-          asyncOut.error(boundary.signal.reason);
-        else if (boundary.done) {
-          let { scripts, html } = head.consume().flushScript();
-          asyncOut.script(scripts), asyncOut.write(html), asyncOut.end();
-        }
-      }
-    );
-  },
-  registerRenderer(renderer, id) {
-    return register(
-      RENDERER_REGISTER_ID,
-      renderer,
-      register(id, () => {
-      })
-    );
-  },
-  registerRenderBody(fn) {
-    register(RENDER_BODY_ID, fn);
-  }
-};
-
-// src/html/for.ts
-function forOfBy2(by, item, index) {
-  return by ? typeof by == "string" ? item[by] : by(item, index) : index;
-}
-function forInBy2(by, name, value) {
-  return by ? by(name, value) : name;
-}
-function forToBy2(by, index) {
-  return by ? by(index) : index;
-}
-
 // src/html/template.ts
 var createTemplate = (templateId, renderer) => (renderer.render = render, renderer._ = renderer, registerContent(templateId, renderer));
+function isTemplate(renderer) {
+  return !!renderer._;
+}
 function render(input = {}) {
   let { $global: $global2 } = input;
   $global2 ? ({ $global: $global2, ...input } = input, $global2 = {
@@ -2070,20 +1954,23 @@ var ServerRendered = class {
     );
   }
   toReadable() {
-    let encoder = new TextEncoder();
+    let cancelled = !1, boundary, encoder = new TextEncoder();
     return new ReadableStream({
       start: (ctrl) => {
-        this.#read(
+        boundary = this.#read(
           (html) => {
             ctrl.enqueue(encoder.encode(html));
           },
           (err) => {
-            ctrl.error(err);
+            boundary = void 0, cancelled || ctrl.error(err);
           },
           () => {
-            ctrl.close();
+            boundary = void 0, ctrl.close();
           }
         );
+      },
+      cancel: (reason) => {
+        cancelled = !0, boundary?.abort(reason);
       }
     });
   }
@@ -2135,6 +2022,165 @@ var ServerRendered = class {
 };
 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)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, shouldResume) => {
+  let renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
+  if (typeof renderer == "string") {
+    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    if (nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), !voidElementsReg.test(renderer)) {
+      let renderNativeTag = () => {
+        renderer === "textarea" ? write(
+          controllable_textarea_value(
+            scopeId,
+            accessor,
+            input.value,
+            input.valueChange
+          )
+        ) : content && (renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+          scopeId,
+          accessor,
+          input.value,
+          input.valueChange,
+          content
+        ) : content());
+      };
+      shouldResume ? withBranchId(branchId, renderNativeTag) : renderNativeTag(), write(`</${renderer}>`);
+    }
+    shouldResume && write(
+      state.mark(
+        "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + " " + branchId
+      )
+    );
+  } else {
+    shouldResume && write(state.mark("[" /* BranchStart */, branchId + ""));
+    let render2 = () => {
+      if (renderer) {
+        if (isTemplate(renderer)) {
+          let 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();
+    };
+    result = shouldResume ? withBranchId(branchId, render2) : render2(), shouldResume && write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
+  }
+  return peekNextScopeId() !== branchId ? shouldResume && writeScope(scopeId, {
+    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
+    ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
+  }) : nextScopeId(), result;
+};
+function createContent(id, fn) {
+  return fn.h = id, fn;
+}
+function registerContent(id, fn, scopeId) {
+  return register2(createContent(id, fn), id, scopeId);
+}
+function patchDynamicTag(patch) {
+  dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
+    let patched = patch(scopeId, accessor, tag);
+    return patched.h = tag, originalDynamicTag(
+      scopeId,
+      accessor,
+      patched,
+      input,
+      content,
+      inputIsArgs,
+      resume
+    );
+  })(dynamicTag);
+}
+
+// src/html/compat.ts
+var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap(), compat = {
+  fork,
+  write,
+  writeScript,
+  nextScopeId,
+  isTagsAPI(fn) {
+    return !!fn.h;
+  },
+  patchDynamicTag,
+  writeSetScopeForComponent(m5c) {
+    let scopeId = nextScopeId();
+    writeScope(scopeId, { m5c }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
+  },
+  toJSON() {
+    let compatRegistered = COMPAT_REGISTRY.get(this);
+    if (!compatRegistered) {
+      let registered = getRegistered(this);
+      if (registered) {
+        let scopeId = getScopeId(registered.scope);
+        scopeId !== void 0 && writeScope(scopeId, {}), COMPAT_REGISTRY.set(
+          this,
+          compatRegistered = [registered.id, scopeId]
+        );
+      }
+    }
+    return compatRegistered;
+  },
+  render(renderer, willRerender, classAPIOut, component, input) {
+    let $global2 = classAPIOut.global, state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
+    state || ($global2.runtimeId ||= DEFAULT_RUNTIME_ID, $global2.renderId ||= $global2.componentIdPrefix || DEFAULT_RENDER_ID, $global2[K_TAGS_API_STATE] = state = new State2($global2));
+    let boundary = new Boundary(state), head = new Chunk(
+      boundary,
+      null,
+      null
+    ), normalizedInput = input;
+    if ("renderBody" in input) {
+      normalizedInput = {};
+      for (let key in input)
+        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
+    }
+    head.render(() => {
+      if (willRerender) {
+        let scopeId = peekNextScopeId();
+        writeScope(scopeId, { m5c: component.id }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
+      }
+      isTemplate(renderer) && willRerender ? renderer(normalizedInput, 1) : renderer(normalizedInput);
+    });
+    let asyncOut = classAPIOut.beginAsync();
+    queueMicrotask(
+      boundary.onNext = () => {
+        if (boundary.signal.aborted)
+          asyncOut.error(boundary.signal.reason);
+        else if (boundary.done) {
+          let { scripts, html } = head.consume().flushScript();
+          asyncOut.script(scripts), asyncOut.write(html), asyncOut.end();
+        }
+      }
+    );
+  },
+  registerRenderer(renderer, id) {
+    return register(
+      RENDERER_REGISTER_ID,
+      renderer,
+      register(id, () => {
+      })
+    );
+  },
+  registerRenderBody(fn) {
+    register(RENDER_BODY_ID, fn);
+  }
+};
+
+// src/html/for.ts
+function forOfBy2(by, item, index) {
+  return by ? typeof by == "string" ? item[by] : by(item, index) : index;
+}
+function forInBy2(by, name, value) {
+  return by ? by(name, value) : name;
+}
+function forToBy2(by, index) {
+  return by ? by(index) : index;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,
@@ -2143,6 +2189,7 @@ function NOOP2() {
   attrTags,
   attrs,
   classAttr,
+  commentSeparator,
   compat,
   controllable_detailsOrDialog_open,
   controllable_input_checked,
@@ -2172,7 +2219,7 @@ function NOOP2() {
   nodeRef,
   optionValueAttr,
   partialAttrs,
-  peekNextScope,
+  peekNextScopeId,
   register,
   registerContent,
   resumeClosestBranch,
@@ -2184,6 +2231,8 @@ function NOOP2() {
   resumeSingleNodeForIn,
   resumeSingleNodeForOf,
   resumeSingleNodeForTo,
+  serializeGuard,
+  serializeIf,
   setTagVar,
   styleAttr,
   toString,