@msb235/blits 0.10.0 → 0.12.0

package/dist/lean.js

@@ -0,0 +1,23 @@
+import { made } from './mixer.js';
+export * from './index.js';
+/**
+ * The stock engine without lanes: every voice folds subject by subject, to the same values, and a
+ * bundle that takes `mix` from here leaves the lanes' code out. `lanes: true` is refused.
+ *
+ * @category engine
+ */
+export const lean = {
+    name: 'lean',
+    runs: new Set(['fn', 'keys', 'motion']),
+    create(kit, opts) {
+        return made(kit, opts, null);
+    },
+};
+/**
+ * Makes a mix over a kit, on the engine the options name or the lean one.
+ *
+ * @category mix
+ */
+export function mix(kit, opts = {}) {
+    return (opts.engine ?? lean).create(kit, opts);
+}

package/dist/leavings.d.ts

@@ -17,8 +17,13 @@ export declare class Leavings<I> {
      * front: entries are in the order they left, and mix time does not run back along it.
      */
     expire(reach: number, out: ((e: Left<I>) => void) | null): void;
-    /** The record `subject` had at `cut` and left with after it, if it left after `cut`. */
+    /**
+     * The record `subject` had at `cut` and left with after it, if it left after `cut`. None where it
+     * left saying only that it had faded out, after `cut`, of a voice that had not met it.
+     */
     at(subject: I, cut: Cut): Subject<unknown> | undefined;
+    /** Each subject's first leaving after `cut`, which holds what it had at `cut`. */
+    after(cut: Cut): Left<I>[];
     /** Each time `subject` left, oldest first. */
     of(subject: I): readonly Left<I>[];
     /** Every entry, oldest first. */

package/dist/leavings.js

@@ -49,16 +49,30 @@ export class Leavings {
             this.head = 0;
         }
     }
-    /** The record `subject` had at `cut` and left with after it, if it left after `cut`. */
+    /**
+     * The record `subject` had at `cut` and left with after it, if it left after `cut`. None where it
+     * left saying only that it had faded out, after `cut`, of a voice that had not met it.
+     */
     at(subject, cut) {
         const own = this.by.get(subject);
         if (own === undefined)
             return undefined;
         for (const e of own)
             if (!within(cut, e.seq, e.sync))
-                return e.held;
+                return !e.held.reaches && e.parted !== null && e.parted.seq > cut.seq ? undefined : e.held;
         return undefined;
     }
