marko 6.4.0 → 6.4.2

package/dist/html/writer.d.ts

@@ -38,7 +38,9 @@ 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 _html(html: string): void;
 export declare function writeScript(script: string): void;
-export declare function _script(scopeId: number, registryId: string, serializeMarker?: number): void;
+export declare function catchableBoundary(): Boundary | null;
+export declare function mayDrop(written: Boundary): boolean;
+export declare function _script(scopeId: number, registryId: string, markerGuard?: number): void;
 export declare function _trailers(html: string): void;
 export declare function _resume<T extends WeakKey>(val: T, id: string, scopeId?: number, locals?: Locals): T;
 export declare function _resume_locals<T extends WeakKey>(val: T, id: string, locals: Record<string, unknown>, ownerScopeId?: number): T;
@@ -51,31 +53,31 @@ export declare function _el_resume(scopeId: number, accessor: Accessor, shouldRe
 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 _resume_branch(scopeId: number): void;
-export declare function _attr_content(nodeAccessor: Accessor, scopeId: number, content: unknown, serializeReason?: 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, mark?: unknown): void;
-export declare function _show_end(scopeId: number, accessor: Accessor, display: unknown, serializeMarker?: number, serializeStateful?: 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, serializeBranch?: number, serializeMarker?: number, serializeStateful?: 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, serializeBranch?: number, serializeMarker?: number, serializeStateful?: 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, serializeBranch?: number, serializeMarker?: number, serializeStateful?: 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, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
-export declare function _if(cb: () => void | number, scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): 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, serializeMarker?: number): ScopeInternals;
-export type SerializeReasonValue = undefined | number | Partial<Record<string, number>>;
+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: SerializeReasonValue, group: number): number;
-export declare function _set_serialize_reason(reason: SerializeReasonValue): void;
-export declare function _scope_reason(): SerializeReasonValue;
-export declare function _serialize_if(condition: SerializeReasonValue, key: number): 1 | undefined;
-export declare function _serialize_guard(condition: SerializeReasonValue, key: number): 0 | 1;
+export declare function maskGroup(mask: 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 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, serializeMarker?: number): 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;
 declare const NOOP: () => void;
 type Mark = Mark.Value;
@@ -101,7 +103,7 @@ export declare class State implements SerializeState {
     flushScopes: boolean;
     writeScopes: Record<number, PartialScope>;
     readyIds: Set<string> | null;
-    serializeReason: SerializeReasonValue;
+    scopeReason: GroupMask;
     $global: $Global & {
         renderId: string;
         runtimeId: string;
@@ -123,13 +125,20 @@ export declare class State implements SerializeState {
 }
 type FlushStatus = FlushStatus.Value;
 export { FlushStatus };
-export declare class Boundary extends AbortController {
+export declare class Boundary {
     onNext: typeof NOOP;
     count: number;
     resumeWrites: number;
     state: State;
     parent?: Boundary;
+    aborted: boolean;
+    reason: unknown;
+    subscribed?: unknown[];
+    pendingReorders?: Set<Chunk>;
+    children?: Boundary[];
+    withinCatch: boolean;
     constructor(state: State, signal?: AbortSignal, parent?: Boundary);
+    abort(reason: unknown): void;
     handleEvent(event: Event): void;
     flush(): 0 | 1 | 2;
     startAsync(): void;
@@ -142,9 +151,15 @@ export declare class Chunk {
     lastEffect: string;
     async: boolean;
     consumed: boolean;
-    needsWalk: boolean;
     reorderId: string | null;
+    reorderStart: string;
     deferredReady: Opt<Chunk>;
+    heldEffects: Opt<Chunk>;
+    deferredReorder: Chunk | null;
+    catchRange: {
+        id: string;
+        end: Chunk;
+    } | null;
     placeholder: {
         body: Chunk;
         render: () => void;
@@ -162,16 +177,21 @@ export declare class Chunk {
     writeEffect(scopeId: number, registryId: string): void;
     writeScript(script: string): void;
     append(chunk: Chunk): void;
+    takeHeldEffects(): Opt<Chunk>;
     takeDeferredReady(): Opt<Chunk>;
     deferOwnReady(): void;
-    flushPlaceholder(): void;
-    consume(): Chunk;
+    renderPlaceholders(boundary: Boundary): void;
+    renderPlaceholder(state: State): boolean;
+    markCatchRange(): void;
+    queueDeferredReorder(): void;
+    consume(boundary: Boundary): Chunk;
     render(content: () => void): Chunk;
     render<T>(content: (val: T) => void, val: T): Chunk;
     flushReadyScripts(boundary: Boundary, reservations?: string[], holdEffects?: boolean): string;
     flushScript(boundary: Boundary): this;
     flushHTML(boundary: Boundary): string;
 }
+export declare function joinHeldEffects(heldEffects: Opt<Chunk>, effects: string): string;
 type QueueCallback = (ticked: true) => void;
 export declare function queueTick(cb: QueueCallback): void;
 export declare function offTick(cb: QueueCallback): void;

package/dist/html.d.ts

@@ -1,5 +1,5 @@
 export { attrTag, attrTags } from "./common/attr-tag";
-export { _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
+export { _assert_class_toggles, _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
 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";
@@ -7,4 +7,4 @@ export { _escape, _escape_comment, _escape_script, _escape_style, _escape_style_
 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, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _text_resume, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";
+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";