chordsheetjs 13.2.0 → 13.2.1

package/lib/index.js

@@ -912,22 +912,16 @@ const $3d106a0ee348cfa8$export$40141681ebb03523 = {
    * @param {string} chords The chords
    * @param {string | null} lyrics The lyrics
    * @param {string | null} annotation The annotation
-   */ constructor(chords = '', lyrics = null, annotation = null){
-        /**
-     * The chords
-     * @member
-     * @type {string}
-     */ this.chords = chords || '';
-        /**
-     * The lyrics
-     * @member
-     * @type {string}
-     */ this.lyrics = lyrics || '';
-        /**
-     * The annotation
-     * @member
-     * @type {string}
-     */ this.annotation = annotation || '';
+   * @param {Chord | null} chordObj Optional pre-parsed Chord object
+   */ 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)
@@ -944,13 +938,13 @@ const $3d106a0ee348cfa8$export$40141681ebb03523 = {
    * Returns a deep copy of the ChordLyricsPair, useful when programmatically transforming a song
    * @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: chords, lyrics: lyrics, annotation: annotation }) {
-        return new $551a223fc13b5c10$var$ChordLyricsPair(chords || this.chords, lyrics || this.lyrics, annotation || this.annotation);
+    set({ chords: chords, lyrics: lyrics, annotation: annotation, chordObj: chordObj }) {
+        return new $551a223fc13b5c10$var$ChordLyricsPair(chords ?? this.chords, lyrics ?? this.lyrics, annotation ?? this.annotation, chordObj ?? null);
     }
     setLyrics(lyrics) {
         return this.set({
@@ -987,7 +981,8 @@ const $3d106a0ee348cfa8$export$40141681ebb03523 = {
         if (chordObj) {
             const changedChord = func(chordObj);
             return this.set({
-                chords: changedChord.toString()
+                chords: changedChord.toString(),
+                chordObj: changedChord
             });
         }
         return this.clone();
@@ -2231,12 +2226,13 @@ const $c2d6ab25ad00308f$var$PREFERS_FLAT_NUMBERS = [
    */ static distance(oneKey, otherKey) {
         return this.wrapOrFail(oneKey).distanceTo(otherKey);
     }
-    constructor({ grade: grade = null, number: number = null, minor: minor, type: type, accidental: accidental, referenceKeyGrade: referenceKeyGrade = null, referenceKeyMode: referenceKeyMode = null, originalKeyString: originalKeyString = null, preferredAccidental: preferredAccidental = null }){
+    constructor({ grade: grade = null, number: number = null, minor: minor, type: type, accidental: accidental, referenceKeyGrade: referenceKeyGrade = null, referenceKeyMode: referenceKeyMode = null, originalKeyString: originalKeyString = null, preferredAccidental: preferredAccidental = null, explicitAccidental: 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;
@@ -2246,6 +2242,7 @@ const $c2d6ab25ad00308f$var$PREFERS_FLAT_NUMBERS = [
         this.referenceKeyGrade = referenceKeyGrade;
         this.referenceKeyMode = referenceKeyMode;
         this.originalKeyString = originalKeyString;
+        this.explicitAccidental = explicitAccidental;
     }
     distanceTo(otherKey) {
         const otherKeyObj = $c2d6ab25ad00308f$var$Key.wrapOrFail(otherKey);
@@ -2499,7 +2496,8 @@ const $c2d6ab25ad00308f$var$PREFERS_FLAT_NUMBERS = [
     useAccidental(newAccidental) {
         this.ensureGrade();
         return this.set({
-            accidental: newAccidental
+            accidental: newAccidental,
+            explicitAccidental: newAccidental !== null
         });
     }
     /** @deprecated Use useAccidental instead */ useModifier(newAccidental) {
@@ -2518,6 +2516,8 @@ const $c2d6ab25ad00308f$var$PREFERS_FLAT_NUMBERS = [
     }
     normalizeEnharmonics(key) {
         if (key) {
+            // Preserve explicit accidental choices made via useAccidental()
+            if (this.explicitAccidental) return this.clone();
             const rootKeyString = $c2d6ab25ad00308f$var$Key.wrapOrFail(key).toString({
                 showMinor: true
             });
@@ -2542,6 +2542,7 @@ const $c2d6ab25ad00308f$var$PREFERS_FLAT_NUMBERS = [
             referenceKeyGrade: this.referenceKeyGrade,
             originalKeyString: this.originalKeyString,
             preferredAccidental: this.preferredAccidental,
+            explicitAccidental: this.explicitAccidental,
             ...overwrite ? attributes : {}
         });
     }
@@ -5113,7 +5114,6 @@ var $6c1ed1378c3b5965$export$2e2bcd8739ae039 = $6c1ed1378c3b5965$var$ChordDefini
 
 
 
-
 /**
  * Represents a comment. See https://www.chordpro.org/chordpro/chordpro-file-format-specification/#overview
  */ class $0bd084786477abba$var$Comment {
@@ -6431,10 +6431,10 @@ var $15f1d40e3d1ed3a0$export$2e2bcd8739ae039 = $15f1d40e3d1ed3a0$var$Ternary;
     }
     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 '';
@@ -36517,7 +36517,7 @@ const $a5a21ced491ea51f$var$endSectionTags = {
 var $a5a21ced491ea51f$export$2e2bcd8739ae039 = $a5a21ced491ea51f$var$UltimateGuitarParser;
 
 
-var $ae92e002ce14f11a$export$2e2bcd8739ae039 = '13.2.0';
+var $ae92e002ce14f11a$export$2e2bcd8739ae039 = '13.2.1';