@sudobility/music_types 0.11.30 → 0.11.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/domain/commands/edit-commands.d.ts +3 -3
- package/dist/domain/commands/edit-commands.d.ts.map +1 -1
- package/dist/domain/commands/edit-commands.js +25 -25
- package/dist/domain/commands/edit-commands.js.map +1 -1
- package/dist/domain/commands/history.d.ts +32 -0
- package/dist/domain/commands/history.d.ts.map +1 -0
- package/dist/domain/commands/history.js +63 -0
- package/dist/domain/commands/history.js.map +1 -0
- package/dist/domain/commands/note-commands.d.ts +9 -12
- package/dist/domain/commands/note-commands.d.ts.map +1 -1
- package/dist/domain/commands/note-commands.js +42 -72
- package/dist/domain/commands/note-commands.js.map +1 -1
- package/dist/domain/commands/note-marks.d.ts +171 -0
- package/dist/domain/commands/note-marks.d.ts.map +1 -0
- package/dist/domain/commands/note-marks.js +427 -0
- package/dist/domain/commands/note-marks.js.map +1 -0
- package/dist/domain/commands/reflow.d.ts +1 -1
- package/dist/domain/commands/reflow.js +17 -17
- package/dist/domain/commands/reflow.js.map +1 -1
- package/dist/domain/commands/region-commands.d.ts +4 -4
- package/dist/domain/commands/region-commands.d.ts.map +1 -1
- package/dist/domain/commands/region-commands.js +7 -7
- package/dist/domain/commands/region-commands.js.map +1 -1
- package/dist/domain/commands/relocate-commands.d.ts +3 -3
- package/dist/domain/commands/relocate-commands.js +15 -15
- package/dist/domain/commands/relocate-commands.js.map +1 -1
- package/dist/domain/commands/ripple-commands.d.ts +2 -2
- package/dist/domain/commands/ripple-commands.js +13 -13
- package/dist/domain/commands/ripple-commands.js.map +1 -1
- package/dist/domain/commands/snapshot.d.ts +3 -3
- package/dist/domain/commands/snapshot.js +5 -5
- package/dist/domain/commands/snapshot.js.map +1 -1
- package/dist/domain/commands/structure-commands.d.ts +86 -5
- package/dist/domain/commands/structure-commands.d.ts.map +1 -1
- package/dist/domain/commands/structure-commands.js +272 -36
- package/dist/domain/commands/structure-commands.js.map +1 -1
- package/dist/domain/commands/track-commands.d.ts +2 -2
- package/dist/domain/commands/track-commands.js +7 -7
- package/dist/domain/commands/track-commands.js.map +1 -1
- package/dist/domain/commands/types.d.ts +2 -2
- package/dist/domain/generation/replacement-region.d.ts +32 -0
- package/dist/domain/generation/replacement-region.d.ts.map +1 -0
- package/dist/domain/generation/replacement-region.js +79 -0
- package/dist/domain/generation/replacement-region.js.map +1 -0
- package/dist/domain/instruments/gm-icon.d.ts +12 -0
- package/dist/domain/instruments/gm-icon.d.ts.map +1 -0
- package/dist/domain/instruments/gm-icon.js +327 -0
- package/dist/domain/instruments/gm-icon.js.map +1 -0
- package/dist/domain/instruments/gm-kit.js +9 -9
- package/dist/domain/instruments/gm-kit.js.map +1 -1
- package/dist/domain/instruments/gm-percussion.js +48 -48
- package/dist/domain/instruments/gm-percussion.js.map +1 -1
- package/dist/domain/instruments/gm-polyphony.js +6 -6
- package/dist/domain/instruments/gm-range.js +6 -6
- package/dist/domain/instruments/gm-transposition.js +1 -1
- package/dist/domain/instruments/gm.d.ts +1 -1
- package/dist/domain/instruments/gm.js +161 -161
- package/dist/domain/instruments/gm.js.map +1 -1
- package/dist/domain/instruments/icon-art.d.ts +75 -0
- package/dist/domain/instruments/icon-art.d.ts.map +1 -0
- package/dist/domain/instruments/icon-art.js +93 -0
- package/dist/domain/instruments/icon-art.js.map +1 -0
- package/dist/domain/instruments/instrument-fit.d.ts +31 -0
- package/dist/domain/instruments/instrument-fit.d.ts.map +1 -0
- package/dist/domain/instruments/instrument-fit.js +117 -0
- package/dist/domain/instruments/instrument-fit.js.map +1 -0
- package/dist/domain/instruments/instrument-options.d.ts +62 -0
- package/dist/domain/instruments/instrument-options.d.ts.map +1 -0
- package/dist/domain/instruments/instrument-options.js +69 -0
- package/dist/domain/instruments/instrument-options.js.map +1 -0
- package/dist/domain/instruments/track-instrument.d.ts +80 -0
- package/dist/domain/instruments/track-instrument.d.ts.map +1 -0
- package/dist/domain/instruments/track-instrument.js +102 -0
- package/dist/domain/instruments/track-instrument.js.map +1 -0
- package/dist/domain/notation/chord-symbol.d.ts +26 -0
- package/dist/domain/notation/chord-symbol.d.ts.map +1 -0
- package/dist/domain/notation/chord-symbol.js +32 -0
- package/dist/domain/notation/chord-symbol.js.map +1 -0
- package/dist/domain/notation/lyric-syllables.d.ts +15 -0
- package/dist/domain/notation/lyric-syllables.d.ts.map +1 -0
- package/dist/domain/notation/lyric-syllables.js +15 -0
- package/dist/domain/notation/lyric-syllables.js.map +1 -0
- package/dist/domain/notation/music-vocabulary.d.ts +59 -0
- package/dist/domain/notation/music-vocabulary.d.ts.map +1 -0
- package/dist/domain/notation/music-vocabulary.js +164 -0
- package/dist/domain/notation/music-vocabulary.js.map +1 -0
- package/dist/domain/pitch/pitch.d.ts +1 -1
- package/dist/domain/pitch/pitch.js +29 -29
- package/dist/domain/pitch/transpose.d.ts +1 -1
- package/dist/domain/pitch/transpose.js +2 -2
- package/dist/domain/quantization/quantize.d.ts +2 -2
- package/dist/domain/quantization/quantize.js +9 -9
- package/dist/domain/quantization/quantize.js.map +1 -1
- package/dist/domain/score/articulation.d.ts +56 -0
- package/dist/domain/score/articulation.d.ts.map +1 -0
- package/dist/domain/score/articulation.js +56 -0
- package/dist/domain/score/articulation.js.map +1 -0
- package/dist/domain/score/bar-numbers.d.ts +38 -0
- package/dist/domain/score/bar-numbers.d.ts.map +1 -0
- package/dist/domain/score/bar-numbers.js +49 -0
- package/dist/domain/score/bar-numbers.js.map +1 -0
- package/dist/domain/score/collapse-rests.d.ts +23 -0
- package/dist/domain/score/collapse-rests.d.ts.map +1 -0
- package/dist/domain/score/collapse-rests.js +78 -0
- package/dist/domain/score/collapse-rests.js.map +1 -0
- package/dist/domain/score/cue-notes.d.ts +24 -0
- package/dist/domain/score/cue-notes.d.ts.map +1 -0
- package/dist/domain/score/cue-notes.js +105 -0
- package/dist/domain/score/cue-notes.js.map +1 -0
- package/dist/domain/score/dynamics.d.ts +62 -0
- package/dist/domain/score/dynamics.d.ts.map +1 -0
- package/dist/domain/score/dynamics.js +142 -0
- package/dist/domain/score/dynamics.js.map +1 -0
- package/dist/domain/score/effective-clef.d.ts +42 -0
- package/dist/domain/score/effective-clef.d.ts.map +1 -0
- package/dist/domain/score/effective-clef.js +39 -0
- package/dist/domain/score/effective-clef.js.map +1 -0
- package/dist/domain/score/extract-part.d.ts +10 -0
- package/dist/domain/score/extract-part.d.ts.map +1 -0
- package/dist/domain/score/extract-part.js +44 -0
- package/dist/domain/score/extract-part.js.map +1 -0
- package/dist/domain/score/factory.d.ts +1 -1
- package/dist/domain/score/factory.js +12 -12
- package/dist/domain/score/factory.js.map +1 -1
- package/dist/domain/score/fermata-tempo.d.ts +40 -0
- package/dist/domain/score/fermata-tempo.d.ts.map +1 -0
- package/dist/domain/score/fermata-tempo.js +95 -0
- package/dist/domain/score/fermata-tempo.js.map +1 -0
- package/dist/domain/score/flatten.d.ts +32 -0
- package/dist/domain/score/flatten.d.ts.map +1 -0
- package/dist/domain/score/flatten.js +132 -0
- package/dist/domain/score/flatten.js.map +1 -0
- package/dist/domain/score/fragment.d.ts +4 -8
- package/dist/domain/score/fragment.d.ts.map +1 -1
- package/dist/domain/score/fragment.js +8 -8
- package/dist/domain/score/fragment.js.map +1 -1
- package/dist/domain/score/ids.d.ts +1 -1
- package/dist/domain/score/ids.js +6 -6
- package/dist/domain/score/ottava.d.ts +41 -0
- package/dist/domain/score/ottava.d.ts.map +1 -0
- package/dist/domain/score/ottava.js +98 -0
- package/dist/domain/score/ottava.js.map +1 -0
- package/dist/domain/score/performance-timeline.d.ts +42 -0
- package/dist/domain/score/performance-timeline.d.ts.map +1 -0
- package/dist/domain/score/performance-timeline.js +78 -0
- package/dist/domain/score/performance-timeline.js.map +1 -0
- package/dist/domain/score/queries.d.ts +2 -2
- package/dist/domain/score/queries.js +7 -7
- package/dist/domain/score/queries.js.map +1 -1
- package/dist/domain/score/rehearsal-marks.d.ts +30 -0
- package/dist/domain/score/rehearsal-marks.d.ts.map +1 -0
- package/dist/domain/score/rehearsal-marks.js +126 -0
- package/dist/domain/score/rehearsal-marks.js.map +1 -0
- package/dist/domain/score/repeat-order.d.ts +21 -0
- package/dist/domain/score/repeat-order.d.ts.map +1 -0
- package/dist/domain/score/repeat-order.js +123 -0
- package/dist/domain/score/repeat-order.js.map +1 -0
- package/dist/domain/score/snapshot-tree.d.ts +23 -0
- package/dist/domain/score/snapshot-tree.d.ts.map +1 -0
- package/dist/domain/score/snapshot-tree.js +45 -0
- package/dist/domain/score/snapshot-tree.js.map +1 -0
- package/dist/domain/score/ties.d.ts +1 -1
- package/dist/domain/score/ties.js +7 -7
- package/dist/domain/score/ties.js.map +1 -1
- package/dist/domain/score/written-pitch.d.ts +33 -0
- package/dist/domain/score/written-pitch.d.ts.map +1 -0
- package/dist/domain/score/written-pitch.js +110 -0
- package/dist/domain/score/written-pitch.js.map +1 -0
- package/dist/domain/selection/range-select.d.ts +13 -0
- package/dist/domain/selection/range-select.d.ts.map +1 -0
- package/dist/domain/selection/range-select.js +40 -0
- package/dist/domain/selection/range-select.js.map +1 -0
- package/dist/domain/selection/selection-editing.d.ts +30 -0
- package/dist/domain/selection/selection-editing.d.ts.map +1 -0
- package/dist/domain/selection/selection-editing.js +31 -0
- package/dist/domain/selection/selection-editing.js.map +1 -0
- package/dist/domain/selection/selection.d.ts +2 -2
- package/dist/domain/selection/selection.js +7 -7
- package/dist/domain/selection/selection.js.map +1 -1
- package/dist/domain/selection/types.d.ts +2 -2
- package/dist/domain/selection/types.d.ts.map +1 -1
- package/dist/domain/time/duration-modifiers.d.ts +40 -0
- package/dist/domain/time/duration-modifiers.d.ts.map +1 -0
- package/dist/domain/time/duration-modifiers.js +50 -0
- package/dist/domain/time/duration-modifiers.js.map +1 -0
- package/dist/domain/time/duration-selection.d.ts +23 -0
- package/dist/domain/time/duration-selection.d.ts.map +1 -0
- package/dist/domain/time/duration-selection.js +50 -0
- package/dist/domain/time/duration-selection.js.map +1 -0
- package/dist/domain/time/durations.js +6 -6
- package/dist/domain/time/durations.js.map +1 -1
- package/dist/domain/time/fraction.d.ts +1 -1
- package/dist/domain/time/fraction.js +1 -1
- package/dist/domain/time/tap-to-note.d.ts +21 -0
- package/dist/domain/time/tap-to-note.d.ts.map +1 -0
- package/dist/domain/time/tap-to-note.js +43 -0
- package/dist/domain/time/tap-to-note.js.map +1 -0
- package/dist/domain/time/tempo-map.d.ts +1 -1
- package/dist/domain/time/ticks.d.ts +1 -1
- package/dist/domain/time/ticks.d.ts.map +1 -1
- package/dist/domain/time/ticks.js +14 -14
- package/dist/domain/time/ticks.js.map +1 -1
- package/dist/domain/time/tuplets.d.ts +42 -0
- package/dist/domain/time/tuplets.d.ts.map +1 -0
- package/dist/domain/time/tuplets.js +53 -0
- package/dist/domain/time/tuplets.js.map +1 -0
- package/dist/domain/validation/issues.d.ts +1 -1
- package/dist/domain/validation/issues.js +20 -20
- package/dist/domain/validation/validator.d.ts +2 -2
- package/dist/domain/validation/validator.d.ts.map +1 -1
- package/dist/domain/validation/validator.js +31 -31
- package/dist/domain/validation/validator.js.map +1 -1
- package/dist/domain/voicing/allocate.d.ts +2 -2
- package/dist/domain/voicing/allocate.js +6 -6
- package/dist/domain/voicing/allocate.js.map +1 -1
- package/dist/index.d.ts +72 -5535
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +79 -462
- package/dist/index.js.map +1 -1
- package/dist/model/api.d.ts +1696 -0
- package/dist/model/api.d.ts.map +1 -0
- package/dist/model/api.js +125 -0
- package/dist/model/api.js.map +1 -0
- package/dist/model/generation.d.ts +2178 -0
- package/dist/model/generation.d.ts.map +1 -0
- package/dist/model/generation.js +142 -0
- package/dist/model/generation.js.map +1 -0
- package/dist/model/schemas.d.ts +1200 -0
- package/dist/model/schemas.d.ts.map +1 -0
- package/dist/model/schemas.js +200 -0
- package/dist/model/schemas.js.map +1 -0
- package/dist/model/score.d.ts +462 -0
- package/dist/model/score.d.ts.map +1 -0
- package/dist/model/score.js +34 -0
- package/dist/model/score.js.map +1 -0
- package/dist/platform/audio.d.ts.map +1 -1
- package/dist/platform/file.d.ts.map +1 -1
- package/dist/platform/index.d.ts +7 -7
- package/dist/platform/index.js +7 -7
- package/dist/platform/midi-input.d.ts +2 -2
- package/dist/platform/midi.d.ts.map +1 -1
- package/dist/platform/mod.d.ts +2 -2
- package/dist/platform/playback.d.ts +7 -7
- package/dist/platform/xml.js +1 -1
- package/dist/services/regeneration/controller.d.ts +6 -6
- package/dist/services/regeneration/controller.js +12 -12
- package/dist/services/regeneration/controller.js.map +1 -1
- package/dist/test/fixtures.d.ts +1 -1
- package/dist/test/fixtures.js +103 -103
- package/dist/test/fixtures.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { fraction, fractionToTicks } from
|
|
1
|
+
import { fraction, fractionToTicks } from "./fraction.js";
|
|
2
2
|
/** Multiplies a fraction by a positive integer/rational scalar expressed as a fraction. */
|
|
3
3
|
function scaleFraction(f, scale) {
|
|
4
4
|
return fraction(f.numerator * scale.numerator, f.denominator * scale.denominator);
|
|
@@ -24,18 +24,18 @@ export const DURATIONS = {
|
|
|
24
24
|
eighth: BASE_DURATIONS.eighth,
|
|
25
25
|
sixteenth: BASE_DURATIONS.sixteenth,
|
|
26
26
|
thirtysecond: BASE_DURATIONS.thirtysecond,
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
27
|
+
"dotted-whole": scaleFraction(BASE_DURATIONS.whole, DOTTED_SCALE),
|
|
28
|
+
"dotted-half": scaleFraction(BASE_DURATIONS.half, DOTTED_SCALE),
|
|
29
|
+
"dotted-quarter": scaleFraction(BASE_DURATIONS.quarter, DOTTED_SCALE),
|
|
30
|
+
"dotted-eighth": scaleFraction(BASE_DURATIONS.eighth, DOTTED_SCALE),
|
|
31
|
+
"dotted-sixteenth": scaleFraction(BASE_DURATIONS.sixteenth, DOTTED_SCALE),
|
|
32
|
+
"dotted-thirtysecond": scaleFraction(BASE_DURATIONS.thirtysecond, DOTTED_SCALE),
|
|
33
|
+
"triplet-whole": scaleFraction(BASE_DURATIONS.whole, TRIPLET_SCALE),
|
|
34
|
+
"triplet-half": scaleFraction(BASE_DURATIONS.half, TRIPLET_SCALE),
|
|
35
|
+
"triplet-quarter": scaleFraction(BASE_DURATIONS.quarter, TRIPLET_SCALE),
|
|
36
|
+
"triplet-eighth": scaleFraction(BASE_DURATIONS.eighth, TRIPLET_SCALE),
|
|
37
|
+
"triplet-sixteenth": scaleFraction(BASE_DURATIONS.sixteenth, TRIPLET_SCALE),
|
|
38
|
+
"triplet-thirtysecond": scaleFraction(BASE_DURATIONS.thirtysecond, TRIPLET_SCALE),
|
|
39
39
|
};
|
|
40
40
|
/** Integer tick length of a named duration at the given PPQ. */
|
|
41
41
|
export function ticksFor(duration, ppq) {
|
|
@@ -57,7 +57,7 @@ const DURATION_NAMES = Object.keys(DURATIONS);
|
|
|
57
57
|
* the sake of eighteen comparisons.
|
|
58
58
|
*/
|
|
59
59
|
export function durationNameForTicks(ticks, ppq) {
|
|
60
|
-
return DURATION_NAMES.find(name => ticksFor(name, ppq) === ticks) ?? null;
|
|
60
|
+
return DURATION_NAMES.find((name) => ticksFor(name, ppq) === ticks) ?? null;
|
|
61
61
|
}
|
|
62
62
|
/** Integer tick length of one full measure in the given time signature. */
|
|
63
63
|
export function measureDurationTicks(ts, ppq) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ticks.js","sourceRoot":"","sources":["../../../src/domain/time/ticks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ticks.js","sourceRoot":"","sources":["../../../src/domain/time/ticks.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Finding the tuplets already written in a voice.
|
|
3
|
+
*
|
|
4
|
+
* A triplet is not a separate kind of object in this model — it is three notes
|
|
5
|
+
* whose durations are each two thirds of a plain note value, which is exactly
|
|
6
|
+
* what a triplet *is*. The toolbar has been able to write them since the
|
|
7
|
+
* duration table gained `triplet-*`; what was missing was drawing the bracket
|
|
8
|
+
* and the number, and saying so in MusicXML.
|
|
9
|
+
*
|
|
10
|
+
* Derived rather than stored, deliberately. A `tupletId` on each note would be
|
|
11
|
+
* a second source of truth that every edit — delete one of the three, change
|
|
12
|
+
* one's duration, paste over the middle — could leave inconsistent with the
|
|
13
|
+
* durations themselves. Deriving it means a group that no longer sums to a
|
|
14
|
+
* plain note value simply stops being drawn as one, which is the truth.
|
|
15
|
+
*/
|
|
16
|
+
import type { MusicalEvent } from "../../index.js";
|
|
17
|
+
/** A run of events forming one tuplet, as indices into the voice's event list. */
|
|
18
|
+
export type TupletGroup = {
|
|
19
|
+
/** Index of the first event in the group. */
|
|
20
|
+
start: number;
|
|
21
|
+
/** How many events the group covers. */
|
|
22
|
+
length: number;
|
|
23
|
+
/** How many notes are played in the time of `normalNotes` — 3 for a triplet. */
|
|
24
|
+
actualNotes: number;
|
|
25
|
+
/** How many plain notes that time is worth — 2 for a triplet. */
|
|
26
|
+
normalNotes: number;
|
|
27
|
+
};
|
|
28
|
+
/**
|
|
29
|
+
* Every tuplet in `events`, in order.
|
|
30
|
+
*
|
|
31
|
+
* Groups runs of consecutive events that share the same triplet duration, in
|
|
32
|
+
* threes. Three is what makes the group whole: three triplet-eighths occupy a
|
|
33
|
+
* quarter, and a run of four would be one complete triplet plus a leftover
|
|
34
|
+
* that is not yet a tuplet — drawing a bracket over it would claim a grouping
|
|
35
|
+
* the music does not have.
|
|
36
|
+
*
|
|
37
|
+
* Rests count. A triplet with a rest in the middle is still a triplet, and
|
|
38
|
+
* skipping them would join notes either side of it into a group that is not
|
|
39
|
+
* one.
|
|
40
|
+
*/
|
|
41
|
+
export declare function tupletGroups(events: readonly MusicalEvent[], ppq: number): TupletGroup[];
|
|
42
|
+
//# sourceMappingURL=tuplets.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tuplets.d.ts","sourceRoot":"","sources":["../../../src/domain/time/tuplets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnD,kFAAkF;AAClF,MAAM,MAAM,WAAW,GAAG;IACxB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,WAAW,EAAE,MAAM,CAAC;IACpB,iEAAiE;IACjE,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAMF;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,GAAG,EAAE,MAAM,GACV,WAAW,EAAE,CAqCf"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { durationNameForTicks } from "./ticks.js";
|
|
2
|
+
/** Triplets are the only tuplet the duration table can express, so far. */
|
|
3
|
+
const TRIPLET_ACTUAL = 3;
|
|
4
|
+
const TRIPLET_NORMAL = 2;
|
|
5
|
+
/**
|
|
6
|
+
* Every tuplet in `events`, in order.
|
|
7
|
+
*
|
|
8
|
+
* Groups runs of consecutive events that share the same triplet duration, in
|
|
9
|
+
* threes. Three is what makes the group whole: three triplet-eighths occupy a
|
|
10
|
+
* quarter, and a run of four would be one complete triplet plus a leftover
|
|
11
|
+
* that is not yet a tuplet — drawing a bracket over it would claim a grouping
|
|
12
|
+
* the music does not have.
|
|
13
|
+
*
|
|
14
|
+
* Rests count. A triplet with a rest in the middle is still a triplet, and
|
|
15
|
+
* skipping them would join notes either side of it into a group that is not
|
|
16
|
+
* one.
|
|
17
|
+
*/
|
|
18
|
+
export function tupletGroups(events, ppq) {
|
|
19
|
+
const groups = [];
|
|
20
|
+
let runStart = 0;
|
|
21
|
+
let runName = null;
|
|
22
|
+
let runLength = 0;
|
|
23
|
+
const flush = () => {
|
|
24
|
+
// Only whole threes; a trailing one or two are left ungrouped.
|
|
25
|
+
for (let i = 0; i + TRIPLET_ACTUAL <= runLength; i += TRIPLET_ACTUAL) {
|
|
26
|
+
groups.push({
|
|
27
|
+
start: runStart + i,
|
|
28
|
+
length: TRIPLET_ACTUAL,
|
|
29
|
+
actualNotes: TRIPLET_ACTUAL,
|
|
30
|
+
normalNotes: TRIPLET_NORMAL,
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
runName = null;
|
|
34
|
+
runLength = 0;
|
|
35
|
+
};
|
|
36
|
+
events.forEach((event, index) => {
|
|
37
|
+
const name = durationNameForTicks(event.durationTicks, ppq);
|
|
38
|
+
const isTriplet = name !== null && name.startsWith("triplet-");
|
|
39
|
+
if (!isTriplet || name !== runName) {
|
|
40
|
+
flush();
|
|
41
|
+
if (!isTriplet)
|
|
42
|
+
return;
|
|
43
|
+
runStart = index;
|
|
44
|
+
runName = name;
|
|
45
|
+
runLength = 1;
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
runLength += 1;
|
|
49
|
+
});
|
|
50
|
+
flush();
|
|
51
|
+
return groups;
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=tuplets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tuplets.js","sourceRoot":"","sources":["../../../src/domain/time/tuplets.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAclD,2EAA2E;AAC3E,MAAM,cAAc,GAAG,CAAC,CAAC;AACzB,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,YAAY,CAC1B,MAA+B,EAC/B,GAAW;IAEX,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,OAAO,GAAkB,IAAI,CAAC;IAClC,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,+DAA+D;QAC/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,IAAI,SAAS,EAAE,CAAC,IAAI,cAAc,EAAE,CAAC;YACrE,MAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,QAAQ,GAAG,CAAC;gBACnB,MAAM,EAAE,cAAc;gBACtB,WAAW,EAAE,cAAc;gBAC3B,WAAW,EAAE,cAAc;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,IAAI,CAAC;QACf,SAAS,GAAG,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAC9B,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAC5D,MAAM,SAAS,GAAG,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAE/D,IAAI,CAAC,SAAS,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACnC,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,SAAS;gBAAE,OAAO;YACvB,QAAQ,GAAG,KAAK,CAAC;YACjB,OAAO,GAAG,IAAI,CAAC;YACf,SAAS,GAAG,CAAC,CAAC;YACd,OAAO;QACT,CAAC;QACD,SAAS,IAAI,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IACH,KAAK,EAAE,CAAC;IAER,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* returns `ValidationIssue[]`; the UI displays them and, via `objectId`/
|
|
4
4
|
* `trackId`/`measureId`, navigates to the affected object on click.
|
|
5
5
|
*/
|
|
6
|
-
export type ValidationSeverity =
|
|
6
|
+
export type ValidationSeverity = "error" | "warning";
|
|
7
7
|
export type ValidationIssue = {
|
|
8
8
|
severity: ValidationSeverity;
|
|
9
9
|
code: string;
|
|
@@ -10,25 +10,25 @@
|
|
|
10
10
|
* that only pattern-match on known codes.
|
|
11
11
|
*/
|
|
12
12
|
export const ISSUE_CODES = {
|
|
13
|
-
DUPLICATE_ID:
|
|
14
|
-
INVALID_PITCH_RANGE:
|
|
15
|
-
NON_POSITIVE_DURATION:
|
|
16
|
-
NEGATIVE_TICK:
|
|
17
|
-
INVALID_VELOCITY:
|
|
18
|
-
INVALID_MIDI_PROGRAM:
|
|
19
|
-
INVALID_MIDI_CHANNEL:
|
|
20
|
-
INVALID_TIME_SIGNATURE:
|
|
21
|
-
INVALID_KEY_SIGNATURE:
|
|
22
|
-
MEASURE_OVERFULL:
|
|
23
|
-
MEASURE_UNDERFULL:
|
|
24
|
-
EVENT_OUTSIDE_MEASURE:
|
|
25
|
-
MISSING_TIE_TARGET:
|
|
26
|
-
INVALID_TRACK_REFERENCE:
|
|
27
|
-
INVALID_VOICE_REFERENCE:
|
|
28
|
-
OVERLAPPING_SAME_PITCH:
|
|
29
|
-
TOO_MANY_SIMULTANEOUS_NOTES:
|
|
30
|
-
TEMPO_MAP_UNSORTED:
|
|
31
|
-
INVALID_TEMPO_BPM:
|
|
32
|
-
MEASURE_ORDERING:
|
|
13
|
+
DUPLICATE_ID: "duplicate-id",
|
|
14
|
+
INVALID_PITCH_RANGE: "invalid-pitch-range",
|
|
15
|
+
NON_POSITIVE_DURATION: "non-positive-duration",
|
|
16
|
+
NEGATIVE_TICK: "negative-tick",
|
|
17
|
+
INVALID_VELOCITY: "invalid-velocity",
|
|
18
|
+
INVALID_MIDI_PROGRAM: "invalid-midi-program",
|
|
19
|
+
INVALID_MIDI_CHANNEL: "invalid-midi-channel",
|
|
20
|
+
INVALID_TIME_SIGNATURE: "invalid-time-signature",
|
|
21
|
+
INVALID_KEY_SIGNATURE: "invalid-key-signature",
|
|
22
|
+
MEASURE_OVERFULL: "measure-overfull",
|
|
23
|
+
MEASURE_UNDERFULL: "measure-underfull",
|
|
24
|
+
EVENT_OUTSIDE_MEASURE: "event-outside-measure",
|
|
25
|
+
MISSING_TIE_TARGET: "missing-tie-target",
|
|
26
|
+
INVALID_TRACK_REFERENCE: "invalid-track-reference",
|
|
27
|
+
INVALID_VOICE_REFERENCE: "invalid-voice-reference",
|
|
28
|
+
OVERLAPPING_SAME_PITCH: "overlapping-same-pitch",
|
|
29
|
+
TOO_MANY_SIMULTANEOUS_NOTES: "too-many-simultaneous-notes",
|
|
30
|
+
TEMPO_MAP_UNSORTED: "tempo-map-unsorted",
|
|
31
|
+
INVALID_TEMPO_BPM: "invalid-tempo-bpm",
|
|
32
|
+
MEASURE_ORDERING: "measure-ordering",
|
|
33
33
|
};
|
|
34
34
|
//# sourceMappingURL=issues.js.map
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
* (empty when the score is fully consistent). Pure and read-only: never
|
|
5
5
|
* mutates its input.
|
|
6
6
|
*/
|
|
7
|
-
import type { Score } from
|
|
8
|
-
import type { ValidationIssue } from
|
|
7
|
+
import type { Score } from "../../index.js";
|
|
8
|
+
import type { ValidationIssue } from "./issues.js";
|
|
9
9
|
/** Validates a `Score` against every rule in spec §23 (Task 4 brief scope). Read-only; never mutates `score`. */
|
|
10
10
|
export declare function validateScore(score: Score): ValidationIssue[];
|
|
11
11
|
//# sourceMappingURL=validator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../src/domain/validation/validator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../src/domain/validation/validator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAkB,KAAK,EAAgB,MAAM,gBAAgB,CAAC;AAM1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA0lBnD,iHAAiH;AACjH,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,eAAe,EAAE,CAsB7D"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { isNoteEvent } from
|
|
2
|
-
import { pitchToMidi } from
|
|
3
|
-
import { voiceChannel } from
|
|
4
|
-
import { ISSUE_CODES } from
|
|
1
|
+
import { isNoteEvent } from "../../index.js";
|
|
2
|
+
import { pitchToMidi } from "../pitch/pitch.js";
|
|
3
|
+
import { voiceChannel } from "../score/ties.js";
|
|
4
|
+
import { ISSUE_CODES } from "./issues.js";
|
|
5
5
|
const MIN_MIDI = 0;
|
|
6
6
|
const MAX_MIDI = 127;
|
|
7
7
|
const MIN_VELOCITY = 0;
|
|
@@ -37,16 +37,16 @@ function checkTempoMap(score) {
|
|
|
37
37
|
let lastTick = -Infinity;
|
|
38
38
|
for (const event of score.tempoMap) {
|
|
39
39
|
if (event.tick < 0) {
|
|
40
|
-
issues.push(issue(
|
|
40
|
+
issues.push(issue("error", ISSUE_CODES.NEGATIVE_TICK, `Tempo event ${event.id} has a negative tick (${event.tick}).`, {
|
|
41
41
|
objectId: event.id,
|
|
42
42
|
}));
|
|
43
43
|
}
|
|
44
44
|
if (event.tick < lastTick) {
|
|
45
|
-
issues.push(issue(
|
|
45
|
+
issues.push(issue("error", ISSUE_CODES.TEMPO_MAP_UNSORTED, `Tempo map is not sorted by tick at event ${event.id} (tick ${event.tick} follows tick ${lastTick}).`, { objectId: event.id }));
|
|
46
46
|
}
|
|
47
47
|
lastTick = event.tick;
|
|
48
48
|
if (event.bpm < MIN_BPM || event.bpm > MAX_BPM) {
|
|
49
|
-
issues.push(issue(
|
|
49
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_TEMPO_BPM, `Tempo event ${event.id} has bpm ${event.bpm}, expected ${MIN_BPM}-${MAX_BPM}.`, { objectId: event.id }));
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
return issues;
|
|
@@ -74,7 +74,7 @@ function checkUniqueIds(score) {
|
|
|
74
74
|
const issues = [];
|
|
75
75
|
for (const [id, count] of counts) {
|
|
76
76
|
if (count > 1) {
|
|
77
|
-
issues.push(issue(
|
|
77
|
+
issues.push(issue("error", ISSUE_CODES.DUPLICATE_ID, `Id "${id}" is used ${count} times; ids must be unique.`, {
|
|
78
78
|
objectId: id,
|
|
79
79
|
}));
|
|
80
80
|
}
|
|
@@ -87,11 +87,11 @@ function checkTrack(track) {
|
|
|
87
87
|
const issues = [];
|
|
88
88
|
if (track.midiProgram < MIN_MIDI_PROGRAM ||
|
|
89
89
|
track.midiProgram > MAX_MIDI_PROGRAM) {
|
|
90
|
-
issues.push(issue(
|
|
90
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_MIDI_PROGRAM, `Track "${track.name}" has midiProgram ${track.midiProgram}, expected ${MIN_MIDI_PROGRAM}-${MAX_MIDI_PROGRAM}.`, { objectId: track.id, trackId: track.id }));
|
|
91
91
|
}
|
|
92
92
|
if (track.midiChannel < MIN_MIDI_CHANNEL ||
|
|
93
93
|
track.midiChannel > MAX_MIDI_CHANNEL) {
|
|
94
|
-
issues.push(issue(
|
|
94
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_MIDI_CHANNEL, `Track "${track.name}" has midiChannel ${track.midiChannel}, expected ${MIN_MIDI_CHANNEL}-${MAX_MIDI_CHANNEL}.`, { objectId: track.id, trackId: track.id }));
|
|
95
95
|
}
|
|
96
96
|
return issues;
|
|
97
97
|
}
|
|
@@ -108,10 +108,10 @@ function checkMeasureOrdering(track) {
|
|
|
108
108
|
let expectedStart = 0;
|
|
109
109
|
track.measures.forEach((measure, position) => {
|
|
110
110
|
if (measure.index !== position) {
|
|
111
|
-
issues.push(issue(
|
|
111
|
+
issues.push(issue("error", ISSUE_CODES.MEASURE_ORDERING, `Measure at position ${position} of track "${track.name}" has index ${measure.index}, expected ${position}.`, { objectId: measure.id, trackId: track.id, measureId: measure.id }));
|
|
112
112
|
}
|
|
113
113
|
if (measure.startTick !== expectedStart) {
|
|
114
|
-
issues.push(issue(
|
|
114
|
+
issues.push(issue("error", ISSUE_CODES.MEASURE_ORDERING, `Measure ${measure.index} of track "${track.name}" starts at tick ${measure.startTick}, expected ${expectedStart} (immediately after the previous measure).`, { objectId: measure.id, trackId: track.id, measureId: measure.id }));
|
|
115
115
|
}
|
|
116
116
|
expectedStart = measure.startTick + measure.durationTicks;
|
|
117
117
|
});
|
|
@@ -144,7 +144,7 @@ function checkTooManySimultaneousNotes(track) {
|
|
|
144
144
|
}
|
|
145
145
|
if (max > MAX_SIMULTANEOUS_NOTES) {
|
|
146
146
|
return [
|
|
147
|
-
issue(
|
|
147
|
+
issue("warning", ISSUE_CODES.TOO_MANY_SIMULTANEOUS_NOTES, `Track "${track.name}" has up to ${max} notes sounding simultaneously (readability threshold ${MAX_SIMULTANEOUS_NOTES}).`, { trackId: track.id }),
|
|
148
148
|
];
|
|
149
149
|
}
|
|
150
150
|
return [];
|
|
@@ -156,10 +156,10 @@ function checkMeasureSignatures(track, measure) {
|
|
|
156
156
|
const { timeSignature, keySignature } = measure;
|
|
157
157
|
if (timeSignature.numerator < 1 ||
|
|
158
158
|
!VALID_TIME_SIG_DENOMINATORS.has(timeSignature.denominator)) {
|
|
159
|
-
issues.push(issue(
|
|
159
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_TIME_SIGNATURE, `Measure ${measure.index} has invalid time signature ${timeSignature.numerator}/${timeSignature.denominator} (numerator must be >= 1; denominator must be one of 1, 2, 4, 8, 16, 32).`, { objectId: measure.id, trackId: track.id, measureId: measure.id }));
|
|
160
160
|
}
|
|
161
161
|
if (keySignature.fifths < MIN_FIFTHS || keySignature.fifths > MAX_FIFTHS) {
|
|
162
|
-
issues.push(issue(
|
|
162
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_KEY_SIGNATURE, `Measure ${measure.index} has key signature fifths=${keySignature.fifths}, expected ${MIN_FIFTHS}..${MAX_FIFTHS}.`, { objectId: measure.id, trackId: track.id, measureId: measure.id }));
|
|
163
163
|
}
|
|
164
164
|
return issues;
|
|
165
165
|
}
|
|
@@ -174,7 +174,7 @@ function checkOverlappingSamePitch(track, measure, voice) {
|
|
|
174
174
|
const overlaps = a.startTick < b.startTick + b.durationTicks &&
|
|
175
175
|
b.startTick < a.startTick + a.durationTicks;
|
|
176
176
|
if (overlaps && samePitch(a.pitch, b.pitch)) {
|
|
177
|
-
issues.push(issue(
|
|
177
|
+
issues.push(issue("error", ISSUE_CODES.OVERLAPPING_SAME_PITCH, `Notes ${a.id} and ${b.id} in voice "${voice.name}" (measure ${measure.index}) overlap in time at the same pitch.`, { objectId: b.id, trackId: track.id, measureId: measure.id }));
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
180
|
}
|
|
@@ -193,7 +193,7 @@ function checkOverlappingSamePitch(track, measure, voice) {
|
|
|
193
193
|
*/
|
|
194
194
|
function coveredTicks(events) {
|
|
195
195
|
const spans = events
|
|
196
|
-
.map(e => ({ start: e.startTick, end: e.startTick + e.durationTicks }))
|
|
196
|
+
.map((e) => ({ start: e.startTick, end: e.startTick + e.durationTicks }))
|
|
197
197
|
.sort((a, b) => a.start - b.start);
|
|
198
198
|
let total = 0;
|
|
199
199
|
let i = 0;
|
|
@@ -220,10 +220,10 @@ function checkVoice(track, measure, voice) {
|
|
|
220
220
|
const issues = [];
|
|
221
221
|
for (const event of voice.events) {
|
|
222
222
|
if (event.durationTicks <= 0) {
|
|
223
|
-
issues.push(issue(
|
|
223
|
+
issues.push(issue("error", ISSUE_CODES.NON_POSITIVE_DURATION, `Event ${event.id} has non-positive durationTicks (${event.durationTicks}).`, { objectId: event.id, trackId: track.id, measureId: measure.id }));
|
|
224
224
|
}
|
|
225
225
|
if (event.startTick < 0) {
|
|
226
|
-
issues.push(issue(
|
|
226
|
+
issues.push(issue("error", ISSUE_CODES.NEGATIVE_TICK, `Event ${event.id} has a negative startTick (${event.startTick}).`, {
|
|
227
227
|
objectId: event.id,
|
|
228
228
|
trackId: track.id,
|
|
229
229
|
measureId: measure.id,
|
|
@@ -232,30 +232,30 @@ function checkVoice(track, measure, voice) {
|
|
|
232
232
|
if (event.startTick < measure.startTick ||
|
|
233
233
|
event.startTick + event.durationTicks >
|
|
234
234
|
measure.startTick + measure.durationTicks) {
|
|
235
|
-
issues.push(issue(
|
|
235
|
+
issues.push(issue("error", ISSUE_CODES.EVENT_OUTSIDE_MEASURE, `Event ${event.id} [${event.startTick}, ${event.startTick + event.durationTicks}) falls outside measure ${measure.index}'s span [${measure.startTick}, ${measure.startTick + measure.durationTicks}).`, { objectId: event.id, trackId: track.id, measureId: measure.id }));
|
|
236
236
|
}
|
|
237
237
|
if (event.trackId !== track.id) {
|
|
238
|
-
issues.push(issue(
|
|
238
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_TRACK_REFERENCE, `Event ${event.id} references trackId "${event.trackId}" but lives on track "${track.id}".`, { objectId: event.id, trackId: track.id, measureId: measure.id }));
|
|
239
239
|
}
|
|
240
240
|
if (event.voiceId !== voice.id) {
|
|
241
|
-
issues.push(issue(
|
|
241
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_VOICE_REFERENCE, `Event ${event.id} references voiceId "${event.voiceId}" but lives in voice "${voice.id}".`, { objectId: event.id, trackId: track.id, measureId: measure.id }));
|
|
242
242
|
}
|
|
243
243
|
if (isNoteEvent(event)) {
|
|
244
244
|
if (event.velocity < MIN_VELOCITY || event.velocity > MAX_VELOCITY) {
|
|
245
|
-
issues.push(issue(
|
|
245
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_VELOCITY, `Note ${event.id} has velocity ${event.velocity}, expected ${MIN_VELOCITY}-${MAX_VELOCITY}.`, { objectId: event.id, trackId: track.id, measureId: measure.id }));
|
|
246
246
|
}
|
|
247
247
|
const midi = pitchToMidi(event.pitch);
|
|
248
248
|
if (midi < MIN_MIDI || midi > MAX_MIDI) {
|
|
249
|
-
issues.push(issue(
|
|
249
|
+
issues.push(issue("error", ISSUE_CODES.INVALID_PITCH_RANGE, `Note ${event.id} has pitch MIDI ${midi}, expected ${MIN_MIDI}-${MAX_MIDI}.`, { objectId: event.id, trackId: track.id, measureId: measure.id }));
|
|
250
250
|
}
|
|
251
251
|
}
|
|
252
252
|
}
|
|
253
253
|
const covered = coveredTicks(voice.events);
|
|
254
254
|
if (covered > measure.durationTicks) {
|
|
255
|
-
issues.push(issue(
|
|
255
|
+
issues.push(issue("error", ISSUE_CODES.MEASURE_OVERFULL, `Voice "${voice.name}" in measure ${measure.index} covers ${covered} ticks, exceeding the measure's ${measure.durationTicks}.`, { objectId: voice.id, trackId: track.id, measureId: measure.id }));
|
|
256
256
|
}
|
|
257
257
|
else if (covered < measure.durationTicks) {
|
|
258
|
-
issues.push(issue(
|
|
258
|
+
issues.push(issue("warning", ISSUE_CODES.MEASURE_UNDERFULL, `Voice "${voice.name}" in measure ${measure.index} covers ${covered} ticks, short of the measure's ${measure.durationTicks}.`, { objectId: voice.id, trackId: track.id, measureId: measure.id }));
|
|
259
259
|
}
|
|
260
260
|
issues.push(...checkOverlappingSamePitch(track, measure, voice));
|
|
261
261
|
return issues;
|
|
@@ -276,7 +276,7 @@ function findIndexedPartner(index, tick, excludeId, pitch, requireFlag) {
|
|
|
276
276
|
const candidates = index.get(tick);
|
|
277
277
|
if (!candidates)
|
|
278
278
|
return undefined;
|
|
279
|
-
return candidates.find(c => c.event.id !== excludeId &&
|
|
279
|
+
return candidates.find((c) => c.event.id !== excludeId &&
|
|
280
280
|
requireFlag(c) &&
|
|
281
281
|
samePitch(c.event.pitch, pitch));
|
|
282
282
|
}
|
|
@@ -336,15 +336,15 @@ function checkTieTargets(score) {
|
|
|
336
336
|
const measureId = track.measures[measureIndex]?.id;
|
|
337
337
|
if (event.tieStart) {
|
|
338
338
|
const targetTick = event.startTick + event.durationTicks;
|
|
339
|
-
const partner = findIndexedPartner(byStartTick, targetTick, event.id, event.pitch, c => Boolean(c.event.tieStop));
|
|
339
|
+
const partner = findIndexedPartner(byStartTick, targetTick, event.id, event.pitch, (c) => Boolean(c.event.tieStop));
|
|
340
340
|
if (!partner) {
|
|
341
|
-
issues.push(issue(
|
|
341
|
+
issues.push(issue("warning", ISSUE_CODES.MISSING_TIE_TARGET, `Note ${event.id} has tieStart but no matching tieStop note at the next position with the same pitch.`, { objectId: event.id, trackId: track.id, measureId }));
|
|
342
342
|
}
|
|
343
343
|
}
|
|
344
344
|
if (event.tieStop) {
|
|
345
|
-
const partner = findIndexedPartner(byEndTick, event.startTick, event.id, event.pitch, c => Boolean(c.event.tieStart));
|
|
345
|
+
const partner = findIndexedPartner(byEndTick, event.startTick, event.id, event.pitch, (c) => Boolean(c.event.tieStart));
|
|
346
346
|
if (!partner) {
|
|
347
|
-
issues.push(issue(
|
|
347
|
+
issues.push(issue("warning", ISSUE_CODES.MISSING_TIE_TARGET, `Note ${event.id} has tieStop but no matching tieStart note ending at its start tick with the same pitch.`, { objectId: event.id, trackId: track.id, measureId }));
|
|
348
348
|
}
|
|
349
349
|
}
|
|
350
350
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/domain/validation/validator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/domain/validation/validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type { NoteEvent } from
|
|
1
|
+
import type { NoteEvent } from "../../index.js";
|
|
2
2
|
export type AllocateVoicesOptions = {
|
|
3
3
|
maxVoices: number;
|
|
4
4
|
splitPoint?: number;
|
|
5
5
|
};
|
|
6
6
|
export type VoiceGroup = {
|
|
7
7
|
voiceIndex: number;
|
|
8
|
-
staff:
|
|
8
|
+
staff: "upper" | "lower";
|
|
9
9
|
notes: NoteEvent[];
|
|
10
10
|
};
|
|
11
11
|
/**
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* must be readable; a caller may reassign manually afterward. Pure
|
|
8
8
|
* function: never mutates `notes`.
|
|
9
9
|
*/
|
|
10
|
-
import { pitchToMidi } from
|
|
10
|
+
import { pitchToMidi } from "../pitch/pitch.js";
|
|
11
11
|
const DEFAULT_SPLIT_POINT = 60; // middle C
|
|
12
12
|
/**
|
|
13
13
|
* Groups `notes` into chronological clusters of notes sharing the exact
|
|
@@ -31,7 +31,7 @@ function groupChordClusters(notes) {
|
|
|
31
31
|
}
|
|
32
32
|
cluster.push(note);
|
|
33
33
|
}
|
|
34
|
-
return order.map(key => byKey.get(key));
|
|
34
|
+
return order.map((key) => byKey.get(key));
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* The index of the best voice slot for a cluster starting at `startTick`:
|
|
@@ -88,12 +88,12 @@ export function allocateVoices(notes, opts) {
|
|
|
88
88
|
}
|
|
89
89
|
const result = [];
|
|
90
90
|
voices.forEach((voice, voiceIndex) => {
|
|
91
|
-
const upper = voice.notes.filter(n => pitchToMidi(n.pitch) >= splitPoint);
|
|
92
|
-
const lower = voice.notes.filter(n => pitchToMidi(n.pitch) < splitPoint);
|
|
91
|
+
const upper = voice.notes.filter((n) => pitchToMidi(n.pitch) >= splitPoint);
|
|
92
|
+
const lower = voice.notes.filter((n) => pitchToMidi(n.pitch) < splitPoint);
|
|
93
93
|
if (upper.length > 0)
|
|
94
|
-
result.push({ voiceIndex, staff:
|
|
94
|
+
result.push({ voiceIndex, staff: "upper", notes: upper });
|
|
95
95
|
if (lower.length > 0)
|
|
96
|
-
result.push({ voiceIndex, staff:
|
|
96
|
+
result.push({ voiceIndex, staff: "lower", notes: lower });
|
|
97
97
|
});
|
|
98
98
|
return result;
|
|
99
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allocate.js","sourceRoot":"","sources":["../../../src/domain/voicing/allocate.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,mBAAmB,GAAG,EAAE,CAAC,CAAC,WAAW;AAU3C;;;;;;;GAOG;AACH,SAAS,kBAAkB,CAAC,KAAkB;IAC5C,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;IACpE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE7C,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACtD,IAAI,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,EAAE,CAAC;YACb,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"allocate.js","sourceRoot":"","sources":["../../../src/domain/voicing/allocate.ts"],"names":[],"mappings":"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"}
|