@scorelabs/core 1.0.9 → 1.0.11

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/dist/types/User.d.ts

@@ -0,0 +1,21 @@
+/**
+ * WARNING: DO NOT ADD SENSITIVE LOGIC OR PRIVATE CONSTANTS TO THIS FILE.
+ * This package (@scorelabs/core) is used in public-facing frontend applications
+ * and could be exposed. Keep all token generation, verification, and encryption
+ * logic in the 'backend' or 'website' utilities.
+ */
+export type UserTier = 'free' | 'premium';
+export interface UserData {
+    accessToken?: string;
+    access_token?: string;
+    uuid?: string | number;
+    name?: string;
+    first_name?: string;
+    last_name?: string;
+    username?: string;
+    email?: string;
+    is_admin?: number | boolean;
+    id?: string | number;
+    tier?: UserTier | string;
+    picture?: string;
+}

package/dist/types/User.js

@@ -0,0 +1,7 @@
+/**
+ * WARNING: DO NOT ADD SENSITIVE LOGIC OR PRIVATE CONSTANTS TO THIS FILE.
+ * This package (@scorelabs/core) is used in public-facing frontend applications
+ * and could be exposed. Keep all token generation, verification, and encryption
+ * logic in the 'backend' or 'website' utilities.
+ */
+export {};

package/dist/types/index.d.ts

@@ -24,3 +24,4 @@ export * from './Pedal.js';
 export * from './Slur.js';
 export * from './Tuplet.js';
 export * from './Repeat.js';
+export * from './User.js';

package/dist/types/index.js

@@ -24,3 +24,4 @@ export * from './Pedal.js';
 export * from './Slur.js';
 export * from './Tuplet.js';
 export * from './Repeat.js';
+export * from './User.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scorelabs/core",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Core logic and models for ScoreLabs music notation",
   "type": "module",
   "files": [
@@ -24,6 +24,7 @@
     "release:major": "npm version major && npm publish --access public",
     "release": "npm run release:patch",
     "test": "vitest",
+    "test:coverage": "vitest run --coverage",
     "lint": "eslint ."
   },
   "dependencies": {
@@ -32,6 +33,7 @@
   "devDependencies": {
     "@types/jszip": "^3.4.0",
     "@types/node": "^25.2.3",
+    "@vitest/coverage-v8": "^4.0.18",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
   }