@tspro/web-music-score 4.0.1 → 4.1.0

package/dist/theory/index.d.ts

@@ -1,9 +1,9 @@
 import { N as Note } from '../note-eA2xPPiG.js';
 export { A as Accidental, d as DefaultGuitarNoteLabel, D as DefaultPitchNotation, G as GuitarNoteLabel, e as GuitarNoteLabelList, a as NoteLetter, P as ParsedNote, b as PitchNotation, c as PitchNotationList, S as SymbolSet, g as getPitchNotationName, f as validateGuitarNoteLabel, v as validatePitchNotation } from '../note-eA2xPPiG.js';
-import { D as Degree } from '../scale-B2Icbetz.js';
-export { b as Interval, I as IntervalDirection, a as IntervalQuality, c as Scale, d as ScaleFactory, S as ScaleType, i as getDefaultScale, h as getScale, e as getScaleFactory, g as getScaleFactoryList, v as validateIntervalQuality, f as validateScaleType } from '../scale-B2Icbetz.js';
+import { D as Degree } from '../scale-DQNA-YLD.js';
+export { b as Interval, I as IntervalDirection, a as IntervalQuality, c as Scale, d as ScaleFactory, S as ScaleType, i as getDefaultScale, h as getScale, e as getScaleFactory, g as getScaleFactoryList, v as validateIntervalQuality, f as validateScaleType } from '../scale-DQNA-YLD.js';
 export { D as DefaultHandedness, a as DefaultTuningName, H as Handedness, T as TuningNameList, g as getTuningStrings, v as validateHandedness, b as validateTuningName } from '../guitar-CaZJDA05.js';
