marko 6.0.0-next.3.21 → 6.0.0-next.3.23

package/dist/html/dynamic-tag.d.ts

@@ -1,11 +1,11 @@
+import type { Accessor } from "../common/types";
 import type { ServerRenderer } from "./template";
-import { type PartialScope } from "./writer";
 interface BodyContentObject {
     [x: PropertyKey]: unknown;
     content: ServerRenderer;
 }
-export declare function dynamicTagInput(scope: PartialScope, tag: unknown | string | ServerRenderer | BodyContentObject, input: Record<string, unknown>, content?: () => void, tagVar?: unknown): unknown;
-export declare function dynamicTagArgs(scope: PartialScope, tag: unknown | string | ServerRenderer | BodyContentObject, args: unknown[]): unknown;
+export declare function dynamicTagInput(scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, input: Record<string, unknown>, content?: () => void, tagVar?: unknown): undefined;
+export declare function dynamicTagArgs(scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, args: unknown[]): undefined;
 declare let getDynamicRenderer: (value: any) => string | ServerRenderer | undefined;
 export declare let createRenderer: (fn: ServerRenderer) => ServerRenderer;
 export declare function patchDynamicTag(newGetDynamicRenderer: typeof getDynamicRenderer, newCreateRenderer: typeof createRenderer): void;

package/dist/html/writer.d.ts

