@sudobility/music_types 0.11.30 → 0.11.32

package/dist/domain/score/flatten.js

@@ -0,0 +1,132 @@
+/**
+ * Flattening a score into the notes that actually sound.
+ *
+ * One traversal, shared by live playback (`playbackPlan`) and offline audio
+ * export (`renderEvents`). They used to walk the score separately, and drifted:
+ * playback joined tied notes into one sustained note while the export
+ * re-articulated every tied segment — so a tie sounded once on screen and
+ * twice in the file, against `renderEvents`' own promise to match "what you
+ * just heard".
+ *
+ * Ticks, not seconds: a tempo is the caller's concern. Live playback keeps
+ * ticks and hands the engine a `TempoConversion`; the offline renderer
+ * converts, because a rendered file has no tempo map to consult.
+ *
+ * Mute and solo are *not* applied here either. The export drops silenced
+ * tracks' notes, while playback keeps them and lets the engine mix live — the
+ * whole reason `applyMix` exists.
+ */
+import { isNoteEvent } from "../../index.js";
+import { articulatedDuration, articulatedVelocity } from "./articulation.js";
+import { DEFAULT_VELOCITY, dynamicsInForce, effectiveVelocity, hairpinVelocities, } from "./dynamics.js";
+import { pitchToMidi } from "../pitch/pitch.js";
+import { joinTiedNotes } from "./ties.js";
+/**
+ * Every voice-ordinal channel of a track: across all measures in tick order,
+ * the events at that ordinal position.
+ *
+ * Voice ids are not stable across a barline, so the ordinal stands in for "the
+ * same voice" from bar to bar — which is what lets `joinTiedNotes` see a tie
+ * that crosses one. `ties.ts` exports a `voiceChannel`, but that takes a single
+ * ordinal and returns measure-annotated notes for tie-*partner* lookup, where
+ * this needs every ordinal at once with rests included.
+ */
+export function trackVoiceChannels(track) {
+    const maxVoices = track.measures.reduce((max, m) => Math.max(max, m.voices.length), 0);
+    const channels = [];
+    for (let voiceIndex = 0; voiceIndex < maxVoices; voiceIndex += 1) {
+        const channel = [];
+        for (const measure of track.measures) {
+            const voice = measure.voices[voiceIndex];
+            if (voice)
+                channel.push(...voice.events);
+        }
+        channel.sort((a, b) => a.startTick - b.startTick);
+        channels.push(channel);
+    }
+    return channels;
+}
+/** Every note the score sounds, ties joined, in tick order. */
+export function flattenScoreNotes(score) {
+    const notes = [];
+    for (const track of score.tracks) {
+        for (const channel of trackVoiceChannels(track)) {
+            const joined = joinTiedNotes(channel);
+            // Resolved over the joined, ordered channel: "the next dynamic" only
+            // means anything in tick order, and a tie join can merge the note a
+            // marking sits on into the one before it.
+            const inForce = dynamicsInForce(joined);
+            // The gradual half of the dynamics. Resolved over the same joined,
+            // ordered channel, so a wedge's endpoints are found in the order a
+            // player reads them.
+            const ramped = hairpinVelocities(joined, inForce);
+            for (const event of joined) {
+                if (!isNoteEvent(event))
+                    continue;
+                // Two steps, and the order matters: the dynamic sets the level, then
+                // the articulation is an offset on top of it — so an accent inside a
+                // quiet passage stays an accent rather than being flattened to a fixed
+                // loud velocity.
+                /*
+                  A hairpin overrides the level for the notes it spans — that is what
+                  the wedge means, that the level is *changing* across them — while the
+                  note's own written velocity survives as a deviation on top either
+                  way, exactly as it does under a plain dynamic.
+                */
+                const ramp = ramped.get(event.id);
+                const dynamicVelocity = ramp === undefined
+                    ? effectiveVelocity(event, inForce.get(event.id) ?? null)
+                    : Math.max(1, Math.min(127, ramp + (event.velocity - DEFAULT_VELOCITY)));
+                const velocity = articulatedVelocity(dynamicVelocity, event.articulation);
+                /*
+                  Ornaments sound, and they borrow from the note they decorate.
+        
+                  They take no time from the *bar* — that is why they hang off their
+                  principal — but they have to take it from somewhere, and an
+                  acciaccatura is crushed against the note it leads into. So they are
+                  laid before it and the principal starts that much later, which leaves
+                  the bar's total unchanged and every following note where it was.
+        
+                  Never more than half the principal: an ornament that swallowed its
+                  own note would be a rewrite rather than a decoration.
+                */
+                const graceNotes = event.graceNotes ?? [];
+                let graceTicks = 0;
+                if (graceNotes.length > 0) {
+                    const wanted = graceNotes.reduce((sum, g) => sum + g.durationTicks, 0);
+                    graceTicks = Math.min(wanted, Math.floor(event.durationTicks / 2));
+                    const each = Math.floor(graceTicks / graceNotes.length);
+                    graceNotes.forEach((grace, i) => {
+                        if (each <= 0)
+                            return;
+                        notes.push({
+                            tick: event.startTick + i * each,
+                            durTicks: each,
+                            midi: pitchToMidi(grace.pitch),
+                            // A shade under the principal: an ornament leads into the note,
+                            // it does not compete with it. Off the *pre-articulation*
+                            // velocity, because an accent belongs to the note it is written
+                            // on and not to what leads into it.
+                            velocity: Math.max(1, Math.round(dynamicVelocity * 0.8)),
+                            trackId: track.id,
+                            noteId: `${event.id}-grace-${i}`,
+                        });
+                    });
+                }
+                notes.push({
+                    tick: event.startTick + graceTicks,
+                    // Shortened by a staccato or a marcato, and only ever shortened —
+                    // the note still *occupies* its written length, so nothing after it
+                    // moves and the bar still adds up.
+                    durTicks: articulatedDuration(event.durationTicks - graceTicks, event.articulation),
+                    midi: pitchToMidi(event.pitch),
+                    velocity,
+                    trackId: track.id,
+                    noteId: event.id,
+                });
+            }
+        }
+    }
+    return notes.sort((a, b) => a.tick - b.tick);
+}
+//# sourceMappingURL=flatten.js.map

