@scorelabs/core 1.0.10 → 1.0.11

package/dist/constants.d.ts

@@ -0,0 +1,4 @@
+export declare const DEFAULT_WEBSITE_URL: string;
+export declare const DEFAULT_VIEWER_URL: string;
+export declare const DEFAULT_API_URL: string;
+export declare const DEFAULT_DATABASE_URL: string;

package/dist/constants.js

@@ -0,0 +1,10 @@
+const getEnv = (key, defaultValue) => {
+    if (typeof process !== 'undefined' && process.env && process.env[key]) {
+        return process.env[key];
+    }
+    return defaultValue;
+};
+export const DEFAULT_WEBSITE_URL = getEnv('WEBSITE_URL', 'http://localhost:5173');
+export const DEFAULT_VIEWER_URL = getEnv('VIEWER_URL', 'http://localhost:5174');
+export const DEFAULT_API_URL = getEnv('API_URL', 'http://localhost:3000');
+export const DEFAULT_DATABASE_URL = getEnv('TURSO_DATABASE_URL', 'file:local.db');

package/dist/importers/MusicXMLParser.d.ts

@@ -1,4 +1,4 @@
-import { ScoreJSON } from '../models/Score';
+import { ScoreJSON } from '../models/Score.js';
 /**
  * MusicXML Parser
  *
@@ -25,6 +25,7 @@ export declare class MusicXMLParser {
     private parseTitle;
     private parseCopyright;
     private parseComposer;
+    private parseLyricist;
     private parsePartList;
     private parseParts;
     private parsePart;

package/dist/importers/MusicXMLParser.js

@@ -1,6 +1,7 @@
 import JSZip from 'jszip';
-import { getInstrumentByProgram, guessInstrumentByName } from '../models/Instrument';
-import { Accidental, Arpeggio, Articulation, BarlineStyle, Bowing, Clef, DURATION_VALUES, Duration, GlissandoType, HairpinType, NoteheadShape, Ornament, OttavaType, StemDirection, decomposeDuration, } from '../models/types';
+import { getInstrumentByProgram, guessInstrumentByName } from '../models/Instrument.js';
+import { Accidental, Arpeggio, Articulation, BarlineStyle, Bowing, Clef, Duration, GlissandoType, HairpinType, NoteheadShape, Ornament, OttavaType, StemDirection, calculateDurationValue, decomposeDuration, } from '../models/types.js';
+// TODO: Write tests for MusicXMLParser. It is important to test it thoroughly.
 /**
  * MusicXML Parser
  *
@@ -81,7 +82,7 @@ export class MusicXMLParser {
             if (!_parser)
                 throw new Error('No DOMParser available');
             const containerDoc = _parser.parseFromString(containerXml, 'application/xml');
-            const rootfile = (new MusicXMLParser(_parser)).querySelector(containerDoc, 'rootfile');
+            const rootfile = new MusicXMLParser(_parser).querySelector(containerDoc, 'rootfile');
             const fullPath = rootfile?.getAttribute('full-path');
             if (!fullPath)
                 throw new Error('Invalid MXL: Could not find main score file path');
@@ -120,6 +121,7 @@ export class MusicXMLParser {
         const title = this.parseTitle(doc);
         const subtitle = this.parseSubtitle(doc);
         const composer = this.parseComposer(doc);
+        const lyricist = this.parseLyricist(doc);
         const copyright = this.parseCopyright(doc);
         const partInfo = this.parsePartList(doc);
         const parts = this.parseParts(doc, partInfo);
@@ -127,6 +129,7 @@ export class MusicXMLParser {
         let globalTempoDuration = Duration.Quarter;
         let globalTempoIsDotted = false;
         let globalTempoText = '';
+        let globalTempoDotCount = 0;
         if (parts.length > 0 && parts[0].staves.length > 0 && parts[0].staves[0].measures.length > 0) {
             const firstMeasure = parts[0].staves[0].measures[0];
             if (firstMeasure.tempo) {
@@ -134,6 +137,7 @@ export class MusicXMLParser {
                 globalTempoDuration = firstMeasure.tempo.duration;
                 globalTempoIsDotted = firstMeasure.tempo.isDotted;
                 globalTempoText = firstMeasure.tempo.text || '';
+                globalTempoDotCount = firstMeasure.tempo.dotCount || 0;
             }
         }
         const score = {
@@ -151,7 +155,9 @@ export class MusicXMLParser {
             tempoDuration: globalTempoDuration,
             tempoIsDotted: globalTempoIsDotted,
             tempoText: globalTempoText,
+            tempoDotCount: globalTempoDotCount,
             copyright,
+            lyricist,
         };
         return this.postProcess(score);
     }
@@ -210,7 +216,38 @@ export class MusicXMLParser {
             if (creator.getAttribute('type') === 'composer')
                 return creator.textContent ?? 'Unknown';
         }
-        return this.querySelector(doc, 'identification creator')?.textContent ?? 'Unknown';
+        // If no type="composer", but there is only one creator, assume it's the composer
+        if (creators.length === 1)
+            return (creators[0].textContent ?? 'Unknown');
+        // Check credits for composer type
+        const credits = this.querySelectorAll(doc, 'credit');
+        for (const credit of Array.from(credits)) {
+            const type = this.querySelector(credit, 'credit-type');
+            if (type?.textContent?.toLowerCase() === 'composer') {
+                const words = this.querySelector(credit, 'credit-words');
+                if (words?.textContent)
+                    return words.textContent;
+            }
+        }
+        return creators.length > 0 ? creators[0].textContent ?? 'Unknown' : 'Unknown';
+    }
+    parseLyricist(doc) {
+        const creators = this.querySelectorAll(doc, 'identification creator');
+        for (const creator of Array.from(creators)) {
+            if (creator.getAttribute('type') === 'lyricist')
+                return creator.textContent ?? '';
+        }
+        // Check credits for lyricist type
+        const credits = this.querySelectorAll(doc, 'credit');
+        for (const credit of Array.from(credits)) {
+            const type = this.querySelector(credit, 'credit-type');
+            if (type?.textContent?.toLowerCase() === 'lyricist') {
+                const words = this.querySelector(credit, 'credit-words');
+                if (words?.textContent)
+                    return words.textContent;
+            }
+        }
+        return '';
     }
     parsePartList(doc) {
         const partInfo = new Map();
@@ -347,7 +384,7 @@ export class MusicXMLParser {
                 staffVoices.set(i, new Map());
             const children = this.getChildren(measureElement);
             let pendingChord = undefined;
-            let currentNoteSetMap = new Map();
+            const currentNoteSetMap = new Map();
             const beamGroupIdMap = new Map();
             let globalBeamId = 1;
             let currentHairpin = undefined;
@@ -364,8 +401,9 @@ export class MusicXMLParser {
                     if (metronome) {
                         const beatUnit = this.getText(metronome, 'beat-unit') || 'quarter';
                         const bpm = parseInt(this.getText(metronome, 'per-minute') || '120');
-                        const isDotted = this.querySelector(metronome, 'beat-unit-dot') !== null;
-                        measureTempo = { bpm, duration: this.mapDuration(beatUnit), isDotted };
+                        const dotCount = this.querySelectorAll(metronome, 'beat-unit-dot').length;
+                        const isDotted = dotCount > 0;
+                        measureTempo = { bpm, duration: this.mapDuration(beatUnit), isDotted, dotCount };
                     }
                     const rehearsal = this.querySelector(child, 'rehearsal');
                     if (rehearsal)
@@ -514,12 +552,13 @@ export class MusicXMLParser {
                 const v1 = vMap0.get('1') || vMap0.get(Array.from(vMap0.keys())[0]);
                 if (v1) {
                     // Check duration of first voice in first staff
-                    const expectedDivisions = this.currentBeats * (divisions * 4 / this.currentBeatType);
+                    const expectedDivisions = this.currentBeats * ((divisions * 4) / this.currentBeatType);
                     let totalMeasureDivs = 0;
                     const notes = this.querySelectorAll(measureElement, 'note');
                     // Find first voice in first staff
                     for (const n of notes) {
-                        if ((this.getText(n, 'staff') || '1') === '1' && (this.getText(n, 'voice') || '1') === (Array.from(vMap0.keys())[0] || '1')) {
+                        if ((this.getText(n, 'staff') || '1') === '1' &&
+                            (this.getText(n, 'voice') || '1') === (Array.from(vMap0.keys())[0] || '1')) {
                             if (this.querySelector(n, 'chord'))
                                 continue;
                             totalMeasureDivs += this.getNumber(n, 'duration') || 0;
@@ -535,7 +574,7 @@ export class MusicXMLParser {
                 let voicesIndices = Array.from(vMap.keys()).sort();
                 if (voicesIndices.length === 0)
                     voicesIndices = ['1'];
-                const voices = voicesIndices.map(id => vMap.get(id) || []);
+                const voices = voicesIndices.map((id) => vMap.get(id) || []);
                 const measure = {
                     voices: voices,
                     timeSignature: measureTimeSignature,
@@ -553,8 +592,7 @@ export class MusicXMLParser {
                     const targetDur = (this.currentBeats * 4) / this.currentBeatType;
                     measure.voices = measure.voices.map((v) => {
                         const currentDur = v.reduce((sum, ns) => {
-                            const base = DURATION_VALUES[ns.notes[0].duration];
-                            return sum + (ns.notes[0].isDotted ? base * 1.5 : base);
+                            return sum + calculateDurationValue(ns.notes[0].duration, ns.notes[0].dotCount || (ns.notes[0].isDotted ? 1 : 0));
                         }, 0);
                         if (currentDur < targetDur - 0.001) {
                             const gap = targetDur - currentDur;
@@ -583,9 +621,10 @@ export class MusicXMLParser {
         const isGrace = this.querySelector(noteElement, 'grace') !== null;
         const type = this.getText(noteElement, 'type');
         const duration = type ? this.mapDuration(type) : Duration.Quarter;
-        const isDotted = this.querySelector(noteElement, 'dot') !== null;
+        const dotCount = this.querySelectorAll(noteElement, 'dot').length;
+        const isDotted = dotCount > 0;
         if (isRest)
-            return { duration, isRest: true, isDotted };
+            return { duration, isRest: true, isDotted, dotCount };
         let step = 'C', octave = 4, alter = 0;
         const unpitched = this.querySelector(noteElement, 'unpitched');
         if (unpitched) {
@@ -751,7 +790,9 @@ export class MusicXMLParser {
                 pullOff = pullOffEl.getAttribute('type') || 'start';
         }
         let glissando = undefined;
-        const glissEl = notations ? (this.querySelector(notations, 'glissando') || this.querySelector(notations, 'slide')) : null;
+        const glissEl = notations
+            ? this.querySelector(notations, 'glissando') || this.querySelector(notations, 'slide')
+            : null;
         if (glissEl) {
             const type = glissEl.getAttribute('type');
             if (type === 'start' || type === 'stop') {
@@ -782,6 +823,7 @@ export class MusicXMLParser {
             duration,
             pitch: { midiNumber, step: this.stepToNumber(step), alter, octave },
             isDotted,
+            dotCount,
             accidental,
             slur,
             tie,

package/dist/importers/index.d.ts

@@ -1 +1 @@
-export * from './MusicXMLParser';
+export * from './MusicXMLParser.js';

package/dist/importers/index.js

@@ -1 +1 @@
-export * from './MusicXMLParser';
+export * from './MusicXMLParser.js';

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './models/index.js';
 export * from './importers/index.js';
+export * from './constants.js';

package/dist/index.js

@@ -1,2 +1,3 @@
 export * from './models/index.js';
 export * from './importers/index.js';
+export * from './constants.js';

package/dist/models/Measure.d.ts

@@ -1,6 +1,6 @@
-import { Note, NoteJSON } from './Note';
-import { NoteSet, NoteSetJSON } from './NoteSet';
-import { BarlineStyle, Clef, Duration, KeySignature, Repeat, Tempo, TimeSignature, Volta } from './types';
+import { Note, NoteJSON } from './Note.js';
+import { NoteSet, NoteSetJSON } from './NoteSet.js';
+import { BarlineStyle, Clef, Duration, KeySignature, Repeat, Tempo, TimeSignature, Volta } from './types.js';
 /**
  * Represents a single measure containing note sets, potentially in multiple voices.
  */
