@msb235/blits 0.5.0 → 0.7.0

package/dist/marks.js

@@ -10,22 +10,52 @@ export function readingAt(mix, u) {
 }
 /** Every mark between two host timestamps, earliest first, with the order that tells each apart. */
 export function listed(mix, from, to) {
-    const lo = from - mix.offset;
-    const hi = to - mix.offset;
+    const out = voiceMarks(mix, from, to);
+    for (const a of announcedMarks(mix.transport, from, to))
+        if (a.score !== undefined || a.slot === mix.slot)
+            out.push(a.listed);
+    return sorted(out);
+}
+/** Every mark of every mix on a transport and every one announced on it, earliest first. */
+export function listedAll(transport, from, to) {
+    const out = [];
+    for (const m of transport.members)
+        out.push(...voiceMarks(m, from, to));
+    for (const a of announcedMarks(transport, from, to))
+        out.push(a.listed);
+    return sorted(out);
+}
+function sorted(out) {
+    return out.sort((a, b) => a.timestamp - b.timestamp || a.order - b.order);
+}
+function announcedMarks(transport, from, to) {
+    const lo = from - transport.offset;
+    const hi = to - transport.offset;
     const out = [];
-    for (const a of mix.announced)
+    for (const a of transport.announced)
         if (a.at >= lo && a.at <= hi)
             out.push({
-                timestamp: a.at + mix.offset,
-                mark: undefined,
-                voice: undefined,
                 score: a.score,
-                name: a.name,
-                tags: a.tags,
-                order: a.order,
+                slot: a.slot,
+                listed: {
+                    timestamp: a.at + transport.offset,
+                    mark: undefined,
+                    voice: undefined,
+                    score: a.score,
+                    name: a.name,
+                    tags: a.tags,
+                    mix: a.mix,
+                    order: a.order,
+                },
             });
+    return out;
+}
+function voiceMarks(mix, from, to) {
+    const lo = from - mix.offset;
+    const hi = to - mix.offset;
+    const out = [];
     for (const voice of [...mix.cued, ...mix.gone]) {
-        for (const mark of ['start', 'in', 'out', 'end']) {
+        for (const mark of ['start', 'in', 'coast', 'out', 'end']) {
             const m = markOf(mix, voice, mark);
             const t = m === undefined ? m : hostOf(mix, m) - mix.offset;
             if (t === undefined || t < lo || t > hi)
@@ -37,11 +67,11 @@ export function listed(mix, from, to) {
                 score: voice.spec.score,
                 name: voice.spec.name,
                 tags: voice.spec.tags ?? none,
+                mix: mix.name,
                 order: voice.id,
             });
         }
     }
-    out.sort((a, b) => a.timestamp - b.timestamp || a.order - b.order);
     return out;
 }
 /** When a voice reaches a mark, mix time, or undefined while nothing has fixed it. */
