marko 6.4.4 → 6.4.6

package/dist/html/writer.d.ts

@@ -1,22 +1,22 @@
 import { _hoist_read_error } from "../common/errors";
 import { type Opt } from "../common/opt";
-import { type $Global, type Accessor, type Falsy, ResumeSymbol } from "../common/types";
+import { type $Global, type Accessor, ResumeSymbol } from "../common/types";
 import * as FlushStatus from "./constants/flush-status";
 import * as Mark from "./constants/mark";
-import { K_SCOPE_ID, type Locals, Serializer } from "./serializer";
+import { K_SCOPE_ID, type Locals, type SerializeChannel, SerializerState } from "./serializer";
 import type { ServerRenderer } from "./template";
 export type PartialScope = Record<Accessor, unknown>;
-interface SerializeState {
-    readyId?: string;
-    parent?: SerializeState;
+interface Channel extends SerializeChannel {
+    parent?: Channel;
     resumes: string;
     writeScopes: Record<number, PartialScope>;
     passiveScopes?: Record<number, PartialScope>;
     flushScopes: boolean;
 }
-type ScopeInternals = PartialScope & {
+export type ScopeInternals = PartialScope & {
     [K_SCOPE_ID]?: number;
 };
+export declare let $chunk: Chunk;
 export declare function getChunk(): Chunk | undefined;
 export declare function withChunk<T>(chunk: Chunk, cb: () => T): T;
 export declare function getContext(key: keyof NonNullable<Chunk["context"]>): unknown;
@@ -33,9 +33,20 @@ export declare function _scope_id(): number;
 export declare function _peek_scope_id(): number;
 export declare function withContext<T>(key: PropertyKey, value: unknown, cb: () => T): T;
 export declare function withContext<T, U>(key: PropertyKey, value: unknown, cb: (value: U) => T, cbValue: U): T;
+export declare function withContext<T, U, V>(key: PropertyKey, value: unknown, cb: (value: U, value2: V) => T, cbValue: U, cbValue2: V): T;
+export declare function captureContext(chunk: Chunk): void;
+export declare const kBranchId: unique symbol;
+export interface AsyncContent {
+    visit?: string;
+    end?: Chunk;
+    parent?: AsyncContent;
+    resumed?: true;
+}
 export declare function isInResumedBranch(): boolean;
 export declare function withBranchId<T>(branchId: number, cb: () => T): T;
 export declare function withBranchId<T, U>(branchId: number, cb: (value: U) => T, cbValue: U): T;
+export declare function withBranchId<T, U, V>(branchId: number, cb: (value: U, value2: V) => T, cbValue: U, cbValue2: V): T;
+export declare function withAsyncContent<T, U>(async: AsyncContent, cb: (value: U) => T, value: U): T;
 export declare function _html(html: string): void;
 export declare function writeScript(script: string): void;
 export declare function catchableBoundary(): Boundary | null;
@@ -49,54 +60,46 @@ export declare function _hoist(scopeId: number, id: string): {
     (): void;
     [Symbol.iterator]: typeof _hoist_read_error;
 };
-export declare function _el_resume(scopeId: number, accessor: Accessor, shouldResume?: number): string;
-export declare function _text_resume(scopeId: number, accessor: Accessor, val: unknown, shouldResume?: number): string;
-export declare function _html_resume(scopeId: number, accessor: Accessor, val: unknown, shouldResume?: number): string;
+export declare function _el_resume(scopeId: number, accessor: Accessor, markerGuard?: number): string;
+export declare function _text_resume(scopeId: number, accessor: Accessor, val: unknown, markerGuard?: number): string;
+export declare function _html_resume(scopeId: number, accessor: Accessor, val: unknown, markerGuard?: number): string;
 export declare function _resume_branch(scopeId: number): void;
 export declare function _attr_content(nodeAccessor: Accessor, scopeId: number, content: unknown, markerGuard?: number): void;
 export declare function _var(parentScopeId: number, scopeOffsetAccessor: Accessor, childScopeId: number, registryId: string, nodeAccessor?: Accessor): void;
-export declare function _show_start(display: unknown, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0): void;
-export declare function _show_end(scopeId: number, accessor: Accessor, display: unknown, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1 | 0): void;
-export declare function _for_of(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, by: Falsy | ((item: unknown, index: number) => unknown), scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _for_in(obj: Falsy | {}, cb: (key: string, value: unknown) => void, by: Falsy | ((key: string, v: unknown) => unknown), scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _for_to(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _for_until(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _if(cb: () => void | number, scopeId: number, accessor: Accessor, branchGuard?: number, markerGuard?: number, branchExprGuard?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function deferBranchStart(chunk: Chunk): string;
-export declare function applyBranchStart(chunk: Chunk, beforeBranch: string, rendered: boolean): void;
 declare let writeScope: (scopeId: number, partialScope: PartialScope) => ScopeInternals;
 export { writeScope as _scope };
 export declare function _existing_scope(scopeId: number): ScopeInternals;
 export declare function _scope_with_id(scopeId: number): ScopeInternals;
 export declare function _subscribe(subscribers: Set<ScopeInternals> | undefined, scope: ScopeInternals, resumeId?: string, markerGuard?: number): ScopeInternals;
 export type GroupMask = undefined | number | Partial<Record<string, number>>;
-export declare const CLIENT_ALL = 715827883;
-export declare function maskGroup(mask: GroupMask, group: number): number;
+export declare const ALL_GROUPS = 715827883;
+export declare function getGroupReason(reason: GroupMask, group: number): number;
 export declare function _set_scope_reason(reason: GroupMask): void;
 export declare function _scope_reason(): GroupMask;
-export declare function _write_if(condition: GroupMask, key: number): 1 | undefined;
-export declare function _write_guard(condition: GroupMask, key: number): 0 | 1;
+export declare function _write_if(reason: GroupMask, group: number): 1 | undefined;
+export declare function _write_guard(reason: GroupMask, group: number): 0 | 1;
 export declare function writeWaitReady(readyId: string, renderer: ServerRenderer, input: unknown): void;
-export declare function _await<T>(scopeId: number, accessor: Accessor, promise: Promise<T> | T, content: (value: T) => void, markerGuard?: number): void;
-export declare function _try(scopeId: number, accessor: Accessor, content: () => void, placeholderContent?: ServerRenderer, catchContent?: ServerRenderer, placeholderId?: string, catchId?: string): void;
+export declare function deferBranchStart(chunk: Chunk): string;
+export declare function applyBranchStart(chunk: Chunk, beforeBranch: string, rendered: boolean): void;
 declare const NOOP: () => void;
+export declare function getAsyncContent(chunk: Chunk): AsyncContent | undefined;
 type Mark = Mark.Value;
-export declare class State implements SerializeState {
+export declare class State implements Channel {
     tagId: number;
     scopeId: number;
     reorderId: number;
     readyGate: number;
-    hasGlobals: boolean;
-    needsMainRuntime: boolean;
-    hasMainRuntime: boolean;
-    hasReadyRuntime: boolean;
+    hasWrittenGlobals: boolean;
+    needsWalkerRuntime: boolean;
+    hasWalkerRuntime: boolean;
+    hasWrittenReady: boolean;
     hasReorderRuntime: boolean;
     hasWrittenResume: boolean;
     walkOnNextFlush: boolean;
     trailerHTML: string;
     resumes: string;
     nonceAttr: string;
-    serializer: Serializer;
+    serializer: SerializerState;
     writeReorders: Chunk[] | null;
     scopes: Map<number, ScopeInternals>;
     scope: (scopeId: number) => ScopeInternals;
@@ -112,13 +115,20 @@ export declare class State implements SerializeState {
         renderId: string;
         runtimeId: string;
     });
-    flushChunk(html: string, scripts: string, pending: number): string;
+    joinFlush(html: string, scripts: string, pending: number): string;
     walkScript(): string;
+    addResumes(channel: Channel, resumes: string): void;
+    queueScope(target: Channel, scopeId: number, partialScope: PartialScope): void;
+    queuePassiveScope(target: Channel, scopeId: number, partialScope: PartialScope): void;
+    queueEffect(scopeId: number, registryId: string): void;
+    serializeFlush(boundary: Boundary): void;
+    runtimeScript(): string;
+    keepsTryMarks(chunk: Chunk, resumeWrites: number): boolean;
     resumeScript(resumes: string): string;
     get runtimePrefix(): string;
     get commentPrefix(): string;
     reorder(chunk: Chunk): void;
-    writeReady(id: string, resumes: string): string;
+    readyScript(id: string, resumes: string): string;
     readyAccess(readyKey: string): string;
     nextReorderId(): string;
     mark(code: ResumeSymbol | Mark, str: string): string;
@@ -170,9 +180,10 @@ export declare class Chunk {
     boundary: Boundary;
     next: Chunk | null;
     context: Record<string | symbol, unknown> | null;
-    serializeState: SerializeState;
-    constructor(boundary: Boundary, next: Chunk | null, context: Record<string | symbol, unknown> | null, serializeState: SerializeState);
+    channel: Channel;
+    constructor(boundary: Boundary, next: Chunk | null, context: Record<string | symbol, unknown> | null, channel: Channel);
     fork(boundary: Boundary, next: Chunk | null): Chunk;
+    forkRest(boundary: Boundary): Chunk;
     writeHTML(html: string): void;
     writeEffect(scopeId: number, registryId: string): void;
     writeScript(script: string): void;
@@ -187,8 +198,9 @@ export declare class Chunk {
     consume(boundary: Boundary): Chunk;
     render(content: () => void): Chunk;
     render<T>(content: (val: T) => void, val: T): Chunk;
+    render<T, U>(content: (val: T, val2: U) => void, val: T, val2: U): Chunk;
     flushReadyScripts(boundary: Boundary, reservations?: string[], holdEffects?: boolean): string;
-    flushScript(boundary: Boundary): this;
+    flush(boundary: Boundary): this;
     flushHTML(boundary: Boundary): string;
 }
 export declare function joinHeldEffects(heldEffects: Opt<Chunk>, effects: string): string;

package/dist/html.d.ts

@@ -4,7 +4,8 @@ export { _flush_head, withLoadAssets, withPageAssets } from "./html/assets";
 export { _attr, _attr_and, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_select_value, _attrs_textarea_value, _style_html, _textarea_value, } from "./html/attrs";
 export { compat } from "./html/compat";
 export { _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _to_text, _unescaped, } from "./html/content";
+export { _await, _for_in, _for_of, _for_to, _for_until, _if, _show_end, _show_start, _try, } from "./html/control-flow";
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
 export { forIn, forOf, forTo, forUntil } from "./html/for";
 export { _template } from "./html/template";
-export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, _scope, _scope_id, _scope_reason, _html_resume, _scope_with_id, _script, _write_guard, _write_if, _set_scope_reason, _show_end, _show_start, _text_resume, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";
+export { _attr_content, _el, _el_resume, _existing_scope, _hoist, _html, _id, _peek_scope_id, _resume, _resume_branch, _resume_locals, _scope, _scope_id, _scope_reason, _html_resume, _scope_with_id, _script, _write_guard, _write_if, _set_scope_reason, _text_resume, _subscribe, _trailers, _var, $global, } from "./html/writer";