-export { A as AccidentalType, K as KeySignature, M as Mode, N as NoteLength, i as NoteLengthProps, h as NoteLengthStr, R as RhythmProps, c as Tempo, a as TimeSignature, T as TimeSignatureString, l as Tuplet, j as TupletRatio, f as alterTempoSpeed, g as getDefaultKeySignature, d as getDefaultTempo, b as getDefaultTimeSignature, e as getTempoString, v as validateNoteLength, k as validateTupletRatio } from '../tempo-Dt8aHpol.js';
+export { A as AccidentalType, B as BeamGrouping, K as KeySignature, M as Mode, N as NoteLength, j as NoteLengthProps, i as NoteLengthStr, R as RhythmProps, d as Tempo, b as TimeSignature, a as TimeSignatureString, T as TimeSignatures, m as Tuplet, k as TupletRatio, h as alterTempoSpeed, g as getDefaultKeySignature, e as getDefaultTempo, c as getDefaultTimeSignature, f as getTempoString, v as validateNoteLength, l as validateTupletRatio } from '../tempo-Bp1UzsrZ.js';
 
 /** Chord info type. */
 type ChordInfo = {

package/dist/theory/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v4.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.1.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -24,6 +24,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 var theory_exports = {};
 __export(theory_exports, {
   AccidentalType: () => AccidentalType,
+  BeamGrouping: () => BeamGrouping,
   Chord: () => Chord,
   DefaultGuitarNoteLabel: () => DefaultGuitarNoteLabel,
   DefaultHandedness: () => DefaultHandedness,
@@ -46,6 +47,7 @@ __export(theory_exports, {
   ScaleType: () => ScaleType,
   SymbolSet: () => SymbolSet,
   TimeSignature: () => TimeSignature,
+  TimeSignatures: () => TimeSignatures,
   TuningNameList: () => TuningNameList,
   Tuplet: () => Tuplet,
   alterTempoSpeed: () => alterTempoSpeed,
@@ -2129,6 +2131,24 @@ var RhythmProps = _RhythmProps;
 
 // src/theory/time-signature.ts
 var import_core9 = require("@tspro/web-music-score/core");
+var TimeSignatures = /* @__PURE__ */ ((TimeSignatures2) => {
+  TimeSignatures2["_2_4"] = "2/4";
+  TimeSignatures2["_3_4"] = "3/4";
+  TimeSignatures2["_4_4"] = "4/4";
+  TimeSignatures2["_5_8"] = "5/8";
+  TimeSignatures2["_6_8"] = "6/8";
+  TimeSignatures2["_7_8"] = "7/8";
+  TimeSignatures2["_9_8"] = "9/8";
+  TimeSignatures2["_12_8"] = "12/8";
+  return TimeSignatures2;
+})(TimeSignatures || {});
+var BeamGrouping = /* @__PURE__ */ ((BeamGrouping2) => {
+  BeamGrouping2["_2_3"] = "2-3";
+  BeamGrouping2["_3_2"] = "3-2";
+  BeamGrouping2["_2_2_3"] = "2-2-3";
+  BeamGrouping2["_3_2_2"] = "3-2-2";
+  return BeamGrouping2;
+})(BeamGrouping || {});
 var TimeSignature = class {
   constructor(...args) {
     /** Number of beats in measure, upper value (e.g. "3" in "3/4"). */
@@ -2139,17 +2159,22 @@ var TimeSignature = class {
     __publicField(this, "beatLength");
     /** Number of ticks in measure. */
     __publicField(this, "measureTicks");
-    /** Number of beam groups in measure. */
-    __publicField(this, "beamGroupCount");
-    /** Length of one beam group. */
-    __publicField(this, "beamGroupLength");
-    if (args.length === 1 && typeof args[0] === "string") {
+    /** Beam groups (e.g. [[2], [2]] or [[2, 2], [2, 2]] (first try as [[4], [4]])). */
+    __publicField(this, "beamGroupSizes", []);
+    let beamGrouping;
+    if (import_ts_utils_lib9.Utils.Is.isEnumValue(args[0], TimeSignatures)) {
       let parts = args[0].split("/");
       this.beatCount = +parts[0];
       this.beatSize = +parts[1];
-    } else if (args.length === 2 && typeof args[0] === "number" && typeof args[1] === "number") {
+      if (import_ts_utils_lib9.Utils.Is.isEnumValue(args[1], BeamGrouping)) {
+        beamGrouping = args[1];
+      }
+    } else if (import_ts_utils_lib9.Utils.Is.isIntegerGte(args[0], 2) && import_ts_utils_lib9.Utils.Is.isIntegerGte(args[1], 2)) {
       this.beatCount = args[0];
       this.beatSize = args[1];
+      if (import_ts_utils_lib9.Utils.Is.isEnumValue(args[2], BeamGrouping)) {
+        beamGrouping = args[2];
+      }
     } else {
       throw new import_core9.MusicError(import_core9.MusicErrorType.Timesignature, `Invalid args: ${args}`);
     }
@@ -2158,20 +2183,40 @@ var TimeSignature = class {
     } else if (!import_ts_utils_lib9.Utils.Is.isIntegerGte(this.beatSize, 1)) {
       throw new import_core9.MusicError(import_core9.MusicErrorType.Timesignature, `Invalid beatSize: ${this.beatSize}`);
     }
-    let props = NoteLengthProps.create(this.beatSize);
-    this.beatLength = props.noteLength;
-    this.measureTicks = this.beatCount * props.ticks;
-    if (this.is(2, 4) || this.is(3, 4) || this.is(4, 4)) {
-      this.beamGroupCount = this.beatCount;
-    } else if (this.is(6, 8) || this.is(9, 8)) {
-      this.beamGroupCount = this.beatCount / 3;
-    } else {
-      console.warn("Not necessarily an error, but unsupported time signature: " + this.toString());
-      this.beamGroupCount = 1;
+    let { noteLength, ticks } = NoteLengthProps.create(this.beatSize);
+    this.beatLength = noteLength;
+    this.measureTicks = this.beatCount * ticks;
+    if (this.is(2, 4)) {
+      this.beamGroupSizes = [[2], [2]];
+    } else if (this.is(3, 4)) {
+      this.beamGroupSizes = [[2], [2], [2]];
+    } else if (this.is(4, 4)) {
+      this.beamGroupSizes = [[2, 2], [2, 2]];
+    } else if (this.is(5, 8)) {
+      if (!import_ts_utils_lib9.Utils.Is.isUndefined(beamGrouping) && beamGrouping !== "2-3" /* _2_3 */ && beamGrouping !== "3-2" /* _3_2 */) {
+        throw new import_core9.MusicError(import_core9.MusicErrorType.Timesignature, `Invalid beam grouping "${beamGrouping}" for time signature "${this.toString()}".`);
+      } else {
+        this.beamGroupSizes = beamGrouping === "3-2" /* _3_2 */ ? [[3], [2]] : [[2], [3]];
+        beamGrouping = void 0;
+      }
+    } else if (this.is(6, 8)) {
+      this.beamGroupSizes = [[3], [3]];
+    } else if (this.is(7, 8)) {
+      if (!import_ts_utils_lib9.Utils.Is.isUndefined(beamGrouping) && beamGrouping !== "2-2-3" /* _2_2_3 */ && beamGrouping !== "3-2-2" /* _3_2_2 */) {
+        throw new import_core9.MusicError(import_core9.MusicErrorType.Timesignature, `Invalid beam grouping "${beamGrouping}" for time signature "${this.toString()}".`);
+      } else {
+        this.beamGroupSizes = beamGrouping === "3-2-2" /* _3_2_2 */ ? [[3], [2], [2]] : [[2], [2], [3]];
+        beamGrouping = void 0;
+      }
+    } else if (this.is(9, 8)) {
+      this.beamGroupSizes = [[3], [3], [3]];
+    } else if (this.is(12, 8)) {
+      this.beamGroupSizes = [[3], [3], [3], [3]];
     }
-    this.beamGroupLength = this.measureTicks / this.beamGroupCount;
-    if (!import_ts_utils_lib9.Utils.Is.isIntegerGte(this.beamGroupLength, 1)) {
-      throw new import_core9.MusicError(import_core9.MusicErrorType.Timesignature, `Invalid beamGroupLength: ${this.beamGroupLength}`);
+    if (this.beamGroupSizes.length === 0) {
+      throw new import_core9.MusicError(import_core9.MusicErrorType.Timesignature, `Unimplemented time signature "${this.toString()}".`);
+    } else if (beamGrouping !== void 0) {
+      throw new import_core9.MusicError(import_core9.MusicErrorType.Timesignature, `Invalid beam grouping "${beamGrouping}" for time signature "${this.toString()}".`);
     }
   }
   /**
@@ -2223,6 +2268,7 @@ var import_core10 = require("@tspro/web-music-score/core");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AccidentalType,
+  BeamGrouping,
   Chord,
   DefaultGuitarNoteLabel,
   DefaultHandedness,
@@ -2245,6 +2291,7 @@ var import_core10 = require("@tspro/web-music-score/core");
   ScaleType,
   SymbolSet,
   TimeSignature,
+  TimeSignatures,
   TuningNameList,
   Tuplet,
   alterTempoSpeed,

package/dist/theory/index.mjs

@@ -1,7 +1,7 @@
-/* WebMusicScore v4.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.1.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   __publicField
-} from "../chunk-YFPLOHP2.mjs";
+} from "../chunk-MHNTJ6FU.mjs";
 
 // src/theory/chord.ts
 import { Utils as Utils6 } from "@tspro/ts-utils-lib";
@@ -2062,6 +2062,24 @@ var RhythmProps = _RhythmProps;
 
 // src/theory/time-signature.ts
 import { MusicError as MusicError9, MusicErrorType as MusicErrorType9 } from "@tspro/web-music-score/core";
+var TimeSignatures = /* @__PURE__ */ ((TimeSignatures2) => {
+  TimeSignatures2["_2_4"] = "2/4";
+  TimeSignatures2["_3_4"] = "3/4";
+  TimeSignatures2["_4_4"] = "4/4";
+  TimeSignatures2["_5_8"] = "5/8";
+  TimeSignatures2["_6_8"] = "6/8";
+  TimeSignatures2["_7_8"] = "7/8";
+  TimeSignatures2["_9_8"] = "9/8";
+  TimeSignatures2["_12_8"] = "12/8";
+  return TimeSignatures2;
+})(TimeSignatures || {});
+var BeamGrouping = /* @__PURE__ */ ((BeamGrouping2) => {
+  BeamGrouping2["_2_3"] = "2-3";
+  BeamGrouping2["_3_2"] = "3-2";
+  BeamGrouping2["_2_2_3"] = "2-2-3";
+  BeamGrouping2["_3_2_2"] = "3-2-2";
+  return BeamGrouping2;
+})(BeamGrouping || {});
 var TimeSignature = class {
   constructor(...args) {
     /** Number of beats in measure, upper value (e.g. "3" in "3/4"). */
@@ -2072,17 +2090,22 @@ var TimeSignature = class {
     __publicField(this, "beatLength");
     /** Number of ticks in measure. */
     __publicField(this, "measureTicks");
-    /** Number of beam groups in measure. */
-    __publicField(this, "beamGroupCount");
-    /** Length of one beam group. */
-    __publicField(this, "beamGroupLength");
-    if (args.length === 1 && typeof args[0] === "string") {
+    /** Beam groups (e.g. [[2], [2]] or [[2, 2], [2, 2]] (first try as [[4], [4]])). */
+    __publicField(this, "beamGroupSizes", []);
+    let beamGrouping;
+    if (Utils9.Is.isEnumValue(args[0], TimeSignatures)) {
       let parts = args[0].split("/");
       this.beatCount = +parts[0];
       this.beatSize = +parts[1];
-    } else if (args.length === 2 && typeof args[0] === "number" && typeof args[1] === "number") {
+      if (Utils9.Is.isEnumValue(args[1], BeamGrouping)) {
+        beamGrouping = args[1];
+      }
+    } else if (Utils9.Is.isIntegerGte(args[0], 2) && Utils9.Is.isIntegerGte(args[1], 2)) {
       this.beatCount = args[0];
       this.beatSize = args[1];
+      if (Utils9.Is.isEnumValue(args[2], BeamGrouping)) {
+        beamGrouping = args[2];
+      }
     } else {
       throw new MusicError9(MusicErrorType9.Timesignature, `Invalid args: ${args}`);
     }
@@ -2091,20 +2114,40 @@ var TimeSignature = class {
     } else if (!Utils9.Is.isIntegerGte(this.beatSize, 1)) {
       throw new MusicError9(MusicErrorType9.Timesignature, `Invalid beatSize: ${this.beatSize}`);
     }
-    let props = NoteLengthProps.create(this.beatSize);
-    this.beatLength = props.noteLength;
-    this.measureTicks = this.beatCount * props.ticks;
-    if (this.is(2, 4) || this.is(3, 4) || this.is(4, 4)) {
-      this.beamGroupCount = this.beatCount;
-    } else if (this.is(6, 8) || this.is(9, 8)) {
-      this.beamGroupCount = this.beatCount / 3;
-    } else {
-      console.warn("Not necessarily an error, but unsupported time signature: " + this.toString());
-      this.beamGroupCount = 1;
+    let { noteLength, ticks } = NoteLengthProps.create(this.beatSize);
+    this.beatLength = noteLength;
+    this.measureTicks = this.beatCount * ticks;
+    if (this.is(2, 4)) {
+      this.beamGroupSizes = [[2], [2]];
+    } else if (this.is(3, 4)) {
+      this.beamGroupSizes = [[2], [2], [2]];
+    } else if (this.is(4, 4)) {
+      this.beamGroupSizes = [[2, 2], [2, 2]];
+    } else if (this.is(5, 8)) {
+      if (!Utils9.Is.isUndefined(beamGrouping) && beamGrouping !== "2-3" /* _2_3 */ && beamGrouping !== "3-2" /* _3_2 */) {
+        throw new MusicError9(MusicErrorType9.Timesignature, `Invalid beam grouping "${beamGrouping}" for time signature "${this.toString()}".`);
+      } else {
+        this.beamGroupSizes = beamGrouping === "3-2" /* _3_2 */ ? [[3], [2]] : [[2], [3]];
+        beamGrouping = void 0;
+      }
+    } else if (this.is(6, 8)) {
+      this.beamGroupSizes = [[3], [3]];
+    } else if (this.is(7, 8)) {
+      if (!Utils9.Is.isUndefined(beamGrouping) && beamGrouping !== "2-2-3" /* _2_2_3 */ && beamGrouping !== "3-2-2" /* _3_2_2 */) {
+        throw new MusicError9(MusicErrorType9.Timesignature, `Invalid beam grouping "${beamGrouping}" for time signature "${this.toString()}".`);
+      } else {
+        this.beamGroupSizes = beamGrouping === "3-2-2" /* _3_2_2 */ ? [[3], [2], [2]] : [[2], [2], [3]];
+        beamGrouping = void 0;
+      }
+    } else if (this.is(9, 8)) {
+      this.beamGroupSizes = [[3], [3], [3]];
+    } else if (this.is(12, 8)) {
+      this.beamGroupSizes = [[3], [3], [3], [3]];
     }
-    this.beamGroupLength = this.measureTicks / this.beamGroupCount;
-    if (!Utils9.Is.isIntegerGte(this.beamGroupLength, 1)) {
-      throw new MusicError9(MusicErrorType9.Timesignature, `Invalid beamGroupLength: ${this.beamGroupLength}`);
+    if (this.beamGroupSizes.length === 0) {
+      throw new MusicError9(MusicErrorType9.Timesignature, `Unimplemented time signature "${this.toString()}".`);
+    } else if (beamGrouping !== void 0) {
+      throw new MusicError9(MusicErrorType9.Timesignature, `Invalid beam grouping "${beamGrouping}" for time signature "${this.toString()}".`);
     }
   }
   /**
@@ -2155,6 +2198,7 @@ import { init as initCore } from "@tspro/web-music-score/core";
 initCore();
 export {
   AccidentalType,
+  BeamGrouping,
   Chord,
   DefaultGuitarNoteLabel,
   DefaultHandedness,
@@ -2177,6 +2221,7 @@ export {
   ScaleType,
   SymbolSet,
   TimeSignature,
+  TimeSignatures,
   TuningNameList,
   Tuplet,
   alterTempoSpeed,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tspro/web-music-score",
-    "version": "4.0.1",
+    "version": "4.1.0",
     "author": "PahkaSoft",
     "license": "MIT",
     "private": false,
@@ -102,6 +102,7 @@
         "@tspro/tsup-plugin-inline-assets": "^1.0.0",
         "@types/react": "^18.0.0",
         "@types/react-dom": "^18.0.0",
+        "rimraf": "^6.0.1",
         "tsup": "^8.5.0",
         "typedoc": "^0.28.6",
         "typescript": "latest"
@@ -117,4 +118,4 @@
         "build:prod (all workspaces)": "npm run build && npm run build:prod --workspaces --if-present",
         "docs": "typedoc"
     }
-}
+}