marko 6.0.113 → 6.0.114

package/dist/debug/html.mjs

@@ -281,7 +281,7 @@ var REORDER_RUNTIME_CODE = true ? (
   let onNextSibling,
     placeholder,
     nextSibling,
-    placeholders = {},
+    placeholders = runtime.p = {},
     replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);
   runtime.d.head.append(
     runtime.d.querySelector("style[" + runtime.i + "]") || ""
@@ -331,7 +331,7 @@ var REORDER_RUNTIME_CODE = true ? (
     }
   };
 })`
-) : `(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})`;
+) : `(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})`;
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol();
@@ -1699,6 +1699,9 @@ function writeScript(script) {
   $chunk.writeScript(script);
 }
 function _script(scopeId, registryId) {
+  if ($chunk.context?.[kIsAsync]) {
+    _resume_branch(scopeId);
+  }
   $chunk.boundary.state.needsMainRuntime = true;
   $chunk.writeEffect(scopeId, registryId);
 }
@@ -1738,13 +1741,13 @@ function normalizeServerRender(value) {
   }
 }
 var kPendingContexts = Symbol("Pending Contexts");
-function withContext(key, value, cb) {
+function withContext(key, value, cb, cbValue) {
   const ctx = $chunk.context ||= { [kPendingContexts]: 0 };
   const prev = ctx[key];
   ctx[kPendingContexts]++;
   ctx[key] = value;
   try {
-    return cb();
+    return cb(cbValue);
   } finally {
     ctx[kPendingContexts]--;
     ctx[key] = prev;
@@ -1813,17 +1816,21 @@ function _hoist(scopeId, id) {
   return _resume(getter, id, scopeId);
 }
 function _resume_branch(scopeId) {
-  const branchId = $chunk.context?.[branchIdKey];
+  const branchId = $chunk.context?.[kBranchId];
   if (branchId !== void 0 && branchId !== scopeId) {
     writeScope(scopeId, { ["#ClosestBranchId" /* ClosestBranchId */]: branchId });
   }
 }
-var branchIdKey = Symbol();
+var kBranchId = Symbol("Branch Id");
+var kIsAsync = Symbol("Is Async");
 function isInResumedBranch() {
-  return $chunk?.context?.[branchIdKey] !== void 0;
+  return $chunk?.context?.[kBranchId] !== void 0;
 }
 function withBranchId(branchId, cb) {
-  return withContext(branchIdKey, branchId, cb);
+  return withContext(kBranchId, branchId, cb);
+}
+function withIsAsync(cb, value) {
+  return withContext(kIsAsync, true, cb, value);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
@@ -2207,7 +2214,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
               $chunk.writeHTML(
                 $chunk.boundary.state.mark("[" /* BranchStart */, "")
               );
-              content(value);
+              withIsAsync(content, value);
               $chunk.writeHTML(
                 $chunk.boundary.state.mark(
                   "]" /* BranchEnd */,
@@ -2215,7 +2222,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
                 )
               );
             } else {
-              content(value);
+              withIsAsync(content, value);
             }
           });
           boundary.endAsync(chunk);
@@ -2235,11 +2242,11 @@ function _try(scopeId, accessor, content, input) {
   const placeholderContent = normalizeDynamicRenderer(input.placeholder);
   if (catchContent) {
     tryCatch(
-      placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+      placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId) : content,
       catchContent
     );
   } else if (placeholderContent) {
-    tryPlaceholder(content, placeholderContent);
+    tryPlaceholder(content, placeholderContent, branchId);
   } else {
     content();
   }
@@ -2255,7 +2262,7 @@ function _try(scopeId, accessor, content, input) {
     )
   );
 }
-function tryPlaceholder(content, placeholder) {
+function tryPlaceholder(content, placeholder, branchId) {
   const chunk = $chunk;
   const { boundary } = chunk;
   const body = new Chunk(boundary, null, chunk.context);
@@ -2263,9 +2270,10 @@ function tryPlaceholder(content, placeholder) {
     chunk.append(body);
     return;
   }
-  chunk.next = $chunk = new Chunk(boundary, chunk.next, body.context);
+  chunk.next = $chunk = new Chunk(boundary, chunk.next, chunk.context);
   chunk.placeholderBody = body;
   chunk.placeholderRender = placeholder;
+  chunk.placeholderBranchId = branchId;
 }
 function tryCatch(content, catchContent) {
   const chunk = $chunk;
@@ -2441,18 +2449,16 @@ var Chunk = class {
   reorderId = null;
   placeholderBody = null;
   placeholderRender = null;
+  placeholderBranchId = null;
   writeHTML(html) {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
     if (this.lastEffect === registryId) {
-      this.effects += "," + scopeId;
+      this.effects += " " + scopeId;
     } else {
       this.lastEffect = registryId;
-      this.effects = concatEffects(
-        this.effects,
-        '"' + registryId + '",' + scopeId
-      );
+      this.effects = concatEffects(this.effects, registryId + " " + scopeId);
     }
   }
   writeScript(script) {
@@ -2469,7 +2475,8 @@ var Chunk = class {
       const body = this.placeholderBody.consume();
       if (body.async) {
         const { state } = this.boundary;
-        const reorderId = body.reorderId = state.nextReorderId();
+        const reorderId = body.reorderId = this.placeholderBranchId ? this.placeholderBranchId + "" : state.nextReorderId();
+        this.placeholderBranchId = null;
         this.writeHTML(state.mark("!^" /* Placeholder */, reorderId));
         const after = this.render(this.placeholderRender);
         if (after !== this) {
@@ -2541,7 +2548,7 @@ var Chunk = class {
     }
     if (effects) {
       needsWalk = true;
-      state.resumes = state.resumes ? state.resumes + "," + effects : effects;
+      state.resumes = state.resumes ? state.resumes + ',"' + effects + '"' : '"' + effects + '"';
     }
     if (state.resumes) {
       if (state.hasWrittenResume) {
@@ -2605,12 +2612,12 @@ var Chunk = class {
           }
           reorderScripts = concatScripts(
             reorderScripts,
-            "_.push(" + reorderEffects + ")"
+            '_.push("' + reorderEffects + '")'
           );
         }
         scripts = concatScripts(
           scripts,
-          reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
+          reorderScripts && runtimePrefix + ".j" /* Scripts */ + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"
         );
         html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
       }
@@ -2669,7 +2676,7 @@ function flushSerializer(boundary) {
       if (scopeIdDelta) serializeData.push(scopeIdDelta);
       serializeData.push(scope);
     }
-    state.resumes = concatEffects(
+    state.resumes = concatSequence(
       state.resumes,
       serializer.stringify(serializeData, boundary)
     );
@@ -2684,6 +2691,9 @@ function _trailers(html) {
   $chunk.boundary.state.trailerHTML += html;
 }
 function concatEffects(a, b) {
+  return a ? b ? a + " " + b : a : b;
+}
+function concatSequence(a, b) {
   return a ? b ? a + "," + b : a : b;
 }
 function concatScripts(a, b) {

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

@@ -1,7 +1,8 @@
 import { type Accessor, AccessorProp, type BranchScope, type EncodedAccessor, type Scope } from "../common/types";
 import { type Renderer, type SetupFn } from "./renderer";
 import { type Signal } from "./signals";
-export declare function _await(nodeAccessor: EncodedAccessor, template?: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown>): (scope: Scope, promise: Promise<unknown>) => void;
+export declare function _await_promise(nodeAccessor: EncodedAccessor, params?: Signal<unknown>): (scope: Scope, promise: Promise<unknown>) => void;
+export declare function _await_content(nodeAccessor: EncodedAccessor, template?: string | 0, walks?: string | 0, setup?: SetupFn | 0): (scope: Scope) => void;
 export declare function _try(nodeAccessor: EncodedAccessor, template?: string | 0, walks?: string | 0, setup?: SetupFn | 0): (scope: Scope, input: {
     catch: unknown;
     placeholder: unknown;

package/dist/dom/queue.d.ts

@@ -10,6 +10,6 @@ export declare function queueRender<T>(scope: Scope, signal: Signal<T>, signalKe
 export declare function queueEffect<S extends Scope, T extends ExecFn<S>>(scope: S, fn: T): void;
 export declare function run(): void;
 export declare function prepareEffects(fn: () => void): unknown[];
-export declare let runEffects: (effects: unknown[], checkPending?: boolean) => void;
+export declare let runEffects: (effects: unknown[], checkPending?: boolean | 1) => void;
 export declare let _enable_catch: () => void;
 export {};

package/dist/dom/resume.d.ts

@@ -1,5 +1,24 @@
-import { type EncodedAccessor, type Scope } from "../common/types";
+import { type AwaitCounter, type EncodedAccessor, type Scope } from "../common/types";
 import type { Signal } from "./signals";
+type Resumes = (number | Scope)[];
+type ResumeFn = (ctx: object) => Resumes;
+export interface Renders {
+    (renderId: string): RenderData;
+    [renderId: string]: RenderData;
+}
+export interface RenderData {
+    i: string;
+    v: Comment[];
+    r?: (string | ResumeFn)[];
+    s?: Record<string, Scope>;
+    w(): void;
+    m(): unknown[];
+    d: never;
+    l: never;
+    x: never;
+    j?: never;
+    p?: Record<string | number, AwaitCounter>;
+}
 export declare function enableBranches(): void;
 export declare function init(runtimeId?: string): void;
 export declare let isResuming: undefined | 0 | 1;
@@ -7,3 +26,4 @@ export declare function getRegisteredWithScope(id: string, scope?: Scope): unkno
 export declare function _resume<T>(id: string, obj: T): T;
 export declare function _var_resume<T extends Signal<unknown>>(id: string, signal: T): T;
 export declare function _el(id: string, accessor: EncodedAccessor): (scope: Scope) => () => any;
+export {};

package/dist/dom.d.ts

@@ -4,7 +4,7 @@ export { forIn, forOf, forTo, forUntil } from "./common/for";
 export { _call } from "./common/helpers";
 export { $signal, $signalReset } from "./dom/abort-signal";
 export { compat } from "./dom/compat";
-export { _await, _dynamic_tag, _for_in, _for_of, _for_to, _for_until, _if, _resume_dynamic_tag, _try, } from "./dom/control-flow";
+export { _await_content, _await_promise, _dynamic_tag, _for_in, _for_of, _for_to, _for_until, _if, _resume_dynamic_tag, _try, } from "./dom/control-flow";
 export { _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open_script as _attr_details_open_script, _attr_details_or_dialog_open as _attr_dialog_open, _attr_details_or_dialog_open_script as _attr_dialog_open_script, _attr_input_checked, _attr_input_checked_script, _attr_input_checkedValue, _attr_input_checkedValue_script, _attr_input_value, _attr_input_value_script, _attr_select_value, _attr_select_value_script, _attr_textarea_value, _attr_textarea_value_script, } from "./dom/controllable";
 export { _attr, _attr_class, _attr_class_item, _attr_class_items, _attr_content, _attr_style, _attr_style_item, _attr_style_items, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_script, _html, _lifecycle, _text, _text_content, } from "./dom/dom";
 export { _on } from "./dom/event";