chordsheetjs 13.2.0 → 13.2.1

package/lib/bundle.js

@@ -33807,11 +33807,18 @@ var ChordSheetJS = (() => {
         * @param {string} chords The chords
         * @param {string | null} lyrics The lyrics
         * @param {string | null} annotation The annotation
+        * @param {Chord | null} chordObj Optional pre-parsed Chord object
         */
-        constructor(chords = "", lyrics = null, annotation = null) {
+        constructor(chords = "", lyrics = null, annotation = null, chordObj = null) {
+          this._chordObj = null;
           this.chords = chords || "";
           this.lyrics = lyrics || "";
           this.annotation = annotation || "";
+          this._chordObj = chordObj;
+        }
+        /** Returns the Chord object if available, otherwise parses from string */
+        get chord() {
+          return this._chordObj || (0, $177a605b8569b31c$export$2e2bcd8739ae039).parse(this.chords.trim());
         }
         /**
         * Indicates whether a ChordLyricsPair should be visible in a formatted chord sheet (except for ChordPro sheets)
@@ -33831,13 +33838,13 @@ var ChordSheetJS = (() => {
         * @returns {ChordLyricsPair}
         */
         clone() {
-          return new _$551a223fc13b5c10$var$ChordLyricsPair(this.chords, this.lyrics, this.annotation);
+          return new _$551a223fc13b5c10$var$ChordLyricsPair(this.chords, this.lyrics, this.annotation, this._chordObj?.clone() || null);
         }
         toString() {
           return `ChordLyricsPair(chords=${this.chords}, lyrics=${this.lyrics})`;
         }
-        set({ chords, lyrics, annotation }) {
-          return new _$551a223fc13b5c10$var$ChordLyricsPair(chords || this.chords, lyrics || this.lyrics, annotation || this.annotation);
+        set({ chords, lyrics, annotation, chordObj }) {
+          return new _$551a223fc13b5c10$var$ChordLyricsPair(chords ?? this.chords, lyrics ?? this.lyrics, annotation ?? this.annotation, chordObj ?? null);
         }
         setLyrics(lyrics) {
           return this.set({
@@ -33875,7 +33882,8 @@ var ChordSheetJS = (() => {
           if (chordObj) {
             const changedChord = func(chordObj);
             return this.set({
-              chords: changedChord.toString()
+              chords: changedChord.toString(),
+              chordObj: changedChord
             });
           }
           return this.clone();
@@ -35092,12 +35100,13 @@ ${error.stack}`);
         static distance(oneKey, otherKey) {
           return this.wrapOrFail(oneKey).distanceTo(otherKey);
         }
-        constructor({ grade = null, number = null, minor, type, accidental, referenceKeyGrade = null, referenceKeyMode = null, originalKeyString = null, preferredAccidental = null }) {
+        constructor({ grade = null, number = null, minor, type, accidental, referenceKeyGrade = null, referenceKeyMode = null, originalKeyString = null, preferredAccidental = null, explicitAccidental = false }) {
           this.number = null;
           this.minor = false;
           this.referenceKeyGrade = null;
           this.referenceKeyMode = null;
           this.originalKeyString = null;
+          this.explicitAccidental = false;
           this.grade = grade;
           this.number = number;
           this.minor = minor;
@@ -35107,6 +35116,7 @@ ${error.stack}`);
           this.referenceKeyGrade = referenceKeyGrade;
           this.referenceKeyMode = referenceKeyMode;
           this.originalKeyString = originalKeyString;
+          this.explicitAccidental = explicitAccidental;
         }
         distanceTo(otherKey) {
           const otherKeyObj = _$c2d6ab25ad00308f$var$Key.wrapOrFail(otherKey);
@@ -35359,7 +35369,8 @@ ${error.stack}`);
         useAccidental(newAccidental) {
           this.ensureGrade();
           return this.set({
-            accidental: newAccidental
+            accidental: newAccidental,
+            explicitAccidental: newAccidental !== null
           });
         }
         /** @deprecated Use useAccidental instead */
@@ -35379,6 +35390,7 @@ ${error.stack}`);
         }
         normalizeEnharmonics(key) {
           if (key) {
+            if (this.explicitAccidental) return this.clone();
             const rootKeyString = _$c2d6ab25ad00308f$var$Key.wrapOrFail(key).toString({
               showMinor: true
             });
@@ -35403,6 +35415,7 @@ ${error.stack}`);
             referenceKeyGrade: this.referenceKeyGrade,
             originalKeyString: this.originalKeyString,
             preferredAccidental: this.preferredAccidental,
+            explicitAccidental: this.explicitAccidental,
             ...overwrite ? attributes : {}
           });
         }
@@ -39212,10 +39225,10 @@ ${formattedContentLines}`;
         }
         formatChordLyricsPairChords(chordLyricsPair) {
           if (chordLyricsPair.chords) {
-            const renderedChord = (0, $177a605b8569b31c$export$2e2bcd8739ae039).parse(chordLyricsPair.chords);
-            if (!renderedChord) return `[${chordLyricsPair.chords}]`;
-            const normalizedChord = this.configuration.normalizeChords ? renderedChord.normalize() : renderedChord;
-            return `[${normalizedChord}]`;
+            const chordObj = chordLyricsPair.chord;
+            if (!chordObj) return `[${chordLyricsPair.chords}]`;
+            const finalChord = this.configuration.normalizeChords ? chordObj.normalize() : chordObj;
+            return `[${finalChord}]`;
           }
           if (chordLyricsPair.annotation) return `[*${chordLyricsPair.annotation}]`;
           return "";
@@ -68804,7 +68817,7 @@ AjwCRQJ5AAAAAAABAAAAANpTmfAAAAAA0e+yRgAAAADR77JG
         }
       };
       var $a5a21ced491ea51f$export$2e2bcd8739ae039 = $a5a21ced491ea51f$var$UltimateGuitarParser;
-      var $ae92e002ce14f11a$export$2e2bcd8739ae039 = "13.2.0";
+      var $ae92e002ce14f11a$export$2e2bcd8739ae039 = "13.2.1";
       var $a3816b486f741c00$exports = {};
       var $892913528e7f60f9$export$2e2bcd8739ae039 = {
         CHORUS: $dce48cb70c4120bb$export$8db6c706fc9142b2,