@@ -1,4 +1,4 @@
-import type { $Global, Accessor } from "../common/types";
+import { type $Global, type Accessor, type Falsy, ResumeSymbol } from "../common/types";
 import { Serializer } from "./serializer";
 export type PartialScope = Record<Accessor, unknown>;
 type ScopeInternals = PartialScope & {
@@ -8,12 +8,7 @@ declare const K_SCOPE_ID: unique symbol;
 declare enum Mark {
     Placeholder = "!^",
     PlaceholderEnd = "!",
-    ReorderMarker = "#",
-    SectionStart = "[",
-    SectionEnd = "]",
-    SectionSingleNodesEnd = "|",
-    Node = "*",
-    Cleanup = "$"
+    ReorderMarker = "#"
 }
 export declare function getChunk(): Chunk | undefined;
 export declare function getScopeId(scope: unknown): number | undefined;
@@ -29,10 +24,15 @@ export declare function peekNextScope(): PartialScope;
 export declare function getScopeById(scopeId: number | undefined): PartialScope | undefined;
 export declare function markResumeNode(scopeId: number, accessor: Accessor): string;
 export declare function nodeRef(scopeId: number, id?: string): () => void;
-export declare function markResumeScopeStart(scopeId: number, index?: number): string;
-export declare function markResumeControlEnd(scopeId: number, accessor: Accessor): string;
-export declare function markResumeControlSingleNodeEnd(scopeId: number, accessor: Accessor, childScopeIds?: number | number[]): string;
-export declare function markResumeCleanup(scopeId: number): string;
+export declare function resumeClosestBranch(scopeId: number): void;
+export declare function resumeForOf(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, scopeId: number, accessor: Accessor): void;
+export declare function resumeSingleNodeForOf(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, scopeId: number, accessor: Accessor): void;
+export declare function resumeForIn(obj: Falsy | {}, cb: (key: string, value: unknown) => void, scopeId: number, accessor: Accessor): void;
+export declare function resumeSingleNodeForIn(obj: Falsy | {}, cb: (key: string, value: unknown) => void, scopeId: number, accessor: Accessor): void;
+export declare function resumeForTo(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, scopeId: number, accessor: Accessor): void;
+export declare function resumeSingleNodeForTo(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, scopeId: number, accessor: Accessor): void;
+export declare function resumeConditional(cb: () => void | number, scopeId: number, accessor: Accessor): void;
+export declare function resumeSingleNodeConditional(cb: () => void | number, scopeId: number, accessor: Accessor): void;
 export declare function writeScope(scopeId: number, partialScope: PartialScope): ScopeInternals;
 export declare function writeExistingScope(scope: ScopeInternals): ScopeInternals;
 export declare function ensureScopeWithId(scopeId: number): PartialScope;
@@ -79,7 +79,7 @@ export declare class State {
     get commentPrefix(): string;
     reorder(chunk: Chunk): void;
     nextReorderId(): string;
-    mark(code: Mark, str: string): string;
+    mark(code: ResumeSymbol | Mark, str: string): string;
 }
 export declare class Boundary extends AbortController {
     state: State;

package/dist/html.d.ts

@@ -6,4 +6,4 @@ export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
 export { createRenderer, dynamicTagArgs, dynamicTagInput, } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
 export { createTemplate } from "./html/template";
-export { $global, ensureScopeWithId, fork, getScopeById, markResumeCleanup, markResumeControlEnd, markResumeControlSingleNodeEnd, markResumeNode, markResumeScopeStart, nextScopeId, nextTagId, nodeRef, peekNextScope, register, tryContent, write, writeEffect, writeExistingScope, writeScope, writeTrailers, } from "./html/writer";
+export { $global, ensureScopeWithId, fork, getScopeById, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScope, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, resumeSingleNodeConditional, resumeSingleNodeForIn, resumeSingleNodeForOf, resumeSingleNodeForTo, tryContent, write, writeEffect, writeExistingScope, writeScope, writeTrailers, } from "./html/writer";

package/dist/html.js

@@ -46,11 +46,7 @@ __export(html_exports, {
   forToBy: () => forToBy,
   fork: () => fork,
   getScopeById: () => getScopeById,
-  markResumeCleanup: () => markResumeCleanup,
-  markResumeControlEnd: () => markResumeControlEnd,
-  markResumeControlSingleNodeEnd: () => markResumeControlSingleNodeEnd,
   markResumeNode: () => markResumeNode,
-  markResumeScopeStart: () => markResumeScopeStart,
   nextScopeId: () => nextScopeId,
   nextTagId: () => nextTagId,
   nodeRef: () => nodeRef,
@@ -59,6 +55,15 @@ __export(html_exports, {
   partialAttrs: () => partialAttrs,
   peekNextScope: () => peekNextScope,
   register: () => register2,
+  resumeClosestBranch: () => resumeClosestBranch,
+  resumeConditional: () => resumeConditional,
+  resumeForIn: () => resumeForIn,
+  resumeForOf: () => resumeForOf,
+  resumeForTo: () => resumeForTo,
+  resumeSingleNodeConditional: () => resumeSingleNodeConditional,
+  resumeSingleNodeForIn: () => resumeSingleNodeForIn,
+  resumeSingleNodeForOf: () => resumeSingleNodeForOf,
+  resumeSingleNodeForTo: () => resumeSingleNodeForTo,
   styleAttr: () => styleAttr,
   toString: () => toString,
   tryContent: () => tryContent,
@@ -151,6 +156,24 @@ function escapeStyle(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
 
+// src/common/for.ts
+function forIn(obj, cb) {
+  for (let key in obj)
+    cb(key, obj[key]);
+}
+function forOf(list, cb) {
+  if (list) {
+    let i = 0;
+    for (let item of list)
+      cb(item, i++);
+  }
+}
+function forTo(to, from, step, cb) {
+  let start = from || 0, delta = step || 1;
+  for (let steps = (to - start) / delta, i = 0; i <= steps; i++)
+    cb(start + i * delta);
+}
+
 // src/html/inlined-runtimes.ts
 var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e)))}})';
 
@@ -1007,23 +1030,114 @@ function nodeRef(scopeId, id) {
   };
   return id ? register2(getter, id, scopeId) : getter;
 }
