chordsheetjs 7.4.0 → 7.5.0

package/lib/bundle.js

@@ -1800,7 +1800,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({
@@ -2029,6 +2034,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();
@@ -2079,8 +2085,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) {
@@ -2145,9 +2168,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();
@@ -3228,7 +3255,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;
     }
@@ -3289,16 +3318,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;
     }

package/lib/index.js

@@ -1799,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({
@@ -2028,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();
@@ -2078,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) {
@@ -2144,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();
@@ -3227,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;
     }
@@ -3288,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;
     }