chordsheetjs 15.2.0 → 15.3.0

package/lib/index.js

@@ -5607,6 +5607,7 @@ const $287d3e472e1fbd90$export$82f9bd327a40ea54 = {
     key: null,
     metadata: $287d3e472e1fbd90$export$a014e67b549cbef4,
     normalizeChords: true,
+    normalizeChordSuffix: true,
     useUnicodeModifiers: false,
     user: null
 };
@@ -6524,9 +6525,16 @@ class $15f1d40e3d1ed3a0$var$Ternary extends (0, $8e2590a06c021dbf$export$2e2bcd8
 var $15f1d40e3d1ed3a0$export$2e2bcd8739ae039 = $15f1d40e3d1ed3a0$var$Ternary;
 
 
+
 /**
  * Formats a song into a ChordPro chord sheet
  */ class $244a67400187e14e$var$ChordProFormatter extends (0, $ed0d9ddbbe7224cd$export$2e2bcd8739ae039) {
+    getDefaultConfiguration() {
+        return {
+            ...(0, $fe1d3ba9df1ecad5$export$cb4529290f33d264)(),
+            normalizeChordSuffix: false
+        };
+    }
     /**
    * Formats a song into a ChordPro chord sheet.
    * @param {Song} song The song to be formatted
@@ -6652,7 +6660,9 @@ var $15f1d40e3d1ed3a0$export$2e2bcd8739ae039 = $15f1d40e3d1ed3a0$var$Ternary;
         if (chordLyricsPair.chords) {
             const chordObj = chordLyricsPair.chord;
             if (!chordObj) return `[${chordLyricsPair.chords}]`;
-            const finalChord = this.configuration.normalizeChords ? chordObj.normalize() : chordObj;
+            const finalChord = this.configuration.normalizeChords ? chordObj.normalize(null, {
+                normalizeSuffix: this.configuration.normalizeChordSuffix
+            }) : chordObj;
             return `[${finalChord}]`;
         }
         if (chordLyricsPair.annotation) return `[*${chordLyricsPair.annotation}]`;
@@ -7620,6 +7630,7 @@ const $e02a17f5a26edf19$var$defaultConstructorOptions = {
     contextKey: null,
     decapo: false,
     normalizeChords: true,
+    normalizeChordSuffix: true,
     renderKey: null,
     songKey: null,
     style: null,
@@ -7635,6 +7646,7 @@ class $e02a17f5a26edf19$var$ChordRenderer {
         this.capo = config.decapo ? config.capo : 0;
         this.contextKey = config.contextKey;
         this.normalizeChords = config.normalizeChords;
+        this.normalizeChordSuffix = config.normalizeChordSuffix;
         this.renderKey = config.renderKey;
         this.songKey = config.songKey;
         this.style = config.style;
@@ -7647,7 +7659,9 @@ class $e02a17f5a26edf19$var$ChordRenderer {
         return (0, $28a2fcb6fb95a147$export$79570e60478bce41)(chord, [
             (c)=>c.transpose(this.effectiveTransposeDistance),
             (c)=>this.accidental ? c.useAccidental(this.accidental) : c,
-            (c)=>this.normalizeChords ? c.normalize(this.effectiveKey) : c,
+            (c)=>this.normalizeChords ? c.normalize(this.effectiveKey, {
+                    normalizeSuffix: this.normalizeChordSuffix
+                }) : c,
             (c)=>this.changeChordType(c)
         ]).toString({
             useUnicodeModifier: this.useUnicodeModifier
@@ -8047,13 +8061,38 @@ function $2ce1086ce25c9ac0$export$fd31a53e6281557e(transposeKey, songKey) {
     if (/^\d+$/.test(transposeKey)) return parseInt(transposeKey, 10);
     return (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).distance(songKey, transposeKey);
 }
-function $2ce1086ce25c9ac0$export$596ec52955da9472(chordString, line, song, { renderKey: renderKey = null, useUnicodeModifier: useUnicodeModifier = false, normalizeChords: normalizeChords = true, decapo: decapo = false } = {}) {
+/**
+ * Renders a chord in the context of a line and song and taking into account some options
+ * @param chordString The chord to render
+ * @param line The line the chord is in
+ * @param song The song the line is in
+ * @param renderKey The key to render the chord in. If not provided, the line key will be used,
+ * or the song key if the line key is not provided.
+ * @param useUnicodeModifier Whether to use unicode modifiers ('\u266f'/'\u266d') or plain text ('#'/'b').
+ * Default `false`.
+ * @param normalizeChords Whether to normalize the chord to the key (default `true`)
+ * @param normalizeChordSuffix Whether to normalize the chord suffix (e.g. `sus2` to `2`, `maj7` to `ma7`).
+ * Only takes effect when `normalizeChords` is `true`. Default `true`.
+ * @param decapo Whether to transpose all chords to eliminate the capo (default `false`)
+ */ const $2ce1086ce25c9ac0$var$renderChordDefaults = {
+    renderKey: null,
+    useUnicodeModifier: false,
+    normalizeChords: true,
+    normalizeChordSuffix: true,
+    decapo: false
+};
+function $2ce1086ce25c9ac0$export$596ec52955da9472(chordString, line, song, options = {}) {
+    const { renderKey: renderKey, useUnicodeModifier: useUnicodeModifier, normalizeChords: normalizeChords, normalizeChordSuffix: normalizeChordSuffix, decapo: decapo } = {
+        ...$2ce1086ce25c9ac0$var$renderChordDefaults,
+        ...options
+    };
     const capoString = song.metadata.getSingle((0, $d21c5c7a462f3c34$export$866f445d49bad88e));
     return new (0, $e02a17f5a26edf19$export$2e2bcd8739ae039)({
         capo: capoString ? parseInt(capoString, 10) : 0,
         contextKey: (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).wrap(line.key || song.key),
         decapo: decapo,
         normalizeChords: normalizeChords,
+        normalizeChordSuffix: normalizeChordSuffix,
         renderKey: renderKey,
         songKey: (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).wrap(song.key),
         style: song.metadata.getSingle((0, $d21c5c7a462f3c34$export$d8cbdf44b1f66df1)),
@@ -13411,7 +13450,7 @@ function $2da8d6b3c840ecd4$export$9f6ee93f4e2fb3d2(string) {
 
 
 const $e136d63bbe28a4e0$var$WHITE_SPACE = /\s/;
-const $e136d63bbe28a4e0$var$CHORD_LINE_REGEX = /^\s*((([A-G|Do|Re|Mi|Fa|Sol|La|Si])(#|b)?([^/\s]*)(\/([A-G|Do|Re|Mi|Fa|Sol|La|Si])(#|b)?)?)(\s|$)+)+(\s|$)+/;
+const $e136d63bbe28a4e0$var$CHORD_LINE_REGEX = /^\s*(((?:[A-G]|Do|Re|Mi|Fa|Sol|La|Si)(#|b)?([^/\s]*)(\/(?:[A-G]|Do|Re|Mi|Fa|Sol|La|Si)(#|b)?)?)(\s|$)+)+(\s|$)+/;
 /**
  * Parses a normal chord sheet
  *
@@ -13989,6 +14028,7 @@ var $f9c5006b26957916$export$2e2bcd8739ae039 = {
         return (0, $2ce1086ce25c9ac0$export$596ec52955da9472)(item.chords, line, this.song, {
             renderKey: this.configuration.key,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             decapo: this.configuration.decapo
         });
     }
@@ -26534,6 +26574,7 @@ var $1408adfd7317f0b6$export$2e2bcd8739ae039 = ({ configuration: configuration,
                                     renderKey: key,
                                     useUnicodeModifier: configuration.useUnicodeModifiers,
                                     normalizeChords: configuration.normalizeChords,
+                                    normalizeChordSuffix: configuration.normalizeChordSuffix,
                                     decapo: configuration.decapo
                                 })}
                         </div>
@@ -26733,6 +26774,7 @@ var $396f7048979e89c9$export$2e2bcd8739ae039 = ({ configuration: configuration,
                                             renderKey: key,
                                             useUnicodeModifier: configuration.useUnicodeModifiers,
                                             normalizeChords: configuration.normalizeChords,
+                                            normalizeChordSuffix: configuration.normalizeChordSuffix,
                                             decapo: configuration.decapo
                                         })}</td>
                           `;
@@ -27661,6 +27703,7 @@ var $bdd8c6196670168a$export$2e2bcd8739ae039 = $bdd8c6196670168a$var$Condition;
             renderKey: this.configuration.key,
             useUnicodeModifier: this.configuration.useUnicodeModifiers,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             decapo: this.configuration.decapo
         });
         return chords;
@@ -28789,6 +28832,7 @@ class $9c53a1d7fff20a4a$export$e6ce86b8bc39728b {
             renderKey: null,
             useUnicodeModifier: this.config.useUnicodeModifiers,
             normalizeChords: this.config.normalizeChords,
+            normalizeChordSuffix: this.config.normalizeChordSuffix,
             decapo: this.config.decapo
         });
     }
@@ -29865,6 +29909,7 @@ class $7fa32b9e3992eddb$export$12b762d1038ddc6b {
             linePadding: this.configuration.layout.sections.global.linePadding,
             useUnicodeModifiers: this.configuration.useUnicodeModifiers,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             // Column and page layout information
             minY: dimensions.minY,
             columnWidth: dimensions.columnWidth,
@@ -29925,7 +29970,7 @@ const $a5a21ced491ea51f$var$UG_METADATA_REGEX = /^(\w+):\s*(.+)$/;
 const $a5a21ced491ea51f$var$OTHER_METADATA_LINE_REGEX = /^\[([^\]]+)]/;
 const $a5a21ced491ea51f$var$REPEAT_NOTATION_REGEX = /\s+(x\d+)\s*$/i;
 // eslint-disable-next-line max-len
-const $a5a21ced491ea51f$var$CHORD_LINE_REGEX = /^\s*((([A-G|Do|Re|Mi|Fa|Sol|La|Si])(#|b)?([^/\s]*)(\/([A-G|Do|Re|Mi|Fa|Sol|La|Si])(#|b)?)?)(\s|$)+)+(\s|$)+/;
+const $a5a21ced491ea51f$var$CHORD_LINE_REGEX = /^\s*(((?:[A-G]|Do|Re|Mi|Fa|Sol|La|Si)(#|b)?([^/\s]*)(\/(?:[A-G]|Do|Re|Mi|Fa|Sol|La|Si)(#|b)?)?)(\s|$)+)+(\s|$)+/;
 const $a5a21ced491ea51f$var$startSectionTags = {
     [(0, $dce48cb70c4120bb$export$4b194284baed1659)]: (0, $d21c5c7a462f3c34$export$deca399f8cd9b7dc),
     [(0, $dce48cb70c4120bb$export$8db6c706fc9142b2)]: (0, $d21c5c7a462f3c34$export$4f5168acae064e01),
@@ -30130,7 +30175,7 @@ const $a5a21ced491ea51f$var$endSectionTags = {
 var $a5a21ced491ea51f$export$2e2bcd8739ae039 = $a5a21ced491ea51f$var$UltimateGuitarParser;
 
 
-var $ae92e002ce14f11a$export$2e2bcd8739ae039 = '15.2.0';
+var $ae92e002ce14f11a$export$2e2bcd8739ae039 = '15.3.0';