@@ -20,9 +20,12 @@ export declare class Measure {
     readonly barlineStyle: BarlineStyle;
     constructor(voices: NoteSet[][], timeSignature?: TimeSignature | undefined, keySignature?: KeySignature | undefined, systemBreak?: boolean, pageBreak?: boolean, repeats?: Repeat[], volta?: Volta | undefined, isPickup?: boolean, clef?: Clef | undefined, tempo?: Tempo | undefined, rehearsalMark?: string | undefined, systemText?: string | undefined, barlineStyle?: BarlineStyle);
     get notes(): NoteSet[];
+    getNoteOffset(voiceIndex: number, noteIndex: number): number;
+    moveNoteToVoice(fromVoiceIndex: number, noteIndex: number, toVoiceIndex: number): Measure;
+    splitNote(voiceIndex: number, noteIndex: number, splitOffset: number): Measure;
     get hasStartRepeat(): boolean;
     get hasEndRepeat(): boolean;
-    changeNoteDuration(noteIndex: number, newDuration: Duration, isDotted?: boolean, voiceIndex?: number): Measure;
+    changeNoteDuration(noteIndex: number, newDuration: Duration, dotCountOrIsDotted?: number | boolean, voiceIndex?: number): Measure;
     getTotalDuration(voiceIndex?: number): number;
     static fromJSON(data: MeasureJSON): Measure;
     transpose(semitones: number): Measure;

package/dist/models/Measure.js

@@ -1,6 +1,6 @@
-import { Note } from './Note';
-import { NoteSet } from './NoteSet';
-import { BarlineStyle, DURATION_VALUES, Duration, decomposeDuration, } from './types';
+import { Note } from './Note.js';
+import { NoteSet } from './NoteSet.js';
+import { BarlineStyle, Duration, calculateDurationValue, decomposeDuration, } from './types.js';
 /**
  * Represents a single measure containing note sets, potentially in multiple voices.
  */
@@ -39,26 +39,110 @@ export class Measure {
     get notes() {
         return this.voices[0] || [];
     }
+    getNoteOffset(voiceIndex, noteIndex) {
+        const voice = this.voices[voiceIndex];
+        if (!voice)
+            return 0;
+        let offset = 0;
+        for (let i = 0; i < noteIndex && i < voice.length; i++) {
+            offset += voice[i].getDurationValue();
+        }
+        return offset;
+    }
+    moveNoteToVoice(fromVoiceIndex, noteIndex, toVoiceIndex) {
+        if (fromVoiceIndex === toVoiceIndex)
+            return this;
+        const fromVoice = this.voices[fromVoiceIndex];
+        if (!fromVoice || noteIndex < 0 || noteIndex >= fromVoice.length)
+            return this;
+        const noteSetToMove = fromVoice[noteIndex];
+        if (noteSetToMove.isRest)
+            return this;
+        const onset = this.getNoteOffset(fromVoiceIndex, noteIndex);
+        // 1. Replace with rest in fromVoice first to get the source updated
+        let updatedMeasure = this.deleteNote(noteIndex, fromVoiceIndex);
+        // 2. Ensure toVoice exists and has rests up to total duration
+        const targetDur = this.timeSignature
+            ? (this.timeSignature.beats * 4) / this.timeSignature.beatType
+            : this.getTotalDuration(fromVoiceIndex);
+        updatedMeasure = updatedMeasure.fillVoiceWithRests(toVoiceIndex, targetDur);
+        // 3. Find the note/rest at 'onset' in toVoice and split if necessary
+        let toVoice = updatedMeasure.voices[toVoiceIndex];
+        let currentOffset = 0;
+        let targetNoteIndex = -1;
+        for (let i = 0; i < toVoice.length; i++) {
+            const dur = toVoice[i].getDurationValue();
+            if (Math.abs(currentOffset - onset) < 0.001) {
+                targetNoteIndex = i;
+                break;
+            }
+            if (onset > currentOffset + 0.001 && onset < currentOffset + dur - 0.001) {
+                // Need to split
+                updatedMeasure = updatedMeasure.splitNote(toVoiceIndex, i, onset - currentOffset);
+                toVoice = updatedMeasure.voices[toVoiceIndex]; // Update reference
+                // After split, the target should be at i + (number of segments added - 1)
+                // Let's just re-scan to be safe
+                currentOffset = 0;
+                for (let j = 0; j < toVoice.length; j++) {
+                    if (Math.abs(currentOffset - onset) < 0.001) {
+                        targetNoteIndex = j;
+                        break;
+                    }
+                    currentOffset += toVoice[j].getDurationValue();
+                }
+                break;
+            }
+            currentOffset += dur;
+        }
+        if (targetNoteIndex !== -1) {
+            // We found the correct position in the prepared target voice
+            updatedMeasure = updatedMeasure.replaceNoteSet(targetNoteIndex, noteSetToMove, toVoiceIndex);
+        }
+        return updatedMeasure;
+    }
+    splitNote(voiceIndex, noteIndex, splitOffset) {
+        const voice = this.voices[voiceIndex];
+        if (!voice || noteIndex < 0 || noteIndex >= voice.length)
+            return this;
+        const target = voice[noteIndex];
+        const duration = target.getDurationValue();
+        if (splitOffset <= 0 || splitOffset >= duration - 0.001)
+            return this;
+        const leftParts = decomposeDuration(splitOffset);
+        const rightParts = decomposeDuration(duration - splitOffset);
+        const leftNotes = leftParts.map((p) => target.withDuration(p.duration, p.isDotted).withTie(target.isRest ? false : true));
+        const rightNotes = rightParts.map((p, idx) => {
+            const isLast = idx === rightParts.length - 1;
+            return target
+                .withDuration(p.duration, p.isDotted)
+                .withTie(isLast ? !!target.notes[0].tie : !target.isRest);
+        });
+        const newVoice = [...voice];
+        newVoice.splice(noteIndex, 1, ...leftNotes, ...rightNotes);
+        const newVoices = [...this.voices];
+        newVoices[voiceIndex] = newVoice;
+        return this.withVoices(newVoices);
+    }
     get hasStartRepeat() {
-        return this.repeats.some((r) => r.type === "start");
+        return this.repeats.some((r) => r.type === 'start');
     }
     get hasEndRepeat() {
-        return this.repeats.some((r) => r.type === "end");
+        return this.repeats.some((r) => r.type === 'end');
     }
-    changeNoteDuration(noteIndex, newDuration, isDotted = false, voiceIndex = 0) {
+    changeNoteDuration(noteIndex, newDuration, dotCountOrIsDotted = 0, voiceIndex = 0) {
         const voice = this.voices[voiceIndex];
         if (!voice || noteIndex < 0 || noteIndex >= voice.length)
             return this;
         const targetNoteSet = voice[noteIndex];
         const oldVal = targetNoteSet.getDurationValue();
-        const base = DURATION_VALUES[newDuration];
-        const newVal = isDotted ? base * 1.5 : base;
+        const dotCount = typeof dotCountOrIsDotted === 'number' ? dotCountOrIsDotted : (dotCountOrIsDotted ? 1 : 0);
+        const newVal = calculateDurationValue(newDuration, dotCount);
         if (Math.abs(newVal - oldVal) < 0.001)
             return this;
         const updatedVoice = [...voice];
         if (newVal < oldVal) {
             const gap = oldVal - newVal;
-            updatedVoice[noteIndex] = targetNoteSet.withDuration(newDuration, isDotted);
+            updatedVoice[noteIndex] = targetNoteSet.withDuration(newDuration, dotCountOrIsDotted);
             const rests = decomposeDuration(gap).map((d) => new NoteSet([new Note(d.duration, undefined, true, d.isDotted)]));
             updatedVoice.splice(noteIndex + 1, 0, ...rests);
         }
@@ -70,7 +154,7 @@ export class Measure {
             }
             if (available < delta - 0.001)
                 return this;
-            updatedVoice[noteIndex] = targetNoteSet.withDuration(newDuration, isDotted);
+            updatedVoice[noteIndex] = targetNoteSet.withDuration(newDuration, dotCountOrIsDotted);
             let consumed = 0;
             let removeCount = 0;
             const replacements = [];
@@ -164,7 +248,7 @@ export class Measure {
             for (let i = index + 1; i < updatedVoice.length; i++) {
                 available += updatedVoice[i].getDurationValue();
             }
-            // If there's enough space to consume, do it. 
+            // If there's enough space to consume, do it.
             // If not, we still replace it but it will overflow (which simplifyRests might fix or layout will handle)
             updatedVoice[index] = newNoteSet;
             let consumed = 0;
@@ -235,7 +319,7 @@ export class Measure {
                         if (ts.beats === 4 || ts.beats === 2) {
                             // In 4/4 or 2/4, eighth notes are often beamed in groups of 2 beats (length 2.0)
                             // unless there are sixteenth notes which force 1-beat groupings.
-                            beamBeatLength = (lastGroupHasSixteenths || isSixteenth) ? 1.0 : 2.0;
+                            beamBeatLength = lastGroupHasSixteenths || isSixteenth ? 1.0 : 2.0;
                         }
                     }
                     else if (ts.beatType === 8) {
@@ -368,9 +452,11 @@ export class Measure {
         if (!voice || voice.length === 0)
             return this;
         const totalDur = this.getTotalDuration(voiceIndex);
-        const expectedDur = this.timeSignature ? (this.timeSignature.beats * 4) / this.timeSignature.beatType : 4.0;
+        const expectedDur = this.timeSignature
+            ? (this.timeSignature.beats * 4) / this.timeSignature.beatType
+            : 4.0;
         // Special Case: If the whole measure is rests, just return a single whole rest (or appropriate duration)
-        const allRests = voice.every(ns => ns.isRest);
+        const allRests = voice.every((ns) => ns.isRest);
         if (allRests && Math.abs(totalDur - expectedDur) < 0.001) {
             const newVoice = [new NoteSet([new Note(Duration.Whole, undefined, true)])];
             const newVoices = [...this.voices];

package/dist/models/Note.d.ts

@@ -1,13 +1,9 @@
-import { Pitch } from './Pitch';
-import { Accidental, Arpeggio, Articulation, Bowing, Duration, Dynamic, FretboardDiagram, Glissando, Hairpin, Lyric, NoteheadShape, Ornament, Ottava, Pedal, Slur, StemDirection, Tuplet } from './types';
-/**
- * Represents a single note or rest in a measure.
- */
+import { Pitch } from './Pitch.js';
+import { Accidental, Arpeggio, Articulation, Bowing, Duration, Dynamic, FretboardDiagram, Glissando, Hairpin, Lyric, NoteheadShape, Ornament, Ottava, Pedal, Slur, StemDirection, Tuplet } from './types.js';
 export declare class Note {
     readonly duration: Duration;
     readonly pitch?: Pitch | undefined;
     readonly isRest: boolean;
-    readonly isDotted: boolean;
     readonly accidental?: Accidental | undefined;
     readonly beamGroup?: number | undefined;
     readonly articulations: Articulation[];
@@ -39,8 +35,10 @@ export declare class Note {
     readonly hammerOn?: "start" | "stop" | undefined;
     readonly pullOff?: "start" | "stop" | undefined;
     constructor(duration: Duration, pitch?: Pitch | undefined, // undefined for rests
-    isRest?: boolean, isDotted?: boolean, accidental?: Accidental | undefined, beamGroup?: number | undefined, // Group ID for beamed notes
+    isRest?: boolean, dotCountOrIsDotted?: number | boolean, accidental?: Accidental | undefined, beamGroup?: number | undefined, // Group ID for beamed notes
     articulations?: Articulation[], dynamic?: Dynamic | undefined, tie?: boolean | undefined, slur?: Slur | undefined, tuplet?: Tuplet | undefined, hairpin?: Hairpin | undefined, isGrace?: boolean, lyric?: Lyric | undefined, chord?: string | undefined, glissando?: Glissando | undefined, arpeggio?: Arpeggio | undefined, ottava?: Ottava | undefined, pedal?: Pedal | undefined, ornament?: Ornament | undefined, fret?: number | undefined, string?: number | undefined, fretboardDiagram?: FretboardDiagram | undefined, lyrics?: Lyric[] | undefined, staffText?: string | undefined, color?: string | undefined, notehead?: NoteheadShape | undefined, bowing?: Bowing | undefined, fingering?: number | undefined, stemDirection?: StemDirection | undefined, isStringCircled?: boolean | undefined, palmMute?: "start" | "stop" | undefined, hammerOn?: "start" | "stop" | undefined, pullOff?: "start" | "stop" | undefined);
+    readonly dotCount: number;
+    get isDotted(): boolean;
     /**
      * Get all lyrics as standardized objects
      */
@@ -74,7 +72,7 @@ export declare class Note {
     withLyrics(lyrics: Lyric[]): Note;
     withHairpin(hairpin?: Hairpin): Note;
     withAccidental(accidental?: Accidental): Note;
-    withDuration(duration: Duration, isDotted?: boolean): Note;
+    withDuration(duration: Duration, dotCountOrIsDotted?: number | boolean): Note;
     withRest(isRest: boolean): Note;
     withFretboardDiagram(diagram?: FretboardDiagram): Note;
     withBeamGroup(beamGroup?: number): Note;
@@ -107,6 +105,7 @@ export interface NoteJSON {
     };
     isRest?: boolean;
     isDotted?: boolean;
+    dotCount?: number;
     accidental?: string;
     beamGroup?: number;
     articulation?: string;

package/dist/models/Note.js

@@ -1,13 +1,10 @@
-import { Pitch } from './Pitch';
-import { Accidental, DURATION_VALUES, Duration, } from './types';
-/**
- * Represents a single note or rest in a measure.
- */
+import { Pitch } from './Pitch.js';
+import { Accidental, Duration, calculateDurationValue, } from './types.js';
+// TODO: replace dotCountOrIsDotted with dotCount: number and use it everywhere. Do not worry about legacy stuff.
 export class Note {
     duration;
     pitch;
     isRest;
-    isDotted;
     accidental;
     beamGroup;
     articulations;
@@ -39,12 +36,11 @@ export class Note {
     hammerOn;
     pullOff;
     constructor(duration, pitch, // undefined for rests
-    isRest = false, isDotted = false, accidental, beamGroup, // Group ID for beamed notes
+    isRest = false, dotCountOrIsDotted = 0, accidental, beamGroup, // Group ID for beamed notes
     articulations = [], dynamic, tie, slur, tuplet, hairpin, isGrace = false, lyric, chord, glissando, arpeggio, ottava, pedal, ornament, fret, string, fretboardDiagram, lyrics, staffText, color, notehead, bowing, fingering, stemDirection, isStringCircled, palmMute, hammerOn, pullOff) {
         this.duration = duration;
         this.pitch = pitch;
         this.isRest = isRest;
-        this.isDotted = isDotted;
         this.accidental = accidental;
         this.beamGroup = beamGroup;
         this.articulations = articulations;
@@ -75,6 +71,12 @@ export class Note {
         this.palmMute = palmMute;
         this.hammerOn = hammerOn;
         this.pullOff = pullOff;
+        this.dotCount =
+            typeof dotCountOrIsDotted === 'number' ? dotCountOrIsDotted : dotCountOrIsDotted ? 1 : 0;
+    }
+    dotCount;
+    get isDotted() {
+        return this.dotCount > 0;
     }
     /**
      * Get all lyrics as standardized objects
@@ -100,8 +102,7 @@ export class Note {
     getDurationValue() {
         if (this.isGrace)
             return 0;
-        const base = DURATION_VALUES[this.duration];
-        let val = this.isDotted ? base * 1.5 : base;
+        let val = calculateDurationValue(this.duration, this.dotCount);
         if (this.tuplet) {
             val = val * (this.tuplet.normal / this.tuplet.actual);
         }
@@ -120,10 +121,10 @@ export class Note {
                 this.duration === Duration.TwoHundredFiftySixth));
     }
     withGrace(isGrace) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withChord(chord) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     transpose(semitones) {
         if (this.isRest || !this.pitch) {
@@ -133,7 +134,7 @@ export class Note {
         const chromaticIdx = newPitch.midiNumber % 12;
         const hasSharp = [1, 3, 6, 8, 10].includes(chromaticIdx);
         const newAccidental = hasSharp ? Accidental.Sharp : undefined;
-        return new Note(this.duration, newPitch, this.isRest, this.isDotted, newAccidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, newPitch, this.isRest, this.dotCount, newAccidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     transposeOctave(octaves) {
         if (!this.pitch || this.isRest)
@@ -166,97 +167,97 @@ export class Note {
         return this.withPitch(newPitch).withAccidental(newAccidental);
     }
     withPitch(pitch) {
-        return new Note(this.duration, pitch, false, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, pitch, false, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withArticulation(articulation) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, articulation ? [articulation] : [], this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, articulation ? [articulation] : [], this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withArticulations(articulations) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withDynamic(dynamic) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withTie(tie) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withSlur(slur) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withTuplet(tuplet) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withLyric(lyric) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withLyrics(lyrics) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withHairpin(hairpin) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withAccidental(accidental) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
-    withDuration(duration, isDotted = false) {
-        return new Note(duration, this.pitch, this.isRest, isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+    withDuration(duration, dotCountOrIsDotted = 0) {
+        return new Note(duration, this.pitch, this.isRest, dotCountOrIsDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withRest(isRest) {
-        return new Note(this.duration, this.pitch, isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withFretboardDiagram(diagram) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, diagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, diagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withBeamGroup(beamGroup) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withGlissando(glissando) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withArpeggio(arpeggio) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withOttava(ottava) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withPedal(pedal) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withOrnament(ornament) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withTab(fret, string) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, fret, string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, fret, string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withStaffText(text) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, text, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, text, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withColor(color) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, color, this.notehead, this.bowing, this.fingering, this.stemDirection);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withNotehead(notehead) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withBowing(bowing) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withFingering(fingering) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withStemDirection(stemDirection) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withStringCircled(isStringCircled) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, isStringCircled, this.palmMute, this.hammerOn, this.pullOff);
     }
     withPalmMute(palmMute) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, palmMute, this.hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, palmMute, this.hammerOn, this.pullOff);
     }
     withHammerOn(hammerOn) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, hammerOn, this.pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, hammerOn, this.pullOff);
     }
     withPullOff(pullOff) {
-        return new Note(this.duration, this.pitch, this.isRest, this.isDotted, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, pullOff);
+        return new Note(this.duration, this.pitch, this.isRest, this.dotCount, this.accidental, this.beamGroup, this.articulations, this.dynamic, this.tie, this.slur, this.tuplet, this.hairpin, this.isGrace, this.lyric, this.chord, this.glissando, this.arpeggio, this.ottava, this.pedal, this.ornament, this.fret, this.string, this.fretboardDiagram, this.lyrics, this.staffText, this.color, this.notehead, this.bowing, this.fingering, this.stemDirection, this.isStringCircled, this.palmMute, this.hammerOn, pullOff);
     }
     toJSON() {
         return {
@@ -273,6 +274,7 @@ export class Note {
                     : undefined,
             isRest: this.isRest || undefined,
             isDotted: this.isDotted || undefined,
+            dotCount: this.dotCount || undefined,
             accidental: this.accidental,
             beamGroup: this.beamGroup,
             articulations: this.articulations.length > 0 ? this.articulations : undefined,
@@ -319,6 +321,6 @@ export class Note {
         else if (data.articulation) {
             articulations = [data.articulation];
         }
-        return new Note(data.duration, pitch, data.isRest ?? false, data.isDotted ?? false, data.accidental, data.beamGroup, articulations, data.dynamic, data.tie, data.slur, data.tuplet, data.hairpin, data.isGrace ?? false, data.lyric, data.chord, data.glissando, data.arpeggio, data.ottava, data.pedal, data.ornament, data.fret, data.string, data.fretboardDiagram, data.lyrics, data.staffText, data.color, data.notehead, data.bowing, data.fingering, data.stemDirection, data.isStringCircled, data.palmMute, data.hammerOn, data.pullOff);
+        return new Note(data.duration, pitch, data.isRest ?? false, data.dotCount !== undefined ? data.dotCount : data.isDotted ? 1 : 0, data.accidental, data.beamGroup, articulations, data.dynamic, data.tie, data.slur, data.tuplet, data.hairpin, data.isGrace ?? false, data.lyric, data.chord, data.glissando, data.arpeggio, data.ottava, data.pedal, data.ornament, data.fret, data.string, data.fretboardDiagram, data.lyrics, data.staffText, data.color, data.notehead, data.bowing, data.fingering, data.stemDirection, data.isStringCircled, data.palmMute, data.hammerOn, data.pullOff);
     }
 }

package/dist/models/NoteSet.d.ts

@@ -1,17 +1,18 @@
-import { Note, NoteJSON } from './Note';
-import { Pitch } from './Pitch';
-import { Accidental, Arpeggio, Articulation, Bowing, Duration, Dynamic, FretboardDiagram, Glissando, Hairpin, Lyric, NoteheadShape, Ornament, Ottava, Pedal, Slur, StemDirection, Tuplet } from './types';
+import { Note, NoteJSON } from './Note.js';
+import { Pitch } from './Pitch.js';
+import { Accidental, Arpeggio, Articulation, Bowing, Duration, Dynamic, FretboardDiagram, Glissando, Hairpin, Lyric, NoteheadShape, Ornament, Ottava, Pedal, Slur, StemDirection, Tuplet } from './types.js';
 export declare class NoteSet {
     readonly notes: Note[];
     constructor(notes: Note[]);
     get duration(): Duration;
     get isDotted(): boolean;
+    get dotCount(): number;
     get isRest(): boolean;
     get beamGroup(): number | undefined;
     get tuplet(): Tuplet | undefined;
     getDurationValue(): number;
     isBeamable(): boolean;
-    withDuration(duration: Duration, isDotted?: boolean): NoteSet;
+    withDuration(duration: Duration, dotCountOrIsDotted?: number | boolean): NoteSet;
     withBeamGroup(group?: number): NoteSet;
     withNotes(notes: Note[]): NoteSet;
     withLyrics(lyrics: Lyric[]): NoteSet;

package/dist/models/NoteSet.js

@@ -1,5 +1,5 @@
-import { Note } from './Note';
-import { Duration, } from './types';
+import { Note } from './Note.js';
+import { Duration, } from './types.js';
 export class NoteSet {
     notes;
     constructor(notes) {
@@ -14,6 +14,9 @@ export class NoteSet {
     get isDotted() {
         return this.notes[0].isDotted;
     }
+    get dotCount() {
+        return this.notes[0].dotCount;
+    }
     get isRest() {
         return this.notes[0].isRest;
     }
@@ -29,8 +32,8 @@ export class NoteSet {
     isBeamable() {
         return this.notes[0].isBeamable();
     }
-    withDuration(duration, isDotted = false) {
-        return new NoteSet(this.notes.map((n) => n.withDuration(duration, isDotted)));
+    withDuration(duration, dotCountOrIsDotted = 0) {
+        return new NoteSet(this.notes.map((n) => n.withDuration(duration, dotCountOrIsDotted)));
     }
     withBeamGroup(group) {
         return new NoteSet(this.notes.map((n) => n.withBeamGroup(group)));

package/dist/models/Part.d.ts

@@ -1,8 +1,8 @@
-import { Instrument } from './Instrument';
-import { Measure } from './Measure';
-import { Note } from './Note';
-import { Staff, StaffJSON } from './Staff';
-import { Duration } from './types';
+import { Instrument } from './Instrument.js';
+import { Measure } from './Measure.js';
+import { Note } from './Note.js';
+import { Staff, StaffJSON } from './Staff.js';
+import { Duration } from './types.js';
 /**
  * Represents a musical part (instrument/voice) which can have multiple staves.
  */

package/dist/models/Part.js

@@ -1,5 +1,5 @@
-import { PRESET_INSTRUMENTS } from './Instrument';
-import { Staff } from './Staff';
+import { PRESET_INSTRUMENTS } from './Instrument.js';
+import { Staff } from './Staff.js';
 /**
  * Represents a musical part (instrument/voice) which can have multiple staves.
  */

package/dist/models/Pitch.d.ts

@@ -1,4 +1,4 @@
-import { Clef } from './types';
+import { Clef } from './types.js';
 /**
  * Pitch representation using MIDI numbers and explicit spelling (step, alter, octave).
  */

package/dist/models/Pitch.js

@@ -1,4 +1,4 @@
-import { Clef } from './types';
+import { Clef } from './types.js';
 /**
  * Pitch representation using MIDI numbers and explicit spelling (step, alter, octave).
  */

package/dist/models/PreMeasure.d.ts

@@ -1,4 +1,4 @@
-import { Clef, KeySignature, TimeSignature } from './types';
+import { Clef, KeySignature, TimeSignature } from './types.js';
 export interface PreMeasureJSON {
     clef?: string;
     keySignature?: KeySignature;

package/dist/models/Score.d.ts

@@ -1,8 +1,8 @@
-import { Measure } from './Measure';
-import { NoteSet } from './NoteSet';
-import { Part, PartJSON } from './Part';
-import { Staff } from './Staff';
-import { Clef, Duration, Genre, KeySignature, TimeSignature } from './types';
+import { Measure } from './Measure.js';
+import { NoteSet } from './NoteSet.js';
+import { Part, PartJSON } from './Part.js';
+import { Staff } from './Staff.js';
+import { Clef, Duration, Genre, KeySignature, TimeSignature } from './types.js';
 /**
  * Represents a complete musical score.
  */
@@ -21,11 +21,13 @@ export declare class Score {
     readonly subtitle: string;
     readonly genre: Genre;
     readonly tempoText: string;
-    constructor(title: string, composer: string, timeSignature: TimeSignature, keySignature: KeySignature, parts: Part[], bpm?: number, tempoDuration?: Duration, tempoIsDotted?: boolean, copyright?: string, lyricist?: string, swing?: boolean, subtitle?: string, genre?: Genre, tempoText?: string);
+    readonly tempoDotCount: number;
+    constructor(title: string, composer: string, timeSignature: TimeSignature, keySignature: KeySignature, parts: Part[], bpm?: number, tempoDuration?: Duration, tempoIsDotted?: boolean, copyright?: string, lyricist?: string, swing?: boolean, subtitle?: string, genre?: Genre, tempoText?: string, tempoDotCount?: number);
     withTitle(title: string): Score;
     withComposer(composer: string): Score;
     withSubtitle(subtitle: string): Score;
     withGenre(genre: Genre): Score;
+    withBpm(bpm: number): Score;
     getMeasureCount(): number;
     getTimeSignatureAt(measureIndex: number): TimeSignature;
     getKeySignatureAt(measureIndex: number): KeySignature;
@@ -56,6 +58,7 @@ export declare class Score {
     replaceMeasure(partIndex: number, staffIndex: number, measureIndex: number, newMeasure: Measure, autoBeam?: boolean): Score;
     deleteNote(partIndex: number, staffIndex: number, measureIndex: number, noteIndex: number, voiceIndex?: number): Score;
     changeNoteDuration(partIndex: number, staffIndex: number, measureIndex: number, noteIndex: number, newDuration: Duration, isDotted?: boolean, voiceIndex?: number): Score;
+    moveNoteToVoice(partIndex: number, staffIndex: number, measureIndex: number, noteIndex: number, fromVoiceIndex: number, toVoiceIndex: number): Score;
     pasteNotes(partIndex: number, staffIndex: number, measureIndex: number, noteIndex: number, notesToPaste: NoteSet[]): Score;
     withTempo(bpm: number, duration: Duration, isDotted: boolean): Score;
     withTempoText(text: string): Score;
@@ -81,6 +84,7 @@ export interface ScoreJSON {
     bpm?: number;
     tempoDuration?: Duration;
     tempoIsDotted?: boolean;
+    tempoDotCount?: number;
     copyright?: string;
     lyricist?: string;
     swing?: boolean;

package/dist/models/Score.js

@@ -1,6 +1,6 @@
-import { Measure } from './Measure';
-import { Part } from './Part';
-import { Duration, Genre, decomposeDuration } from './types';
+import { Measure } from './Measure.js';
+import { Part } from './Part.js';
+import { Duration, Genre, decomposeDuration } from './types.js';
 /**
  * Represents a complete musical score.
  */
@@ -19,7 +19,8 @@ export class Score {
     subtitle;
     genre;
     tempoText;
-    constructor(title, composer, timeSignature, keySignature, parts, bpm = 120, tempoDuration = Duration.Quarter, tempoIsDotted = false, copyright = '', lyricist = '', swing = false, subtitle = '', genre = Genre.Unknown, tempoText = '') {
+    tempoDotCount;
+    constructor(title, composer, timeSignature, keySignature, parts, bpm = 120, tempoDuration = Duration.Quarter, tempoIsDotted = false, copyright = '', lyricist = '', swing = false, subtitle = '', genre = Genre.Unknown, tempoText = '', tempoDotCount = 0) {
         this.title = title;
         this.composer = composer;
         this.timeSignature = timeSignature;
@@ -34,18 +35,22 @@ export class Score {
         this.subtitle = subtitle;
         this.genre = genre;
         this.tempoText = tempoText;
+        this.tempoDotCount = tempoDotCount;
     }
     withTitle(title) {
-        return new Score(title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     withComposer(composer) {
-        return new Score(this.title, composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     withSubtitle(subtitle) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     withGenre(genre) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, genre, this.tempoText, this.tempoDotCount);
+    }
+    withBpm(bpm) {
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     getMeasureCount() {
         return this.parts[0]?.getMeasureCount() ?? 0;
@@ -88,7 +93,7 @@ export class Score {
     }
     static fromJSON(data) {
         const parts = data.parts.map((p) => Part.fromJSON(p));
-        return new Score(data.title, data.composer, data.timeSignature, data.keySignature, parts, data.bpm ?? 120, data.tempoDuration ?? Duration.Quarter, data.tempoIsDotted ?? false, data.copyright ?? '', data.lyricist ?? '', data.swing ?? false, data.subtitle ?? '', data.genre || Genre.Unknown, data.tempoText ?? '');
+        return new Score(data.title, data.composer, data.timeSignature, data.keySignature, parts, data.bpm ?? 120, data.tempoDuration ?? Duration.Quarter, data.tempoIsDotted ?? false, data.copyright ?? '', data.lyricist ?? '', data.swing ?? false, data.subtitle ?? '', data.genre || Genre.Unknown, data.tempoText ?? '', data.tempoDotCount ?? (data.tempoIsDotted ? 1 : 0));
     }
     transpose(semitones) {
         const semitoneToFifths = {
@@ -112,7 +117,7 @@ export class Score {
             newFifths -= 12;
         while (newFifths < -7)
             newFifths += 12;
-        return new Score(this.title, this.composer, this.timeSignature, { fifths: newFifths }, this.parts.map((p) => p.transpose(semitones)), this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, { fifths: newFifths }, this.parts.map((p) => p.transpose(semitones)), this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     replaceNote(partIndex, staffIndex, measureIndex, noteIndex, newNote, voiceIndex = 0) {
         if (partIndex < 0 || partIndex >= this.parts.length)
@@ -122,10 +127,10 @@ export class Score {
         return this.replaceMeasure(partIndex, staffIndex, measureIndex, updatedMeasure, true);
     }
     withKeySignature(keySig) {
-        return new Score(this.title, this.composer, this.timeSignature, keySig, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, keySig, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     withTimeSignature(timeSig) {
-        return new Score(this.title, this.composer, timeSig, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, timeSig, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     updateMeasureSignatures(measureIndex, signatures, autoBeam = true) {
         let score = this;
@@ -170,7 +175,7 @@ export class Score {
                 for (let sIdx = 0; sIdx < currentScore.parts[pIdx].staves.length; sIdx++) {
                     const staff = currentScore.parts[pIdx].staves[sIdx];
                     if (staff.measures.length < maxMeasures) {
-                        let updatedMsrs = [...staff.measures];
+                        const updatedMsrs = [...staff.measures];
                         for (let i = staff.measures.length; i < maxMeasures; i++) {
                             const ts = currentScore.getTimeSignatureAt(i);
                             const targetDur = ts.beats * (4 / ts.beatType);
@@ -201,10 +206,10 @@ export class Score {
         const staff = this.parts[pIdx].staves[sIdx];
         const measures = staff.measures;
         const maxVoices = Math.max(...measures.map((m) => m.voices.length), 1);
-        let updatedMeasures = [...measures];
+        const updatedMeasures = [...measures];
         for (let vIdx = 0; vIdx < maxVoices; vIdx++) {
             // 1. Collect notes and merge tied notes into logical streams
-            let stream = [];
+            const stream = [];
             for (let mIdx = fromMeasureIndex; mIdx < measures.length; mIdx++) {
                 const msr = measures[mIdx];
                 const voice = msr.voices[vIdx] || [];
@@ -295,7 +300,7 @@ export class Score {
         }
         const newParts = [...this.parts];
         newParts[partIndex] = newParts[partIndex].replaceMeasure(staffIndex, measureIndex, measureToUse);
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, newParts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, newParts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     deleteNote(partIndex, staffIndex, measureIndex, noteIndex, voiceIndex = 0) {
         if (partIndex < 0 || partIndex >= this.parts.length)
@@ -311,6 +316,15 @@ export class Score {
         const updatedMeasure = measure.changeNoteDuration(noteIndex, newDuration, isDotted, voiceIndex);
         return this.replaceMeasure(partIndex, staffIndex, measureIndex, updatedMeasure, true);
     }
+    moveNoteToVoice(partIndex, staffIndex, measureIndex, noteIndex, fromVoiceIndex, toVoiceIndex) {
+        if (partIndex < 0 || partIndex >= this.parts.length)
+            return this;
+        const measure = this.parts[partIndex].staves[staffIndex].measures[measureIndex];
+        if (!measure)
+            return this;
+        const updatedMeasure = measure.moveNoteToVoice(fromVoiceIndex, noteIndex, toVoiceIndex);
+        return this.replaceMeasure(partIndex, staffIndex, measureIndex, updatedMeasure, true);
+    }
     pasteNotes(partIndex, staffIndex, measureIndex, noteIndex, notesToPaste) {
         if (partIndex < 0 || partIndex >= this.parts.length)
             return this;
@@ -370,22 +384,22 @@ export class Score {
         return newScore;
     }
     withTempo(bpm, duration, isDotted) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, bpm, duration, isDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, bpm, duration, isDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     withTempoText(text) {
         return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, text);
     }
     withSwing(swing) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     withLyricist(lyricist) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     withCopyright(copyright) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts, this.bpm, this.tempoDuration, this.tempoIsDotted, copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     withParts(parts) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, parts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     toJSON() {
         return {
@@ -403,6 +417,7 @@ export class Score {
             subtitle: this.subtitle,
             genre: this.genre,
             tempoText: this.tempoText,
+            tempoDotCount: this.tempoDotCount,
         };
     }
     replacePart(partIndex, newPart) {
@@ -410,29 +425,29 @@ export class Score {
             return this;
         const newParts = [...this.parts];
         newParts[partIndex] = newPart;
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, newParts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, newParts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     addPart(newPart) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, [...this.parts, newPart], this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, [...this.parts, newPart], this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     removePart(partIndex) {
         if (partIndex < 0 || partIndex >= this.parts.length)
             return this;
         const newParts = this.parts.filter((_, i) => i !== partIndex);
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, newParts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, newParts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     replaceStaff(partIndex, staffIndex, newStaff) {
         if (partIndex < 0 || partIndex >= this.parts.length)
             return this;
         const newParts = [...this.parts];
         newParts[partIndex] = newParts[partIndex].replaceStaff(staffIndex, newStaff);
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, newParts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, newParts, this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     addMeasure(index, measure) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts.map((p) => p.addMeasure(index, measure)), this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts.map((p) => p.addMeasure(index, measure)), this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     deleteMeasure(index) {
-        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts.map((p) => p.deleteMeasure(index)), this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText);
+        return new Score(this.title, this.composer, this.timeSignature, this.keySignature, this.parts.map((p) => p.deleteMeasure(index)), this.bpm, this.tempoDuration, this.tempoIsDotted, this.copyright, this.lyricist, this.swing, this.subtitle, this.genre, this.tempoText, this.tempoDotCount);
     }
     getPlaybackSequence() {
         const measures = this.parts[0]?.staves[0]?.measures || [];

package/dist/models/Staff.d.ts

@@ -1,7 +1,7 @@
-import { Measure, MeasureJSON } from './Measure';
-import { Note } from './Note';
-import { Pitch } from './Pitch';
-import { Clef, Duration } from './types';
+import { Measure, MeasureJSON } from './Measure.js';
+import { Note } from './Note.js';
+import { Pitch } from './Pitch.js';
+import { Clef, Duration } from './types.js';
 /**
  * Represents a single staff (one set of 5 lines with a clef).
  */

package/dist/models/Staff.js

@@ -1,5 +1,5 @@
-import { Measure } from './Measure';
-import { Pitch } from './Pitch';
+import { Measure } from './Measure.js';
+import { Pitch } from './Pitch.js';
 /**
  * Represents a single staff (one set of 5 lines with a clef).
  */

package/dist/models/index.d.ts

@@ -1,10 +1,10 @@
-export * from './types';
-export * from './Pitch';
-export * from './Note';
-export * from './NoteSet';
-export * from './Measure';
-export * from './Staff';
-export * from './Part';
-export * from './Score';
-export * from './Instrument';
-export * from './PreMeasure';
+export * from './types.js';
+export * from './Pitch.js';
+export * from './Note.js';
+export * from './NoteSet.js';
+export * from './Measure.js';
+export * from './Staff.js';
+export * from './Part.js';
+export * from './Score.js';
+export * from './Instrument.js';
+export * from './PreMeasure.js';

package/dist/models/index.js

@@ -1,10 +1,10 @@
-export * from './types';
-export * from './Pitch';
-export * from './Note';
-export * from './NoteSet';
-export * from './Measure';
-export * from './Staff';
-export * from './Part';
-export * from './Score';
-export * from './Instrument';
-export * from './PreMeasure';
+export * from './types.js';
+export * from './Pitch.js';
+export * from './Note.js';
+export * from './NoteSet.js';
+export * from './Measure.js';
+export * from './Staff.js';
+export * from './Part.js';
+export * from './Score.js';
+export * from './Instrument.js';
+export * from './PreMeasure.js';

package/dist/types/Duration.d.ts

@@ -10,6 +10,10 @@ export declare enum Duration {
     TwoHundredFiftySixth = "two-hundred-fifty-sixth"
 }
 export declare const DURATION_VALUES: Record<Duration, number>;
+/**
+ * Calculates the numeric duration value (quarter = 1) for a given duration and dot count.
+ */
+export declare function calculateDurationValue(duration: Duration, dotCount?: number): number;
 /**
  * Decomposes a duration value (quarter = 1) into a list of duration/dot pairs.
  */

package/dist/types/Duration.js

@@ -22,6 +22,19 @@ export const DURATION_VALUES = {
     [Duration.OneHundredTwentyEighth]: 0.03125,
     [Duration.TwoHundredFiftySixth]: 0.015625,
 };
+/**
+ * Calculates the numeric duration value (quarter = 1) for a given duration and dot count.
+ */
+export function calculateDurationValue(duration, dotCount = 0) {
+    const base = DURATION_VALUES[duration];
+    let multiplier = 1;
+    let dotValue = 0.5;
+    for (let i = 0; i < dotCount; i++) {
+        multiplier += dotValue;
+        dotValue /= 2;
+    }
+    return base * multiplier;
+}
 /**
  * Decomposes a duration value (quarter = 1) into a list of duration/dot pairs.
  */

package/dist/types/Tempo.d.ts

@@ -3,6 +3,7 @@ export interface Tempo {
     bpm: number;
     duration: Duration;
     isDotted: boolean;
+    dotCount?: number;
     text?: string;
     gradual?: 'ritardando' | 'accelerando';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scorelabs/core",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Core logic and models for ScoreLabs music notation",
   "type": "module",
   "files": [