+    /** Each subject's first leaving after `cut`, which holds what it had at `cut`. */
+    after(cut) {
+        const out = [];
+        const seen = new Set();
+        for (const e of this.all())
+            if (!within(cut, e.seq, e.sync) && !seen.has(e.subject)) {
+                seen.add(e.subject);
+                out.push(e);
+            }
+        return out;
+    }
     /** Each time `subject` left, oldest first. */
     of(subject) {
         return this.by.get(subject) ?? [];

package/dist/marks.d.ts

@@ -1,8 +1,12 @@
-import type { Listed } from './book.js';
+import { type Listed } from './book.js';
 import type { Mixer } from './mixer.js';
 import type { Transport } from './transport.js';
-import type { Mark } from './types.js';
+import type { MarkName } from './types.js';
 import { type Voice } from './voice.js';
+/** A voice's marks, in the order `marks` lists those at one time. */
+export declare const voiceMarks: readonly ["start", "in", "coast", "out", "end"];
+/** Refuses marks placed inside a voice under one of its own five names, or that it could never reach. */
+export declare function checkMarks(marks: Readonly<Record<string, number>>, duration: number): void;
 /** The host timestamp the mix clock reads mix time `t` at; Infinity where it never will. */
 export declare function hostOf<I, O>(mix: Mixer<I, O>, t: number): number;
 /** What the mix clock reads at host time `u`, by the clock in force then. */
@@ -12,4 +16,4 @@ export declare function listed<I, O>(mix: Mixer<I, O>, from: number, to: number)
 /** Every mark of every mix on a transport and every one announced on it, earliest first. */
 export declare function listedAll(transport: Transport, from: number, to: number): Listed[];
 /** When a voice reaches a mark, mix time, or undefined while nothing has fixed it. */
-export declare function markOf<I, O>(mix: Mixer<I, O>, voice: Voice<I, O>, mark: Mark): number | undefined;
+export declare function markOf<I, O>(mix: Mixer<I, O>, voice: Voice<I, O>, mark: MarkName): number | undefined;

package/dist/marks.js

@@ -1,5 +1,21 @@
+import { arcMark } from './arcs.js';
+import { inPass } from './book.js';
 import { startOf } from './place.js';
 import { none } from './voice.js';
+/** A voice's marks, in the order `marks` lists those at one time. */
+export const voiceMarks = ['start', 'in', 'coast', 'out', 'end'];
+/** Refuses marks placed inside a voice under one of its own five names, or that it could never reach. */
+export function checkMarks(marks, duration) {
+    for (const name of Object.keys(marks)) {
+        if (voiceMarks.includes(name))
+            throw new Error(`blits: ${name} is one of a voice's own marks; a mark placed inside it needs another name`);
+        const at = marks[name];
+        if (!inPass(at, duration))
+            throw new RangeError(duration > 0
+                ? `blits: mark ${name} is voice ms into a pass, 0 up to ${duration}, not ${at}`
+                : `blits: mark ${name} is voice ms, 0 or more, not ${at}`);
+    }
+}
 /** The host timestamp the mix clock reads mix time `t` at; Infinity where it never will. */
 export function hostOf(mix, t) {
     return (mix.pace === null ? t : mix.pace.timeOf(t)) + mix.offset;
@@ -10,7 +26,7 @@ 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 out = voiceMarks(mix, from, to);
+    const out = marksOf(mix, from, to);
     for (const a of announcedMarks(mix.transport, from, to))
         if (a.score !== undefined || a.slot === mix.slot)
             out.push(a.listed);
@@ -20,7 +36,7 @@ export function listed(mix, from, to) {
 export function listedAll(transport, from, to) {
     const out = [];
     for (const m of transport.members)
-        out.push(...voiceMarks(m, from, to));
+        out.push(...marksOf(m, from, to));
     for (const a of announcedMarks(transport, from, to))
         out.push(a.listed);
     return sorted(out);
@@ -50,30 +66,36 @@ function announcedMarks(transport, from, to) {
             });
     return out;
 }
-function voiceMarks(mix, from, to) {
+function marksOf(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', '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)
-                continue;
-            out.push({
-                timestamp: t + mix.offset,
-                mark,
-                voice: voice.id,
-                score: voice.spec.score,
-                name: voice.spec.name,
-                tags: voice.spec.tags ?? none,
-                mix: mix.name,
-                order: voice.id,
-            });
-        }
+        for (const mark of voiceMarks)
+            listOne(mix, voice, mark, lo, hi, out);
+        const inner = voice.spec.marks;
+        if (inner !== undefined)
+            for (const mark of Object.keys(inner))
+                listOne(mix, voice, mark, lo, hi, out);
     }
     return out;
 }
