@tspro/web-music-score 4.2.0 → 4.2.1

package/dist/pieces/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.2.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/pieces/index.mjs

@@ -1,5 +1,5 @@
-/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
-import "../chunk-5NWLGWHS.mjs";
+/* WebMusicScore v4.2.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+import "../chunk-64N22LCV.mjs";
 
 // src/pieces/frere-jacques.ts
 import { DocumentBuilder } from "@tspro/web-music-score/score";

package/dist/react-ui/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.2.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;

package/dist/react-ui/index.mjs

@@ -1,7 +1,7 @@
-/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.2.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   __publicField
-} from "../chunk-5NWLGWHS.mjs";
+} from "../chunk-64N22LCV.mjs";
 
 // src/react-ui/circle-of-fifths.tsx
 import * as React from "react";

package/dist/score/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.2.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -1816,24 +1816,24 @@ var ObjRest = class extends MusicObject {
   visibleInStaff(staff) {
     return staff.containsVoiceId(this.voiceId) && this.staffObjects.some((obj) => obj instanceof ObjStaffRest && obj.staff === staff);
   }
-  getRestDotVerticalDisplacement(noteLength) {
-    switch (noteLength) {
-      case import_theory3.NoteLength.Whole:
+  getRestDotVerticalDisplacement(noteSize) {
+    switch (noteSize) {
+      case 1:
         return 1;
-      case import_theory3.NoteLength.Half:
+      case 2:
         return -1;
-      case import_theory3.NoteLength.Quarter:
+      case 4:
         return -1;
-      case import_theory3.NoteLength.Eighth:
+      case 8:
         return -1;
-      case import_theory3.NoteLength.Sixteenth:
+      case 16:
         return -1;
-      case import_theory3.NoteLength.ThirtySecond:
+      case 32:
         return -3;
-      case import_theory3.NoteLength.SixtyFourth:
+      case 64:
         return -3;
       default:
-        throw new import_core5.MusicError(import_core5.MusicErrorType.Score, "Cannot get rest dot vertical displacement because note length is invalid.");
+        throw new import_core5.MusicError(import_core5.MusicErrorType.Score, `Get rest dot vertical displacement: Invalid note size: ${noteSize}`);
     }
   }
   updateAccidentalState(accState) {
@@ -1846,22 +1846,22 @@ var ObjRest = class extends MusicObject {
     }
     let { unitSize } = renderer;
     let { ownDiatonicId } = this;
-    let { noteLength, dotCount, flagCount } = this.rhythmProps;
+    let { noteSize, dotCount, flagCount } = this.rhythmProps;
     let leftw = 0;
     let rightw = 0;
     let toph = 0;
     let bottomh = 0;
-    if (noteLength === import_theory3.NoteLength.Whole) {
+    if (import_theory3.NoteLengthProps.equals(noteSize, import_theory3.NoteLength.Whole)) {
       leftw = unitSize;
       rightw = unitSize;
       toph = 0;
       bottomh = unitSize;
-    } else if (noteLength === import_theory3.NoteLength.Half) {
+    } else if (import_theory3.NoteLengthProps.equals(noteSize, import_theory3.NoteLength.Half)) {
       leftw = unitSize;
       rightw = unitSize;
       toph = unitSize;
       bottomh = 0;
-    } else if (noteLength === import_theory3.NoteLength.Quarter) {
+    } else if (import_theory3.NoteLengthProps.equals(noteSize, import_theory3.NoteLength.Quarter)) {
       leftw = unitSize * 1;
       rightw = unitSize * 1;
       toph = unitSize * 3.2;
@@ -1882,7 +1882,7 @@ var ObjRest = class extends MusicObject {
       for (let i = 0; i < dotCount; i++) {
         let dotWidth = DocumentSettings.DotSize * unitSize;
         let dotX = rightw + (DocumentSettings.RestDotSpace + DocumentSettings.DotSize * unitSize) + i * DocumentSettings.DotSize * unitSize * 1.5;
-        let dotY = this.getRestDotVerticalDisplacement(noteLength) * unitSize;
+        let dotY = this.getRestDotVerticalDisplacement(noteSize) * unitSize;
         obj.dotRects.push(DivRect.createCentered(dotX, dotY, dotWidth, dotWidth));
       }
       obj.offset(0, staff.getDiatonicIdY(ownDiatonicId));
@@ -1913,18 +1913,18 @@ var ObjRest = class extends MusicObject {
     renderer.drawDebugRect(this.getRect());
     let { unitSize, lineWidth } = renderer;
     let { color } = this;
-    let { noteLength, flagCount } = this.rhythmProps;
+    let { noteSize, flagCount } = this.rhythmProps;
     ctx.strokeStyle = ctx.fillStyle = color;
     ctx.lineWidth = lineWidth;
     this.staffObjects.forEach((obj) => {
       let { dotRects, restRect } = obj;
       let x = restRect.centerX;
       let y = restRect.centerY;
-      if (noteLength === import_theory3.NoteLength.Whole) {
+      if (import_theory3.NoteLengthProps.equals(noteSize, import_theory3.NoteLength.Whole)) {
         ctx.fillRect(x - unitSize, y, unitSize * 2, unitSize);
-      } else if (noteLength === import_theory3.NoteLength.Half) {
+      } else if (import_theory3.NoteLengthProps.equals(noteSize, import_theory3.NoteLength.Half)) {
         ctx.fillRect(x - unitSize, y - unitSize, unitSize * 2, unitSize);
-      } else if (noteLength === import_theory3.NoteLength.Quarter) {
+      } else if (import_theory3.NoteLengthProps.equals(noteSize, import_theory3.NoteLength.Quarter)) {
         ctx.beginPath();
         ctx.moveTo(x - unitSize * 0.6, y - unitSize * 3.2);
         ctx.lineTo(x + unitSize * 0.7, y - unitSize * 1.5);

package/dist/score/index.mjs

@@ -1,10 +1,10 @@
-/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.2.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   RhythmProps
-} from "../chunk-7MNV5JN6.mjs";
+} from "../chunk-RQFFLRWF.mjs";
 import {
   __publicField
-} from "../chunk-5NWLGWHS.mjs";
+} from "../chunk-64N22LCV.mjs";
 
 // src/score/pub/div-rect.ts
 import { Utils } from "@tspro/ts-utils-lib";
@@ -1729,24 +1729,24 @@ var ObjRest = class extends MusicObject {
   visibleInStaff(staff) {
     return staff.containsVoiceId(this.voiceId) && this.staffObjects.some((obj) => obj instanceof ObjStaffRest && obj.staff === staff);
   }
-  getRestDotVerticalDisplacement(noteLength) {
-    switch (noteLength) {
-      case NoteLength.Whole:
+  getRestDotVerticalDisplacement(noteSize) {
+    switch (noteSize) {
+      case 1:
         return 1;
-      case NoteLength.Half:
+      case 2:
         return -1;
-      case NoteLength.Quarter:
+      case 4:
         return -1;
-      case NoteLength.Eighth:
+      case 8:
         return -1;
-      case NoteLength.Sixteenth:
+      case 16:
         return -1;
-      case NoteLength.ThirtySecond:
+      case 32:
         return -3;
-      case NoteLength.SixtyFourth:
+      case 64:
         return -3;
       default:
-        throw new MusicError5(MusicErrorType5.Score, "Cannot get rest dot vertical displacement because note length is invalid.");
+        throw new MusicError5(MusicErrorType5.Score, `Get rest dot vertical displacement: Invalid note size: ${noteSize}`);
     }
   }
   updateAccidentalState(accState) {
@@ -1759,22 +1759,22 @@ var ObjRest = class extends MusicObject {
     }
     let { unitSize } = renderer;
     let { ownDiatonicId } = this;
-    let { noteLength, dotCount, flagCount } = this.rhythmProps;
+    let { noteSize, dotCount, flagCount } = this.rhythmProps;
     let leftw = 0;
     let rightw = 0;
     let toph = 0;
     let bottomh = 0;
-    if (noteLength === NoteLength.Whole) {
+    if (NoteLengthProps.equals(noteSize, NoteLength.Whole)) {
       leftw = unitSize;
       rightw = unitSize;
       toph = 0;
       bottomh = unitSize;
-    } else if (noteLength === NoteLength.Half) {
+    } else if (NoteLengthProps.equals(noteSize, NoteLength.Half)) {
       leftw = unitSize;
       rightw = unitSize;
       toph = unitSize;
       bottomh = 0;
-    } else if (noteLength === NoteLength.Quarter) {
+    } else if (NoteLengthProps.equals(noteSize, NoteLength.Quarter)) {
       leftw = unitSize * 1;
       rightw = unitSize * 1;
       toph = unitSize * 3.2;
@@ -1795,7 +1795,7 @@ var ObjRest = class extends MusicObject {
       for (let i = 0; i < dotCount; i++) {
         let dotWidth = DocumentSettings.DotSize * unitSize;
         let dotX = rightw + (DocumentSettings.RestDotSpace + DocumentSettings.DotSize * unitSize) + i * DocumentSettings.DotSize * unitSize * 1.5;
-        let dotY = this.getRestDotVerticalDisplacement(noteLength) * unitSize;
+        let dotY = this.getRestDotVerticalDisplacement(noteSize) * unitSize;
         obj.dotRects.push(DivRect.createCentered(dotX, dotY, dotWidth, dotWidth));
       }
       obj.offset(0, staff.getDiatonicIdY(ownDiatonicId));
@@ -1826,18 +1826,18 @@ var ObjRest = class extends MusicObject {
     renderer.drawDebugRect(this.getRect());
     let { unitSize, lineWidth } = renderer;
     let { color } = this;
-    let { noteLength, flagCount } = this.rhythmProps;
+    let { noteSize, flagCount } = this.rhythmProps;
     ctx.strokeStyle = ctx.fillStyle = color;
     ctx.lineWidth = lineWidth;
     this.staffObjects.forEach((obj) => {
       let { dotRects, restRect } = obj;
       let x = restRect.centerX;
       let y = restRect.centerY;
-      if (noteLength === NoteLength.Whole) {
+      if (NoteLengthProps.equals(noteSize, NoteLength.Whole)) {
         ctx.fillRect(x - unitSize, y, unitSize * 2, unitSize);
-      } else if (noteLength === NoteLength.Half) {
+      } else if (NoteLengthProps.equals(noteSize, NoteLength.Half)) {
         ctx.fillRect(x - unitSize, y - unitSize, unitSize * 2, unitSize);
-      } else if (noteLength === NoteLength.Quarter) {
+      } else if (NoteLengthProps.equals(noteSize, NoteLength.Quarter)) {
         ctx.beginPath();
         ctx.moveTo(x - unitSize * 0.6, y - unitSize * 3.2);
         ctx.lineTo(x + unitSize * 0.7, y - unitSize * 1.5);

package/dist/theory/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.2.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/theory/index.mjs

@@ -1,4 +1,4 @@
-/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.2.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   NoteLength,
   NoteLengthProps,
@@ -6,10 +6,10 @@ import {
   Tuplet,
   validateNoteLength,
   validateTupletRatio
-} from "../chunk-7MNV5JN6.mjs";
+} from "../chunk-RQFFLRWF.mjs";
 import {
   __publicField
-} from "../chunk-5NWLGWHS.mjs";
+} from "../chunk-64N22LCV.mjs";
 
 // src/theory/chord.ts
 import { Utils as Utils6 } from "@tspro/ts-utils-lib";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tspro/web-music-score",
-    "version": "4.2.0",
+    "version": "4.2.1",
     "author": "PahkaSoft",
     "license": "MIT",
     "private": false,
@@ -96,7 +96,7 @@
         "package.json"
     ],
     "dependencies": {
-        "@tspro/ts-utils-lib": "^1.6.0",
+        "@tspro/ts-utils-lib": "^1.7.0",
         "tone": "^15.1.22"
     },
     "peerDependencies": {