@leafo/lml 0.1.1 → 0.2.0
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/README.md +257 -38
- package/dist/grammar.d.ts.map +1 -1
- package/dist/grammar.js +1228 -268
- package/dist/grammar.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/music.d.ts +1 -0
- package/dist/music.d.ts.map +1 -1
- package/dist/music.js +7 -3
- package/dist/music.js.map +1 -1
- package/dist/noteUtils.d.ts +24 -0
- package/dist/noteUtils.d.ts.map +1 -0
- package/dist/noteUtils.js +80 -0
- package/dist/noteUtils.js.map +1 -0
- package/dist/parser.d.ts +4 -2
- package/dist/parser.d.ts.map +1 -1
- package/dist/parser.js +145 -23
- package/dist/parser.js.map +1 -1
- package/dist/song.d.ts +10 -1
- package/dist/song.d.ts.map +1 -1
- package/dist/song.js +39 -3
- package/dist/song.js.map +1 -1
- package/package.json +5 -3
package/dist/parser.js
CHANGED
|
@@ -1,8 +1,49 @@
|
|
|
1
1
|
// @ts-ignore - generated file
|
|
2
2
|
import * as peg from "./grammar.js";
|
|
3
|
-
import { KeySignature } from "./music.js";
|
|
3
|
+
import { parseNote, KeySignature, OFFSETS, OCTAVE_SIZE } from "./music.js";
|
|
4
4
|
import { MultiTrackSong, SongNote } from "./song.js";
|
|
5
5
|
import { AutoChords } from "./auto-chords.js";
|
|
6
|
+
// 48 ticks per beat - divisible by 1,2,3,4,6,8,12,16,24,48
|
|
7
|
+
// Allows exact representation of triplets, sixtuplets, etc.
|
|
8
|
+
const TICKS_PER_BEAT = 48;
|
|
9
|
+
/**
|
|
10
|
+
* Given a note name without octave (e.g., "C", "F#") and a reference pitch,
|
|
11
|
+
* find the octave that places the note closest to the reference.
|
|
12
|
+
*/
|
|
13
|
+
function findClosestOctave(noteLetter, referencePitch) {
|
|
14
|
+
const match = noteLetter.match(/^([A-G])(#|b)?$/);
|
|
15
|
+
if (!match) {
|
|
16
|
+
throw new Error(`Invalid note letter: ${noteLetter}`);
|
|
17
|
+
}
|
|
18
|
+
const [, letter, accidental] = match;
|
|
19
|
+
let noteOffset = OFFSETS[letter];
|
|
20
|
+
if (accidental === "#")
|
|
21
|
+
noteOffset += 1;
|
|
22
|
+
if (accidental === "b")
|
|
23
|
+
noteOffset -= 1;
|
|
24
|
+
// Normalize to 0-11 range (handles Cb = 11, B# = 0)
|
|
25
|
+
noteOffset = ((noteOffset % OCTAVE_SIZE) + OCTAVE_SIZE) % OCTAVE_SIZE;
|
|
26
|
+
// Find the reference note's octave
|
|
27
|
+
const refOctave = Math.floor(referencePitch / OCTAVE_SIZE);
|
|
28
|
+
// Calculate pitches for octaves around the reference
|
|
29
|
+
let bestPitch = refOctave * OCTAVE_SIZE + noteOffset;
|
|
30
|
+
let bestDistance = Math.abs(bestPitch - referencePitch);
|
|
31
|
+
// Check octave below
|
|
32
|
+
const pitchBelow = (refOctave - 1) * OCTAVE_SIZE + noteOffset;
|
|
33
|
+
const distBelow = Math.abs(pitchBelow - referencePitch);
|
|
34
|
+
if (distBelow < bestDistance) {
|
|
35
|
+
bestPitch = pitchBelow;
|
|
36
|
+
bestDistance = distBelow;
|
|
37
|
+
}
|
|
38
|
+
// Check octave above
|
|
39
|
+
const pitchAbove = (refOctave + 1) * OCTAVE_SIZE + noteOffset;
|
|
40
|
+
const distAbove = Math.abs(pitchAbove - referencePitch);
|
|
41
|
+
if (distAbove < bestDistance) {
|
|
42
|
+
bestPitch = pitchAbove;
|
|
43
|
+
}
|
|
44
|
+
const finalOctave = Math.floor(bestPitch / OCTAVE_SIZE) - 1;
|
|
45
|
+
return `${noteLetter}${finalOctave}`;
|
|
46
|
+
}
|
|
6
47
|
// tokens are separated by whitespace
|
|
7
48
|
// a note is a5.1.2
|
|
8
49
|
// - 5 is the octave
|
|
@@ -24,21 +65,41 @@ class SongParser {
|
|
|
24
65
|
}
|
|
25
66
|
// compile ast to song notes
|
|
26
67
|
compile(ast, opts) {
|
|
68
|
+
// Extract frontmatter from AST
|
|
69
|
+
const frontmatter = {};
|
|
70
|
+
for (const node of ast) {
|
|
71
|
+
if (node[0] === "frontmatter") {
|
|
72
|
+
frontmatter[node[1]] = node[2];
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
const defaultOctave = opts?.defaultOctave ?? 4;
|
|
27
76
|
const state = {
|
|
28
77
|
startPosition: 0,
|
|
29
78
|
position: 0,
|
|
30
|
-
|
|
31
|
-
|
|
79
|
+
ticksPerNote: TICKS_PER_BEAT, // 1 beat = 48 ticks
|
|
80
|
+
ticksPerMeasure: TICKS_PER_BEAT * 4, // 4 beats per measure default
|
|
32
81
|
timeScale: 1,
|
|
33
82
|
keySignature: new KeySignature(0),
|
|
34
83
|
currentTrack: 0,
|
|
84
|
+
lastMeasure: -1,
|
|
85
|
+
nextMeasureStart: 0,
|
|
86
|
+
explicitMeasureUsed: false,
|
|
87
|
+
lastNotePitch: null,
|
|
88
|
+
defaultPitch: (defaultOctave + 1) * OCTAVE_SIZE, // C at the default octave (MIDI: C4 = 60)
|
|
35
89
|
};
|
|
36
90
|
const song = new MultiTrackSong();
|
|
37
91
|
this.compileCommands(ast, state, song);
|
|
38
92
|
song.metadata = {
|
|
39
93
|
keySignature: state.keySignature.count,
|
|
40
|
-
beatsPerMeasure: state.
|
|
94
|
+
beatsPerMeasure: state.ticksPerMeasure / TICKS_PER_BEAT,
|
|
95
|
+
...(Object.keys(frontmatter).length > 0 && { frontmatter }),
|
|
41
96
|
};
|
|
97
|
+
// Ensure default 4/4 time signature at position 0 for getMeasures()
|
|
98
|
+
if (!song.timeSignatures || song.timeSignatures.length === 0 || song.timeSignatures[0][0] > 0) {
|
|
99
|
+
if (!song.timeSignatures)
|
|
100
|
+
song.timeSignatures = [];
|
|
101
|
+
song.timeSignatures.unshift([0, 4]);
|
|
102
|
+
}
|
|
42
103
|
if (song.autoChords) {
|
|
43
104
|
const settings = opts ? opts.autoChordsSettings : {};
|
|
44
105
|
if (opts && opts.autoChords) {
|
|
@@ -67,23 +128,47 @@ class SongParser {
|
|
|
67
128
|
Object.setPrototypeOf(blockState, state);
|
|
68
129
|
this.compileCommands(blockCommands, blockState, song);
|
|
69
130
|
state.position = blockState.position;
|
|
131
|
+
state.lastNotePitch = blockState.lastNotePitch;
|
|
132
|
+
// If time signature changed inside block, recalculate next measure boundary
|
|
133
|
+
if (blockState.ticksPerMeasure !== state.ticksPerMeasure) {
|
|
134
|
+
const measureStart = state.nextMeasureStart - state.ticksPerMeasure;
|
|
135
|
+
state.nextMeasureStart = measureStart + blockState.ticksPerMeasure;
|
|
136
|
+
state.ticksPerMeasure = blockState.ticksPerMeasure;
|
|
137
|
+
}
|
|
70
138
|
break;
|
|
71
139
|
}
|
|
72
140
|
case "halfTime": {
|
|
73
|
-
|
|
141
|
+
const [, count = 1] = command;
|
|
142
|
+
state.timeScale *= Math.pow(2, count);
|
|
74
143
|
break;
|
|
75
144
|
}
|
|
76
145
|
case "doubleTime": {
|
|
77
|
-
|
|
146
|
+
const [, count = 1] = command;
|
|
147
|
+
state.timeScale *= Math.pow(0.5, count);
|
|
78
148
|
break;
|
|
79
149
|
}
|
|
80
150
|
case "tripleTime": {
|
|
81
|
-
|
|
151
|
+
const [, count = 1] = command;
|
|
152
|
+
state.timeScale *= Math.pow(1 / 3, count);
|
|
82
153
|
break;
|
|
83
154
|
}
|
|
84
155
|
case "measure": {
|
|
85
156
|
const [, measure] = command;
|
|
86
|
-
|
|
157
|
+
if (measure !== undefined) {
|
|
158
|
+
// Explicit measure number - calculate position (for jumps)
|
|
159
|
+
const measureNum = measure;
|
|
160
|
+
state.lastMeasure = measureNum;
|
|
161
|
+
state.position = measureNum * state.ticksPerMeasure;
|
|
162
|
+
state.nextMeasureStart = (measureNum + 1) * state.ticksPerMeasure;
|
|
163
|
+
state.explicitMeasureUsed = true;
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
// Auto-increment - always jump to next measure boundary
|
|
167
|
+
state.lastMeasure += 1;
|
|
168
|
+
state.position = state.nextMeasureStart;
|
|
169
|
+
state.nextMeasureStart = state.position + state.ticksPerMeasure;
|
|
170
|
+
state.explicitMeasureUsed = false;
|
|
171
|
+
}
|
|
87
172
|
break;
|
|
88
173
|
}
|
|
89
174
|
case "setTrack": {
|
|
@@ -97,20 +182,19 @@ class SongParser {
|
|
|
97
182
|
if (!track.clefs) {
|
|
98
183
|
track.clefs = [];
|
|
99
184
|
}
|
|
100
|
-
|
|
185
|
+
// Convert ticks to beats for storage
|
|
186
|
+
track.clefs.push([state.position / TICKS_PER_BEAT, clef]);
|
|
101
187
|
break;
|
|
102
188
|
}
|
|
103
189
|
case "note": {
|
|
104
190
|
const [, name, noteOpts] = command;
|
|
105
191
|
let noteName = name;
|
|
106
|
-
let
|
|
107
|
-
let start = null;
|
|
192
|
+
let durationTicks = state.ticksPerNote * state.timeScale;
|
|
108
193
|
let hasAccidental = false;
|
|
109
194
|
if (noteOpts) {
|
|
110
195
|
if (noteOpts.duration) {
|
|
111
|
-
|
|
196
|
+
durationTicks *= noteOpts.duration;
|
|
112
197
|
}
|
|
113
|
-
start = noteOpts.start ?? null;
|
|
114
198
|
if (noteOpts.sharp) {
|
|
115
199
|
hasAccidental = true;
|
|
116
200
|
noteName = noteName.substring(0, 1) + "#" + noteName.substring(1);
|
|
@@ -123,29 +207,46 @@ class SongParser {
|
|
|
123
207
|
hasAccidental = true;
|
|
124
208
|
}
|
|
125
209
|
}
|
|
210
|
+
// Handle relative octave (note without octave number)
|
|
211
|
+
const hasOctave = /\d$/.test(noteName);
|
|
212
|
+
if (!hasOctave) {
|
|
213
|
+
const referencePitch = state.lastNotePitch ?? state.defaultPitch;
|
|
214
|
+
noteName = findClosestOctave(noteName, referencePitch);
|
|
215
|
+
}
|
|
126
216
|
if (!hasAccidental) {
|
|
127
217
|
// apply default accidental
|
|
128
218
|
noteName = state.keySignature.unconvertNote(noteName);
|
|
129
219
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
220
|
+
// Round duration to ensure integer ticks
|
|
221
|
+
durationTicks = Math.round(durationTicks);
|
|
222
|
+
// Determine start position
|
|
223
|
+
let startTicks;
|
|
224
|
+
if (noteOpts?.start != null) {
|
|
225
|
+
// Explicit @ position is in beats, convert to ticks
|
|
226
|
+
startTicks = noteOpts.start * TICKS_PER_BEAT;
|
|
227
|
+
}
|
|
228
|
+
else {
|
|
229
|
+
startTicks = state.position;
|
|
230
|
+
state.position += durationTicks;
|
|
133
231
|
}
|
|
134
|
-
|
|
232
|
+
// Update lastNotePitch for relative octave tracking
|
|
233
|
+
state.lastNotePitch = parseNote(noteName);
|
|
234
|
+
// Convert ticks to beats for SongNote
|
|
235
|
+
song.pushWithTrack(new SongNote(noteName, startTicks / TICKS_PER_BEAT, durationTicks / TICKS_PER_BEAT, noteOpts?.location), state.currentTrack);
|
|
135
236
|
break;
|
|
136
237
|
}
|
|
137
238
|
case "rest": {
|
|
138
239
|
const [, restTiming] = command;
|
|
139
|
-
let
|
|
240
|
+
let durationTicks = state.ticksPerNote * state.timeScale;
|
|
140
241
|
if (restTiming) {
|
|
141
242
|
if (restTiming.start) {
|
|
142
243
|
break; // do nothing
|
|
143
244
|
}
|
|
144
245
|
if (restTiming.duration) {
|
|
145
|
-
|
|
246
|
+
durationTicks *= restTiming.duration;
|
|
146
247
|
}
|
|
147
248
|
}
|
|
148
|
-
state.position +=
|
|
249
|
+
state.position += Math.round(durationTicks);
|
|
149
250
|
break;
|
|
150
251
|
}
|
|
151
252
|
case "keySignature": {
|
|
@@ -154,8 +255,15 @@ class SongParser {
|
|
|
154
255
|
}
|
|
155
256
|
case "timeSignature": {
|
|
156
257
|
const [, perBeat, noteValue] = command;
|
|
157
|
-
|
|
158
|
-
|
|
258
|
+
// Convert beat duration to ticks: 4/4 means quarter note = 1 beat = 48 ticks
|
|
259
|
+
// In 6/8, eighth note = 1 beat = 48 ticks, so ticksPerNote = 48 * (4/8) = 24
|
|
260
|
+
state.ticksPerNote = TICKS_PER_BEAT * (4 / noteValue);
|
|
261
|
+
state.ticksPerMeasure = state.ticksPerNote * perBeat;
|
|
262
|
+
// Track time signature changes for getMeasures()
|
|
263
|
+
if (!song.timeSignatures) {
|
|
264
|
+
song.timeSignatures = [];
|
|
265
|
+
}
|
|
266
|
+
song.timeSignatures.push([state.position / TICKS_PER_BEAT, perBeat]);
|
|
159
267
|
break;
|
|
160
268
|
}
|
|
161
269
|
case "macro": {
|
|
@@ -165,10 +273,24 @@ class SongParser {
|
|
|
165
273
|
if (!song.autoChords) {
|
|
166
274
|
song.autoChords = [];
|
|
167
275
|
}
|
|
168
|
-
|
|
276
|
+
// Convert ticks to beats for storage
|
|
277
|
+
song.autoChords.push([state.position / TICKS_PER_BEAT, chord]);
|
|
169
278
|
}
|
|
170
279
|
break;
|
|
171
280
|
}
|
|
281
|
+
case "string": {
|
|
282
|
+
const [, text] = command;
|
|
283
|
+
if (!song.strings) {
|
|
284
|
+
song.strings = [];
|
|
285
|
+
}
|
|
286
|
+
// Convert ticks to beats for storage
|
|
287
|
+
song.strings.push([state.position / TICKS_PER_BEAT, text]);
|
|
288
|
+
break;
|
|
289
|
+
}
|
|
290
|
+
case "frontmatter": {
|
|
291
|
+
// Handled separately before compileCommands
|
|
292
|
+
break;
|
|
293
|
+
}
|
|
172
294
|
default: {
|
|
173
295
|
console.warn("Got unknown command when parsing song", command);
|
|
174
296
|
}
|
package/dist/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"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"}
|
package/dist/song.d.ts
CHANGED
|
@@ -3,7 +3,8 @@ export declare class SongNote {
|
|
|
3
3
|
note: string;
|
|
4
4
|
start: number;
|
|
5
5
|
duration: number;
|
|
6
|
-
|
|
6
|
+
sourceLocation?: [number, number];
|
|
7
|
+
constructor(note: string, start: number, duration: number, sourceLocation?: [number, number]);
|
|
7
8
|
clone(): SongNote;
|
|
8
9
|
inRange(min: number, max: number): boolean;
|
|
9
10
|
transpose(semitones: number): SongNote;
|
|
@@ -15,12 +16,15 @@ export declare class SongNote {
|
|
|
15
16
|
export interface SongMetadata {
|
|
16
17
|
keySignature?: number;
|
|
17
18
|
beatsPerMeasure?: number;
|
|
19
|
+
frontmatter?: Record<string, string>;
|
|
18
20
|
}
|
|
19
21
|
export declare class SongNoteList extends Array<SongNote> {
|
|
20
22
|
static bucketSize: number;
|
|
21
23
|
metadata?: SongMetadata;
|
|
22
24
|
autoChords?: [number, [string, string]][];
|
|
23
25
|
clefs?: [number, string][];
|
|
26
|
+
strings?: [number, string][];
|
|
27
|
+
timeSignatures?: [number, number][];
|
|
24
28
|
trackName?: string;
|
|
25
29
|
private buckets?;
|
|
26
30
|
constructor();
|
|
@@ -29,8 +33,13 @@ export declare class SongNoteList extends Array<SongNote> {
|
|
|
29
33
|
clearCache(): void;
|
|
30
34
|
transpose(amount?: number): SongNoteList;
|
|
31
35
|
notesInRange(start: number, stop: number): SongNote[];
|
|
36
|
+
findNotesForSelection(start: number, end: number): Set<number>;
|
|
32
37
|
getStopInBeats(): number;
|
|
33
38
|
getStartInBeats(): number;
|
|
39
|
+
getMeasures(): {
|
|
40
|
+
start: number;
|
|
41
|
+
beats: number;
|
|
42
|
+
}[];
|
|
34
43
|
noteRange(): [string, string] | undefined;
|
|
35
44
|
fittingStaff(): "treble" | "bass" | "grand";
|
|
36
45
|
private getBucketRange;
|
package/dist/song.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"song.d.ts","sourceRoot":"","sources":["../src/song.ts"],"names":[],"mappings":"AAKA,qBAAa,QAAQ;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"song.d.ts","sourceRoot":"","sources":["../src/song.ts"],"names":[],"mappings":"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"}
|
package/dist/song.js
CHANGED
|
@@ -3,14 +3,16 @@ import { parseNote, noteName, MIDDLE_C_PITCH } from "./music.js";
|
|
|
3
3
|
// start: when note begins in beats
|
|
4
4
|
// duration: how long note is in beats
|
|
5
5
|
export class SongNote {
|
|
6
|
-
constructor(note, start, duration) {
|
|
6
|
+
constructor(note, start, duration, sourceLocation) {
|
|
7
7
|
this.id = Symbol();
|
|
8
8
|
this.note = note;
|
|
9
9
|
this.start = start;
|
|
10
10
|
this.duration = duration;
|
|
11
|
+
this.sourceLocation = sourceLocation;
|
|
11
12
|
}
|
|
12
13
|
clone() {
|
|
13
|
-
|
|
14
|
+
const cloned = new SongNote(this.note, this.start, this.duration, this.sourceLocation);
|
|
15
|
+
return cloned;
|
|
14
16
|
}
|
|
15
17
|
inRange(min, max) {
|
|
16
18
|
const stop = this.start + this.duration;
|
|
@@ -23,7 +25,7 @@ export class SongNote {
|
|
|
23
25
|
return true;
|
|
24
26
|
}
|
|
25
27
|
transpose(semitones) {
|
|
26
|
-
return new SongNote(noteName(parseNote(this.note) + semitones), this.start, this.duration);
|
|
28
|
+
return new SongNote(noteName(parseNote(this.note) + semitones), this.start, this.duration, this.sourceLocation);
|
|
27
29
|
}
|
|
28
30
|
getStart() {
|
|
29
31
|
return this.start;
|
|
@@ -72,6 +74,19 @@ export class SongNoteList extends Array {
|
|
|
72
74
|
notesInRange(start, stop) {
|
|
73
75
|
return [...this.filter((n) => n.inRange(start, stop))];
|
|
74
76
|
}
|
|
77
|
+
// find note indices that overlap with the given source position range
|
|
78
|
+
findNotesForSelection(start, end) {
|
|
79
|
+
const result = new Set();
|
|
80
|
+
this.forEach((note, index) => {
|
|
81
|
+
if (!note.sourceLocation)
|
|
82
|
+
return;
|
|
83
|
+
const [noteStart, noteEnd] = note.sourceLocation;
|
|
84
|
+
if (start <= noteEnd && end >= noteStart) {
|
|
85
|
+
result.add(index);
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
return result;
|
|
89
|
+
}
|
|
75
90
|
getStopInBeats() {
|
|
76
91
|
if (this.length == 0) {
|
|
77
92
|
return 0;
|
|
@@ -84,6 +99,27 @@ export class SongNoteList extends Array {
|
|
|
84
99
|
}
|
|
85
100
|
return Math.min.apply(null, this.map((n) => n.getStart()));
|
|
86
101
|
}
|
|
102
|
+
getMeasures() {
|
|
103
|
+
const measures = [];
|
|
104
|
+
const songEnd = this.getStopInBeats();
|
|
105
|
+
if (songEnd === 0)
|
|
106
|
+
return measures;
|
|
107
|
+
// Default to 4 beats per measure if no time signatures
|
|
108
|
+
const timeSigs = this.timeSignatures ?? [[0, 4]];
|
|
109
|
+
let position = 0;
|
|
110
|
+
let sigIndex = 0;
|
|
111
|
+
let currentBeats = timeSigs[0]?.[1] ?? 4;
|
|
112
|
+
while (position < songEnd) {
|
|
113
|
+
// Check if time signature changes at or before current position
|
|
114
|
+
while (sigIndex < timeSigs.length && timeSigs[sigIndex][0] <= position) {
|
|
115
|
+
currentBeats = timeSigs[sigIndex][1];
|
|
116
|
+
sigIndex++;
|
|
117
|
+
}
|
|
118
|
+
measures.push({ start: position, beats: currentBeats });
|
|
119
|
+
position += currentBeats;
|
|
120
|
+
}
|
|
121
|
+
return measures;
|
|
122
|
+
}
|
|
87
123
|
noteRange() {
|
|
88
124
|
if (!this.length) {
|
|
89
125
|
return undefined;
|
package/dist/song.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"song.js","sourceRoot":"","sources":["../src/song.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhE,wBAAwB;AACxB,mCAAmC;AACnC,sCAAsC;AACtC,MAAM,OAAO,QAAQ;
|
|
1
|
+
{"version":3,"file":"song.js","sourceRoot":"","sources":["../src/song.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@leafo/lml",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "LML (Leaf's Music Language) parser and music theory library",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -16,11 +16,13 @@
|
|
|
16
16
|
"dist"
|
|
17
17
|
],
|
|
18
18
|
"scripts": {
|
|
19
|
-
"build:grammar": "peggy --format es -o src/grammar.js src/grammar.pegjs",
|
|
19
|
+
"build:grammar": "peggy --format es --allowed-start-rules start,note -o src/grammar.js src/grammar.pegjs",
|
|
20
20
|
"build:ts": "tsc",
|
|
21
21
|
"build": "npm run build:grammar && npm run build:ts",
|
|
22
22
|
"clean": "rm -rf dist src/grammar.js",
|
|
23
|
-
"test": "node --import tsx --test 'test/**/*.test.ts'"
|
|
23
|
+
"test": "node --import tsx --test 'test/**/*.test.ts'",
|
|
24
|
+
"regenerate-expected": "node --import tsx scripts/regenerate-expected.ts",
|
|
25
|
+
"editor": "npm run dev --prefix editor"
|
|
24
26
|
},
|
|
25
27
|
"devDependencies": {
|
|
26
28
|
"peggy": "^5.0.6",
|