-function markResumeScopeStart(scopeId, index) {
-  return $chunk.boundary.state.mark(
-    "[" /* SectionStart */,
-    scopeId + (index ? " " + index : "")
+function resumeClosestBranch(scopeId) {
+  let branchId = $chunk.context?.[branchIdKey];
+  branchId !== void 0 && branchId !== scopeId && $chunk.writeHTML(
+    $chunk.boundary.state.mark("$" /* ClosestBranch */, "" + scopeId)
+  );
+}
+var branchIdKey = Symbol();
+function resumeForOf(list, cb, scopeId, accessor) {
+  forOf(list, (item, i) => {
+    let branchId = peekNextScopeId();
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        "[" /* BranchStart */,
+        branchId + (i ? " " : "")
+      )
+    ), withContext(branchIdKey, branchId, () => cb(item, i));
+  }), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
+}
+function resumeSingleNodeForOf(list, cb, scopeId, accessor) {
+  let branchIds = "";
+  forOf(list, (item, index) => {
+    let branchId = peekNextScopeId();
+    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(item, index));
+  }), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
+}
+function resumeForIn(obj, cb, scopeId, accessor) {
+  let sep = "";
+  forIn(obj, (key, value) => {
+    let branchId = peekNextScopeId();
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+    ), sep = " ", withContext(branchIdKey, branchId, () => cb(key, value));
+  }), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
+}
+function resumeSingleNodeForIn(obj, cb, scopeId, accessor) {
+  let branchIds = "";
+  forIn(obj, (key, value) => {
+    let branchId = peekNextScopeId();
+    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(key, value));
+  }), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
+}
+function resumeForTo(to, from, step, cb, scopeId, accessor) {
+  let sep = "";
+  forTo(to, from, step, (index) => {
+    let branchId = peekNextScopeId();
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+    ), sep = " ", withContext(branchIdKey, branchId, () => cb(index));
+  }), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
   );
 }
-function markResumeControlEnd(scopeId, accessor) {
-  return $chunk.boundary.state.mark("]" /* SectionEnd */, scopeId + " " + accessor);
+function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor) {
+  let branchIds = "";
+  forTo(to, from, step, (index) => {
+    let branchId = peekNextScopeId();
+    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(index));
+  }), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
 }
-function markResumeControlSingleNodeEnd(scopeId, accessor, childScopeIds) {
-  return $chunk.boundary.state.mark(
-    "|" /* SectionSingleNodesEnd */,
-    scopeId + " " + accessor + " " + (childScopeIds ?? "")
+function resumeConditional(cb, scopeId, accessor) {
+  let branchId = peekNextScopeId();
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+  ), withContext(branchIdKey, branchId, cb), peekNextScopeId() !== branchId ? writeScope(branchId, {}) : nextScopeId(), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
   );
 }