package/dist/domain/score/flatten.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flatten.js","sourceRoot":"","sources":["../../../src/domain/score/flatten.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAoB1C;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAY;IAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CACrC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAC1C,CAAC,CACF,CAAC;IACF,MAAM,QAAQ,GAAqB,EAAE,CAAC;IACtC,KAAK,IAAI,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,SAAS,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;QACjE,MAAM,OAAO,GAAmB,EAAE,CAAC;QACnC,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,KAAK;gBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;QAClD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,iBAAiB,CAAC,KAAY;IAC5C,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,KAAK,MAAM,OAAO,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;YACtC,qEAAqE;YACrE,oEAAoE;YACpE,0CAA0C;YAC1C,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;YACxC,mEAAmE;YACnE,mEAAmE;YACnE,qBAAqB;YACrB,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAClD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;oBAAE,SAAS;gBAClC,qEAAqE;gBACrE,qEAAqE;gBACrE,uEAAuE;gBACvE,iBAAiB;gBACjB;;;;;kBAKE;gBACF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAClC,MAAM,eAAe,GACnB,IAAI,KAAK,SAAS;oBAChB,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;oBACzD,CAAC,CAAC,IAAI,CAAC,GAAG,CACN,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,GAAG,gBAAgB,CAAC,CAAC,CAC1D,CAAC;gBACR,MAAM,QAAQ,GAAG,mBAAmB,CAClC,eAAe,EACf,KAAK,CAAC,YAAY,CACnB,CAAC;gBAEF;;;;;;;;;;;kBAWE;gBACF,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC;gBAC1C,IAAI,UAAU,GAAG,CAAC,CAAC;gBACnB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,aAAa,EACjC,CAAC,CACF,CAAC;oBACF,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;oBACnE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;oBACxD,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;wBAC9B,IAAI,IAAI,IAAI,CAAC;4BAAE,OAAO;wBACtB,KAAK,CAAC,IAAI,CAAC;4BACT,IAAI,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI;4BAChC,QAAQ,EAAE,IAAI;4BACd,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;4BAC9B,gEAAgE;4BAChE,0DAA0D;4BAC1D,gEAAgE;4BAChE,oCAAoC;4BACpC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC;4BACxD,OAAO,EAAE,KAAK,CAAC,EAAE;4BACjB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,UAAU,CAAC,EAAE;yBACjC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,KAAK,CAAC,IAAI,CAAC;oBACT,IAAI,EAAE,KAAK,CAAC,SAAS,GAAG,UAAU;oBAClC,kEAAkE;oBAClE,oEAAoE;oBACpE,mCAAmC;oBACnC,QAAQ,EAAE,mBAAmB,CAC3B,KAAK,CAAC,aAAa,GAAG,UAAU,EAChC,KAAK,CAAC,YAAY,CACnB;oBACD,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;oBAC9B,QAAQ;oBACR,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,MAAM,EAAE,KAAK,CAAC,EAAE;iBACjB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;AAC/C,CAAC"}

