@msb235/blits 0.6.0 → 0.7.1

package/dist/lanes.d.ts

@@ -1,9 +1,9 @@
 import type { Column } from './columns.js';
 import { type Crowd, row } from './crowd.js';
 import { call, foldKeys, one, parting, readKeyed, reset, run, signalled, subjectAt } from './fill.js';
-import { fold, foldDelta, foldInto, foldRun, gather } from './gather.js';
+import { fold, foldDelta, foldInto, foldRun, gate, gather } from './gather.js';
 import { type Lane, type Laned, type Locus } from './lane.js';
-import type { Watcher } from './motion.js';
+import type { Watcher } from './motions.js';
 import { type absent, Numbers } from './numbers.js';
 import { Owed } from './owed.js';
 import type { Channel } from './types.js';
@@ -13,6 +13,10 @@ export interface LaneHost<I, O> {
     readonly voices: readonly Voice<I, O>[];
     readonly channels: readonly Channel<unknown>[];
     readonly names: readonly string[];
+    /** The mix itself, for its clock: a getter V8 does not inline would box `now` on return. */
+    readonly clock: {
+        readonly now: number;
+    };
     /** Whether a voice's patch and spec can run on a lane, its channels aside. */
     fits(voice: Voice<I, O>): boolean;
     /** The voice's record for a subject this probe has already linked it to, from `head` if there. */
@@ -35,12 +39,14 @@ export interface LaneHost<I, O> {
      * stateful if the signal keeps state. `slot` is the subject's number.
      */
     signal(voice: Voice<I, O>, subject: I, held: Subject<unknown>, elapsed: number, pass: number, slot: number): number;
+    /** Whether a rest-less channel's contribution passes the band, as the general path decides it. */
+    passes(was: boolean | undefined, w: number): boolean;
     /** Sets `reading.horizon` for the voice and a subject delayed `delay` voice ms. */
     horizon(voice: Voice<I, O>, delay: number): void;
     /** Whether the mix keeps history, so a record a patch call changed may need a copy kept. */
     readonly keeps: boolean;
     /** After a patch call, keeps history of a record that grew kept state. */
-    after(voice: Voice<I, O>, held: Subject<unknown>): void;
+    after(voice: Voice<I, O>, subject: I, held: Subject<unknown>): void;
     /** A patch call left kept state on a record: the voice is stateful from now on. */
     kept(voice: Voice<I, O>): void;
 }
@@ -62,6 +68,9 @@ export declare class Lanes<I, O> implements Watcher {
     overlap: boolean;
     /** The loci whose voices are on lanes, every member of each on one. */
     loci: Locus<I, O>[];
+    /** The lane and record `one` is folding, whose band state a rest-less channel reads. */
+    folding: Lane<I, O> | null;
+    rec: Subject<unknown> | null;
     /** While a fill gathers a locus: that locus and the member gathering, where folds go instead. */
     into: Locus<I, O> | null;
     intoId: number;
@@ -88,14 +97,17 @@ export declare class Lanes<I, O> implements Watcher {
     /** The highest voice id the last qualify or settling of `touched` considered. */
     known: number;
     /**
-     * Per subject number, `SLOT` numbers side by side, so a probe reads one place in memory: which
-     * fill last wrote it (0 for none); the latest lane epoch a probe of it has checked it against;
-     * how many idle lanes reach it, since a probe reads lanes only where none do; and the probe count
-     * at its last probe read from the lanes and at its last probe folded by the general path, with
-     * the fill the former read, which say whether a lane or a record holds what `weightOf` reports.
+     * Per subject number, `SLOT` numbers side by side, so a probe reads one place in memory: the
+     * fill that last left it to the general path, being late, owing, newly numbered or forgotten;
+     * the latest lane epoch a probe of it has checked it against; how many idle lanes reach it,
+     * since a probe reads lanes only where none do; and the probe count at its last probe read from
+     * the lanes and at its last probe folded by the general path, with the fill the former read,
+     * which say whether a lane or a record holds what `weightOf` reports.
      */
     per: Float64Array<ArrayBuffer>;
     fills: number;
+    /** The latest fill if it ran a lane, else 0: a subject whose `FILLED` is below it reads it. */
+    busyFill: number;
     probes: number;
     /**
      * Each subject by number as last probed, held from that probe until the next fill uses it, so a
@@ -140,6 +152,11 @@ export declare class Lanes<I, O> implements Watcher {
     lastDistinct: number;
     /** Numbered subjects alive. */
     live: number;
+    /**
+     * The probe count a subject's last probe must pass for this fill to fill it: the start of the
+     * last frame with a probe, or -1 while every subject alive was probed then, when it fills all.
+     */
+    lately: number;
     filledVersion: number;
     qualifiedVersion: number;
     constructor(host: LaneHost<I, O>);
@@ -171,7 +188,7 @@ export declare class Lanes<I, O> implements Watcher {
      * them. One that a lane has not met yet, newly numbered or newly reached, takes the general path
      * this frame, which is where it is first seen; so does one probed from inside a fill.
      */
-    prepare(slot: number, subject: I, now: number, version: number, head: Subject<unknown> | null): boolean;
+    prepare(slot: number, subject: I, version: number, head: Subject<unknown> | null): boolean;
     /** Whether this frame's lanes are filled and nothing since asks `begin` to look again. */
     filled(now: number, version: number): boolean;
     /**
@@ -180,6 +197,11 @@ export declare class Lanes<I, O> implements Watcher {
      */
     begin(now: number, version: number): number;
     general(slot: number): false;
+    /**
+     * Whether this fill leaves the subject at `slot` to the general path, for not having been probed
+     * this frame or the last: a probe of it before the next fill then takes the general path.
+     */
+    unread(slot: number): boolean;
     /** Whether a probe has read the subject since the frame began, on either path. */
     probedThisFrame(slot: number): boolean;
     /** Whether the subject at `slot` reads some laned voice from the general path this fill. */
@@ -221,6 +243,7 @@ declare const methods: {
     foldDelta: typeof foldDelta;
     foldRun: typeof foldRun;
     foldInto: typeof foldInto;
+    gate: typeof gate;
 };
 type Methods = typeof methods;
 export interface Lanes<I, O> extends Methods {

package/dist/lanes.js

@@ -1,7 +1,7 @@
 import { row } from './crowd.js';
 import { call, fillAll, foldKeys, one, parting, readKeyed, reset, run, signalled, subjectAt, } from './fill.js';
-import { fold, foldDelta, foldInto, foldRun, gather } from './gather.js';
-import { meet, owable, reach } from './meet.js';
+import { fold, foldDelta, foldInto, foldRun, gate, gather } from './gather.js';
+import { meet, reach } from './meet.js';
 import { Numbers } from './numbers.js';
 import { Owed } from './owed.js';
 import { requalify, retouch } from './qualify.js';
@@ -26,6 +26,9 @@ export class Lanes {
     overlap = false;
     /** The loci whose voices are on lanes, every member of each on one. */
     loci = [];
+    /** The lane and record `one` is folding, whose band state a rest-less channel reads. */
+    folding = null;
+    rec = null;
     /** While a fill gathers a locus: that locus and the member gathering, where folds go instead. */
     into = null;
     intoId = 0;
@@ -52,14 +55,17 @@ export class Lanes {
     /** The highest voice id the last qualify or settling of `touched` considered. */
     known = 0;
     /**
-     * Per subject number, `SLOT` numbers side by side, so a probe reads one place in memory: which
-     * fill last wrote it (0 for none); the latest lane epoch a probe of it has checked it against;
-     * how many idle lanes reach it, since a probe reads lanes only where none do; and the probe count
-     * at its last probe read from the lanes and at its last probe folded by the general path, with
-     * the fill the former read, which say whether a lane or a record holds what `weightOf` reports.
+     * Per subject number, `SLOT` numbers side by side, so a probe reads one place in memory: the
+     * fill that last left it to the general path, being late, owing, newly numbered or forgotten;
+     * the latest lane epoch a probe of it has checked it against; how many idle lanes reach it,
+     * since a probe reads lanes only where none do; and the probe count at its last probe read from
+     * the lanes and at its last probe folded by the general path, with the fill the former read,
+     * which say whether a lane or a record holds what `weightOf` reports.
      */
     per = new Float64Array(0);
     fills = 0;
+    /** The latest fill if it ran a lane, else 0: a subject whose `FILLED` is below it reads it. */
+    busyFill = 0;
     probes = 0;
     /**
      * Each subject by number as last probed, held from that probe until the next fill uses it, so a
@@ -104,6 +110,11 @@ export class Lanes {
     lastDistinct = 0;
     /** Numbered subjects alive. */
     live = 0;
+    /**
+     * The probe count a subject's last probe must pass for this fill to fill it: the start of the
+     * last frame with a probe, or -1 while every subject alive was probed then, when it fills all.
+     */
+    lately = -1;
     filledVersion = Number.NaN;
     qualifiedVersion = Number.NaN;
     constructor(host) {
@@ -132,7 +143,7 @@ export class Lanes {
         const slot = this.numbers.take(subject);
         this.live++;
         this.grow(slot + 1);
-        this.per[slot * 6 /* Per.SLOT */ + 0 /* Per.FILLED */] = 0;
+        this.per[slot * 6 /* Per.SLOT */ + 0 /* Per.FILLED */] = this.fills;
         this.per[slot * 6 /* Per.SLOT */ + 1 /* Per.SEEN */] = -1;
         this.per[slot * 6 /* Per.SLOT */ + 2 /* Per.IDLE */] = 0;
         this.per[slot * 6 /* Per.SLOT */ + 3 /* Per.LANE_PROBE */] = 0;
@@ -195,9 +206,10 @@ export class Lanes {
      * them. One that a lane has not met yet, newly numbered or newly reached, takes the general path
      * this frame, which is where it is first seen; so does one probed from inside a fill.
      */
-    prepare(slot, subject, now, version, head) {
-        const ready = this.filled(now, version) ? 1 /* Begin.READY */ : this.begin(now, version);
-        if (ready === 0 /* Begin.GENERAL */)
+    prepare(slot, subject, version, head) {
+        // Read, not passed: a double passed to a call V8 does not inline is boxed, once a probe.
+        const now = this.host.clock.now;
+        if (!this.filled(now, version) && this.begin(now, version) === 0 /* Begin.GENERAL */)
             return this.general(slot);
         if (slot < 0)
             return false;
@@ -206,18 +218,9 @@ export class Lanes {
         const probe = ++this.probes;
         const per = this.per;
         const o = slot * 6 /* Per.SLOT */;
-        let lane = per[o + 0 /* Per.FILLED */] === this.fills && per[o + 2 /* Per.IDLE */] === 0;
-        if (per[o + 1 /* Per.SEEN */] < this.wide && meet(this, slot, subject, head)) {
-            // 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.
-            if (lane && per[o + 2 /* Per.IDLE */] === 0 && owable(this, slot))
-                this.owed.owe(slot, this.met);
-            else {
-                per[o + 0 /* Per.FILLED */] = 0;
-                lane = false;
-            }
-        }
+        let lane = per[o + 0 /* Per.FILLED */] < this.busyFill && per[o + 2 /* Per.IDLE */] === 0;
+        if (per[o + 1 /* Per.SEEN */] < this.wide)
+            lane = meet(this, slot, subject, head, lane);
         if (lane) {
             per[o + 3 /* Per.LANE_PROBE */] = probe;
             per[o + 5 /* Per.LANE_FILL */] = this.fills;
@@ -283,6 +286,20 @@ export class Lanes {
             this.per[slot * 6 /* Per.SLOT */ + 4 /* Per.GENERAL_PROBE */] = ++this.probes;
         return false;
     }
+    /**
+     * Whether this fill leaves the subject at `slot` to the general path, for not having been probed
+     * this frame or the last: a probe of it before the next fill then takes the general path.
+     */
+    unread(slot) {
+        const per = this.per;
+        const o = slot * 6 /* Per.SLOT */;
+        const lately = this.lately;
+        if (per[o + 3 /* Per.LANE_PROBE */] > lately ||
+            per[o + 4 /* Per.GENERAL_PROBE */] > lately)
+            return false;
+        per[o + 0 /* Per.FILLED */] = this.fills;
+        return true;
+    }
     /** Whether a probe has read the subject since the frame began, on either path. */
     probedThisFrame(slot) {
         const from = this.frameProbes;
@@ -312,6 +329,11 @@ export class Lanes {
     rests(slot) {
         for (const ch of this.laned) {
             const values = ch.values;
+            if (ch.op === 'last') {
+                if (!Number.isNaN(values[slot * ch.axes]))
+                    return false;
+                continue;
+            }
             if (ch.scalar) {
                 if (!(Math.abs(values[slot] - ch.rest) < 1e-9))
                     return false;
@@ -333,6 +355,12 @@ export class Lanes {
         for (let c = 0; c < laned.length; c++) {
             const ch = laned[c];
             const axes = ch.axes;
+            // Never `delete`: it drops a reused out object into dictionary mode for good.
+            if (ch.op === 'last' && Number.isNaN(ch.values[slot * axes])) {
+                if (pose[ch.name] !== undefined)
+                    pose[ch.name] = undefined;
+                continue;
+            }
             if (ch.scalar) {
                 pose[ch.name] = ch.values[slot];
                 continue;
@@ -355,7 +383,7 @@ export class Lanes {
                 if (c.list[p] === slot)
                     unplace(this, c, p);
         if (slot < this.cap)
-            this.per[slot * 6 /* Per.SLOT */ + 0 /* Per.FILLED */] = 0;
+            this.per[slot * 6 /* Per.SLOT */ + 0 /* Per.FILLED */] = this.fills;
         this.subjects[slot] = undefined;
     }
     grow(size) {
@@ -417,6 +445,7 @@ const methods = {
     foldDelta,
     foldRun,
     foldInto,
+    gate,
 };
 for (const [name, value] of Object.entries(methods))
     Object.defineProperty(Lanes.prototype, name, { value, writable: true, configurable: true });

package/dist/locus.d.ts

@@ -1,7 +1,7 @@
 import type { Mixer } from './mixer.js';
 import type { Subject, Voice } from './voice.js';
 /**
- * What a fold with a locus in play gathers, kept from one fold to the next: the influences in
+ * What a fold with a locus in play gathers, kept from one fold to the next: the contributions in
  * voice order, each a voice's own or a locus's first member; every locus member; and per channel
  * slot, a locus's folding value, the weight taken into it and the array it owns.
  */
@@ -11,7 +11,7 @@ export interface LocusScratch<I, O> {
     helds: (Subject<unknown> | null)[];
     deltas: (Record<string, unknown> | null)[];
     weights: number[];
-    /** Per influence, -1 for a voice's own, or which of `names` it is. */
+    /** Per contribution, -1 for a voice's own, or which of `names` it is. */
     groups: number[];
     names: string[];
     m: number;
@@ -32,7 +32,7 @@ export declare function locusScratch<I, O>(channels: number): LocusScratch<I, O>
  */
 export declare function own<I, O>(k: LocusScratch<I, O>, slot: number, value: number[], rest: number[]): number[];
 /**
- * Folds one locus's members into one influence through each channel's own `lerp`: its value per
+ * Folds one locus's members into one contribution through each channel's own `lerp`: its value per
  * channel goes in `k.values`, the channels in `k.touched` in the order first met, and its weight
  * is returned. A channel folding by scale takes its value in an array of `k`'s own, lerped in
  * place, since the fold only reads it.

package/dist/locus.js

@@ -35,7 +35,7 @@ export function own(k, slot, value, rest) {
     return out;
 }
 /**
- * Folds one locus's members into one influence through each channel's own `lerp`: its value per
+ * Folds one locus's members into one contribution through each channel's own `lerp`: its value per
  * channel goes in `k.values`, the channels in `k.touched` in the order first met, and its weight
  * is returned. A channel folding by scale takes its value in an array of `k`'s own, lerped in
  * place, since the fold only reads it.

package/dist/marks.d.ts

@@ -1,5 +1,6 @@
 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 Voice } from './voice.js';
 /** The host timestamp the mix clock reads mix time `t` at; Infinity where it never will. */
@@ -8,5 +9,7 @@ export declare function hostOf<I, O>(mix: Mixer<I, O>, t: number): number;
 export declare function readingAt<I, O>(mix: Mixer<I, O>, u: number): number;
 /** Every mark between two host timestamps, earliest first, with the order that tells each apart. */
 export declare function listed<I, O>(mix: Mixer<I, O>, from: number, to: number): Listed[];
+/** 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;

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,12 +86,19 @@ 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.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))
@@ -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) {