+function listOne(mix, voice, mark, lo, hi, out) {
+    const m = markOf(mix, voice, mark);
+    const t = m === undefined ? m : hostOf(mix, m) - mix.offset;
+    if (t === undefined || t < lo || t > hi)
+        return;
+    out.push({
+        timestamp: t + mix.offset,
+        mark,
+        voice: voice.id,
+        score: voice.spec.score,
+        name: voice.spec.name,
+        tags: voice.spec.tags ?? none,
+        mix: mix.name,
+        order: voice.id,
+    });
+}
 /** When a voice reaches a mark, mix time, or undefined while nothing has fixed it. */
 export function markOf(mix, voice, mark) {
     if (!Number.isFinite(voice.start))
@@ -84,12 +106,18 @@ export function markOf(mix, voice, mark) {
         return undefined;
     if (mark === 'start')
         return start;
+    if (voice.arc !== null && (mark === 'in' || mark === 'coast' || mark === 'out' || mark === 'end'))
+        return arcMark(voice, start, mark);
     if (mark === 'in')
         return start + (voice.fade.in ?? 0);
     if (mark === 'coast')
         return coastOf(mix, voice, start);
+    if (mark !== 'out' && mark !== 'end')
+        return insideOf(mix, voice, start, mark);
     const out = voice.out;
     let outAt;
+    // An owner leaves with its last child, over no fade of its own.
+    let leaves = false;
     if (out !== null)
         outAt = out.at;
     else if (Number.isFinite(voice.outAt))
@@ -99,6 +127,13 @@ export function markOf(mix, voice, mark) {
         if (Number.isFinite(t))
             outAt = Math.max(start, t);
     }
+    else if (voice.holding !== null) {
+        const t = lastChild(mix, voice.holding.children, 'end');
+        if (t !== undefined) {
+            outAt = Math.max(start, t);
+            leaves = true;
+        }
+    }
     else if (!(voice.backs ? voice.freezesBefore : voice.freezesAfter)) {
         const t = voice.endsAt();
         if (Number.isFinite(t))
@@ -113,9 +148,38 @@ export function markOf(mix, voice, mark) {
             return out.deadline === undefined ? undefined : out.at + out.deadline;
         return out.at + out.over;
     }
+    if (leaves)
+        return outAt;
     const over = Number.isNaN(voice.outOver) ? (voice.fade.out ?? 0) : voice.outOver;
     return outAt === undefined ? undefined : outAt + (mix.reduced ? 0 : over);
 }
+/** Voice ms within which a mark placed inside a voice counts as reached where the voice starts. */
+const REACHED = 1e-9;
+/**
+ * When a voice reaches a mark it placed inside itself, mix time: `at` into the first pass that
+ * reaches it from where the voice starts, while its clock runs forward and before it ends. None for
+ * a mark it does not place.
+ */
+function insideOf(mix, voice, start, name) {
+    const marks = voice.spec.marks;
+    if (marks === undefined || !Object.hasOwn(marks, name) || voice.backs)
+        return undefined;
+    const at = marks[name];
+    const from = voice.elapsedAt(start);
+    const d = voice.duration;
+    let pass = 0;
+    if (d > 0)
+        pass = Math.max(0, Math.ceil((from - at) / d - REACHED));
+    else if (at < from - REACHED)
+        return undefined;
+    if (pass >= voice.passes)
+        return undefined;
+    const t = voice.timeAt(pass * d + at);
+    if (!Number.isFinite(t))
+        return undefined;
+    const end = markOf(mix, voice, 'end');
+    return end !== undefined && t >= end ? undefined : Math.max(start, t);
+}
 /**
  * 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.
@@ -127,15 +191,15 @@ function coastOf(mix, voice, start) {
     if (voice.fitting !== null)
         t = voice.timeAt(voice.fitting.end);
     else if (voice.holding !== null) {
-        const children = voice.holding.children;
-        if (children.length === 0)
+        const h = voice.holding;
+        if (h.cutSeq !== Number.POSITIVE_INFINITY)
             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);
+        if (h.children.length === 0)
+            t = voice.state === 'done' ? h.coast : undefined;
+        else {
+            t = lastChild(mix, h.children, 'coast');
+            if (t !== undefined)
+                t = Math.max(t, h.coast);
         }
     }
     else
@@ -146,3 +210,17 @@ function coastOf(mix, voice, start) {
     const cut = voice.out !== null ? voice.out.at : voice.state === 'done' ? voice.doneAt : voice.outAt;
     return cut < t ? undefined : t;
 }
+/** The latest of the children's `mark`; undefined for none, or while one has not fixed it. */
+function lastChild(mix, children, mark) {
+    if (children.length === 0)
+        return undefined;
+    let t = Number.NEGATIVE_INFINITY;
+    for (const child of children) {
+        const c = markOf(mix, child, mark);
+        if (c === undefined)
+            return undefined;
+        if (c > t)
+            t = c;
+    }
+    return t;
+}

package/dist/meet.js

@@ -110,6 +110,7 @@ function place(lanes, voice, slot, subject, from, head) {
         return false;
     const o = p * 8 /* Row.STRIDE */;
     c.list[p] = slot;
+    lanes.placed.add(slot, voice.id);
     c.data[o + 0 /* Row.DELAY */] = held.delay;
     c.data[o + 1 /* Row.SINCE */] = held.shown;
     c.data[o + 2 /* Row.WEIGHT */] = 0;

package/dist/mixer.d.ts

@@ -1,7 +1,9 @@
+import { type Arc } from './arcs.js';
 import { blended, laneRead, shareKept } from './blend.js';
 import type { Book } from './book.js';
 import { aims, chain, linkable, relink } from './chain.js';
 import { type LerpInto } from './channels.js';
+import type { Column } from './columns.js';
 import { DepartedIndex } from './departed.js';
 import type { Due } from './due.js';
 import { parting } from './fade.js';
@@ -21,7 +23,7 @@ import { ScoreIndex } from './scored.js';
 import { Fitting } from './spans.js';
 import { Store } from './store.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 { ArcHandle, ArcSpec, BlendMember, 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';
 /**
@@ -34,6 +36,8 @@ export declare const defaults: {
 export declare class Mixer<I, O> implements Mix<I, O> {
     readonly kit: Kit<O>;
     readonly opts: MixOptions;
+    /** The lanes an entry was built with; null in one that leaves them out. */
+    readonly lanesOf: typeof Lanes | null;
     cued: Voice<I, O>[];
     /** Under `history`, voices that have left but that a read back may still reach. */
     gone: Voice<I, O>[];
@@ -95,10 +99,15 @@ export declare class Mixer<I, O> implements Mix<I, O> {
     /** The last array `pull` read, by position, with each subject's chain head, to skip the lookup. */
     pulled: I[];
     pulledHeads: (Subject<unknown> | undefined)[];
-    /** Each remembered head's lane slot, and the `version` and `relinks` they were all current at. */
+    /**
+     * Each remembered head's lane slot, -1 at a position with none, and the `version` and `relinks`
+     * they were all current at.
+     */
     pulledSlots: Int32Array<ArrayBuffer>;
     pulledVersion: number;
     pulledRelinks: number;
+    /** What `pull` knows of each channel it has written, by name; none until the first pull. */
+    pullColumns: Map<string, Column> | null;
     /** Counts chains made stale one subject at a time, which `version` does not. */
     relinks: number;
     /** Read once a sync, so a `reduce` function is not called per voice per subject. */
@@ -119,6 +128,8 @@ export declare class Mixer<I, O> implements Mix<I, O> {
      */
     chains: Store<I, Subject<unknown>>;
     version: number;
+    /** What `prime` reads its clock, voice time and pass from: see `Primed`. */
+    readonly primed: Float64Array<ArrayBuffer>;
     readonly steps: Steps<Voice<I, O>, I>;
     /** Per subject, the voices whose `subjects` name it, in voice order. */
     named: Store<I, Voice<I, O>[]>;
@@ -171,6 +182,8 @@ export declare class Mixer<I, O> implements Mix<I, O> {
     readonly bounded: number[];
     /** By slot, a stock array channel's in-place `lerp`. */
     readonly lerpsInto: (LerpInto | undefined)[];
+    /** By slot, a stock scalar channel's arithmetic, which a fold applies without calling the channel. */
+    readonly scalars: ('sum' | 'mul' | 'max' | undefined)[];
     /** What a fold with a locus in play gathers into, one per depth of folds under way. */
     readonly locusScratch: LocusScratch<I, O>[];
     locusDepth: number;
@@ -181,13 +194,17 @@ export declare class Mixer<I, O> implements Mix<I, O> {
     bookers: Book<I, O>[] | null;
     /** The fit a span being cued takes, which `cue` hands its voice. */
     fitting: Fitting | null;
+    /** What an arc being cued keeps, which `cue` hands its voice. */
+    arcing: Arc | 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);
+    constructor(kit: Kit<O>, opts: MixOptions, 
+    /** The lanes an entry was built with; null in one that leaves them out. */
+    lanesOf: typeof Lanes | null);
     /** Throws where the clock is a shared transport's, which only the transport moves. */
     private own;
     get now(): number;
@@ -203,6 +220,7 @@ export declare class Mixer<I, O> implements Mix<I, O> {
     get nextId(): number;
     set nextId(v: number);
     get timestamp(): number;
+    get seq(): number;
     get last(): number;
     get tape(): Tape | undefined;
     get replaying(): boolean;
@@ -212,16 +230,21 @@ export declare class Mixer<I, O> implements Mix<I, O> {
         off: number;
     };
     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>[];
+    blend(members: readonly (Patch<I, O, unknown> | BlendMember<I, O>)[], 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>;
+    arc(spec: ArcSpec<I, O>): ArcHandle<I>;
     sync(timestamp: number): void;
     book<E = unknown>(opts: BookOptions<E, I>): Booker;
     probe(subject: I, out?: O): O;
     pull(subjects: Iterable<I>, into: Columns<O>): void;
-    seek(time: number): void;
+    seek(to: number | {
+        readonly frame: number;
+    }): void;
     prepare(time: number): Promise<void>;
-    project(time: number): Projection<I, O>;
+    project(at: number | {
+        readonly frame: number;
+    }): Projection<I, O>;
     announce(name: string, opts?: {
         at?: number;
         score?: string;
@@ -245,6 +268,10 @@ export declare class Mixer<I, O> implements Mix<I, O> {
         over?: number;
     }): void;
     drop(subject: I): void;
+    /** Lets `voice` go of a dropped subject. Methods rather than closures, so a drop makes neither. */
+    private forgetIn;
+    private releaseIn;
+    private recordDrop;
     touch(subject?: I): void;
     drain<E = unknown>(tag?: string): Sent<I, E>[];
     /** Voices whose stop 0 is mid-computation, so a fold for one cannot re-enter itself. */
@@ -313,6 +340,8 @@ declare const methods: {
 type Methods = typeof methods;
 export interface Mixer<I, O> extends Methods {
 }
+/** Makes a mix the host asked for, with the registry's history where it names none, and lists it there. */
+export declare function made<I, O, H>(kit: Kit<O>, opts: MixOptions<H>, lanes: typeof Lanes | null): Mix<I, O, H>;
 /**
  * The one that ships: every form on the CPU, probed per subject on demand.
  *