package/dist/domain/score/fragment.d.ts

@@ -1,11 +1,7 @@
-import type { Score, ScoreFragment } from '../../index.js';
-import type { ScoreRange } from '../selection/types.js';
-/**
- * `ScoreFragment` is canonical in @sudobility/music_types and re-exported
- * here so domain modules keep one import site. A fragment is a snapshot of
- * a tick range of a score (measures shared by reference, not deep-cloned).
- */
-export type { ScoreFragment } from '../../index.js';
+import type { Score } from "../../index.js";
+import type { ScoreFragment } from "../../model/score.js";
+import type { ScoreRange } from "../selection/types.js";
+export type { ScoreFragment };
 /** Captures the measures overlapping `range` (per track named in `range.trackIds`, or all tracks if empty). */
 export declare function extractFragment(score: Score, range: ScoreRange): ScoreFragment;
 /**

package/dist/domain/score/fragment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fragment.d.ts","sourceRoot":"","sources":["../../../src/domain/score/fragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAW,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;GAIG;AACH,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,+GAA+G;AAC/G,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,UAAU,GAChB,aAAa,CAMf;AAUD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,GAAG,KAAK,CA6C5E"}
+{"version":3,"file":"fragment.d.ts","sourceRoot":"","sources":["../../../src/domain/score/fragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAW,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAQxD,YAAY,EAAE,aAAa,EAAE,CAAC;AAE9B,+GAA+G;AAC/G,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,UAAU,GAChB,aAAa,CAMf;AAUD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,GAAG,KAAK,CA6C5E"}

package/dist/domain/score/fragment.js

@@ -1,5 +1,5 @@
-import { rebuildMeasureTicks } from './factory.js';
-import { measuresInRange } from './queries.js';
+import { rebuildMeasureTicks } from "./factory.js";
+import { measuresInRange } from "./queries.js";
 /** Captures the measures overlapping `range` (per track named in `range.trackIds`, or all tracks if empty). */
 export function extractFragment(score, range) {
     return {
@@ -30,12 +30,12 @@ function overlapsRange(measure, range) {
  * referentially unchanged.
  */
 export function replaceFragment(score, fragment) {
-    const replacementsByTrackId = new Map(fragment.tracks.map(t => [t.trackId, t.measures]));
-    const tracks = score.tracks.map(track => {
+    const replacementsByTrackId = new Map(fragment.tracks.map((t) => [t.trackId, t.measures]));
+    const tracks = score.tracks.map((track) => {
         const replacementMeasures = replacementsByTrackId.get(track.id);
         if (!replacementMeasures)
             return track;
-        const firstIndex = track.measures.findIndex(m => overlapsRange(m, fragment.range));
+        const firstIndex = track.measures.findIndex((m) => overlapsRange(m, fragment.range));
         if (firstIndex === -1)
             return track;
         let lastIndex = firstIndex;
@@ -43,11 +43,11 @@ export function replaceFragment(score, fragment) {
             overlapsRange(track.measures[lastIndex], fragment.range)) {
             lastIndex += 1;
         }
-        const normalizedMeasures = replacementMeasures.map(measure => ({
+        const normalizedMeasures = replacementMeasures.map((measure) => ({
             ...measure,
-            voices: measure.voices.map(voice => ({
+            voices: measure.voices.map((voice) => ({
                 ...voice,
-                events: voice.events.map(event => ({
+                events: voice.events.map((event) => ({
                     ...event,
                     trackId: track.id,
                     voiceId: voice.id,

package/dist/domain/score/fragment.js.map

@@ -1 +1 @@
-{"version":3,"file":"fragment.js","sourceRoot":"","sources":["../../../src/domain/score/fragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAW/C,+GAA+G;AAC/G,MAAM,UAAU,eAAe,CAC7B,KAAY,EACZ,KAAiB;IAEjB,OAAO;QACL,KAAK;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,SAAS,aAAa,CAAC,OAAgB,EAAE,KAAiB;IACxD,OAAO,CACL,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,OAAO;QACjC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,SAAS,CAC5D,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,eAAe,CAAC,KAAY,EAAE,QAAuB;IACnE,MAAM,qBAAqB,GAAG,IAAI,GAAG,CACnC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAClD,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACtC,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,mBAAmB;YAAE,OAAO,KAAK,CAAC;QAEvC,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAC9C,aAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CACjC,CAAC;QACF,IAAI,UAAU,KAAK,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAEpC,IAAI,SAAS,GAAG,UAAU,CAAC;QAC3B,OACE,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM;YACjC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,EACxD,CAAC;YACD,SAAS,IAAI,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7D,GAAG,OAAO;YACV,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACnC,GAAG,KAAK;gBACR,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACjC,GAAG,KAAK;oBACR,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,OAAO,EAAE,KAAK,CAAC,EAAE;iBAClB,CAAC,CAAC;aACJ,CAAC,CAAC;SACJ,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,GAAG,KAAK;YACR,QAAQ,EAAE;gBACR,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC;gBACtC,GAAG,kBAAkB;gBACrB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;aACnC;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,mBAAmB,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"fragment.js","sourceRoot":"","sources":["../../../src/domain/score/fragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAa/C,+GAA+G;AAC/G,MAAM,UAAU,eAAe,CAC7B,KAAY,EACZ,KAAiB;IAEjB,OAAO;QACL,KAAK;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,SAAS,aAAa,CAAC,OAAgB,EAAE,KAAiB;IACxD,OAAO,CACL,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,OAAO;QACjC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,SAAS,CAC5D,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,eAAe,CAAC,KAAY,EAAE,QAAuB;IACnE,MAAM,qBAAqB,GAAG,IAAI,GAAG,CACnC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CACpD,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,mBAAmB;YAAE,OAAO,KAAK,CAAC;QAEvC,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAChD,aAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CACjC,CAAC;QACF,IAAI,UAAU,KAAK,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAEpC,IAAI,SAAS,GAAG,UAAU,CAAC;QAC3B,OACE,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM;YACjC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,EACxD,CAAC;YACD,SAAS,IAAI,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC/D,GAAG,OAAO;YACV,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACrC,GAAG,KAAK;gBACR,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACnC,GAAG,KAAK;oBACR,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,OAAO,EAAE,KAAK,CAAC,EAAE;iBAClB,CAAC,CAAC;aACJ,CAAC,CAAC;SACJ,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,GAAG,KAAK;YACR,QAAQ,EAAE;gBACR,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC;gBACtC,GAAG,kBAAkB;gBACrB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;aACnC;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,mBAAmB,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AACnD,CAAC"}

package/dist/domain/score/ids.d.ts

@@ -1,4 +1,4 @@
-import type { UUID } from '../../index.js';
+import type { UUID } from "../../index.js";
 /**
  * Generates a v4 UUID. Uses `crypto.randomUUID` when available, falling back
  * to a `Math.random`-based generator in non-secure contexts (e.g. `http://`

package/dist/domain/score/ids.js

@@ -1,4 +1,4 @@
-const HEX_CHARS = '0123456789abcdef';
+const HEX_CHARS = "0123456789abcdef";
 /**
  * Fallback v4-UUID generator for non-secure contexts, where
  * `crypto.randomUUID` is unavailable (it requires a secure context per the
@@ -6,13 +6,13 @@ const HEX_CHARS = '0123456789abcdef';
  * identifiers only.
  */
 function randomUuidFallback() {
-    let result = '';
+    let result = "";
     for (let i = 0; i < 36; i += 1) {
         if (i === 8 || i === 13 || i === 18 || i === 23) {
-            result += '-';
+            result += "-";
         }
         else if (i === 14) {
-            result += '4';
+            result += "4";
         }
         else if (i === 19) {
             result += HEX_CHARS[8 + Math.floor(Math.random() * 4)]; // one of 8, 9, a, b
@@ -29,8 +29,8 @@ function randomUuidFallback() {
  * origins other than `localhost`) where `crypto.randomUUID` is undefined.
  */
 export function createId() {
-    if (typeof crypto !== 'undefined' &&
-        typeof crypto.randomUUID === 'function') {
+    if (typeof crypto !== "undefined" &&
+        typeof crypto.randomUUID === "function") {
         return crypto.randomUUID();
     }
     return randomUuidFallback();

package/dist/domain/score/ottava.d.ts

@@ -0,0 +1,41 @@
+/**
+ * The octave brackets, as a display lens.
+ *
+ * `8va` means "these notes were written an octave lower to keep them on the
+ * stave — play them where the bracket says". The model stores **sounding**
+ * pitch, so the bracket is what moves the noteheads, not the sound: this walks
+ * a score and shifts every note inside a span to where it should be *drawn*.
+ *
+ * A lens over the whole score rather than a shift inside the renderer, for the
+ * reason `writtenScore` is one: the layout and everything measured from it see
+ * the same score, so the drawn note and its staff position agree by
+ * construction rather than by two matched calculations.
+ *
+ * Returns the **identical object** when no bracket exists, so `computeLayout`'s
+ * identity cache is untouched by a score that has none — which is almost every
+ * score.
+ *
+ * **Known limitation**, shared with `writtenScore`: clicking to place a note
+ * *inside* a bracket writes the drawn pitch as the sounding one, because note
+ * entry has no inverse for the display lens. That gap predates this and is not
+ * specific to ottava.
+ */
+import type { Ottava, Score } from "../../index.js";
+/** The octave displacement `ottava` asks for, in octaves. */
+export declare function ottavaOctaves(ottava: Ottava): number;
+/** Whether any note in `score` opens a bracket. */
+export declare function hasOttava(score: Score): boolean;
+/**
+ * `score` with every note inside a bracket moved to where it is written.
+ *
+ * The shift is the *opposite* of the bracket's displacement: `8va` says the
+ * player sounds an octave above the page, so the page shows an octave below
+ * the stored sound.
+ *
+ * Spans are read per voice and in tick order — a bracket opens on one note and
+ * closes on a later one in the same line, exactly like a slur — and an
+ * unclosed opening runs to the end of its voice rather than being dropped,
+ * which is what a reader does with a bracket whose end is missing.
+ */
+export declare function ottavaScore(score: Score): Score;
+//# sourceMappingURL=ottava.d.ts.map

package/dist/domain/score/ottava.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ottava.d.ts","sourceRoot":"","sources":["../../../src/domain/score/ottava.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,EAAa,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAW/D,6DAA6D;AAC7D,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,mDAAmD;AACnD,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAQ/C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CA6B/C"}

package/dist/domain/score/ottava.js

@@ -0,0 +1,98 @@
+import { isNoteEvent } from "../../index.js";
+/** How many octaves, and which way, a bracket displaces what is written. */
+const OTTAVA_OCTAVES = {
+    "8va": 1,
+    "8vb": -1,
+    "15ma": 2,
+    "15mb": -2,
+};
+/** The octave displacement `ottava` asks for, in octaves. */
+export function ottavaOctaves(ottava) {
+    return OTTAVA_OCTAVES[ottava];
+}
+/** Whether any note in `score` opens a bracket. */
+export function hasOttava(score) {
+    return score.tracks.some((track) => track.measures.some((measure) => measure.voices.some((voice) => voice.events.some((e) => isNoteEvent(e) && e.ottavaStart))));
+}
+/**
+ * `score` with every note inside a bracket moved to where it is written.
+ *
+ * The shift is the *opposite* of the bracket's displacement: `8va` says the
+ * player sounds an octave above the page, so the page shows an octave below
+ * the stored sound.
+ *
+ * Spans are read per voice and in tick order — a bracket opens on one note and
+ * closes on a later one in the same line, exactly like a slur — and an
+ * unclosed opening runs to the end of its voice rather than being dropped,
+ * which is what a reader does with a bracket whose end is missing.
+ */
+export function ottavaScore(score) {
+    if (!hasOttava(score))
+        return score;
+    const shifts = octaveShifts(score);
+    if (shifts.size === 0)
+        return score;
+    return {
+        ...score,
+        tracks: score.tracks.map((track) => ({
+            ...track,
+            measures: track.measures.map((measure) => ({
+                ...measure,
+                voices: measure.voices.map((voice) => ({
+                    ...voice,
+                    events: voice.events.map((event) => {
+                        const octaves = isNoteEvent(event)
+                            ? shifts.get(event.id)
+                            : undefined;
+                        if (octaves === undefined)
+                            return event;
+                        const note = event;
+                        return {
+                            ...note,
+                            pitch: { ...note.pitch, octave: note.pitch.octave - octaves },
+                        };
+                    }),
+                })),
+            })),
+        })),
+    };
+}
+/**
+ * Every note inside a bracket, and how many octaves it is displaced by.
+ *
+ * Walked per **voice ordinal across measures**, not per measure: a bracket
+ * opens on one note and closes on a later one, and the later one is usually in
+ * a different bar. The ordinal stands in for "the same line" from bar to bar,
+ * which is the convention `trackVoiceChannels` and `joinTiedNotes` already use.
+ */
+function octaveShifts(score) {
+    const shifts = new Map();
+    for (const track of score.tracks) {
+        const voiceCount = track.measures.reduce((max, m) => Math.max(max, m.voices.length), 0);
+        for (let ordinal = 0; ordinal < voiceCount; ordinal += 1) {
+            const line = [];
+            for (const measure of track.measures) {
+                const voice = measure.voices[ordinal];
+                if (!voice)
+                    continue;
+                for (const event of voice.events) {
+                    if (isNoteEvent(event))
+                        line.push(event);
+                }
+            }
+            line.sort((a, b) => a.startTick - b.startTick);
+            let open = null;
+            for (const note of line) {
+                if (!open && note.ottavaStart)
+                    open = note.ottavaStart;
+                if (open)
+                    shifts.set(note.id, OTTAVA_OCTAVES[open]);
+                // Closed *after* shifting: the closing note is inside its own bracket.
+                if (open && note.ottavaStop)
+                    open = null;
+            }
+        }
+    }
+    return shifts;
+}
+//# sourceMappingURL=ottava.js.map

package/dist/domain/score/ottava.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ottava.js","sourceRoot":"","sources":["../../../src/domain/score/ottava.ts"],"names":[],"mappings":"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"}

package/dist/domain/score/performance-timeline.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Translating between where the music *is written* and where it is *played*.
+ *
+ * Without repeats these are the same number, and the whole editor was built on
+ * that: the caret is a score tick, `seek` takes a score tick, the
+ * following-scroll finds a bar from one. Expanding a repeat breaks the
+ * identity — bar 3 played twice has two performance positions and one written
+ * position — so rather than teach four separate consumers about repeats, the
+ * plan carries this timeline and they translate through it.
+ *
+ * A score with no repeats produces an identity timeline: one segment covering
+ * everything, `performanceTick === sourceTick`. That is what keeps every
+ * existing behaviour byte-identical.
+ */
+import type { PerformanceTimeline, Score } from "../../index.js";
+/**
+ * Builds the timeline for `score`, honouring its repeats.
+ *
+ * Consecutive played bars are merged into one segment: a piece with no repeats
+ * becomes a single identity segment, and even a repeated one has a handful —
+ * so the lookups below stay cheap enough to run per animation frame.
+ */
+export declare function performanceTimeline(score: Score): PerformanceTimeline;
+/**
+ * Where on the page a performance position is.
+ *
+ * Used by everything that draws: the caret, the following-scroll, the bar/beat
+ * readout. A tick past the end clamps to the last segment rather than
+ * returning nothing, because the engine can report a position a hair past the
+ * final note and the caret should sit at the end rather than vanish.
+ */
+export declare function sourceTickFor(timeline: PerformanceTimeline, performanceTick: number): number;
+/**
+ * Where to start playing to hear a written position.
+ *
+ * The **first** time that written tick is performed, deliberately: clicking bar
+ * 3 and pressing play should start the first time through, which is what
+ * "play from here" means to a reader looking at the page. Hearing the repeat
+ * means playing on to it.
+ */
+export declare function performanceTickFor(timeline: PerformanceTimeline, sourceTick: number): number;
+//# sourceMappingURL=performance-timeline.d.ts.map

package/dist/domain/score/performance-timeline.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"performance-timeline.d.ts","sourceRoot":"","sources":["../../../src/domain/score/performance-timeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAOjE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,mBAAmB,CAgCrE;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,mBAAmB,EAC7B,eAAe,EAAE,MAAM,GACtB,MAAM,CAeR;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,MAAM,GACjB,MAAM,CAQR"}

package/dist/domain/score/performance-timeline.js

@@ -0,0 +1,78 @@
+import { repeatPlayOrder } from "./repeat-order.js";
+// The shape lives beside `PlaybackPlan` in this package's platform types, and
+// is already exported from there — this module builds one rather than
+// re-exporting the type and creating two names for it.
+/**
+ * Builds the timeline for `score`, honouring its repeats.
+ *
+ * Consecutive played bars are merged into one segment: a piece with no repeats
+ * becomes a single identity segment, and even a repeated one has a handful —
+ * so the lookups below stay cheap enough to run per animation frame.
+ */
+export function performanceTimeline(score) {
+    const measures = score.tracks[0]?.measures ?? [];
+    // Mutable while building, handed back as the readonly contract type.
+    const segments = [];
+    let performanceTick = 0;
+    for (const { measureIndex } of repeatPlayOrder(score)) {
+        const measure = measures[measureIndex];
+        if (!measure)
+            continue;
+        const previous = segments[segments.length - 1];
+        const continues = previous !== undefined &&
+            previous.sourceTick + previous.durationTicks === measure.startTick;
+        if (continues) {
+            previous.durationTicks += measure.durationTicks;
+        }
+        else {
+            segments.push({
+                performanceTick,
+                sourceTick: measure.startTick,
+                durationTicks: measure.durationTicks,
+            });
+        }
+        performanceTick += measure.durationTicks;
+    }
+    return { segments, durationTicks: performanceTick };
+}
+/**
+ * Where on the page a performance position is.
+ *
+ * Used by everything that draws: the caret, the following-scroll, the bar/beat
+ * readout. A tick past the end clamps to the last segment rather than
+ * returning nothing, because the engine can report a position a hair past the
+ * final note and the caret should sit at the end rather than vanish.
+ */
+export function sourceTickFor(timeline, performanceTick) {
+    const { segments } = timeline;
+    if (segments.length === 0)
+        return performanceTick;
+    for (const segment of segments) {
+        const offset = performanceTick - segment.performanceTick;
+        if (offset >= 0 && offset < segment.durationTicks) {
+            return segment.sourceTick + offset;
+        }
+    }
+    const last = segments[segments.length - 1];
+    if (performanceTick < segments[0].performanceTick)
+        return segments[0].sourceTick;
+    return last.sourceTick + last.durationTicks - 1;
+}
+/**
+ * Where to start playing to hear a written position.
+ *
+ * The **first** time that written tick is performed, deliberately: clicking bar
+ * 3 and pressing play should start the first time through, which is what
+ * "play from here" means to a reader looking at the page. Hearing the repeat
+ * means playing on to it.
+ */
+export function performanceTickFor(timeline, sourceTick) {
+    for (const segment of timeline.segments) {
+        const offset = sourceTick - segment.sourceTick;
+        if (offset >= 0 && offset < segment.durationTicks) {
+            return segment.performanceTick + offset;
+        }
+    }
+    return sourceTick;
+}
+//# sourceMappingURL=performance-timeline.js.map

package/dist/domain/score/performance-timeline.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"performance-timeline.js","sourceRoot":"","sources":["../../../src/domain/score/performance-timeline.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,8EAA8E;AAC9E,sEAAsE;AACtE,uDAAuD;AAEvD;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAY;IAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC;IACjD,qEAAqE;IACrE,MAAM,QAAQ,GAIT,EAAE,CAAC;IACR,IAAI,eAAe,GAAG,CAAC,CAAC;IAExB,KAAK,MAAM,EAAE,YAAY,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QACtD,MAAM,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO;YAAE,SAAS;QAEvB,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC/C,MAAM,SAAS,GACb,QAAQ,KAAK,SAAS;YACtB,QAAQ,CAAC,UAAU,GAAG,QAAQ,CAAC,aAAa,KAAK,OAAO,CAAC,SAAS,CAAC;QAErE,IAAI,SAAS,EAAE,CAAC;YACd,QAAQ,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC;gBACZ,eAAe;gBACf,UAAU,EAAE,OAAO,CAAC,SAAS;gBAC7B,aAAa,EAAE,OAAO,CAAC,aAAa;aACrC,CAAC,CAAC;QACL,CAAC;QACD,eAAe,IAAI,OAAO,CAAC,aAAa,CAAC;IAC3C,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC;AACtD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAC3B,QAA6B,EAC7B,eAAuB;IAEvB,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAC9B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,eAAe,CAAC;IAElD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;QACzD,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;YAClD,OAAO,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC;QACrC,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3C,IAAI,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe;QAC/C,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAChC,OAAO,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;AAClD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAA6B,EAC7B,UAAkB;IAElB,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QAC/C,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;YAClD,OAAO,OAAO,CAAC,eAAe,GAAG,MAAM,CAAC;QAC1C,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/domain/score/queries.d.ts

@@ -1,5 +1,5 @@
-import type { ScoreRange } from '../selection/types.js';
-import type { Measure, MusicalEvent, NoteEvent, Score, Track, UUID } from '../../index.js';
+import type { ScoreRange } from "../selection/types.js";
+import type { Measure, MusicalEvent, NoteEvent, Score, Track, UUID } from "../../index.js";
 /** Finds a track by id, or `null` if no track has that id. */
 export declare function findTrack(score: Score, trackId: UUID): Track | null;
 /** Finds a measure by id across all tracks, or `null` if none has that id. */

package/dist/domain/score/queries.js

@@ -1,13 +1,13 @@
-import { isNoteEvent } from '../../index.js';
-import { pitchToMidi } from '../pitch/pitch.js';
+import { isNoteEvent } from "../../index.js";
+import { pitchToMidi } from "../pitch/pitch.js";
 /** Finds a track by id, or `null` if no track has that id. */
 export function findTrack(score, trackId) {
-    return score.tracks.find(track => track.id === trackId) ?? null;
+    return score.tracks.find((track) => track.id === trackId) ?? null;
 }
 /** Finds a measure by id across all tracks, or `null` if none has that id. */
 export function findMeasure(score, measureId) {
     for (const track of score.tracks) {
-        const measure = track.measures.find(m => m.id === measureId);
+        const measure = track.measures.find((m) => m.id === measureId);
         if (measure)
             return measure;
     }
@@ -18,7 +18,7 @@ export function findEvent(score, eventId) {
     for (const track of score.tracks) {
         for (const measure of track.measures) {
             for (const voice of measure.voices) {
-                const event = voice.events.find(e => e.id === eventId);
+                const event = voice.events.find((e) => e.id === eventId);
                 if (event)
                     return event;
             }
@@ -59,7 +59,7 @@ export function measuresInRange(score, range) {
     for (const track of score.tracks) {
         if (!rangeIncludesTrack(range, track.id))
             continue;
-        const measures = track.measures.filter(m => overlapsRange(m.startTick, m.durationTicks, range));
+        const measures = track.measures.filter((m) => overlapsRange(m.startTick, m.durationTicks, range));
         result.push({ trackId: track.id, measures });
     }
     return result;
@@ -124,7 +124,7 @@ export function allNotes(score) {
  */
 export function scoreWithTracks(score, trackIds) {
     const wanted = new Set(trackIds);
-    const tracks = score.tracks.filter(track => wanted.has(track.id));
+    const tracks = score.tracks.filter((track) => wanted.has(track.id));
     if (tracks.length === score.tracks.length)
         return score;
     return { ...score, tracks };

package/dist/domain/score/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/domain/score/queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/domain/score/queries.ts"],"names":[],"mappings":"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"}