chordsheetjs 7.3.0 → 7.5.0

package/lib/index.js

@@ -1,6 +1,4 @@
-var $988mA$process = require("process");
 var $988mA$lodashget = require("lodash.get");
-var $988mA$handlebars = require("handlebars");
 
 function $parcel$defineInteropFlag(a) {
   Object.defineProperty(a, '__esModule', {value: true, configurable: true});
@@ -1801,7 +1799,12 @@ class $8fcf445ea0999053$var$Note {
         return this._note;
     }
     toString() {
-        return `${this.note}`;
+        switch(this.type){
+            case 0, $af8d31735c159a26$export$1321df9b16c30c6a:
+                return `${this.minor ? this.note.toLowerCase() : this.note.toUpperCase()}`;
+            default:
+                return `${this.note}`;
+        }
     }
     set(attributes) {
         return new $8fcf445ea0999053$var$Note({
@@ -1936,7 +1939,6 @@ var $6ebb068142750218$export$2e2bcd8739ae039 = {
 };
 
 
-
 const $21a34a464e7bc609$export$13215d9ce4923f76 = (collection, Klass)=>{
     const newObject = new Klass();
     collection.push(newObject);
@@ -1969,7 +1971,8 @@ function $21a34a464e7bc609$export$b680e6b2c82f8c2f(message) {
     try {
         throw new Error(`DEPRECATION: ${message}`);
     } catch (e) {
-        if (typeof $988mA$process === "object" && typeof $988mA$process.emitWarning === "function") $988mA$process.emitWarning(`${message}\n${e.stack}`);
+        const proc = globalThis.process;
+        if (typeof proc === "object" && typeof proc.emitWarning === "function") proc.emitWarning(`${message}\n${e.stack}`);
         else console.warn(`${message}\n${e.stack}`);
     }
 }
@@ -2030,6 +2033,7 @@ class $bff5407e03fdc8ee$var$Key {
         this.note = note instanceof (0, $8fcf445ea0999053$export$2e2bcd8739ae039) ? note : (0, $8fcf445ea0999053$export$2e2bcd8739ae039).parse(note);
         this.modifier = modifier || null;
         this.minor = !!minor || false;
+        if (this.minor) this.note.minor = true;
     }
     isMinor() {
         return this.minor || this.note.isMinor();
@@ -2080,8 +2084,25 @@ class $bff5407e03fdc8ee$var$Key {
     toNumeralString(key = null) {
         return this.toNumeral(key).toString();
     }
-    toString() {
-        if (this.isChordSymbol()) return `${this.note}${this.modifier || ""}`;
+    toString({ showMinor: showMinor = true  } = {}) {
+        switch(this.note.type){
+            case 0, $af8d31735c159a26$export$27c95a7104c1f7aa:
+                return this.formatChordSymbolString(showMinor);
+            case 0, $af8d31735c159a26$export$4d318981b5a83836:
+                return this.formatNumericString(showMinor);
+            case 0, $af8d31735c159a26$export$1321df9b16c30c6a:
+                return this.formatNumeralString();
+            default:
+                throw new Error(`Unexpected note type ${this.note.type}`);
+        }
+    }
+    formatChordSymbolString(showMinor) {
+        return `${this.note}${this.modifier || ""}${this.minor && showMinor ? "m" : ""}`;
+    }
+    formatNumericString(showMinor) {
+        return `${this.modifier || ""}${this.note}${this.minor && showMinor ? "m" : ""}`;
+    }
+    formatNumeralString() {
         return `${this.modifier || ""}${this.note}`;
     }
     transpose(delta) {
@@ -2146,9 +2167,13 @@ class $bff5407e03fdc8ee$var$Key {
     }
     normalizeEnharmonics(key) {
         if (key) {
-            const rootKeyString = key.minor ? `${key}m` : key.toString();
+            const rootKeyString = $bff5407e03fdc8ee$var$Key.wrap(key).toString({
+                showMinor: true
+            });
             const enharmonics = (0, $6ebb068142750218$export$2e2bcd8739ae039)[rootKeyString];
-            const thisKeyString = this.toString();
+            const thisKeyString = this.toString({
+                showMinor: false
+            });
             if (enharmonics && enharmonics[thisKeyString]) return $bff5407e03fdc8ee$var$Key.parse(enharmonics[thisKeyString]);
         }
         return this.clone();
@@ -3089,7 +3114,7 @@ var $e12151f977ef7bf6$export$2e2bcd8739ae039 = $e12151f977ef7bf6$var$mapping;
 
 
 
-function $26f57998457eb2d4$var$normalizeSuffix(suffix) {
+function $26f57998457eb2d4$var$normalizeChordSuffix(suffix) {
     if ((0, $e12151f977ef7bf6$export$2e2bcd8739ae039)[suffix] === "[blank]") return null;
     return (0, $e12151f977ef7bf6$export$2e2bcd8739ae039)[suffix] || suffix;
 }
@@ -3136,7 +3161,7 @@ const $26f57998457eb2d4$var$regexes = [
         const keyObj = (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039).wrap(key);
         const rootKey = this.root.toChordSymbol(keyObj).normalizeEnharmonics(keyObj);
         let chordSymbolChord = new $26f57998457eb2d4$var$Chord({
-            suffix: $26f57998457eb2d4$var$normalizeSuffix(this.suffix),
+            suffix: $26f57998457eb2d4$var$normalizeChordSuffix(this.suffix),
             root: rootKey,
             bass: this.bass?.toChordSymbol(keyObj).normalizeEnharmonics(rootKey)
         });
@@ -3172,7 +3197,7 @@ const $26f57998457eb2d4$var$regexes = [
         });
         const keyObj = (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039).wrap(key);
         return new $26f57998457eb2d4$var$Chord({
-            suffix: $26f57998457eb2d4$var$normalizeSuffix(this.suffix),
+            suffix: $26f57998457eb2d4$var$normalizeChordSuffix(this.suffix),
             root: this.root.toNumeric(keyObj),
             bass: this.bass?.toNumeric(keyObj)
         });
@@ -3190,7 +3215,7 @@ const $26f57998457eb2d4$var$regexes = [
         });
         const keyObj = (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039).wrap(key);
         return new $26f57998457eb2d4$var$Chord({
-            suffix: $26f57998457eb2d4$var$normalizeSuffix(this.suffix),
+            suffix: $26f57998457eb2d4$var$normalizeChordSuffix(this.suffix),
             root: this.root.toNumeral(keyObj),
             bass: this.bass?.toNumeral(keyObj)
         });
@@ -3229,7 +3254,9 @@ const $26f57998457eb2d4$var$regexes = [
    * Converts the chord to a string, eg `Esus4/G#` or `1sus4/#3`
    * @returns {string} the chord string
    */ toString() {
-        const chordString = this.root.toString() + (this.suffix || "");
+        const chordString = this.root.toString({
+            showMinor: false
+        }) + (this.suffix || "");
         if (this.bass) return `${chordString}/${this.bass.toString()}`;
         return chordString;
     }
@@ -3244,17 +3271,21 @@ const $26f57998457eb2d4$var$regexes = [
    * - 7# becomes 1
    * - 3# becomes 4
    *
-   * Besides that it normalizes the suffix. For example, `sus2` becomes `2`, `sus4` becomes `sus`.
+   * Besides that it normalizes the suffix if `normalizeSuffix` is `true`.
+   * For example, `sus2` becomes `2`, `sus4` becomes `sus`.
    * All suffix normalizations can be found in `src/normalize_mappings/suffix-mapping.txt`.
-   *
+   * @param {Key|string} [key=null] the key to normalize to
+   * @param {Object} [options={}] options
+   * @param {boolean} [options.normalizeSuffix=true] whether to normalize the chord suffix after transposing
    * @returns {Chord} the normalized chord
-   */ normalize(key = null) {
+   */ normalize(key = null, { normalizeSuffix: normalizeSuffix = true  } = {}) {
+        const suffix = normalizeSuffix ? $26f57998457eb2d4$var$normalizeChordSuffix(this.suffix) : this.suffix;
         if ((0, $21a34a464e7bc609$export$7ee701e290d9865)(key)) return this.process("normalize").set({
-            suffix: (0, $21a34a464e7bc609$export$ed9b06b5ee264ad3)($26f57998457eb2d4$var$normalizeSuffix(this.suffix))
+            suffix: suffix
         });
         return this.set({
+            suffix: suffix,
             root: this.root.normalizeEnharmonics(key),
-            suffix: (0, $21a34a464e7bc609$export$ed9b06b5ee264ad3)($26f57998457eb2d4$var$normalizeSuffix(this.suffix)),
             bass: this.bass ? this.bass.normalizeEnharmonics(this.root.toString()) : null
         });
     }
@@ -3286,16 +3317,17 @@ const $26f57998457eb2d4$var$regexes = [
     }
     constructor({ base: base = null , modifier: modifier = null , suffix: suffix = null , bassBase: bassBase = null , bassModifier: bassModifier = null , root: root = null , bass: bass = null ,  }){
         this.suffix = (0, $21a34a464e7bc609$export$ed9b06b5ee264ad3)(suffix);
+        const isMinor = suffix && suffix[0] === "m" && suffix.substring(0, 3).toLowerCase() !== "maj";
         this.root = root || new (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039)({
             note: base,
             modifier: modifier,
-            minor: suffix === "m"
+            minor: isMinor
         });
         if (bass) this.bass = bass;
         else if (bassBase) this.bass = new (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039)({
             note: bassBase,
             modifier: bassModifier,
-            minor: suffix === "m"
+            minor: isMinor
         });
         else this.bass = null;
     }
@@ -3375,11 +3407,13 @@ var $26f57998457eb2d4$export$2e2bcd8739ae039 = $26f57998457eb2d4$var$Chord;
             lyrics: lyrics
         });
     }
-    transpose(delta, key = null) {
+    transpose(delta, key = null, { normalizeChordSuffix: normalizeChordSuffix = false  } = {}) {
         const chordObj = (0, $26f57998457eb2d4$export$2e2bcd8739ae039).parse(this.chords);
         if (chordObj) {
             let transposedChord = chordObj.transpose(delta);
-            if (key) transposedChord = transposedChord.normalize(key);
+            if (key) transposedChord = transposedChord.normalize(key, {
+                normalizeSuffix: normalizeChordSuffix
+            });
             return this.set({
                 chords: transposedChord.toString()
             });
@@ -4142,8 +4176,10 @@ var $ce1dd7d0f2cd2369$export$2e2bcd8739ae039 = $ce1dd7d0f2cd2369$var$ParserWarni
    * - transpose the song key in {@link metadata}
    * - update any existing `key` directive
    * @param {number} delta The number of semitones (positive or negative) to transpose with
+   * @param {Object} [options={}] options
+   * @param {boolean} [options.normalizeChordSuffix=false] whether to normalize the chord suffixes after transposing
    * @returns {Song} The transposed song
-   */ transpose(delta) {
+   */ transpose(delta, { normalizeChordSuffix: normalizeChordSuffix = false  } = {}) {
         const wrappedKey = (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039).wrap(this.key);
         let transposedKey = null;
         let song = this;
@@ -4152,7 +4188,9 @@ var $ce1dd7d0f2cd2369$export$2e2bcd8739ae039 = $ce1dd7d0f2cd2369$var$ParserWarni
             song = song.setKey(transposedKey);
         }
         return song.mapItems((item)=>{
-            if (item instanceof (0, $d454f4215ba01af2$export$2e2bcd8739ae039)) return item.transpose(delta, transposedKey);
+            if (item instanceof (0, $d454f4215ba01af2$export$2e2bcd8739ae039)) return item.transpose(delta, transposedKey, {
+                normalizeChordSuffix: normalizeChordSuffix
+            });
             return item;
         });
     }
@@ -4161,18 +4199,26 @@ var $ce1dd7d0f2cd2369$export$2e2bcd8739ae039 = $ce1dd7d0f2cd2369$var$ParserWarni
    * - transpose all chords, see: {@link Chord#transpose}
    * - transpose the song key in {@link metadata}
    * - update any existing `key` directive
+   * @param {Object} [options={}] options
+   * @param {boolean} [options.normalizeChordSuffix=false] whether to normalize the chord suffixes after transposing
    * @returns {Song} The transposed song
-   */ transposeUp() {
-        return this.transpose(1);
+   */ transposeUp({ normalizeChordSuffix: normalizeChordSuffix = false  } = {}) {
+        return this.transpose(1, {
+            normalizeChordSuffix: normalizeChordSuffix
+        });
     }
     /**
    * Transposes the song down by one semitone. It will:
    * - transpose all chords, see: {@link Chord#transpose}
    * - transpose the song key in {@link metadata}
    * - update any existing `key` directive
+   * @param {Object} [options={}] options
+   * @param {boolean} [options.normalizeChordSuffix=false] whether to normalize the chord suffixes after transposing
    * @returns {Song} The transposed song
-   */ transposeDown() {
-        return this.transpose(-1);
+   */ transposeDown({ normalizeChordSuffix: normalizeChordSuffix = false  } = {}) {
+        return this.transpose(-1, {
+            normalizeChordSuffix: normalizeChordSuffix
+        });
     }
     /**
    * Returns a copy of the song with the key set to the specified key. It changes:
@@ -4927,6 +4973,19 @@ var $525b2331e4b0ed83$export$2e2bcd8739ae039 = $525b2331e4b0ed83$var$TextFormatt
 
 
 
+/**
+ * Acts as a base class for HTML formatters, taking care of whitelisting prototype property access.
+ */ class $d834af97c9a2e4df$var$HtmlFormatter extends (0, $0055ecb09272ba2d$export$2e2bcd8739ae039) {
+    formatWithTemplate(song, template) {
+        return template({
+            song: song,
+            configuration: this.configuration
+        });
+    }
+}
+var $d834af97c9a2e4df$export$2e2bcd8739ae039 = $d834af97c9a2e4df$var$HtmlFormatter;
+
+
 
 
 
@@ -4979,31 +5038,6 @@ var $5381a6b1b90601c7$export$2e2bcd8739ae039 = ({ configuration: configuration ,
 
 
 
-
-/**
- * Acts as a base class for HTML formatters, taking care of whitelisting prototype property access.
- */ class $d834af97c9a2e4df$var$HtmlFormatter extends (0, $0055ecb09272ba2d$export$2e2bcd8739ae039) {
-    formatWithTemplate(song, template) {
-        return template({
-            song: song,
-            configuration: this.configuration
-        }, {
-            allowedProtoProperties: {
-                bodyLines: true,
-                bodyParagraphs: true,
-                subtitle: true,
-                title: true,
-                value: true,
-                key: true
-            }
-        });
-    }
-}
-var $d834af97c9a2e4df$export$2e2bcd8739ae039 = $d834af97c9a2e4df$var$HtmlFormatter;
-
-
-
-const { html_table_formatter: $5b02ea769c63fd56$var$template  } = (0, ($parcel$interopDefault($988mA$handlebars))).templates;
 const $5b02ea769c63fd56$export$200cf2de69532aa8 = {
     h1: {
         fontSize: "1.5em"
@@ -5037,7 +5071,7 @@ function $5b02ea769c63fd56$export$aa5b6043dd05348b(scope) {
    * @param {Song} song The song to be formatted
    * @returns {string} The HTML string
    */ format(song) {
-        return this.formatWithTemplate(song, $5b02ea769c63fd56$var$template);
+        return this.formatWithTemplate(song, (0, $5381a6b1b90601c7$export$2e2bcd8739ae039));
     }
     /**
    * Generates basic CSS, optionally scoped within the provided selector, to use with output generated by