marko 6.0.0-next.3.26 → 6.0.0-next.3.28

package/dist/debug/html.js

@@ -35,6 +35,7 @@ __export(html_exports, {
   controllable_textarea_value: () => controllable_textarea_value,
   createRenderer: () => createRenderer,
   createTemplate: () => createTemplate,
+  debug: () => debug,
   dynamicTagArgs: () => dynamicTagArgs,
   dynamicTagInput: () => dynamicTagInput,
   ensureScopeWithId: () => ensureScopeWithId,
@@ -582,6 +583,17 @@ var Reference = class {
   init = "";
   assigns = "";
 };
+var DEBUG = /* @__PURE__ */ new WeakMap();
+function debug(obj, file, loc, vars) {
+  if (true) {
+    DEBUG.set(obj, {
+      file,
+      loc,
+      vars
+    });
+  }
+  return obj;
+}
 var Serializer = class {
   #state = new State();
   get flushed() {
@@ -682,6 +694,7 @@ function writeProp(state, val, parent, accessor) {
     case "object":
       return writeObject(state, val, parent, accessor);
     default:
+      throwUnserializable(state, val, parent, accessor);
       return false;
   }
 }
@@ -710,6 +723,9 @@ function writeReferenceOr(state, write2, val, parent, accessor) {
     val,
     ref = new Reference(parent, accessor, state.flush, state.buf.length)
   );
+  if (true) {
+    ref.debug = DEBUG.get(val);
+  }
   if (write2(state, val, ref)) return true;
   state.refs.delete(ref);
   return false;
@@ -786,7 +802,8 @@ function writeUnknownSymbol(state) {
   state.buf.push("Symbol()");
   return true;
 }
-function writeNever() {
+function writeNever(state, val, ref) {
+  throwUnserializable(state, val, ref);
   return false;
 }
 function writeNull(state) {
@@ -867,6 +884,7 @@ function writeUnknownObject(state, val, ref) {
     case globalThis.Response:
       return writeResponse(state, val, ref);
   }
+  throwUnserializable(state, val, ref);
   return false;
 }
 function writePlainObject(state, val, ref) {
@@ -1284,6 +1302,45 @@ function writeAsyncCall(state, boundary, ref, method, value, preferredValueId =
   state.buf.push(")");
   boundary.endAsync();
 }
+function throwUnserializable(state, cause, ref = null, accessor = "") {
+  if (cause !== void 0 && state.boundary?.abort) {
+    let message = "Unable to serialize";
+    let access = "";
+    while (ref?.accessor) {
+      const debug2 = ref.parent?.debug;
+      if (debug2) {
+        const varLoc = debug2.vars?.[ref.accessor];
+        if (varLoc) {
+          if (Array.isArray(varLoc)) {
+            message += ` "${varLoc[0]}" in ${debug2.file}:${varLoc[1]}`;
+          } else {
+            message += ` "${ref.accessor}" in ${debug2.file}:${varLoc}`;
+          }
+        } else {
+          message += ` ${JSON.stringify(ref.accessor)} in ${debug2.file}`;
+          if (debug2.loc) {
+            message += `:${debug2.loc}`;
+          }
+        }
+        break;
+      }
+      access = toAccess(ref.accessor) + access;
+      ref = ref.parent;
+    }
+    if (accessor) {
+      access = toAccess(accessor) + access;
+    }
+    if (access[0] === ".") {
+      access = access.slice(1);
+    }
+    if (access) {
+      message += ` (reading ${access})`;
+    }
+    const err = new TypeError(message, { cause });
+    err.stack = void 0;
+    state.boundary.abort(err);
+  }
+}
 function isCircular(parent, ref) {
   let cur = parent;
   while (cur) {
@@ -2416,6 +2473,7 @@ function escapeAttrValue(str) {
 var prefix = true ? "$compat_" : "$C_";
 var RENDERER_REGISTER_ID = prefix + (true ? "renderer" : "r");
 var SET_SCOPE_REGISTER_ID = prefix + (true ? "setScope" : "s");
+var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
 
 // src/common/meta.ts
 var DEFAULT_RUNTIME_ID = "M";
@@ -2602,11 +2660,14 @@ var compat = {
           asyncOut.error(boundary.signal.reason);
         } else {
           queueMicrotask(() => {
-            const { scripts, html } = head = prepareChunk(head);
-            asyncOut.script(scripts);
-            asyncOut.write(html);
-            asyncOut.end();
-            head.html = head.scripts = "";
+            head = prepareChunk(head);
+            if (boundary.done) {
+              const { scripts, html } = head;
+              asyncOut.script(scripts);
+              asyncOut.write(html);
+              asyncOut.end();
+              head.html = head.scripts = "";
+            }
           });
         }
       }
@@ -2619,6 +2680,9 @@ var compat = {
       register(id, () => {
       })
     );
+  },
+  registerRenderBody(fn) {
+    register(RENDER_BODY_ID, fn);
   }
 };
 
@@ -2713,17 +2777,23 @@ var ServerRenderResult = class {
         done = true;
         if (resolve) {
           resolve({ value, done: !value });
+          value = "";
         }
       }
     );
     return {
       next() {
-        if (value) {
+        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);
         }
-        return done ? Promise.resolve({ value: "", done }) : aborted ? Promise.reject(reason) : new Promise(exec);
       },
       throw(error) {
         if (!(done || aborted)) {
@@ -2803,12 +2873,13 @@ var ServerRenderResult = class {
       }
       const { boundary } = head;
       (boundary.onNext = () => {
-        if (boundary.done) {
-          if (boundary.signal.aborted) {
-            reject(boundary.signal.reason);
-          } else {
-            head = prepareChunk(head);
-            if (boundary.done) resolve(flushChunk(head, true));
+        if (boundary.signal.aborted) {
+          boundary.onNext = NOOP2;
+          reject(boundary.signal.reason);
+        } else if (boundary.done) {
+          head = prepareChunk(head);
+          if (boundary.done) {
+            resolve(flushChunk(head, true));
           }
         }
       })();
@@ -2824,26 +2895,27 @@ var ServerRenderResult = class {
     }
     const { boundary } = head;
     const onNext = boundary.onNext = (write2) => {
-      if (write2 || boundary.done) {
-        if (boundary.signal.aborted) {
-          if (!tick2) offTick(onNext);
-          onAbort(boundary.signal.reason);
-          return;
+      if (boundary.signal.aborted) {
+        if (!tick2) offTick(onNext);
+        boundary.onNext = NOOP2;
+        onAbort(boundary.signal.reason);
+      } else {
+        if (write2 || boundary.done) {
+          head = prepareChunk(head);
         }
-        head = prepareChunk(head);
-      }
-      if (write2 || boundary.done) {
-        const html = flushChunk(head, boundary.done);
-        if (html) onWrite(html);
-        if (boundary.done) {
-          if (!tick2) offTick(onNext);
-          onClose();
-        } else {
-          tick2 = true;
+        if (write2 || boundary.done) {
+          const html = flushChunk(head, boundary.done);
+          if (html) onWrite(html);
+          if (boundary.done) {
+            if (!tick2) offTick(onNext);
+            onClose();
+          } else {
+            tick2 = true;
+          }
+        } else if (tick2) {
+          tick2 = false;
+          queueTick(onNext);
         }
-      } else if (tick2) {
-        tick2 = false;
-        queueTick(onNext);
       }
     };
     onNext();
@@ -2857,6 +2929,8 @@ var ServerRenderResult = class {
     return flushChunk(prepareChunk(head), true);
   }
 };
+function NOOP2() {
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,
@@ -2874,6 +2948,7 @@ var ServerRenderResult = class {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
+  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,

package/dist/debug/html.mjs

@@ -502,6 +502,17 @@ var Reference = class {
   init = "";
   assigns = "";
 };
+var DEBUG = /* @__PURE__ */ new WeakMap();
+function debug(obj, file, loc, vars) {
+  if (true) {
+    DEBUG.set(obj, {
+      file,
+      loc,
+      vars
+    });
+  }
+  return obj;
+}
 var Serializer = class {
   #state = new State();
   get flushed() {
@@ -602,6 +613,7 @@ function writeProp(state, val, parent, accessor) {
     case "object":
       return writeObject(state, val, parent, accessor);
     default:
+      throwUnserializable(state, val, parent, accessor);
       return false;
   }
 }
@@ -630,6 +642,9 @@ function writeReferenceOr(state, write2, val, parent, accessor) {
     val,
     ref = new Reference(parent, accessor, state.flush, state.buf.length)
   );
+  if (true) {
+    ref.debug = DEBUG.get(val);
+  }
   if (write2(state, val, ref)) return true;
   state.refs.delete(ref);
   return false;
@@ -706,7 +721,8 @@ function writeUnknownSymbol(state) {
   state.buf.push("Symbol()");
   return true;
 }
-function writeNever() {
+function writeNever(state, val, ref) {
+  throwUnserializable(state, val, ref);
   return false;
 }
 function writeNull(state) {
@@ -787,6 +803,7 @@ function writeUnknownObject(state, val, ref) {
     case globalThis.Response:
       return writeResponse(state, val, ref);
   }
+  throwUnserializable(state, val, ref);
   return false;
 }
 function writePlainObject(state, val, ref) {
@@ -1204,6 +1221,45 @@ function writeAsyncCall(state, boundary, ref, method, value, preferredValueId =
   state.buf.push(")");
   boundary.endAsync();
 }
+function throwUnserializable(state, cause, ref = null, accessor = "") {
+  if (cause !== void 0 && state.boundary?.abort) {
+    let message = "Unable to serialize";
+    let access = "";
+    while (ref?.accessor) {
+      const debug2 = ref.parent?.debug;
+      if (debug2) {
+        const varLoc = debug2.vars?.[ref.accessor];
+        if (varLoc) {
+          if (Array.isArray(varLoc)) {
+            message += ` "${varLoc[0]}" in ${debug2.file}:${varLoc[1]}`;
+          } else {
+            message += ` "${ref.accessor}" in ${debug2.file}:${varLoc}`;
+          }
+        } else {
+          message += ` ${JSON.stringify(ref.accessor)} in ${debug2.file}`;
+          if (debug2.loc) {
+            message += `:${debug2.loc}`;
+          }
+        }
+        break;
+      }
+      access = toAccess(ref.accessor) + access;
+      ref = ref.parent;
+    }
+    if (accessor) {
+      access = toAccess(accessor) + access;
+    }
+    if (access[0] === ".") {
+      access = access.slice(1);
+    }
+    if (access) {
+      message += ` (reading ${access})`;
+    }
+    const err = new TypeError(message, { cause });
+    err.stack = void 0;
+    state.boundary.abort(err);
+  }
+}
 function isCircular(parent, ref) {
   let cur = parent;
   while (cur) {
@@ -2336,6 +2392,7 @@ function escapeAttrValue(str) {
 var prefix = true ? "$compat_" : "$C_";
 var RENDERER_REGISTER_ID = prefix + (true ? "renderer" : "r");
 var SET_SCOPE_REGISTER_ID = prefix + (true ? "setScope" : "s");
+var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
 
 // src/common/meta.ts
 var DEFAULT_RUNTIME_ID = "M";
@@ -2522,11 +2579,14 @@ var compat = {
           asyncOut.error(boundary.signal.reason);
         } else {
           queueMicrotask(() => {
-            const { scripts, html } = head = prepareChunk(head);
-            asyncOut.script(scripts);
-            asyncOut.write(html);
-            asyncOut.end();
-            head.html = head.scripts = "";
+            head = prepareChunk(head);
+            if (boundary.done) {
+              const { scripts, html } = head;
+              asyncOut.script(scripts);
+              asyncOut.write(html);
+              asyncOut.end();
+              head.html = head.scripts = "";
+            }
           });
         }
       }
@@ -2539,6 +2599,9 @@ var compat = {
       register(id, () => {
       })
     );
+  },
+  registerRenderBody(fn) {
+    register(RENDER_BODY_ID, fn);
   }
 };
 
@@ -2633,17 +2696,23 @@ var ServerRenderResult = class {
         done = true;
         if (resolve) {
           resolve({ value, done: !value });
+          value = "";
         }
       }
     );
     return {
       next() {
-        if (value) {
+        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);
         }
-        return done ? Promise.resolve({ value: "", done }) : aborted ? Promise.reject(reason) : new Promise(exec);
       },
       throw(error) {
         if (!(done || aborted)) {
@@ -2723,12 +2792,13 @@ var ServerRenderResult = class {
       }
       const { boundary } = head;
       (boundary.onNext = () => {
-        if (boundary.done) {
-          if (boundary.signal.aborted) {
-            reject(boundary.signal.reason);
-          } else {
-            head = prepareChunk(head);
-            if (boundary.done) resolve(flushChunk(head, true));
+        if (boundary.signal.aborted) {
+          boundary.onNext = NOOP2;
+          reject(boundary.signal.reason);
+        } else if (boundary.done) {
+          head = prepareChunk(head);
+          if (boundary.done) {
+            resolve(flushChunk(head, true));
           }
         }
       })();
@@ -2744,26 +2814,27 @@ var ServerRenderResult = class {
     }
     const { boundary } = head;
     const onNext = boundary.onNext = (write2) => {
-      if (write2 || boundary.done) {
-        if (boundary.signal.aborted) {
-          if (!tick2) offTick(onNext);
-          onAbort(boundary.signal.reason);
-          return;
+      if (boundary.signal.aborted) {
+        if (!tick2) offTick(onNext);
+        boundary.onNext = NOOP2;
+        onAbort(boundary.signal.reason);
+      } else {
+        if (write2 || boundary.done) {
+          head = prepareChunk(head);
         }
-        head = prepareChunk(head);
-      }
-      if (write2 || boundary.done) {
-        const html = flushChunk(head, boundary.done);
-        if (html) onWrite(html);
-        if (boundary.done) {
-          if (!tick2) offTick(onNext);
-          onClose();
-        } else {
-          tick2 = true;
+        if (write2 || boundary.done) {
+          const html = flushChunk(head, boundary.done);
+          if (html) onWrite(html);
+          if (boundary.done) {
+            if (!tick2) offTick(onNext);
+            onClose();
+          } else {
+            tick2 = true;
+          }
+        } else if (tick2) {
+          tick2 = false;
+          queueTick(onNext);
         }
-      } else if (tick2) {
-        tick2 = false;
-        queueTick(onNext);
       }
     };
     onNext();
@@ -2777,6 +2848,8 @@ var ServerRenderResult = class {
     return flushChunk(prepareChunk(head), true);
   }
 };
+function NOOP2() {
+}
 export {
   $global,
   attr,
@@ -2793,6 +2866,7 @@ export {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
+  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,

package/dist/dom/compat.d.ts

@@ -4,12 +4,12 @@ import { type Renderer } from "./renderer";
 export declare const compat: {
     patchConditionals: typeof patchConditionals;
     queueEffect: typeof queueEffect;
-    init(): void;
+    init(warp10Noop: any): void;
     registerRenderer(fn: any): void;
     isOp(value: any): boolean;
     isRenderer(renderer: any): boolean;
-    getStartNode(scope: any): any;
-    setScopeNodes(scope: any, startNode: Node, endNode: Node): void;
+    getStartNode(branch: any): any;
+    setScopeNodes(branch: any, startNode: Node, endNode: Node): void;
     runComponentEffects(this: any): void;
     runComponentDestroy(this: any): void;
     resolveRegistered(value: any, { runtimeId, componentIdPrefix, }: {
@@ -17,5 +17,5 @@ export declare const compat: {
         componentIdPrefix: string;
     }): any;
     createRenderer(setup: Renderer["___setup"], clone: Renderer["___clone"], args: Renderer["___args"]): Renderer;
-    render(out: any, component: any, renderer: Renderer, args: any): (Node & ChildNode) | ParentNode | null | undefined;
+    render(out: any, component: any, renderer: Renderer, args: any): ChildNode | ParentNode | null | undefined;
 };

package/dist/dom/dom.d.ts

@@ -9,7 +9,7 @@ export declare function textContent(node: ParentNode, value: unknown): void;
 export declare function attrs(scope: Scope, nodeAccessor: Accessor, nextAttrs: Record<string, unknown>): void;
 export declare function partialAttrs(scope: Scope, nodeAccessor: Accessor, nextAttrs: Record<string, unknown>, skip: Record<string, 1>): void;
 export declare function attrsEvents(scope: Scope, nodeAccessor: Accessor): void;
-export declare function html(scope: Scope, value: unknown, index: Accessor): void;
+export declare function html(scope: Scope, value: unknown, accessor: Accessor): void;
 export declare function props(scope: Scope, nodeIndex: number, index: number): void;
 export declare function normalizeAttrValue(value: unknown): string | undefined;
 export declare function lifecycle(scope: Scope, index: string | number, thisObj: Record<string, unknown> & {
@@ -17,3 +17,4 @@ export declare function lifecycle(scope: Scope, index: string | number, thisObj:
     onUpdate?: (this: unknown) => void;
     onDestroy?: (this: unknown) => void;
 }): void;
+export declare function removeChildNodes(startNode: ChildNode, endNode: ChildNode): void;

package/dist/dom/reconcile.d.ts

@@ -1,2 +1,2 @@
 import type { BranchScope } from "../common/types";
-export declare function reconcile(parent: Node & ParentNode, oldBranches: BranchScope[], newBranches: BranchScope[], afterReference: Node | null): void;
+export declare function reconcile(parent: ParentNode, oldBranches: BranchScope[], newBranches: BranchScope[], afterReference: Node | null): void;

package/dist/dom/scope.d.ts

@@ -4,4 +4,4 @@ export declare function finishPendingScopes(): void;
 export declare function getEmptyBranch(marker: Comment): BranchScope;
 export declare function destroyBranch(branch: BranchScope): void;
 export declare function removeAndDestroyBranch(branch: BranchScope): void;
-export declare function insertBranchBefore(branch: BranchScope, parent: Node & ParentNode, nextSibling: Node | null): void;
+export declare function insertBranchBefore(branch: BranchScope, parentNode: ParentNode, nextSibling: Node | null): void;

package/dist/dom/walker.d.ts

@@ -1,4 +1,4 @@
-import { type Scope } from "../common/types";
+import { type BranchScope } from "../common/types";
 export declare const walker: TreeWalker;
 export declare function trimWalkString(walkString: string): string;
-export declare function walk(startNode: Node, walkCodes: string, scope: Scope): void;
+export declare function walk(startNode: Node, walkCodes: string, branch: BranchScope): void;