@@ -56,13 +86,20 @@ export function markOf(mix, voice, mark) {
         return start;
     if (mark === 'in')
         return start + (voice.fade.in ?? 0);
+    if (mark === 'coast')
+        return coastOf(mix, voice, start);
     const out = voice.out;
     let outAt;
     if (out !== null)
         outAt = out.at;
     else if (Number.isFinite(voice.outAt))
         outAt = voice.outAt;
-    else if (!voice.holdsAfter && Number.isFinite(voice.span)) {
+    else if (voice.fitting !== null) {
+        const t = voice.timeAt(voice.fitting.end);
+        if (Number.isFinite(t))
+            outAt = Math.max(start, t);
+    }
+    else if (!voice.freezesAfter && Number.isFinite(voice.span)) {
         const t = voice.timeAt(voice.span + voice.latest);
         if (Number.isFinite(t))
             outAt = Math.max(start, t);
@@ -76,5 +113,36 @@ export function markOf(mix, voice, mark) {
             return out.deadline === undefined ? undefined : out.at + out.deadline;
         return out.at + out.over;
     }
-    return outAt === undefined ? undefined : outAt + (mix.reduced ? 0 : (voice.fade.out ?? 0));
+    const over = Number.isNaN(voice.outOver) ? (voice.fade.out ?? 0) : voice.outOver;
+    return outAt === undefined ? undefined : outAt + (mix.reduced ? 0 : over);
+}
+/**
+ * When a voice's last pass ends, mix time: an owner's when its fit ends, or its last child's. None
+ * for a voice that never ends its passes, or that leaves or begins to fade before they end.
+ */
+function coastOf(mix, voice, start) {
+    if (voice.unplayed)
+        return undefined;
+    let t;
+    if (voice.fitting !== null)
+        t = voice.timeAt(voice.fitting.end);
+    else if (voice.holding !== null) {
+        const children = voice.holding.children;
+        if (children.length === 0)
+            return undefined;
+        t = Number.NEGATIVE_INFINITY;
+        for (const child of children) {
+            const c = markOf(mix, child, 'coast');
+            if (c === undefined)
+                return undefined;
+            t = Math.max(t, c);
+        }
+    }
+    else if (Number.isFinite(voice.span))
+        t = voice.timeAt(voice.span + voice.latest);
+    if (t === undefined || !Number.isFinite(t))
+        return undefined;
+    t = Math.max(start, t);
+    const cut = voice.out !== null ? voice.out.at : voice.state === 'done' ? voice.doneAt : voice.outAt;
+    return cut < t ? undefined : t;
 }

package/dist/meet.d.ts

@@ -9,8 +9,9 @@ import type { Subject } from './voice.js';
 export declare function owable<I, O>(lanes: Lanes<I, O>, slot: number): boolean;
 /**
  * Gives a probed subject a position on every lane that started playing since the subject was last
- * checked and that reaches it. True when any did, so the probe takes the general path.
+ * checked and that reaches it, and says whether the probe still reads the lanes, given `lane`,
+ * whether it would have. Kept out of `prepare`, which V8 then inlines into its callers.
  */
-export declare function meet<I, O>(lanes: Lanes<I, O>, slot: number, subject: I, head: Subject<unknown> | null): boolean;
+export declare function meet<I, O>(lanes: Lanes<I, O>, slot: number, subject: I, head: Subject<unknown> | null, lane: boolean): boolean;
 /** Counts an idle lane more or fewer reaching a subject. */
 export declare function reach<I, O>(lanes: Lanes<I, O>, slot: number, by: number): void;

package/dist/meet.js

@@ -27,9 +27,10 @@ export function owable(lanes, slot) {
 }
 /**
  * Gives a probed subject a position on every lane that started playing since the subject was last
- * checked and that reaches it. True when any did, so the probe takes the general path.
+ * checked and that reaches it, and says whether the probe still reads the lanes, given `lane`,
+ * whether it would have. Kept out of `prepare`, which V8 then inlines into its callers.
  */
-export function meet(lanes, slot, subject, head) {
+export function meet(lanes, slot, subject, head, lane) {
     const seen = lanes.per[slot * 6 /* Per.SLOT */ + 1 /* Per.SEEN */];
     const from = seen < 0 ? -1 - seen : seen;
     lanes.per[slot * 6 /* Per.SLOT */ + 1 /* Per.SEEN */] = lanes.epochs;
@@ -75,7 +76,18 @@ export function meet(lanes, slot, subject, head) {
             lanes.met.push(voice.id);
             met = true;
         }
-    return met;
+    if (!met)
+        return lane;
+    // The fill ran before the subject had these positions. Where every voice it just met folds
+    // after every other laned voice, the general path folds just those onto the lanes' values;
+    // otherwise it reads the general path all frame.
+    const o = slot * 6 /* Per.SLOT */;
+    if (lane && lanes.per[o + 2 /* Per.IDLE */] === 0 && owable(lanes, slot)) {
+        lanes.owed.owe(slot, lanes.met);
+        return true;
+    }
+    lanes.per[o + 0 /* Per.FILLED */] = lanes.fills;
+    return false;
 }
 /** Places a crowd voice's row on the subject a probe met, as `Lane.add` adds a position. */
 function place(lanes, voice, slot, subject, from, head) {

package/dist/mixer.d.ts

@@ -1,20 +1,24 @@
 import { blended, laneRead, shareKept } from './blend.js';
 import type { Book } from './book.js';
-import { aims, chain, linkable } from './chain.js';
+import { aims, chain, linkable, relink } from './chain.js';
 import { type LerpInto } from './channels.js';
 import type { Due } from './due.js';
 import { parting } from './fade.js';
-import { apply, baseFor, clamp, fold, folded, foldLoci, foldWith, influence, isRest, type Key, keyed, linked, owedBy, passes, read, slopeFor, tick } from './fold.js';
+import { apply, baseFor, clamp, contribution, fold, folded, foldLoci, foldWith, isRest, type Key, keyed, linked, owedBy, passes, read, slopeFor, tick } from './fold.js';
 import type { HandleHost } from './handle.js';
 import { held, shownOf, sinceOf, unreachedOf } from './held.js';
 import { Lanes } from './lanes.js';
 import { foldLocus, type LocusScratch } from './locus.js';
-import type { MotionOwner, Motions } from './motion.js';
-import { Pace } from './pace.js';
+import type { MotionOwner, Motions } from './motions.js';
+import type { Pace } from './pace.js';
+import { Keys } from './paging.js';
 import { keep } from './pull.js';
 import { Steps } from './relink.js';
+import { Outs } from './revive.js';
+import { Fitting } from './spans.js';
 import { Store } from './store.js';
-import type { Booker, BookOptions, Channel, Columns, Engine, Handle, Kit, Marked, Mix, MixOptions, OwnerSpec, Patch, Projection, Sent, Signal, VoiceSpec } from './types.js';
+import { type Announced, Transport } from './transport.js';
+import type { Booker, BookOptions, Channel, Columns, Engine, Handle, Kit, Marked, Mix, MixOptions, OwnerSpec, Patch, Projection, Sent, Signal, SpanHandle, SpanSpec, Tape, VoiceSpec } from './types.js';
 import { type Subject, type Voice } from './voice.js';
 import { base, capped, fadeOf, horizonFor, ownedBy, ownerBase, prime, weigh, weighOwned } from './weigh.js';
 export declare class Mixer<I, O> implements Mix<I, O> {
@@ -37,19 +41,6 @@ export declare class Mixer<I, O> implements Mix<I, O> {
         at: number;
         fields: Record<string, unknown>;
     }[];
-    /**
-     * Marks the host announced on a score: `at` in host time, so the mix's rate never moves one, and
-     * NaN until the next sync for one announced as now before any sync; `made` is the mix time it was
-     * announced, for a read back to know what was known.
-     */
-    announced: {
-        name: string;
-        score: string | undefined;
-        tags: readonly string[];
-        at: number;
-        made: number;
-        order: number;
-    }[];
     hostThen: {
         fields: Record<string, unknown>;
     } | undefined;
@@ -60,22 +51,17 @@ export declare class Mixer<I, O> implements Mix<I, O> {
         prev: O | undefined;
         prevAt: number;
     }>;
-    nextId: number;
-    /**
-     * The mix clock: host time at the mix's rate. Host time is the host's timestamp less every gap
-     * `rebase` has taken out, `u` at the last sync.
-     */
-    now: number;
-    u: number;
+    /** The clock this mix plays on, which also holds its tape and the marks announced on it. */
+    readonly transport: Transport;
+    /** Its place among the mixes on its transport, in the order they joined. */
+    slot: number;
+    /** Taken off its transport, so it takes no more calls until a seek puts it back. */
+    dropped: boolean;
+    readonly name: string | undefined;
     /** This mix's frame among every mix's: moved by a sync, and by a control change or drop within one. */
     frame: number;
-    offset: number;
-    /** The mix's own rate; null while it has never been set, when mix time is host time. */
-    pace: Pace | null;
     /** Pending voices whose start the host gave, by its host time, kept where the rate puts it. */
     pins: Map<Voice<I, O>, number> | null;
-    last: number;
-    rebasing: boolean;
     wantsPose: boolean;
     /** The pose `pull` folds a subject into where it cannot read straight from the lanes. */
     scratch: O | undefined;
@@ -100,14 +86,17 @@ export declare class Mixer<I, O> implements Mix<I, O> {
     stirred: boolean;
     /** Counts the changes `stir` records, which a frame's record of a probe is current only before. */
     stirs: number;
+    syncing: boolean;
+    stirFns: (() => void)[] | null;
     /** Records a change to the mix's voices or controls. */
     stir(): void;
+    onWake(fn: () => void): () => void;
     /**
      * Per subject, the first record of the chain through every live voice that reaches it, or a stub
      * where none does. Relinked when `version` moves, which is whenever the list or a voice's pending
      * state changes.
      */
-    readonly chains: Store<I, Subject<unknown>>;
+    chains: Store<I, Subject<unknown>>;
     version: number;
     readonly steps: Steps<Voice<I, O>>;
     /** Per subject, the voices whose `subjects` name it, in voice order. */
@@ -140,7 +129,9 @@ export declare class Mixer<I, O> implements Mix<I, O> {
         subject: I;
     };
     readonly send: (event: unknown) => void;
-    /** The weight `influence` found besides the delta, read by the caller at once. */
+    /** The moment a seek went back to: what is stepped again up to it was sent the first time. */
+    sentTo: number;
+    /** The weight `contribution` found besides the delta, read by the caller at once. */
     w: number;
     readonly names: Key<O>[];
     readonly channels: Channel<unknown>[];
@@ -152,13 +143,36 @@ export declare class Mixer<I, O> implements Mix<I, O> {
     readonly locusScratch: LocusScratch<I, O>[];
     locusDepth: number;
     readonly slotOf: Map<string, number>;
-    readonly lanes: Lanes<I, O> | null;
+    lanes: Lanes<I, O> | null;
     handles: HandleHost<I, O> | null;
     /** What `book` made, still booking; null while there is none. */
     bookers: Book<I, O>[] | null;
+    /** The fit a span being cued takes, which `cue` hands its voice. */
+    fitting: Fitting | null;
     /** Every owner still in the mix, null until one is cued. */
     owners: Voice<I, O>[] | null;
+    /** With a history store, the key each subject is paged under; null without one. */
+    keys: Keys | null;
+    /** With a history store, the voices it paged out whose handles are still held; null without one. */
+    outs: Outs | null;
     constructor(kit: Kit<O>, opts: MixOptions);
+    /** Throws where the clock is a shared transport's, which only the transport moves. */
+    private own;
+    get now(): number;
+    set now(v: number);
+    get u(): number;
+    set u(v: number);
+    get offset(): number;
+    set offset(v: number);
+    get pace(): Pace | null;
+    set pace(v: Pace | null);
+    get announced(): Announced[];
+    set announced(v: Announced[]);
+    get nextId(): number;
+    set nextId(v: number);
+    get last(): number;
+    get tape(): Tape | undefined;
+    get replaying(): boolean;
     get reduced(): boolean;
     get band(): {
         on: number;
@@ -167,16 +181,21 @@ export declare class Mixer<I, O> implements Mix<I, O> {
     cue(spec: VoiceSpec<I, O>): Handle<I>;
     blend(patches: readonly Patch<I, O, unknown>[], by: Signal<I>, spec?: Omit<VoiceSpec<I, O>, 'patch' | 'weight' | 'locus'>): Handle<I>[];
     owns(spec: OwnerSpec<I>): Handle<I>;
+    span(spec: SpanSpec<I>): SpanHandle<I>;
     sync(timestamp: number): void;
     book(opts: BookOptions): Booker;
     probe(subject: I, out?: O): O;
     pull(subjects: Iterable<I>, into: Columns<O>): void;
-    project(timestamp: number): Projection<I, O>;
+    seek(time: number): void;
+    prepare(time: number): Promise<void>;
+    project(time: number): Projection<I, O>;
     announce(name: string, opts?: {
         at?: number;
         score?: string;
         tags?: readonly string[];
     }): void;
+    /** Throws for a mix taken off its transport. */
+    attached(): void;
     marks(from: number, to: number): Marked[];
     atRest(subject: I): boolean;
     rests(pose: O): boolean;
@@ -221,7 +240,7 @@ declare const methods: {
     owedBy: typeof owedBy;
     foldLoci: typeof foldLoci;
     read: typeof read;
-    influence: typeof influence;
+    contribution: typeof contribution;
     keyed: typeof keyed;
     tick: typeof tick;
     apply: typeof apply;
@@ -244,6 +263,7 @@ declare const methods: {
     shareKept: typeof shareKept;
     parting: typeof parting;
     chain: typeof chain;
+    relink: typeof relink;
     linkable: typeof linkable;
     aims: typeof aims;
     held: typeof held;