chordsheetjs 5.1.3 → 6.0.2

package/.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn readme
+git add README.md

package/README.md

@@ -466,6 +466,9 @@ Inherits from <a href="#ChordSheetParser">ChordSheetParser</a></p>
 <dt><a href="#TITLE">TITLE</a> : <code>string</code></dt>
 <dd><p>Title meta directive. See <a href="https://www.chordpro.org/chordpro/directives-title/">https://www.chordpro.org/chordpro/directives-title/</a></p>
 </dd>
+<dt><a href="#TRANSPOSE">TRANSPOSE</a> : <code>string</code></dt>
+<dd><p>Transpose meta directive. See: <a href="https://www.chordpro.org/chordpro/directives-transpose/">https://www.chordpro.org/chordpro/directives-transpose/</a></p>
+</dd>
 <dt><a href="#YEAR">YEAR</a> : <code>string</code></dt>
 <dd><p>Year meta directive. See <a href="https://www.chordpro.org/chordpro/directives-year/">https://www.chordpro.org/chordpro/directives-year/</a></p>
 </dd>
@@ -1176,8 +1179,11 @@ Represents a Chord, consisting of a root, suffix (quality) and bass
         * [.toChordSymbolString(key)](#Chord+toChordSymbolString) ⇒ <code>string</code>
         * [.isChordSymbol()](#Chord+isChordSymbol) ⇒ <code>boolean</code>
         * [.toNumeric(key)](#Chord+toNumeric) ⇒ [<code>Chord</code>](#Chord)
+        * [.toNumeral(key)](#Chord+toNumeral) ⇒ [<code>Chord</code>](#Chord)
+        * [.toNumeralString(key)](#Chord+toNumeralString) ⇒ <code>string</code>
         * [.isNumeric()](#Chord+isNumeric) ⇒ <code>boolean</code>
         * [.toNumericString(key)](#Chord+toNumericString) ⇒ <code>string</code>
+        * [.isNumeral()](#Chord+isNumeral) ⇒ <code>boolean</code>
         * [.toString()](#Chord+toString) ⇒ <code>string</code>
         * [.normalize()](#Chord+normalize) ⇒ [<code>Chord</code>](#Chord)
         * [.useModifier(newModifier)](#Chord+useModifier) ⇒ [<code>Chord</code>](#Chord)
@@ -1231,7 +1237,7 @@ Determines whether the chord is a chord symbol
 <a name="Chord+toNumeric"></a>
 
 ### chord.toNumeric(key) ⇒ [<code>Chord</code>](#Chord)
-Converts the chord to a numeric chord, using the supplied kye as a reference.
+Converts the chord to a numeric chord, using the supplied key as a reference.
 For example, a chord symbol A# with reference key E will return the numeric chord #4.
 
 **Kind**: instance method of [<code>Chord</code>](#Chord)  
@@ -1241,6 +1247,33 @@ For example, a chord symbol A# with reference key E will return the numeric chor
 | --- | --- | --- |
 | key | <code>Key</code> \| <code>string</code> | the reference key |
 
+<a name="Chord+toNumeral"></a>
+
+### chord.toNumeral(key) ⇒ [<code>Chord</code>](#Chord)
+Converts the chord to a numeral chord, using the supplied key as a reference.
+For example, a chord symbol A# with reference key E will return the numeral chord #IV.
+
+**Kind**: instance method of [<code>Chord</code>](#Chord)  
+**Returns**: [<code>Chord</code>](#Chord) - the numeral chord  
+
+| Param | Type | Default | Description |
+| --- | --- | --- | --- |
+| key | <code>Key</code> \| <code>string</code> \| <code>null</code> | <code></code> | the reference key. The key is required when converting a chord symbol |
+
+<a name="Chord+toNumeralString"></a>
+
+### chord.toNumeralString(key) ⇒ <code>string</code>
+Converts the chord to a numeral chord string, using the supplied kye as a reference.
+For example, a chord symbol A# with reference key E will return the numeral chord #4.
+
+**Kind**: instance method of [<code>Chord</code>](#Chord)  
+**Returns**: <code>string</code> - the numeral chord string  
+**See**: {toNumeral}  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| key | <code>Key</code> \| <code>string</code> | the reference key |
+
 <a name="Chord+isNumeric"></a>
 
 ### chord.isNumeric() ⇒ <code>boolean</code>
@@ -1261,6 +1294,12 @@ For example, a chord symbol A# with reference key E will return the numeric chor
 | --- | --- | --- |
 | key | <code>Key</code> \| <code>string</code> | the reference key |
 
+<a name="Chord+isNumeral"></a>
+
+### chord.isNumeral() ⇒ <code>boolean</code>
+Determines whether the chord is a numeral
+
+**Kind**: instance method of [<code>Chord</code>](#Chord)  
 <a name="Chord+toString"></a>
 
 ### chord.toString() ⇒ <code>string</code>
@@ -1271,7 +1310,7 @@ Converts the chord to a string, eg `Esus4/G#` or `1sus4/#3`
 <a name="Chord+normalize"></a>
 
 ### chord.normalize() ⇒ [<code>Chord</code>](#Chord)
-Normalizes the chord:
+Normalizes the chord root and bass notes:
 - Fb becomes E
 - Cb becomes B
 - B# becomes C
@@ -1281,7 +1320,8 @@ Normalizes the chord:
 - 7# becomes 1
 - 3# becomes 4
 
-If the chord is already normalized, this will return a copy.
+Besides that it normalizes the suffix. For example, `sus2` becomes `2`, `sus4` becomes `sus`.
+All suffix normalizations can be found in `src/normalize_mappings/suffix-mapping.txt`.
 
 **Kind**: instance method of [<code>Chord</code>](#Chord)  
 **Returns**: [<code>Chord</code>](#Chord) - the normalized chord  
@@ -1484,6 +1524,12 @@ Time meta directive. See https://www.chordpro.org/chordpro/directives-time/
 ## TITLE : <code>string</code>
 Title meta directive. See https://www.chordpro.org/chordpro/directives-title/
 
+**Kind**: global constant  
+<a name="TRANSPOSE"></a>
+
+## TRANSPOSE : <code>string</code>
+Transpose meta directive. See: https://www.chordpro.org/chordpro/directives-transpose/
+
 **Kind**: global constant  
 <a name="YEAR"></a>
 

package/lib/chord.js

@@ -12,6 +12,8 @@ var _utilities = require("./utilities");
 
 var _key = _interopRequireDefault(require("./key"));
 
+var _suffixNormalizeMapping = _interopRequireDefault(require("./normalize_mappings/suffix-normalize-mapping"));
+
 var _constants = require("./constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -36,11 +38,17 @@ function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollect
 
 function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 
-function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return new BabelRegExp(re, void 0, groups); }; var _super = RegExp.prototype, _groups = new WeakMap(); function BabelRegExp(re, flags, groups) { var _this = new RegExp(re, flags); return _groups.set(_this, groups || _groups.get(re)), _setPrototypeOf(_this, BabelRegExp.prototype); } function buildGroups(result, re) { var g = _groups.get(re); return Object.keys(g).reduce(function (groups, name) { return groups[name] = result[g[name]], groups; }, Object.create(null)); } return _inherits(BabelRegExp, RegExp), BabelRegExp.prototype.exec = function (str) { var result = _super.exec.call(this, str); return result && (result.groups = buildGroups(result, this)), result; }, BabelRegExp.prototype[Symbol.replace] = function (str, substitution) { if ("string" == typeof substitution) { var groups = _groups.get(this); return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) { return "$" + groups[name]; })); } if ("function" == typeof substitution) { var _this = this; return _super[Symbol.replace].call(this, str, function () { var args = arguments; return "object" != _typeof(args[args.length - 1]) && (args = [].slice.call(args)).push(buildGroups(args, _this)), substitution.apply(this, args); }); } return _super[Symbol.replace].call(this, str, substitution); }, _wrapRegExp.apply(this, arguments); }
 
@@ -48,23 +56,12 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-var MAJOR_SCALE = [null, 'M', 'm', 'm', 'M', 'M', 'm', 'dim'];
-
 function normalizeSuffix(suffix) {
-  if (suffix === 'M') {
-    return '';
-  }
-
-  return suffix;
-}
-
-function chordSuffix(noteNumber, suffix) {
-  if ((0, _utilities.isEmptyString)(suffix)) {
-    var defaultSuffix = MAJOR_SCALE[noteNumber];
-    return normalizeSuffix(defaultSuffix);
+  if (_suffixNormalizeMapping["default"][suffix] === '[blank]') {
+    return null;
   }
 
-  return normalizeSuffix(suffix);
+  return _suffixNormalizeMapping["default"][suffix] || suffix;
 }
 
 var chordRegex = /*#__PURE__*/_wrapRegExp(/^([A-G])(#|b)?((?:(?![\t-\r \/\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF])[\s\S])*)(\/([A-G])(#|b)?)?$/i, {
@@ -83,7 +80,16 @@ var numericChordRegex = /*#__PURE__*/_wrapRegExp(/^(#|b)?([1-7])((?:(?![\t-\r \/
   bassBase: 6
 });
 
-var regexes = [numericChordRegex, chordRegex];
+var sortedNumerals = _toConsumableArray(_constants.ROMAN_NUMERALS).sort(function (numeralA, numeralB) {
+  return numeralB.length - numeralA.length;
+});
+
+var numerals = [].concat(_toConsumableArray(sortedNumerals), _toConsumableArray(sortedNumerals.map(function (numeral) {
+  return numeral.toLowerCase();
+}))).join('|');
+var numeralChordRegex = // eslint-disable-next-line max-len
+new RegExp("^(?<modifier>#|b)?(?<base>".concat(numerals, ")(?<suffix>[^/\\s]*)(\\/(?<bassModifier>#|b)?(?<bassBase>").concat(numerals, "))?$"));
+var regexes = [numericChordRegex, numeralChordRegex, chordRegex];
 /**
  * Represents a Chord, consisting of a root, suffix (quality) and bass
  */
@@ -122,15 +128,24 @@ var Chord = /*#__PURE__*/function () {
       set: void 0
     });
 
+    this.suffix = (0, _utilities.presence)(suffix);
     this.root = root || new _key["default"]({
       note: base,
-      modifier: modifier
+      modifier: modifier,
+      minor: suffix === 'm'
     });
-    this.suffix = (0, _utilities.presence)(suffix);
-    this.bass = bass || (bassBase ? new _key["default"]({
-      note: bassBase,
-      modifier: bassModifier
-    }) : null);
+
+    if (bass) {
+      this.bass = bass;
+    } else if (bassBase) {
+      this.bass = new _key["default"]({
+        note: bassBase,
+        modifier: bassModifier,
+        minor: suffix === 'm'
+      });
+    } else {
+      this.bass = null;
+    }
   }
 
   _createClass(Chord, [{
@@ -162,11 +177,18 @@ var Chord = /*#__PURE__*/function () {
 
       var keyObj = _key["default"].wrap(key);
 
-      return new Chord({
-        suffix: chordSuffix(_classPrivateFieldGet(this, _rootNote), this.suffix),
-        root: this.root.toChordSymbol(keyObj),
-        bass: (_this$bass = this.bass) === null || _this$bass === void 0 ? void 0 : _this$bass.toChordSymbol(keyObj)
+      var rootKey = this.root.toChordSymbol(keyObj).normalizeEnharmonics(keyObj);
+      var chordSymbolChord = new Chord({
+        suffix: normalizeSuffix(this.suffix),
+        root: rootKey,
+        bass: (_this$bass = this.bass) === null || _this$bass === void 0 ? void 0 : _this$bass.toChordSymbol(keyObj).normalizeEnharmonics(rootKey)
       });
+
+      if (this.root.isMinor()) {
+        chordSymbolChord = chordSymbolChord.makeMinor();
+      }
+
+      return chordSymbolChord;
     }
     /**
      * Converts the chord to a chord symbol string, using the supplied key as a reference.
@@ -193,7 +215,7 @@ var Chord = /*#__PURE__*/function () {
       return _classPrivateMethodGet(this, _is, _is2).call(this, _constants.SYMBOL);
     }
     /**
-     * Converts the chord to a numeric chord, using the supplied kye as a reference.
+     * Converts the chord to a numeric chord, using the supplied key as a reference.
      * For example, a chord symbol A# with reference key E will return the numeric chord #4.
      * @param {Key|string} key the reference key
      * @returns {Chord} the numeric chord
@@ -202,20 +224,77 @@ var Chord = /*#__PURE__*/function () {
   }, {
     key: "toNumeric",
     value: function toNumeric(key) {
-      var _this$bass2;
+      var _this$bass3;
 
       if (this.isNumeric()) {
         return this.clone();
       }
 
+      if (this.isNumeral()) {
+        var _this$bass2;
+
+        return this.set({
+          root: this.root.toNumeric(),
+          bass: (_this$bass2 = this.bass) === null || _this$bass2 === void 0 ? void 0 : _this$bass2.toNumeric()
+        });
+      }
+
       var keyObj = _key["default"].wrap(key);
 
       return new Chord({
-        suffix: chordSuffix(_classPrivateFieldGet(this, _rootNote), this.suffix),
+        suffix: normalizeSuffix(this.suffix),
         root: this.root.toNumeric(keyObj),
-        bass: (_this$bass2 = this.bass) === null || _this$bass2 === void 0 ? void 0 : _this$bass2.toNumeric(keyObj)
+        bass: (_this$bass3 = this.bass) === null || _this$bass3 === void 0 ? void 0 : _this$bass3.toNumeric(keyObj)
       });
     }
+    /**
+     * Converts the chord to a numeral chord, using the supplied key as a reference.
+     * For example, a chord symbol A# with reference key E will return the numeral chord #IV.
+     * @param {Key|string|null} key the reference key. The key is required when converting a chord symbol
+     * @returns {Chord} the numeral chord
+     */
+
+  }, {
+    key: "toNumeral",
+    value: function toNumeral() {
+      var _this$bass5;
+
+      var key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+
+      if (this.isNumeral()) {
+        return this.clone();
+      }
+
+      if (this.isNumeric()) {
+        var _this$bass4;
+
+        return this.set({
+          root: this.root.toNumeral(),
+          bass: (_this$bass4 = this.bass) === null || _this$bass4 === void 0 ? void 0 : _this$bass4.toNumeral()
+        });
+      }
+
+      var keyObj = _key["default"].wrap(key);
+
+      return new Chord({
+        suffix: normalizeSuffix(this.suffix),
+        root: this.root.toNumeral(keyObj),
+        bass: (_this$bass5 = this.bass) === null || _this$bass5 === void 0 ? void 0 : _this$bass5.toNumeral(keyObj)
+      });
+    }
+    /**
+     * Converts the chord to a numeral chord string, using the supplied kye as a reference.
+     * For example, a chord symbol A# with reference key E will return the numeral chord #4.
+     * @param {Key|string} key the reference key
+     * @returns {string} the numeral chord string
+     * @see {toNumeral}
+     */
+
+  }, {
+    key: "toNumeralString",
+    value: function toNumeralString(key) {
+      return this.toNumeral(key).toString();
+    }
     /**
      * Determines whether the chord is numeric
      * @returns {boolean}
@@ -239,6 +318,16 @@ var Chord = /*#__PURE__*/function () {
     value: function toNumericString(key) {
       return this.toNumeric(key).toString();
     }
+    /**
+     * Determines whether the chord is a numeral
+     * @returns {boolean}
+     */
+
+  }, {
+    key: "isNumeral",
+    value: function isNumeral() {
+      return _classPrivateMethodGet(this, _is, _is2).call(this, _constants.NUMERAL);
+    }
     /**
      * Converts the chord to a string, eg `Esus4/G#` or `1sus4/#3`
      * @returns {string} the chord string
@@ -256,7 +345,7 @@ var Chord = /*#__PURE__*/function () {
       return chordString;
     }
     /**
-     * Normalizes the chord:
+     * Normalizes the chord root and bass notes:
      * - Fb becomes E
      * - Cb becomes B
      * - B# becomes C
@@ -266,14 +355,26 @@ var Chord = /*#__PURE__*/function () {
      * - 7# becomes 1
      * - 3# becomes 4
      *
-     * If the chord is already normalized, this will return a copy.
+     * Besides that it normalizes the suffix. For example, `sus2` becomes `2`, `sus4` becomes `sus`.
+     * All suffix normalizations can be found in `src/normalize_mappings/suffix-mapping.txt`.
+     *
      * @returns {Chord} the normalized chord
      */
 
   }, {
     key: "normalize",
-    value: function normalize() {
-      return _classPrivateMethodGet(this, _process, _process2).call(this, 'normalize');
+    value: function normalize(key) {
+      if (!(0, _utilities.presence)(key)) {
+        return _classPrivateMethodGet(this, _process, _process2).call(this, 'normalize').set({
+          suffix: (0, _utilities.presence)(normalizeSuffix(this.suffix))
+        });
+      }
+
+      return this.set({
+        root: this.root.normalizeEnharmonics(key),
+        suffix: (0, _utilities.presence)(normalizeSuffix(this.suffix)),
+        bass: this.bass ? this.bass.normalizeEnharmonics(this.root.toString()) : null
+      });
     }
     /**
      * Switches to the specified modifier
@@ -317,15 +418,26 @@ var Chord = /*#__PURE__*/function () {
     value: function transpose(delta) {
       return _classPrivateMethodGet(this, _process, _process2).call(this, 'transpose', delta);
     }
+  }, {
+    key: "makeMinor",
+    value: function makeMinor() {
+      if (!this.suffix || this.suffix[0] !== 'm') {
+        return this.set({
+          suffix: "m".concat(this.suffix || '')
+        });
+      }
+
+      return this.clone();
+    }
   }, {
     key: "set",
     value: function set(properties) {
-      var _this$bass3;
+      var _this$bass6;
 
       return new this.constructor(_objectSpread({
         root: this.root.clone(),
         suffix: this.suffix,
-        bass: (_this$bass3 = this.bass) === null || _this$bass3 === void 0 ? void 0 : _this$bass3.clone()
+        bass: (_this$bass6 = this.bass) === null || _this$bass6 === void 0 ? void 0 : _this$bass6.clone()
       }, properties));
     }
   }], [{

package/lib/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VERSE = exports.TAB = exports.SYMBOL = exports.NUMERIC = exports.NONE = exports.INDETERMINATE = exports.CHORUS = void 0;
+exports.VERSE = exports.TAB = exports.SYMBOL = exports.ROMAN_NUMERALS = exports.NUMERIC = exports.NUMERAL = exports.NONE = exports.INDETERMINATE = exports.CHORUS = void 0;
 
 /**
  * Used to mark a paragraph as verse
@@ -47,4 +47,8 @@ exports.TAB = TAB;
 var SYMBOL = 'symbol';
 exports.SYMBOL = SYMBOL;
 var NUMERIC = 'numeric';
-exports.NUMERIC = NUMERIC;
+exports.NUMERIC = NUMERIC;
+var NUMERAL = 'numeral';
+exports.NUMERAL = NUMERAL;
+var ROMAN_NUMERALS = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII'];
+exports.ROMAN_NUMERALS = ROMAN_NUMERALS;

package/lib/key.js

@@ -11,6 +11,8 @@ var _note = _interopRequireDefault(require("./note"));
 
 var _constants = require("./constants");
 
+var _enharmonicNormalize = _interopRequireDefault(require("./normalize_mappings/enharmonic-normalize"));
+
 var _MODIFIER_TRANSPOSITI;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -43,17 +45,24 @@ var FLAT = 'b';
 var SHARP = '#';
 var MODIFIER_TRANSPOSITION = (_MODIFIER_TRANSPOSITI = {}, _defineProperty(_MODIFIER_TRANSPOSITI, SHARP, 1), _defineProperty(_MODIFIER_TRANSPOSITI, FLAT, -1), _MODIFIER_TRANSPOSITI);
 
-var symbolKeyRegex = /*#__PURE__*/_wrapRegExp(/^([A-G])(#|b)?$/i, {
+var symbolKeyRegex = /*#__PURE__*/_wrapRegExp(/^([A-G])(#|b)?(m)?$/i, {
   note: 1,
-  modifier: 2
+  modifier: 2,
+  minor: 3
+});
+
+var numericKeyRegex = /*#__PURE__*/_wrapRegExp(/^(#|b)?([1-7])(m)?$/, {
+  modifier: 1,
+  note: 2,
+  minor: 3
 });
 
-var numericKeyRegex = /*#__PURE__*/_wrapRegExp(/^(#|b)?([1-7])$/, {
+var numeralKeyRegex = /*#__PURE__*/_wrapRegExp(/^(#|b)?(I{1,3}|IV|VI{0,2}|i{1,3}|iv|vi{0,2})$/, {
   modifier: 1,
   note: 2
 });
 
-var regexes = [symbolKeyRegex, numericKeyRegex];
+var regexes = [symbolKeyRegex, numericKeyRegex, numeralKeyRegex];
 
 var _set = /*#__PURE__*/new WeakSet();
 
@@ -61,14 +70,17 @@ var Key = /*#__PURE__*/function () {
   function Key(_ref) {
     var note = _ref.note,
         _ref$modifier = _ref.modifier,
-        modifier = _ref$modifier === void 0 ? null : _ref$modifier;
+        modifier = _ref$modifier === void 0 ? null : _ref$modifier,
+        _ref$minor = _ref.minor,
+        minor = _ref$minor === void 0 ? false : _ref$minor;
 
     _classCallCheck(this, Key);
 
     _classPrivateMethodInitSpec(this, _set);
 
-    this.note = note instanceof _note["default"] ? note : new _note["default"](note);
+    this.note = note instanceof _note["default"] ? note : _note["default"].parse(note);
     this.modifier = modifier || null;
+    this.minor = !!minor || false;
   }
 
   _createClass(Key, [{
@@ -85,6 +97,11 @@ var Key = /*#__PURE__*/function () {
 
       return delta;
     }
+  }, {
+    key: "isMinor",
+    value: function isMinor() {
+      return this.note.isMinor();
+    }
   }, {
     key: "clone",
     value: function clone() {
@@ -97,7 +114,7 @@ var Key = /*#__PURE__*/function () {
         return this.clone();
       }
 
-      var transposeDistance = this.note.getTransposeDistance() + (MODIFIER_TRANSPOSITION[this.modifier] || 0);
+      var transposeDistance = this.note.getTransposeDistance(key.minor) + (MODIFIER_TRANSPOSITION[this.modifier] || 0);
       return key.transpose(transposeDistance).normalize().useModifier(key.modifier);
     }
   }, {
@@ -120,6 +137,18 @@ var Key = /*#__PURE__*/function () {
     value: function isChordSymbol() {
       return this.is(_constants.SYMBOL);
     }
+  }, {
+    key: "isNumeral",
+    value: function isNumeral() {
+      return this.is(_constants.NUMERAL);
+    }
+  }, {
+    key: "equals",
+    value: function equals(_ref2) {
+      var note = _ref2.note,
+          modifier = _ref2.modifier;
+      return this.note.equals(note) && this.modifier === modifier;
+    }
   }, {
     key: "toNumeric",
     value: function toNumeric(key) {
@@ -127,39 +156,69 @@ var Key = /*#__PURE__*/function () {
         return this.clone();
       }
 
+      if (this.isNumeral()) {
+        return _classPrivateMethodGet(this, _set, _set2).call(this, {
+          note: this.note.toNumeric()
+        });
+      }
+
       var numericKey = new Key({
         note: 1
       });
       var symbolKey = key.clone();
-      var reference = this.clone().normalize().useModifier(key.modifier);
+      var reference = this.clone().normalize().useModifier(key.modifier).normalizeEnharmonics(key);
 
       while (!symbolKey.equals(reference)) {
         numericKey = numericKey.transposeUp().useModifier(key.modifier);
-        symbolKey = symbolKey.transposeUp().normalize().useModifier(key.modifier);
+        symbolKey = symbolKey.transposeUp().normalize().useModifier(key.modifier).normalizeEnharmonics(key);
       }
 
       return numericKey;
     }
-  }, {
-    key: "equals",
-    value: function equals(_ref2) {
-      var note = _ref2.note,
-          modifier = _ref2.modifier;
-      return this.note.equals(note) && this.modifier === modifier;
-    }
   }, {
     key: "toNumericString",
     value: function toNumericString(key) {
       return this.toNumeric(key).toString();
     }
+  }, {
+    key: "toNumeral",
+    value: function toNumeral(key) {
+      if (this.isNumeral()) {
+        return this.clone();
+      }
+
+      if (this.isNumeric()) {
+        return _classPrivateMethodGet(this, _set, _set2).call(this, {
+          note: this.note.toNumeral()
+        });
+      }
+
+      var numeralKey = new Key({
+        note: 'I'
+      });
+      var symbolKey = key.clone();
+      var reference = this.clone().normalize().useModifier(key.modifier).normalizeEnharmonics(key);
+
+      while (!symbolKey.equals(reference)) {
+        numeralKey = numeralKey.transposeUp().useModifier(key.modifier);
+        symbolKey = symbolKey.transposeUp().normalize().useModifier(key.modifier).normalizeEnharmonics(key);
+      }
+
+      return numeralKey;
+    }
+  }, {
+    key: "toNumeralString",
+    value: function toNumeralString(key) {
+      return this.toNumeral(key).toString();
+    }
   }, {
     key: "toString",
     value: function toString() {
-      if (this.is(_constants.NUMERIC)) {
-        return "".concat(this.modifier || '').concat(this.note);
+      if (this.isChordSymbol()) {
+        return "".concat(this.note).concat(this.modifier || '');
       }
 
-      return "".concat(this.note).concat(this.modifier || '');
+      return "".concat(this.modifier || '').concat(this.note);
     }
   }, {
     key: "transpose",
@@ -266,6 +325,21 @@ var Key = /*#__PURE__*/function () {
         });
       }
 
+      return this.clone();
+    }
+  }, {
+    key: "normalizeEnharmonics",
+    value: function normalizeEnharmonics(key) {
+      if (key) {
+        var rootKeyString = key.minor ? "".concat(key, "m") : key.toString();
+        var enharmonics = _enharmonicNormalize["default"][rootKeyString];
+        var thisKeyString = this.toString();
+
+        if (enharmonics && enharmonics[thisKeyString]) {
+          return Key.parse(enharmonics[thisKeyString]);
+        }
+      }
+
       return this.clone();
     }
   }], [{
@@ -303,7 +377,8 @@ var Key = /*#__PURE__*/function () {
 function _set2(attributes) {
   return new this.constructor(_objectSpread({
     note: this.note.clone(),
-    modifier: this.modifier
+    modifier: this.modifier,
+    minor: !!this.minor
   }, attributes));
 }