-function markResumeCleanup(scopeId) {
-  return $chunk.boundary.state.mark("$" /* Cleanup */, "" + scopeId);
+function resumeSingleNodeConditional(cb, scopeId, accessor) {
+  let branchId = peekNextScopeId();
+  withContext(branchIdKey, branchId, cb);
+  let rendered = peekNextScopeId() !== branchId;
+  rendered ? writeScope(branchId, {}) : nextScopeId(), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + (rendered ? " " + branchId : "")
+    )
+  );
 }
 function writeScope(scopeId, partialScope) {
   let { state } = $chunk.boundary, { scopes } = state, scope = scopes.get(scopeId);
@@ -1211,7 +1325,7 @@ var State2 = class {
     if (cur.next && !cur.async) {
       let html = "", effects = "", scripts = "";
       do
-        cur.flushPlaceholder(), html += cur.html, effects += cur.effects, scripts = concatScripts(scripts, cur.scripts), cur.consumed = !0, cur = cur.next;
+        cur.flushPlaceholder(), html += cur.html, effects = concatEffects(effects, cur.effects), scripts = concatScripts(scripts, cur.scripts), cur.consumed = !0, cur = cur.next;
       while (cur.next && !cur.async);
       cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts);
     }
@@ -1511,36 +1625,72 @@ 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)$/;
-function dynamicTagInput(scope, tag, input, content, tagVar) {
-  if (!tag && !content) return;
-  let scopeId = getScopeId(scope);
-  return write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), tag ? typeof tag == "string" ? (nextScopeId(), write(
-    `<${tag}${attrs(input, 0, scopeId, tag)}>`
-  ), voidElementsReg.test(tag) || (tag === "textarea" ? write(
-    controllable_textarea_value(
+function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
+  if (!tag && !content) {
+    nextScopeId();
+    return;
+  }
+  if (!tag) {
+    resumeConditional(content, scopeId, accessor);
+    return;
+  }
+  if (typeof tag == "string") {
+    resumeSingleNodeConditional(
+      () => {
+        nextScopeId(), write(`<${tag}${attrs(input, accessor, scopeId, tag)}>`), voidElementsReg.test(tag) || (tag === "textarea" ? write(
+          controllable_textarea_value(
+            scopeId,
+            accessor,
+            input.value,
+            input.valueChange
+          )
+        ) : content && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+          scopeId,
+          accessor,
+          input.value,
+          input.valueChange,
+          content
+        ) : content()), write(`</${tag}>`));
+      },
       scopeId,
-      0,
-      input.value,
-      input.valueChange
-    )
-  ) : content && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+      accessor
+    );
+    return;
+  }
+  let renderer = getDynamicRenderer(tag), result;
+  return resumeConditional(
+    () => {
+      result = renderer(content ? { ...input, content } : input, tagVar);
+    },
     scopeId,
-    0,
-    input.value,
-    input.valueChange,
-    content
-  ) : content()), write(`</${tag}>`)), null) : getDynamicRenderer(tag)(content ? { ...input, content } : input, tagVar) : content();
-}
-function dynamicTagArgs(scope, tag, args) {
-  if (!tag) return;
-  let scopeId = getScopeId(scope);
-  if (write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), typeof tag == "string") {
-    nextScopeId(), write(
-      `<${tag}${attrs(args[0], 0, scopeId, tag)}>`
-    ), voidElementsReg.test(tag) || write(`</${tag}>`);
+    accessor
+  ), result;
+}
+function dynamicTagArgs(scopeId, accessor, tag, args) {
+  if (!tag) {
+    nextScopeId();
+    return;
+  }
+  if (typeof tag == "string") {
+    resumeSingleNodeConditional(
+      () => {
+        nextScopeId(), write(
+          `<${tag}${attrs(args[0], accessor, scopeId, tag)}>`
+        ), voidElementsReg.test(tag) || write(`</${tag}>`);
+      },
+      scopeId,
+      accessor
+    );
     return;
   }
-  return getDynamicRenderer(tag)(...args);
+  let renderer = getDynamicRenderer(tag), result;
+  return resumeConditional(
+    () => {
+      result = renderer(...args);
+    },
+    scopeId,
+    accessor
+  ), result;
 }
 var getDynamicRenderer = normalizeDynamicRenderer, createRenderer = (fn) => fn;
 function patchDynamicTag(newGetDynamicRenderer, newCreateRenderer) {
@@ -1610,24 +1760,6 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   }
 };
 
-// src/common/for.ts
-function forIn(obj, cb) {
-  for (let key in obj)
-    cb(key, obj[key]);
-}
-function forOf(list, cb) {
-  if (list) {
-    let i = 0;
-    for (let item of list)
-      cb(item, i++);
-  }
-}
-function forTo(to, from, step, cb) {
-  let start = from || 0, delta = step || 1;
-  for (let steps = (to - start) / delta, i = 0; i <= steps; i++)
-    cb(start + i * delta);
-}
-
 // src/html/for.ts
 function forOfBy(by, item, index) {
   return by ? typeof by == "string" ? item[by] : by(item, index) : index;
@@ -1812,11 +1944,7 @@ var ServerRenderResult = class {
   forToBy,
   fork,
   getScopeById,
-  markResumeCleanup,
-  markResumeControlEnd,
-  markResumeControlSingleNodeEnd,
   markResumeNode,
-  markResumeScopeStart,
   nextScopeId,
   nextTagId,
   nodeRef,
@@ -1825,6 +1953,15 @@ var ServerRenderResult = class {
   partialAttrs,
   peekNextScope,
   register,
+  resumeClosestBranch,
+  resumeConditional,
+  resumeForIn,
+  resumeForOf,
+  resumeForTo,
+  resumeSingleNodeConditional,
+  resumeSingleNodeForIn,
+  resumeSingleNodeForOf,
+  resumeSingleNodeForTo,
   styleAttr,
   toString,
   tryContent,