marko 6.0.0-next.3.58 → 6.0.0-next.3.60

package/dist/debug/html.js

@@ -568,7 +568,7 @@ var State = class {
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
   boundary = void 0;
-  calls = [];
+  mutations = [];
 };
 var Reference = class {
   constructor(parent, accessor, flush, pos = null, id = null) {
@@ -617,9 +617,25 @@ var Serializer = class {
     this.#state.refs.set(symbol, new Reference(null, null, 0, null, id));
     return symbol;
   }
-  writeCall(value, object, method, spread) {
+  writeCall(value, object, property, spread) {
     const state = this.#state;
-    state.calls.push({ value, object, method, spread });
+    state.mutations.push({
+      type: 0 /* call */,
+      value,
+      object,
+      property,
+      spread
+    });
+    state.flushed = true;
+  }
+  writeAssign(value, object, property) {
+    const state = this.#state;
+    state.mutations.push({
+      type: 1 /* assign */,
+      value,
+      object,
+      property
+    });
     state.flushed = true;
   }
 };
@@ -642,7 +658,7 @@ function getRegistered(val) {
   }
 }
 function writeRoot(state, root) {
-  const { buf, assigned, calls } = state;
+  const { buf, assigned, mutations } = state;
   const hadBuf = buf.length !== 0;
   let result = "";
   if (hadBuf) {
@@ -652,7 +668,7 @@ function writeRoot(state, root) {
     const rootRef = state.refs.get(root);
     if (rootRef) {
       const rootId = ensureId(state, rootRef);
-      if (assigned.size || calls.length) {
+      if (assigned.size || mutations.length) {
         assigned.delete(rootRef);
         writeAssigned(state);
         buf.push(
@@ -693,13 +709,13 @@ function writeAssigned(state) {
     }
     state.assigned = /* @__PURE__ */ new Set();
   }
-  if (state.calls.length) {
-    for (const { value, object, method, spread } of state.calls) {
+  if (state.mutations.length) {
+    for (const mutation of state.mutations) {
       const objectStartIndex = state.buf.push(
         state.buf.length === 0 ? "(" : ",("
       );
-      if (writeProp(state, object, null, "")) {
-        const objectRef = state.refs.get(object);
+      if (writeProp(state, mutation.object, null, "")) {
+        const objectRef = state.refs.get(mutation.object);
         if (objectRef && !objectRef.id) {
           objectRef.id = nextRefAccess(state);
           state.buf[objectStartIndex] = objectRef.id + "=" + state.buf[objectStartIndex];
@@ -708,10 +724,10 @@ function writeAssigned(state) {
         state.buf.push("void 0");
       }
       const valueStartIndex = state.buf.push(
-        ")" + (method === void 0 ? "" : toAccess(toObjectKey(method))) + "(" + (spread ? "..." : "")
+        mutation.type === 0 /* call */ ? ")" + (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
       );
-      if (writeProp(state, value, null, "")) {
-        const valueRef = state.refs.get(value);
+      if (writeProp(state, mutation.value, null, "")) {
+        const valueRef = state.refs.get(mutation.value);
         if (valueRef && !valueRef.id) {
           valueRef.id = nextRefAccess(state);
           state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex];
@@ -721,7 +737,7 @@ function writeAssigned(state) {
       }
       state.buf.push(")");
     }
-    state.calls = [];
+    state.mutations = [];
     if (state.assigned.size) {
       writeAssigned(state);
     }
@@ -1865,9 +1881,22 @@ function ensureScopeWithId(scopeId) {
 function $global() {
   return $chunk.boundary.state.$global;
 }
-function fork(promise, content) {
+function fork(scopeId, accessor, promise, content) {
   if (!isPromise(promise)) {
+    const branchId = peekNextScopeId();
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+    );
     content(promise);
+    writeScope(scopeId, {
+      [accessor + "!" /* ConditionalScope */]: writeScope(branchId, {})
+    });
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
+      )
+    );
     return;
   }
   const chunk = $chunk;
@@ -1883,7 +1912,27 @@ function fork(promise, content) {
       if (chunk.async) {
         chunk.async = false;
         if (!boundary.signal.aborted) {
-          chunk.render(content, value);
+          chunk.render(() => {
+            const branchId = peekNextScopeId();
+            $chunk.writeHTML(
+              $chunk.boundary.state.mark(
+                "[" /* BranchStart */,
+                branchId + ""
+              )
+            );
+            content(value);
+            boundary.state.serializer.writeAssign(
+              writeScope(branchId, {}),
+              ensureScopeWithId(scopeId),
+              accessor + "!" /* ConditionalScope */
+            );
+            $chunk.writeHTML(
+              $chunk.boundary.state.mark(
+                "]" /* BranchEnd */,
+                scopeId + " " + accessor
+              )
+            );
+          });
           boundary.endAsync(chunk);
         }
       }
@@ -1894,22 +1943,37 @@ 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 tryContent(scopeId, accessor, content, input) {
+  const branchId = peekNextScopeId();
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+  );
+  const catchContent = normalizeDynamicRenderer(input.catch);
+  const placeholderContent = normalizeDynamicRenderer(input.placeholder);
+  if (catchContent) {
+    tryCatch(
+      placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+      catchContent
+    );
+  } else if (placeholderContent) {
+    tryPlaceholder(content, placeholderContent);
+  } else {
+    content();
   }
+  writeScope(branchId, {
+    ["*" /* BranchAccessor */]: accessor,
+    ["^" /* CatchContent */]: catchContent,
+    ["%" /* PlaceholderContent */]: placeholderContent
+  });
+  writeScope(scopeId, {
+    [accessor + "!" /* ConditionalScope */]: getScopeById(branchId)
+  });
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
 }
 function tryPlaceholder(content, placeholder) {
   const chunk = $chunk;
@@ -2190,9 +2254,6 @@ function prepareChunk(chunk) {
     hasWalk = true;
     resumes = resumes ? resumes + "," + effects : effects;
   }
-  if (boundary.done && (resumes || state.hasWrittenResume)) {
-    resumes = resumes ? resumes + ",0" : "0";
-  }
   if (resumes) {
     if (state.hasWrittenResume) {
       scripts = concatScripts(
@@ -2616,7 +2677,7 @@ function dynamicTagId(tagName) {
   const normalizedRenderer = normalizeDynamicRenderer(tagName);
   return normalizedRenderer?.___id || normalizedRenderer;
 }
-function dynamicTagInput(scopeId, accessor, tag, input, content) {
+var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   if (!tag && !content) {
     nextScopeId();
     return;
@@ -2668,7 +2729,9 @@ function dynamicTagInput(scopeId, accessor, tag, input, content) {
     );
     return;
   }
-  const renderer = getDynamicRenderer(tag);
+  const renderer = normalizeDynamicRenderer(
+    tag
+  );
   if (true) {
     if (typeof renderer !== "function") {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
@@ -2683,8 +2746,8 @@ function dynamicTagInput(scopeId, accessor, tag, input, content) {
     accessor
   );
   return result;
-}
-function dynamicTagArgs(scopeId, accessor, tag, args) {
+};
+var dynamicTagArgs = (scopeId, accessor, tag, args) => {
   if (!tag) {
     nextScopeId();
     return;
@@ -2705,7 +2768,9 @@ function dynamicTagArgs(scopeId, accessor, tag, args) {
     );
     return;
   }
-  const renderer = getDynamicRenderer(tag);
+  const renderer = normalizeDynamicRenderer(
+    tag
+  );
   if (true) {
     if (typeof renderer !== "function") {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
@@ -2720,7 +2785,7 @@ function dynamicTagArgs(scopeId, accessor, tag, args) {
     accessor
   );
   return result;
-}
+};
 function createContent(id, fn) {
   fn.___id = id;
   return fn;
@@ -2728,9 +2793,20 @@ function createContent(id, fn) {
 function registerContent(id, fn, scopeId) {
   return register2(createContent(id, fn), id, scopeId);
 }
-var getDynamicRenderer = normalizeDynamicRenderer;
-function patchDynamicTag(newGetDynamicRenderer) {
-  getDynamicRenderer = newGetDynamicRenderer;
+function patchDynamicTag(patch) {
+  dynamicTagInput = /* @__PURE__ */ ((originalDynamicTagInput) => (scopeId, accessor, tag, input, content) => originalDynamicTagInput(
+    scopeId,
+    accessor,
+    patch(scopeId, accessor, tag),
+    input,
+    content
+  ))(dynamicTagInput);
+  dynamicTagArgs = /* @__PURE__ */ ((originalDynamicTagArgs) => (scopeId, accessor, tag, args) => originalDynamicTagArgs(
+    scopeId,
+    accessor,
+    patch(scopeId, accessor, tag),
+    args
+  ))(dynamicTagArgs);
 }
 
 // src/html/compat.ts

package/dist/debug/html.mjs

@@ -484,7 +484,7 @@ var State = class {
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
   boundary = void 0;
-  calls = [];
+  mutations = [];
 };
 var Reference = class {
   constructor(parent, accessor, flush, pos = null, id = null) {
@@ -533,9 +533,25 @@ var Serializer = class {
     this.#state.refs.set(symbol, new Reference(null, null, 0, null, id));
     return symbol;
   }
-  writeCall(value, object, method, spread) {
+  writeCall(value, object, property, spread) {
     const state = this.#state;
-    state.calls.push({ value, object, method, spread });
+    state.mutations.push({
+      type: 0 /* call */,
+      value,
+      object,
+      property,
+      spread
+    });
+    state.flushed = true;
+  }
+  writeAssign(value, object, property) {
+    const state = this.#state;
+    state.mutations.push({
+      type: 1 /* assign */,
+      value,
+      object,
+      property
+    });
     state.flushed = true;
   }
 };
@@ -558,7 +574,7 @@ function getRegistered(val) {
   }
 }
 function writeRoot(state, root) {
-  const { buf, assigned, calls } = state;
+  const { buf, assigned, mutations } = state;
   const hadBuf = buf.length !== 0;
   let result = "";
   if (hadBuf) {
@@ -568,7 +584,7 @@ function writeRoot(state, root) {
     const rootRef = state.refs.get(root);
     if (rootRef) {
       const rootId = ensureId(state, rootRef);
-      if (assigned.size || calls.length) {
+      if (assigned.size || mutations.length) {
         assigned.delete(rootRef);
         writeAssigned(state);
         buf.push(
@@ -609,13 +625,13 @@ function writeAssigned(state) {
     }
     state.assigned = /* @__PURE__ */ new Set();
   }
-  if (state.calls.length) {
-    for (const { value, object, method, spread } of state.calls) {
+  if (state.mutations.length) {
+    for (const mutation of state.mutations) {
       const objectStartIndex = state.buf.push(
         state.buf.length === 0 ? "(" : ",("
       );
-      if (writeProp(state, object, null, "")) {
-        const objectRef = state.refs.get(object);
+      if (writeProp(state, mutation.object, null, "")) {
+        const objectRef = state.refs.get(mutation.object);
         if (objectRef && !objectRef.id) {
           objectRef.id = nextRefAccess(state);
           state.buf[objectStartIndex] = objectRef.id + "=" + state.buf[objectStartIndex];
@@ -624,10 +640,10 @@ function writeAssigned(state) {
         state.buf.push("void 0");
       }
       const valueStartIndex = state.buf.push(
-        ")" + (method === void 0 ? "" : toAccess(toObjectKey(method))) + "(" + (spread ? "..." : "")
+        mutation.type === 0 /* call */ ? ")" + (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
       );
-      if (writeProp(state, value, null, "")) {
-        const valueRef = state.refs.get(value);
+      if (writeProp(state, mutation.value, null, "")) {
+        const valueRef = state.refs.get(mutation.value);
         if (valueRef && !valueRef.id) {
           valueRef.id = nextRefAccess(state);
           state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex];
@@ -637,7 +653,7 @@ function writeAssigned(state) {
       }
       state.buf.push(")");
     }
-    state.calls = [];
+    state.mutations = [];
     if (state.assigned.size) {
       writeAssigned(state);
     }
@@ -1781,9 +1797,22 @@ function ensureScopeWithId(scopeId) {
 function $global() {
   return $chunk.boundary.state.$global;
 }
-function fork(promise, content) {
+function fork(scopeId, accessor, promise, content) {
   if (!isPromise(promise)) {
+    const branchId = peekNextScopeId();
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+    );
     content(promise);
+    writeScope(scopeId, {
+      [accessor + "!" /* ConditionalScope */]: writeScope(branchId, {})
+    });
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
+      )
+    );
     return;
   }
   const chunk = $chunk;
@@ -1799,7 +1828,27 @@ function fork(promise, content) {
       if (chunk.async) {
         chunk.async = false;
         if (!boundary.signal.aborted) {
-          chunk.render(content, value);
+          chunk.render(() => {
+            const branchId = peekNextScopeId();
+            $chunk.writeHTML(
+              $chunk.boundary.state.mark(
+                "[" /* BranchStart */,
+                branchId + ""
+              )
+            );
+            content(value);
+            boundary.state.serializer.writeAssign(
+              writeScope(branchId, {}),
+              ensureScopeWithId(scopeId),
+              accessor + "!" /* ConditionalScope */
+            );
+            $chunk.writeHTML(
+              $chunk.boundary.state.mark(
+                "]" /* BranchEnd */,
+                scopeId + " " + accessor
+              )
+            );
+          });
           boundary.endAsync(chunk);
         }
       }
@@ -1810,22 +1859,37 @@ 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 tryContent(scopeId, accessor, content, input) {
+  const branchId = peekNextScopeId();
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+  );
+  const catchContent = normalizeDynamicRenderer(input.catch);
+  const placeholderContent = normalizeDynamicRenderer(input.placeholder);
+  if (catchContent) {
+    tryCatch(
+      placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+      catchContent
+    );
+  } else if (placeholderContent) {
+    tryPlaceholder(content, placeholderContent);
+  } else {
+    content();
   }
+  writeScope(branchId, {
+    ["*" /* BranchAccessor */]: accessor,
+    ["^" /* CatchContent */]: catchContent,
+    ["%" /* PlaceholderContent */]: placeholderContent
+  });
+  writeScope(scopeId, {
+    [accessor + "!" /* ConditionalScope */]: getScopeById(branchId)
+  });
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
 }
 function tryPlaceholder(content, placeholder) {
   const chunk = $chunk;
@@ -2106,9 +2170,6 @@ function prepareChunk(chunk) {
     hasWalk = true;
     resumes = resumes ? resumes + "," + effects : effects;
   }
-  if (boundary.done && (resumes || state.hasWrittenResume)) {
-    resumes = resumes ? resumes + ",0" : "0";
-  }
   if (resumes) {
     if (state.hasWrittenResume) {
       scripts = concatScripts(
@@ -2532,7 +2593,7 @@ function dynamicTagId(tagName) {
   const normalizedRenderer = normalizeDynamicRenderer(tagName);
   return normalizedRenderer?.___id || normalizedRenderer;
 }
-function dynamicTagInput(scopeId, accessor, tag, input, content) {
+var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   if (!tag && !content) {
     nextScopeId();
     return;
@@ -2584,7 +2645,9 @@ function dynamicTagInput(scopeId, accessor, tag, input, content) {
     );
     return;
   }
-  const renderer = getDynamicRenderer(tag);
+  const renderer = normalizeDynamicRenderer(
+    tag
+  );
   if (true) {
     if (typeof renderer !== "function") {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
@@ -2599,8 +2662,8 @@ function dynamicTagInput(scopeId, accessor, tag, input, content) {
     accessor
   );
   return result;
-}
-function dynamicTagArgs(scopeId, accessor, tag, args) {
+};
+var dynamicTagArgs = (scopeId, accessor, tag, args) => {
   if (!tag) {
     nextScopeId();
     return;
@@ -2621,7 +2684,9 @@ function dynamicTagArgs(scopeId, accessor, tag, args) {
     );
     return;
   }
-  const renderer = getDynamicRenderer(tag);
+  const renderer = normalizeDynamicRenderer(
+    tag
+  );
   if (true) {
     if (typeof renderer !== "function") {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
@@ -2636,7 +2701,7 @@ function dynamicTagArgs(scopeId, accessor, tag, args) {
     accessor
   );
   return result;
-}
+};
 function createContent(id, fn) {
   fn.___id = id;
   return fn;
@@ -2644,9 +2709,20 @@ function createContent(id, fn) {
 function registerContent(id, fn, scopeId) {
   return register2(createContent(id, fn), id, scopeId);
 }
-var getDynamicRenderer = normalizeDynamicRenderer;
-function patchDynamicTag(newGetDynamicRenderer) {
-  getDynamicRenderer = newGetDynamicRenderer;
+function patchDynamicTag(patch) {
+  dynamicTagInput = /* @__PURE__ */ ((originalDynamicTagInput) => (scopeId, accessor, tag, input, content) => originalDynamicTagInput(
+    scopeId,
+    accessor,
+    patch(scopeId, accessor, tag),
+    input,
+    content
+  ))(dynamicTagInput);
+  dynamicTagArgs = /* @__PURE__ */ ((originalDynamicTagArgs) => (scopeId, accessor, tag, args) => originalDynamicTagArgs(
+    scopeId,
+    accessor,
+    patch(scopeId, accessor, tag),
+    args
+  ))(dynamicTagArgs);
 }
 
 // src/html/compat.ts

package/dist/dom/control-flow.d.ts

@@ -1,6 +1,11 @@
 import { type Accessor, type BranchScope, type Scope } from "../common/types";
 import { type Renderer } from "./renderer";
 import { type Signal } from "./signals";
+export declare function awaitTag(nodeAccessor: Accessor, renderer: Renderer): (scope: Scope, promise: Promise<unknown>) => void;
+export declare function createTry(nodeAccessor: Accessor, tryContent: Renderer): (scope: Scope, input: {
+    catch: unknown;
+    placeholder: unknown;
+}) => void;
 export declare function conditional(nodeAccessor: Accessor, ...branches: Renderer[]): (scope: Scope, newBranch: number) => void;
 export declare function patchDynamicTag(fn: <T extends typeof dynamicTag>(cond: T) => T): void;
 export declare let dynamicTag: (nodeAccessor: Accessor, getContent?: ((scope: Scope) => Renderer) | 0, getTagVar?: (() => Signal<unknown>) | 0, inputIsArgs?: 1) => Signal<Renderer | string | undefined>;

package/dist/dom/queue.d.ts

@@ -1,4 +1,4 @@
-import type { Scope } from "../common/types";
+import { type Scope } from "../common/types";
 import type { Signal } from "./signals";
 type ExecFn<S extends Scope = Scope> = (scope: S, arg?: any) => void;
 export declare let pendingEffects: unknown[];
@@ -8,4 +8,5 @@ export declare function queueEffect<S extends Scope, T extends ExecFn<S>>(scope:
 export declare function run(): void;
 export declare function prepareEffects(fn: () => void): unknown[];
 export declare function runEffects(effects: unknown[]): void;
+export declare let enableCatch: () => void;
 export {};

package/dist/dom/resume.d.ts

@@ -1,8 +1,8 @@
 import { type Scope } from "../common/types";
 import type { Signal } from "./signals";
+export declare function init(runtimeId?: string): void;
 export declare let isResuming: boolean;
 export declare function register<T>(id: string, obj: T): T;
 export declare function registerBoundSignal<T extends Signal<unknown>>(id: string, signal: T): T;
 export declare function getRegisteredWithScope(id: string, scope?: Scope): unknown;
-export declare function init(runtimeId?: string): void;
 export declare function nodeRef(id: string, key: string): (scope: Scope) => () => any;

package/dist/dom/scope.d.ts

@@ -5,3 +5,4 @@ export declare function finishPendingScopes(): void;
 export declare function destroyBranch(branch: BranchScope): void;
 export declare function removeAndDestroyBranch(branch: BranchScope): void;
 export declare function insertBranchBefore(branch: BranchScope, parentNode: ParentNode, nextSibling: Node | null): void;
+export declare function tempDetatchBranch(branch: BranchScope): void;

package/dist/dom.d.ts

@@ -2,11 +2,11 @@ export { attrTag, attrTags } from "./common/attr-tag";
 export { forIn, forOf, forTo } from "./common/for";
 export { getAbortSignal, resetAbortSignal } from "./dom/abort-signal";
 export { compat } from "./dom/compat";
-export { conditional, dynamicTag, loopIn, loopOf, loopTo, } from "./dom/control-flow";
+export { awaitTag, conditional, createTry, dynamicTag, loopIn, loopOf, loopTo, } from "./dom/control-flow";
 export { controllable_detailsOrDialog_open, controllable_detailsOrDialog_open_effect, controllable_input_checked, controllable_input_checked_effect, controllable_input_checkedValue, controllable_input_checkedValue_effect, controllable_input_value, controllable_input_value_effect, controllable_select_value, controllable_select_value_effect, controllable_textarea_value, controllable_textarea_value_effect, } from "./dom/controllable";
 export { attr, attrs, attrsEvents, classAttr, data, html, lifecycle, partialAttrs, props, styleAttr, textContent, } from "./dom/dom";
 export { on } from "./dom/event";
-export { run } from "./dom/queue";
+export { enableCatch, run } from "./dom/queue";
 export { createContent, createRenderer, registerContent } from "./dom/renderer";
 export { init, nodeRef, register, registerBoundSignal } from "./dom/resume";
 export { conditionalClosure, dynamicClosure, dynamicClosureRead, effect, hoist, intersection, loopClosure, nextTagId, setTagVar, setTagVarChange, state, tagVarSignal, tagVarSignalChange, value, } from "./dom/signals";