@tspro/web-music-score 4.0.1 → 4.1.0

package/dist/score/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/score/pub/div-rect.ts
 import { Utils } from "@tspro/ts-utils-lib";
@@ -38,11 +38,11 @@ var DivRect = class _DivRect {
   /**
    * Create rect from basic left, top, width and height arguments.
    * 
-   * @param left -
-   * @param top -
-   * @param width -
-   * @param height -
-   * @returns 
+   * @param left - Left coordinate.
+   * @param top - Top coordinate.
+   * @param width - With.
+   * @param height - Height.
+   * @returns - DivRect.
    */
   static create(left, top, width, height) {
     return new _DivRect(left, left + width, top, top + height);
@@ -52,9 +52,9 @@ var DivRect = class _DivRect {
    * 
    * @param centerX - Center x-coordinate.
    * @param centerY - Center y-coordinate.
-   * @param width -
-   * @param height -
-   * @returns 
+   * @param width - Width.
+   * @param height - Height.
+   * @returns - DivRect.
    */
   static createCentered(centerX, centerY, width, height) {
     return new _DivRect(centerX - width / 2, centerX + width / 2, centerY - height / 2, centerY + height / 2);
@@ -66,43 +66,43 @@ var DivRect = class _DivRect {
    * @param rightw - Right section width.
    * @param toph - Top section height.
    * @param bottomh - Bottomsection height.
-   * @returns 
+   * @returns - DivRect.
    */
   static createSections(leftw, rightw, toph, bottomh) {
     return new _DivRect(-leftw, 0, rightw, -toph, 0, bottomh);
   }
   /**
-   * Width.
+   * Width getter.
    */
   get width() {
     return this.right - this.left;
   }
   /**
-   * Height.
+   * Height getter.
    */
   get height() {
     return this.bottom - this.top;
   }
   /**
-   * Left section width.
+   * Left section width getter.
    */
   get leftw() {
     return this.centerX - this.left;
   }
   /**
-   * Right section width.
+   * Right section width getter.
    */
   get rightw() {
     return this.right - this.centerX;
   }
   /**
-   * Top section height.
+   * Top section height getter.
    */
   get toph() {
     return this.centerY - this.top;
   }
   /**
-   * Bottom section height.
+   * Bottom section height getter.
    */
   get bottomh() {
     return this.bottom - this.centerY;
@@ -110,9 +110,9 @@ var DivRect = class _DivRect {
   /**
    * Does this Rect contain given (x, y)-point?
    * 
-   * @param x -
-   * @param y -
-   * @returns 
+   * @param x - X-coordinate.
+   * @param y - Y-coordinate.
+   * @returns - True/false.
    */
   contains(x, y) {
     return x >= this.left && x <= this.right && y >= this.top && y <= this.bottom;
@@ -120,9 +120,9 @@ var DivRect = class _DivRect {
   /**
    * Do a and b rects overlap?
    * 
-   * @param a -
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static overlap(a, b) {
     return a.right > b.left && a.left < b.right && a.bottom > b.top && a.top < b.bottom;
@@ -130,17 +130,18 @@ var DivRect = class _DivRect {
   /**
    * Do horizontal measures of a and b rects overlap?
    * 
-   * @param a -
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static overlapX(a, b) {
     return a.right > b.left && a.left < b.right;
   }
   /**
    * Check if this Rect equals with given Rect.
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static equals(a, b) {
     if (a == null && b == null) {
@@ -152,10 +153,11 @@ var DivRect = class _DivRect {
     }
   }
   /**
-   * Check if frame (ignoring centerX/Y) of this Rect equals with given Rect, ignoring centerX and centerY.
+   * Check if frame of this Rect equals with given Rect, ignoring center x- and center y-coordinates.
    * 
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static equalsFrame(a, b) {
     if (a == null && b == null) {
@@ -169,7 +171,7 @@ var DivRect = class _DivRect {
   /**
    * Created duplicate of this Rect.
    * 
-   * @returns 
+   * @returns - Duplicate.
    */
   copy() {
     return new _DivRect(this.left, this.centerX, this.right, this.top, this.centerY, this.bottom);
@@ -177,9 +179,9 @@ var DivRect = class _DivRect {
   /**
    * Move this rect by (dx, dy). Modifies this Rect.
    * 
-   * @param dx -
-   * @param dy -
-   * @returns 
+   * @param dx - Offset amount in x-direction.
+   * @param dy - Offset amount in y-direction.
+   * @returns - This DivRect instance.
    */
   offsetInPlace(dx, dy) {
     this.left += dx;
@@ -193,9 +195,9 @@ var DivRect = class _DivRect {
   /**
    * Move this rect by (dx, dy). Immutable, returns modified copy.
    * 
-   * @param dx -
-   * @param dy -
-   * @returns 
+   * @param dx - Offset amount in x-direction.
+   * @param dy - Offset amount in y-direction.
+   * @returns - DivRect copy with applied offset.
    */
   offsetCopy(dx, dy) {
     return this.copy().offsetInPlace(dx, dy);
@@ -203,8 +205,8 @@ var DivRect = class _DivRect {
   /**
    * Expand this Rect by given Rect. Modifies this Rect.
    * 
-   * @param rect - 
-   * @returns 
+   * @param rect - DivRect to expand this instance with.
+   * @returns - This DivRect instance.
    */
   expandInPlace(rect) {
     this.left = Math.min(this.left, rect.left);
@@ -216,8 +218,8 @@ var DivRect = class _DivRect {
   /**
    * Expand this Rect by given Rect. Immutable, returns modified copy.
    * 
-   * @param rect -
-   * @returns 
+   * @param rect - DivRect to expand this instance with.
+   * @returns - Expanded copy of this DivRect.
    */
   expandCopy(rect) {
     return this.copy().expandInPlace(rect);
@@ -225,8 +227,8 @@ var DivRect = class _DivRect {
   /**
    * Clip this Rect by given Rect. Mmodifies this Rect.
    * 
-   * @param clipRect -
-   * @returns 
+   * @param clipRect - DivRect to clip this instance with.
+   * @returns - This DivRect instance.
    */
   clipInPlace(clipRect) {
     this.left = Math.max(this.left, clipRect.left);
@@ -240,8 +242,8 @@ var DivRect = class _DivRect {
   /**
    * Clip this Rect by given Rect. Immutable, return modified copy.
    * 
-   * @param clipRect -
-   * @returns 
+   * @param clipRect - DivRecto to clip this instance with.
+   * @returns - Clipped DivRect copy.
    */
   clipCopy(clipRect) {
     return this.copy().clipInPlace(clipRect);
@@ -249,9 +251,9 @@ var DivRect = class _DivRect {
   /**
    * Scale Rect. Anchor pos is (centerX, centerY). Modifies this Rect.
    * 
-   * @param scaleX -
-   * @param scaleY -
-   * @returns Copy of scaled Rect.
+   * @param scaleX - Scale x-amount.
+   * @param scaleY - Scale y-amount. If undefined then scale x-amount is used.
+   * @returns This DivRect instance.
    */
   scaleInPlace(scaleX, scaleY) {
     scaleY = scaleY != null ? scaleY : scaleX;
@@ -264,13 +266,17 @@ var DivRect = class _DivRect {
   /**
    * Scale Rect. Anchor pos is (centerX, centerY). Immutable, returns modified copy.
    * 
-   * @param scaleX -
-   * @param scaleY -
-   * @returns Copy of scaled Rect.
+   * @param scaleX - Scale x-amount.
+   * @param scaleY - Scale y-amount. If undefined then scale x-amount is used.
+   * @returns Scaled copy of this DivRect.
    */
   scaleCopy(scaleX, scaleY) {
     return this.copy().scaleInPlace(scaleX, scaleY);
   }
+  /**
+   * Get this DivRect instance.
+   * @returns - This DivRect instance.
+   */
   getRect() {
     return this;
   }
@@ -896,7 +902,7 @@ import { Utils as Utils11 } from "@tspro/ts-utils-lib";
 // src/score/engine/obj-measure.ts
 import { Utils as Utils10 } from "@tspro/ts-utils-lib";
 import { getScale, Scale, validateScaleType, Note as Note7, RhythmProps as RhythmProps4, KeySignature as KeySignature2, getDefaultKeySignature, PitchNotation, SymbolSet, validateNoteLength, NoteLengthProps as NoteLengthProps4 } from "@tspro/web-music-score/theory";
-import { getDefaultTempo, TimeSignature, getDefaultTimeSignature } from "@tspro/web-music-score/theory";
+import { getDefaultTempo, getDefaultTimeSignature } from "@tspro/web-music-score/theory";
 
 // src/score/engine/acc-state.ts
 import { Note } from "@tspro/web-music-score/theory";
@@ -1279,9 +1285,9 @@ var ObjSignature = class extends MusicObject {
     if (showTimeSignature) {
       let timeSignature = this.measure.getTimeSignature();
       let beatCount = timeSignature.beatCount.toString();
-      this.beatCountText = new ObjText(this, { text: beatCount, scale: 1.4 }, 0, 0.5);
+      this.beatCountText = new ObjText(this, { text: beatCount, scale: 1.4 }, 0.5, 0.5);
       let beatSize = timeSignature.beatSize.toString();
-      this.beatSizeText = new ObjText(this, { text: beatSize, scale: 1.4 }, 0, 0.5);
+      this.beatSizeText = new ObjText(this, { text: beatSize, scale: 1.4 }, 0.5, 0.5);
     } else {
       this.beatCountText = this.beatSizeText = void 0;
     }
@@ -1371,6 +1377,7 @@ var ObjSignature = class extends MusicObject {
     return [this];
   }
   layout(renderer) {
+    var _a, _b, _c, _d, _e, _f;
     let { unitSize } = renderer;
     let { staff } = this;
     let paddingX = unitSize;
@@ -1415,15 +1422,16 @@ var ObjSignature = class extends MusicObject {
       });
     }
     let right = x;
+    (_a = this.beatCountText) == null ? void 0 : _a.layout(renderer);
+    (_b = this.beatSizeText) == null ? void 0 : _b.layout(renderer);
+    let tsWidth = Math.max((_d = (_c = this.beatCountText) == null ? void 0 : _c.getRect().width) != null ? _d : 0, (_f = (_e = this.beatSizeText) == null ? void 0 : _e.getRect().width) != null ? _f : 0);
     if (this.beatCountText) {
-      this.beatCountText.layout(renderer);
-      this.beatCountText.offset(x + paddingX, staff.getDiatonicIdY(staff.middleLineDiatonicId + 2));
+      this.beatCountText.offset(x + tsWidth / 2 + paddingX, staff.getDiatonicIdY(staff.middleLineDiatonicId + 2));
       this.rect.expandInPlace(this.beatCountText.getRect());
       right = Math.max(right, this.rect.right);
     }
     if (this.beatSizeText) {
-      this.beatSizeText.layout(renderer);
-      this.beatSizeText.offset(x + paddingX, staff.getDiatonicIdY(staff.bottomLineDiatonicId + 2));
+      this.beatSizeText.offset(x + tsWidth / 2 + paddingX, staff.getDiatonicIdY(staff.bottomLineDiatonicId + 2));
       this.rect.expandInPlace(this.beatSizeText.getRect());
       right = Math.max(right, this.rect.right);
     }
@@ -2812,11 +2820,10 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
   }
   setStemTipY(staff, stemTipY) {
     let obj = this.staffObjects.find((obj2) => obj2.staff === staff);
-    if (!(obj == null ? void 0 : obj.stemTip) || stemTipY === obj.stemTip.centerY) {
-      return;
+    if (this.hasBeamCount() && (obj == null ? void 0 : obj.stemTip) && stemTipY !== obj.stemTip.centerY) {
+      obj.stemTip.top = obj.stemTip.centerY = obj.stemTip.bottom = stemTipY;
+      this.requestRectUpdate();
     }
-    obj.stemTip.top = obj.stemTip.centerY = obj.stemTip.bottom = stemTipY;
-    this.requestRectUpdate();
   }
   offset(dx, dy) {
     this.staffObjects.forEach((obj) => obj.offset(dx, 0));
@@ -5025,7 +5032,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   setTimeSignature(timeSignature) {
     var _a;
     (_a = this.getPrevMeasure()) == null ? void 0 : _a.endSection();
-    this.alterTimeSignature = timeSignature instanceof TimeSignature ? timeSignature : new TimeSignature(timeSignature);
+    this.alterTimeSignature = timeSignature;
     this.updateTimeSignature();
   }
   updateTimeSignature() {
@@ -5555,52 +5562,77 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         return false;
       }
     });
+    let ts = this.getTimeSignature();
+    if (!this.needBeamsUpdate || ts.beamGroupSizes.length === 0) {
+      return;
+    }
     getVoiceIds().forEach((voiceId) => {
-      let symbols = this.getVoiceSymbols(voiceId);
-      if (symbols.length <= 2) {
-        return;
-      }
-      if (!DebugSettings.DisableBeams) {
-        let groupSymbols = [];
+      let symbols = this.getVoiceSymbols(voiceId).slice();
+      if (symbols.length >= 2) {
+        let symbolsStartTicks = this.isUpBeat() ? Math.max(0, this.getMeasureTicks() - this.getConsumedTicks()) : 0;
         let groupStartTicks = 0;
-        let groupEndTicks = 0;
-        if (this.isUpBeat()) {
-          let startTicks = Math.max(0, this.getMeasureTicks() - this.getConsumedTicks());
-          groupStartTicks = groupEndTicks = startTicks;
-        }
-        let ts = this.getTimeSignature();
-        symbols.forEach((symbol) => {
-          groupSymbols.push(symbol);
-          groupEndTicks += symbol.rhythmProps.ticks;
-          if (groupStartTicks === 0 && groupEndTicks === ts.beamGroupLength) {
-            _ObjMeasure.setupBeamGroup(groupSymbols);
-          }
-          while (groupEndTicks >= ts.beamGroupLength) {
-            groupSymbols = [];
-            groupStartTicks = groupEndTicks = groupEndTicks - ts.beamGroupLength;
+        for (let groupId = 0; groupId < ts.beamGroupSizes.length; groupId++) {
+          let beamGroupSize = ts.beamGroupSizes[groupId];
+          let groupSizeSum = 0;
+          beamGroupSize.forEach((s) => groupSizeSum += s);
+          let groupLength = groupSizeSum * NoteLengthProps4.get("8n").ticks;
+          let groupSymbols = [];
+          let groupSymbolsLength = 0;
+          while (symbols.length > 0 && groupSymbolsLength < groupLength) {
+            let symbol = symbols[0];
+            if (symbol.col.positionTicks >= groupStartTicks) {
+              groupSymbols.push(symbol);
+              groupSymbolsLength += symbol.rhythmProps.ticks;
+              symbols.shift();
+            } else {
+              break;
+            }
           }
-        });
+          _ObjMeasure.setupBeamGroup(groupSymbols, beamGroupSize);
+          symbolsStartTicks += groupSymbolsLength;
+          groupStartTicks += groupLength;
+        }
       }
     });
     this.needBeamsUpdate = false;
     this.requestLayout();
   }
-  static setupBeamGroup(groupSymbols) {
+  static setupBeamGroup(groupSymbols, mainBeamGroupSizeArr) {
+    if (mainBeamGroupSizeArr.length === 0) {
+      return false;
+    }
     let groupNotes = groupSymbols.map((s) => {
       var _a;
       return s instanceof ObjNoteGroup && ((_a = s.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? s : void 0;
     });
     ObjNoteGroup.setBeamCounts(groupNotes);
-    let beamNotes = [];
-    groupNotes.forEach((noteGroup) => {
-      if (noteGroup && noteGroup.hasBeamCount()) {
-        beamNotes.push(noteGroup);
-      } else {
-        ObjBeamGroup.createBeam(beamNotes);
-        beamNotes = [];
-      }
-    });
-    ObjBeamGroup.createBeam(beamNotes);
+    let beamGroupSizeArrList = [mainBeamGroupSizeArr];
+    if (mainBeamGroupSizeArr.length > 1) {
+      let sum = 0;
+      mainBeamGroupSizeArr.forEach((s) => sum += s);
+      beamGroupSizeArrList.unshift([sum]);
+    }
+    let beamsCreated = false;
+    while (beamGroupSizeArrList.length > 0 && !beamsCreated) {
+      let beamGroupSizeArr = beamGroupSizeArrList.shift();
+      let groupSymbolsCopy = groupSymbols.slice();
+      beamGroupSizeArr.forEach((beamGroupSize) => {
+        var _a;
+        let beamGroupLength = beamGroupSize * NoteLengthProps4.get("8n").ticks;
+        let beamNotesLength = 0;
+        let beamNotes = [];
+        while (beamNotesLength < beamGroupLength && groupSymbolsCopy.length > 0) {
+          let symbol = groupSymbolsCopy.shift();
+          beamNotesLength += symbol.rhythmProps.ticks;
+          beamNotes.push(symbol instanceof ObjNoteGroup && ((_a = symbol.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? symbol : void 0);
+        }
+        if (beamNotesLength === beamGroupLength && beamNotes.every((n) => n !== void 0) && (beamNotes.every((n) => n.rhythmProps.flagCount === 1) || beamGroupSizeArrList.length === 0)) {
+          ObjBeamGroup.createBeam(beamNotes);
+          beamsCreated = true;
+        }
+      });
+    }
+    return beamsCreated;
   }
   getBarLineLeft() {
     return this.barLineLeft;
@@ -6949,7 +6981,7 @@ var ObjDocument = class extends MusicObject {
 };
 
 // src/score/pub/document-builder.ts
-import { KeySignature as KeySignature3, Note as Note10, NoteLength as NoteLength7, RhythmProps as RhythmProps5, Scale as Scale2, ScaleType, SymbolSet as SymbolSet2, TimeSignature as TimeSignature2, TuningNameList, validateNoteLength as validateNoteLength2, validateTupletRatio } from "@tspro/web-music-score/theory";
+import { BeamGrouping, KeySignature as KeySignature3, Note as Note10, NoteLength as NoteLength7, RhythmProps as RhythmProps5, Scale as Scale2, ScaleType, SymbolSet as SymbolSet2, TimeSignature as TimeSignature2, TimeSignatures, TuningNameList, validateNoteLength as validateNoteLength2, validateTupletRatio } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError17, MusicErrorType as MusicErrorType17 } from "@tspro/web-music-score/core";
 function assertArg(condition, argName, argValue) {
   if (!condition) {
@@ -7117,14 +7149,16 @@ var DocumentBuilder = class {
     this.getMeasure().setKeySignature(...args);
     return this;
   }
-  /**
-   * Set time signature for current measure and forward.
-   * @param timeSignature - TimeSignature  object instance or string (e.g. "3/4").
-   * @returns - This document builder instance.
-   */
-  setTimeSignature(timeSignature) {
-    assertArg(timeSignature instanceof TimeSignature2 || Utils13.Is.isNonEmptyString(timeSignature), "timeSignature", timeSignature);
-    this.getMeasure().setTimeSignature(timeSignature);
+  setTimeSignature(...args) {
+    if (args[0] instanceof TimeSignature2) {
+      this.getMeasure().setTimeSignature(args[0]);
+    } else if (Utils13.Is.isEnumValue(args[0], TimeSignatures) && Utils13.Is.isEnumValueOrUndefined(args[1], BeamGrouping)) {
+      this.getMeasure().setTimeSignature(new TimeSignature2(args[0], args[1]));
+    } else if (Utils13.Is.isIntegerGte(args[0], 1) && Utils13.Is.isIntegerGte(args[1], 1) && Utils13.Is.isEnumValueOrUndefined(args[2], BeamGrouping)) {
+      this.getMeasure().setTimeSignature(new TimeSignature2(args[0], args[1], args[2]));
+    } else {
+      assertArg(false, "timeSignature args", args);
+    }
     return this;
   }
   setTempo(beatsPerMinute, beatLength, dotted) {

package/dist/{tempo-Dt8aHpol.d.ts → tempo-Bp1UzsrZ.d.ts}

@@ -289,8 +289,38 @@ declare class RhythmProps {
     static equals(a: RhythmProps, b: RhythmProps): boolean;
 }
 
-/** Time signature string type. */
-type TimeSignatureString = "2/4" | "3/4" | "4/4" | "6/8" | "9/8";
+/** Time signature enum.  */
+declare enum TimeSignatures {
+    /** 2/4 time signature. */
+    _2_4 = "2/4",
+    /** 3/4 time signature. */
+    _3_4 = "3/4",
+    /** 4/4 time signature. */
+    _4_4 = "4/4",
+    /** 5/8 time signature. */
+    _5_8 = "5/8",
+    /** 6/8 time signature. */
+    _6_8 = "6/8",
+    /** 7/8 time signature. */
+    _7_8 = "7/8",
+    /** 9/8 time signature. */
+    _9_8 = "9/8",
+    /** 12/8 time signature. */
+    _12_8 = "12/8"
+}
+/** @deprecated - Use TimeSignatures enum values or just it's string values. */
+type TimeSignatureString = `${TimeSignatures}`;
+/** Beam grouping enum. */
+declare enum BeamGrouping {
+    /** 2-3 beam grouping for 5/8 time signature. */
+    _2_3 = "2-3",
+    /** 3-2 beam grouping for 5/8 time signature. */
+    _3_2 = "3-2",
+    /** 2-2-3 beam grouping for 7/8 time signature. */
+    _2_2_3 = "2-2-3",
+    /** 3-2-2 beam grouping for 7/8 time signature. */
+    _3_2_2 = "3-2-2"
+}
 /** Time signature class. */
 declare class TimeSignature {
     /** Number of beats in measure, upper value (e.g. "3" in "3/4"). */
@@ -301,21 +331,21 @@ declare class TimeSignature {
     readonly beatLength: NoteLength;
     /** Number of ticks in measure. */
     readonly measureTicks: number;
-    /** Number of beam groups in measure. */
-    readonly beamGroupCount: number;
-    /** Length of one beam group. */
-    readonly beamGroupLength: number;
+    /** Beam groups (e.g. [[2], [2]] or [[2, 2], [2, 2]] (first try as [[4], [4]])). */
+    readonly beamGroupSizes: number[][];
     /**
      * Create new time signature instance.
-     * @param str - For example "4/4".
+     * @param timeSignature - For example "4/4".
+     * @param beamGrouping - Beam grouping (e.g. "3-2" for time signature "5/8").
      */
-    constructor(str: TimeSignatureString);
+    constructor(timeSignature: TimeSignatures | `${TimeSignatures}`, beamGrouping?: BeamGrouping | `${BeamGrouping}`);
     /**
      * Create new time signature instance.
      * @param beatCount - Measure beat count.
      * @param beatSize - Size value: whole-note=1, half-note=2, quarter-note=4, etc.
+     * @param beamGrouping - Beam grouping (e.g. "3-2" for time signature "5/8").
      */
-    constructor(beatCount: number, beatSize: number);
+    constructor(beatCount: number, beatSize: number, beamGrouping?: BeamGrouping | `${BeamGrouping}`);
     /**
      * Test whether this time signature has given beat count and size.
      * @param beatCount - Beat count.
@@ -366,4 +396,4 @@ declare function getTempoString(tempo: Tempo): string;
  */
 declare function alterTempoSpeed(tempo: Tempo, speed: number): Tempo;
 
-export { AccidentalType as A, KeySignature as K, Mode as M, NoteLength as N, RhythmProps as R, type TimeSignatureString as T, TimeSignature as a, getDefaultTimeSignature as b, type Tempo as c, getDefaultTempo as d, getTempoString as e, alterTempoSpeed as f, getDefaultKeySignature as g, type NoteLengthStr as h, NoteLengthProps as i, type TupletRatio as j, validateTupletRatio as k, Tuplet as l, validateNoteLength as v };
+export { AccidentalType as A, BeamGrouping as B, KeySignature as K, Mode as M, NoteLength as N, RhythmProps as R, TimeSignatures as T, type TimeSignatureString as a, TimeSignature as b, getDefaultTimeSignature as c, type Tempo as d, getDefaultTempo as e, getTempoString as f, getDefaultKeySignature as g, alterTempoSpeed as h, type NoteLengthStr as i, NoteLengthProps as j, type TupletRatio as k, validateTupletRatio as l, Tuplet as m, validateNoteLength as v };

package/dist/{tempo-CtUhvJbr.d.mts → tempo-S85Q7uJA.d.mts}

@@ -289,8 +289,38 @@ declare class RhythmProps {
     static equals(a: RhythmProps, b: RhythmProps): boolean;
 }
 
-/** Time signature string type. */
-type TimeSignatureString = "2/4" | "3/4" | "4/4" | "6/8" | "9/8";
+/** Time signature enum.  */
+declare enum TimeSignatures {
+    /** 2/4 time signature. */
+    _2_4 = "2/4",
+    /** 3/4 time signature. */
+    _3_4 = "3/4",
+    /** 4/4 time signature. */
+    _4_4 = "4/4",
+    /** 5/8 time signature. */
+    _5_8 = "5/8",
+    /** 6/8 time signature. */
+    _6_8 = "6/8",
+    /** 7/8 time signature. */
+    _7_8 = "7/8",
+    /** 9/8 time signature. */
+    _9_8 = "9/8",
+    /** 12/8 time signature. */
+    _12_8 = "12/8"
+}
+/** @deprecated - Use TimeSignatures enum values or just it's string values. */
+type TimeSignatureString = `${TimeSignatures}`;
+/** Beam grouping enum. */
+declare enum BeamGrouping {
+    /** 2-3 beam grouping for 5/8 time signature. */
+    _2_3 = "2-3",
+    /** 3-2 beam grouping for 5/8 time signature. */
+    _3_2 = "3-2",
+    /** 2-2-3 beam grouping for 7/8 time signature. */
+    _2_2_3 = "2-2-3",
+    /** 3-2-2 beam grouping for 7/8 time signature. */
+    _3_2_2 = "3-2-2"
+}
 /** Time signature class. */
 declare class TimeSignature {
     /** Number of beats in measure, upper value (e.g. "3" in "3/4"). */
@@ -301,21 +331,21 @@ declare class TimeSignature {
     readonly beatLength: NoteLength;
     /** Number of ticks in measure. */
     readonly measureTicks: number;
-    /** Number of beam groups in measure. */
-    readonly beamGroupCount: number;
-    /** Length of one beam group. */
-    readonly beamGroupLength: number;
+    /** Beam groups (e.g. [[2], [2]] or [[2, 2], [2, 2]] (first try as [[4], [4]])). */
+    readonly beamGroupSizes: number[][];
     /**
      * Create new time signature instance.
-     * @param str - For example "4/4".
+     * @param timeSignature - For example "4/4".
+     * @param beamGrouping - Beam grouping (e.g. "3-2" for time signature "5/8").
      */
-    constructor(str: TimeSignatureString);
+    constructor(timeSignature: TimeSignatures | `${TimeSignatures}`, beamGrouping?: BeamGrouping | `${BeamGrouping}`);
     /**
      * Create new time signature instance.
      * @param beatCount - Measure beat count.
      * @param beatSize - Size value: whole-note=1, half-note=2, quarter-note=4, etc.
+     * @param beamGrouping - Beam grouping (e.g. "3-2" for time signature "5/8").
      */
-    constructor(beatCount: number, beatSize: number);
+    constructor(beatCount: number, beatSize: number, beamGrouping?: BeamGrouping | `${BeamGrouping}`);
     /**
      * Test whether this time signature has given beat count and size.
      * @param beatCount - Beat count.
@@ -366,4 +396,4 @@ declare function getTempoString(tempo: Tempo): string;
  */
 declare function alterTempoSpeed(tempo: Tempo, speed: number): Tempo;
 
-export { AccidentalType as A, KeySignature as K, Mode as M, NoteLength as N, RhythmProps as R, type TimeSignatureString as T, TimeSignature as a, getDefaultTimeSignature as b, type Tempo as c, getDefaultTempo as d, getTempoString as e, alterTempoSpeed as f, getDefaultKeySignature as g, type NoteLengthStr as h, NoteLengthProps as i, type TupletRatio as j, validateTupletRatio as k, Tuplet as l, validateNoteLength as v };
+export { AccidentalType as A, BeamGrouping as B, KeySignature as K, Mode as M, NoteLength as N, RhythmProps as R, TimeSignatures as T, type TimeSignatureString as a, TimeSignature as b, getDefaultTimeSignature as c, type Tempo as d, getDefaultTempo as e, getTempoString as f, getDefaultKeySignature as g, alterTempoSpeed as h, type NoteLengthStr as i, NoteLengthProps as j, type TupletRatio as k, validateTupletRatio as l, Tuplet as m, validateNoteLength as v };

package/dist/theory/index.d.mts

@@ -1,9 +1,9 @@
 import { N as Note } from '../note-eA2xPPiG.mjs';
 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.mjs';
-import { D as Degree } from '../scale-BbDJTbrG.mjs';
-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-BbDJTbrG.mjs';
+import { D as Degree } from '../scale-bnD0WnMV.mjs';
+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-bnD0WnMV.mjs';
 export { D as DefaultHandedness, a as DefaultTuningName, H as Handedness, T as TuningNameList, g as getTuningStrings, v as validateHandedness, b as validateTuningName } from '../guitar-DdexKdN6.mjs';
-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-CtUhvJbr.mjs';
+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-S85Q7uJA.mjs';
 
 /** Chord info type. */
 type ChordInfo = {