mathjs 12.4.2 → 13.0.0

package/lib/cjs/type/unit/Unit.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createUnitClass = void 0;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _is = require("../../utils/is.js");
 var _factory = require("../../utils/factory.js");
@@ -14,29 +12,29 @@ var _function = require("../../utils/function.js");
 var _string = require("../../utils/string.js");
 var _object = require("../../utils/object.js");
 var _constants = require("../../utils/bignumber/constants.js");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var name = 'Unit';
-var dependencies = ['?on', 'config', 'addScalar', 'subtractScalar', 'multiplyScalar', 'divideScalar', 'pow', 'abs', 'fix', 'round', 'equal', 'isNumeric', 'format', 'number', 'Complex', 'BigNumber', 'Fraction'];
-var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
-  var on = _ref.on,
-    config = _ref.config,
-    addScalar = _ref.addScalar,
-    subtractScalar = _ref.subtractScalar,
-    multiplyScalar = _ref.multiplyScalar,
-    divideScalar = _ref.divideScalar,
-    pow = _ref.pow,
-    abs = _ref.abs,
-    fix = _ref.fix,
-    round = _ref.round,
-    equal = _ref.equal,
-    isNumeric = _ref.isNumeric,
-    format = _ref.format,
-    _number = _ref.number,
-    Complex = _ref.Complex,
-    _BigNumber = _ref.BigNumber,
-    _Fraction = _ref.Fraction;
-  var toNumber = _number;
+const name = 'Unit';
+const dependencies = ['?on', 'config', 'addScalar', 'subtractScalar', 'multiplyScalar', 'divideScalar', 'pow', 'abs', 'fix', 'round', 'equal', 'isNumeric', 'format', 'number', 'Complex', 'BigNumber', 'Fraction'];
+const createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.factory)(name, dependencies, _ref => {
+  let {
+    on,
+    config,
+    addScalar,
+    subtractScalar,
+    multiplyScalar,
+    divideScalar,
+    pow,
+    abs,
+    fix,
+    round,
+    equal,
+    isNumeric,
+    format,
+    number,
+    Complex,
+    BigNumber,
+    Fraction
+  } = _ref;
+  const toNumber = number;
   /**
    * A unit can be constructed in the following ways:
    *
@@ -72,11 +70,9 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     this.skipAutomaticSimplification = true;
     if (valuelessUnit === undefined) {
       this.units = [];
-      this.dimensions = BASE_DIMENSIONS.map(function (x) {
-        return 0;
-      });
+      this.dimensions = BASE_DIMENSIONS.map(x => 0);
     } else if (typeof valuelessUnit === 'string') {
-      var u = Unit.parse(valuelessUnit);
+      const u = Unit.parse(valuelessUnit);
       this.units = u.units;
       this.dimensions = u.dimensions;
     } else if ((0, _is.isUnit)(valuelessUnit) && valuelessUnit.value === null) {
@@ -84,9 +80,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       this.fixPrefix = valuelessUnit.fixPrefix;
       this.skipAutomaticSimplification = valuelessUnit.skipAutomaticSimplification;
       this.dimensions = valuelessUnit.dimensions.slice(0);
-      this.units = valuelessUnit.units.map(function (u) {
-        return (0, _extends2["default"])({}, u);
-      });
+      this.units = valuelessUnit.units.map(u => (0, _extends2.default)({}, u));
     } else {
       throw new TypeError('Second parameter in Unit constructor must be a string or valueless Unit');
     }
@@ -104,7 +98,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
   Unit.prototype.isUnit = true;
 
   // private variables and functions for the Unit parser
-  var text, index, c;
+  let text, index, c;
   function skipWhitespace() {
     while (c === ' ' || c === '\t') {
       next();
@@ -125,8 +119,8 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     c = text.charAt(index);
   }
   function parseNumber() {
-    var number = '';
-    var oldIndex = index;
+    let number = '';
+    const oldIndex = index;
     if (c === '+') {
       next();
     } else if (c === '-') {
@@ -167,8 +161,8 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     if (c === 'E' || c === 'e') {
       // The grammar branches here. This could either be part of an exponent or the start of a unit that begins with the letter e, such as "4exabytes"
 
-      var tentativeNumber = '';
-      var tentativeIndex = index;
+      let tentativeNumber = '';
+      const tentativeIndex = index;
       tentativeNumber += c;
       next();
       if (c === '+' || c === '-') {
@@ -193,7 +187,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     return number;
   }
   function parseUnit() {
-    var unitName = '';
+    let unitName = '';
 
     // Alphanumeric characters only; matches [a-zA-Z0-9]
     while (isDigit(c) || Unit.isValidAlpha(c)) {
@@ -202,7 +196,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     }
 
     // Must begin with [a-zA-Z]
-    var firstC = unitName.charAt(0);
+    const firstC = unitName.charAt(0);
     if (Unit.isValidAlpha(firstC)) {
       return unitName;
     } else {
@@ -236,10 +230,10 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     if (typeof text !== 'string') {
       throw new TypeError('Invalid argument in Unit.parse, string expected');
     }
-    var unit = new Unit();
+    const unit = new Unit();
     unit.units = [];
-    var powerMultiplierCurrent = 1;
-    var expectingUnit = false;
+    let powerMultiplierCurrent = 1;
+    let expectingUnit = false;
 
     // A unit should follow this pattern:
     // [number] ...[ [*/] unit[^number] ]
@@ -259,15 +253,15 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     skipWhitespace();
 
     // Optional number at the start of the string
-    var valueStr = parseNumber();
-    var value = null;
+    const valueStr = parseNumber();
+    let value = null;
     if (valueStr) {
       if (config.number === 'BigNumber') {
-        value = new _BigNumber(valueStr);
+        value = new BigNumber(valueStr);
       } else if (config.number === 'Fraction') {
         try {
           // not all numbers can be turned in Fractions, for example very small numbers not
-          value = new _Fraction(valueStr);
+          value = new Fraction(valueStr);
         } catch (err) {
           value = parseFloat(valueStr);
         }
@@ -288,10 +282,10 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     }
 
     // Stack to keep track of powerMultipliers applied to each parentheses group
-    var powerMultiplierStack = [];
+    const powerMultiplierStack = [];
 
     // Running product of all elements in powerMultiplierStack
-    var powerMultiplierStackProduct = 1;
+    let powerMultiplierStackProduct = 1;
     while (true) {
       skipWhitespace();
 
@@ -306,9 +300,9 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       }
 
       // Is there something here?
-      var uStr = void 0;
+      let uStr;
       if (c) {
-        var oldC = c;
+        const oldC = c;
         uStr = parseUnit();
         if (uStr === null) {
           throw new SyntaxError('Unexpected "' + oldC + '" in "' + text + '" at index ' + index.toString());
@@ -319,17 +313,17 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       }
 
       // Verify the unit exists and get the prefix (if any)
-      var res = _findUnit(uStr);
+      const res = _findUnit(uStr);
       if (res === null) {
         // Unit not found.
         throw new SyntaxError('Unit "' + uStr + '" not found.');
       }
-      var power = powerMultiplierCurrent * powerMultiplierStackProduct;
+      let power = powerMultiplierCurrent * powerMultiplierStackProduct;
       // Is there a "^ number"?
       skipWhitespace();
       if (parseCharacter('^')) {
         skipWhitespace();
-        var p = parseNumber();
+        const p = parseNumber();
         if (p === null) {
           // No valid number found for the power!
           throw new SyntaxError('In "' + str + '", "^" must be followed by a floating-point number');
@@ -341,9 +335,9 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       unit.units.push({
         unit: res.unit,
         prefix: res.prefix,
-        power: power
+        power
       });
-      for (var i = 0; i < BASE_DIMENSIONS.length; i++) {
+      for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
         unit.dimensions[i] += (res.unit.dimensions[i] || 0) * power;
       }
 
@@ -377,7 +371,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
 
       // Replace the unit into the auto unit system
       if (res.unit.base) {
-        var baseDim = res.unit.base.key;
+        const baseDim = res.unit.base.key;
         UNIT_SYSTEMS.auto[baseDim] = {
           unit: res.unit,
           prefix: res.prefix
@@ -415,15 +409,15 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {Unit} Returns a cloned version of the unit
    */
   Unit.prototype.clone = function () {
-    var unit = new Unit();
+    const unit = new Unit();
     unit.fixPrefix = this.fixPrefix;
     unit.skipAutomaticSimplification = this.skipAutomaticSimplification;
     unit.value = (0, _object.clone)(this.value);
     unit.dimensions = this.dimensions.slice(0);
     unit.units = [];
-    for (var i = 0; i < this.units.length; i++) {
+    for (let i = 0; i < this.units.length; i++) {
       unit.units[i] = {};
-      for (var p in this.units[i]) {
+      for (const p in this.units[i]) {
         if ((0, _object.hasOwnProperty)(this.units[i], p)) {
           unit.units[i][p] = this.units[i][p];
         }
@@ -465,13 +459,13 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     if (value === null || value === undefined || this.units.length === 0) {
       return value;
     }
-    var res = value;
-    var convert = Unit._getNumberConverter((0, _is.typeOf)(value)); // convert to Fraction or BigNumber if needed
+    let res = value;
+    const convert = Unit._getNumberConverter((0, _is.typeOf)(value)); // convert to Fraction or BigNumber if needed
 
-    for (var i = 0; i < this.units.length; i++) {
-      var unitValue = convert(this.units[i].unit.value);
-      var unitPrefixValue = convert(this.units[i].prefix.value);
-      var unitPower = convert(this.units[i].power);
+    for (let i = 0; i < this.units.length; i++) {
+      const unitValue = convert(this.units[i].unit.value);
+      const unitPrefixValue = convert(this.units[i].prefix.value);
+      const unitPower = convert(this.units[i].power);
       res = multiplyScalar(res, pow(multiplyScalar(unitValue, unitPrefixValue), unitPower));
     }
     return res;
@@ -489,13 +483,13 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     if (value === null || value === undefined || this.units.length === 0) {
       return value;
     }
-    var res = value;
-    var convert = Unit._getNumberConverter((0, _is.typeOf)(value)); // convert to Fraction or BigNumber if needed
+    let res = value;
+    const convert = Unit._getNumberConverter((0, _is.typeOf)(value)); // convert to Fraction or BigNumber if needed
 
-    for (var i = 0; i < this.units.length; i++) {
-      var unitValue = convert(this.units[i].unit.value);
-      var unitPrefixValue = convert(this.units[i].prefix.value);
-      var unitPower = convert(this.units[i].power);
+    for (let i = 0; i < this.units.length; i++) {
+      const unitValue = convert(this.units[i].unit.value);
+      const unitPrefixValue = convert(this.units[i].prefix.value);
+      const unitPower = convert(this.units[i].power);
       res = divideScalar(res, pow(multiplyScalar(unitValue, unitPrefixValue), unitPower));
     }
     return res;
@@ -509,28 +503,28 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    *                                  prefix is returned. Else, null is returned.
    * @private
    */
-  var _findUnit = (0, _function.memoize)(function (str) {
+  const _findUnit = (0, _function.memoize)(str => {
     // First, match units names exactly. For example, a user could define 'mm' as 10^-4 m, which is silly, but then we would want 'mm' to match the user-defined unit.
     if ((0, _object.hasOwnProperty)(UNITS, str)) {
-      var unit = UNITS[str];
-      var prefix = unit.prefixes[''];
+      const unit = UNITS[str];
+      const prefix = unit.prefixes[''];
       return {
-        unit: unit,
-        prefix: prefix
+        unit,
+        prefix
       };
     }
-    for (var _name in UNITS) {
-      if ((0, _object.hasOwnProperty)(UNITS, _name)) {
-        if ((0, _string.endsWith)(str, _name)) {
-          var _unit = UNITS[_name];
-          var prefixLen = str.length - _name.length;
-          var prefixName = str.substring(0, prefixLen);
-          var _prefix = (0, _object.hasOwnProperty)(_unit.prefixes, prefixName) ? _unit.prefixes[prefixName] : undefined;
-          if (_prefix !== undefined) {
+    for (const name in UNITS) {
+      if ((0, _object.hasOwnProperty)(UNITS, name)) {
+        if ((0, _string.endsWith)(str, name)) {
+          const unit = UNITS[name];
+          const prefixLen = str.length - name.length;
+          const prefixName = str.substring(0, prefixLen);
+          const prefix = (0, _object.hasOwnProperty)(unit.prefixes, prefixName) ? unit.prefixes[prefixName] : undefined;
+          if (prefix !== undefined) {
             // store unit, prefix, and value
             return {
-              unit: _unit,
-              prefix: _prefix
+              unit,
+              prefix
             };
           }
         }
@@ -538,9 +532,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     }
     return null;
   }, {
-    hasher: function hasher(args) {
-      return args[0];
-    },
+    hasher: args => args[0],
     limit: 100
   });
 
@@ -571,7 +563,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     }
 
     // All dimensions must be the same
-    for (var i = 0; i < BASE_DIMENSIONS.length; i++) {
+    for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
       if (Math.abs((this.dimensions[i] || 0) - (base.dimensions[i] || 0)) > 1e-12) {
         return false;
       }
@@ -588,7 +580,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    */
   Unit.prototype.equalBase = function (other) {
     // All dimensions must be the same
-    for (var i = 0; i < BASE_DIMENSIONS.length; i++) {
+    for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
       if (Math.abs((this.dimensions[i] || 0) - (other.dimensions[i] || 0)) > 1e-12) {
         return false;
       }
@@ -613,24 +605,26 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {Unit} product of this unit and the other unit
    */
   Unit.prototype.multiply = function (_other) {
-    var res = this.clone();
-    var other = (0, _is.isUnit)(_other) ? _other : new Unit(_other);
-    for (var i = 0; i < BASE_DIMENSIONS.length; i++) {
+    const res = this.clone();
+    const other = (0, _is.isUnit)(_other) ? _other : new Unit(_other);
+    for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
       // Dimensions arrays may be of different lengths. Default to 0.
       res.dimensions[i] = (this.dimensions[i] || 0) + (other.dimensions[i] || 0);
     }
 
     // Append other's units list onto res
-    for (var _i = 0; _i < other.units.length; _i++) {
+    for (let i = 0; i < other.units.length; i++) {
       // Make a shallow copy of every unit
-      var inverted = _objectSpread({}, other.units[_i]);
+      const inverted = {
+        ...other.units[i]
+      };
       res.units.push(inverted);
     }
 
     // If at least one operand has a value, then the result should also have a value
     if (this.value !== null || other.value !== null) {
-      var valThis = this.value === null ? this._normalize(1) : this.value;
-      var valOther = other.value === null ? other._normalize(1) : other.value;
+      const valThis = this.value === null ? this._normalize(1) : this.value;
+      const valOther = other.value === null ? other._normalize(1) : other.value;
       res.value = multiplyScalar(valThis, valOther);
     } else {
       res.value = null;
@@ -659,26 +653,27 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {Unit} result of dividing this unit by the other unit
    */
   Unit.prototype.divide = function (_other) {
-    var res = this.clone();
-    var other = (0, _is.isUnit)(_other) ? _other : new Unit(_other);
-    for (var i = 0; i < BASE_DIMENSIONS.length; i++) {
+    const res = this.clone();
+    const other = (0, _is.isUnit)(_other) ? _other : new Unit(_other);
+    for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
       // Dimensions arrays may be of different lengths. Default to 0.
       res.dimensions[i] = (this.dimensions[i] || 0) - (other.dimensions[i] || 0);
     }
 
     // Invert and append other's units list onto res
-    for (var _i2 = 0; _i2 < other.units.length; _i2++) {
+    for (let i = 0; i < other.units.length; i++) {
       // Make a shallow copy of every unit
-      var inverted = _objectSpread(_objectSpread({}, other.units[_i2]), {}, {
-        power: -other.units[_i2].power
-      });
+      const inverted = {
+        ...other.units[i],
+        power: -other.units[i].power
+      };
       res.units.push(inverted);
     }
 
     // If at least one operand has a value, the result should have a value
     if (this.value !== null || other.value !== null) {
-      var valThis = this.value === null ? this._normalize(1) : this.value;
-      var valOther = other.value === null ? other._normalize(1) : other.value;
+      const valThis = this.value === null ? this._normalize(1) : this.value;
+      const valOther = other.value === null ? other._normalize(1) : other.value;
       res.value = divideScalar(valThis, valOther);
     } else {
       res.value = null;
@@ -696,15 +691,15 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @returns {Unit}      The result: this^p
    */
   Unit.prototype.pow = function (p) {
-    var res = this.clone();
-    for (var i = 0; i < BASE_DIMENSIONS.length; i++) {
+    const res = this.clone();
+    for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
       // Dimensions arrays may be of different lengths. Default to 0.
       res.dimensions[i] = (this.dimensions[i] || 0) * p;
     }
 
     // Adjust the power of each unit in the list
-    for (var _i3 = 0; _i3 < res.units.length; _i3++) {
-      res.units[_i3].power *= p;
+    for (let i = 0; i < res.units.length; i++) {
+      res.units[i].power *= p;
     }
     if (res.value !== null) {
       res.value = pow(res.value, p);
@@ -741,7 +736,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @returns {Unit}      The result: |x|, absolute value of x
    */
   Unit.prototype.abs = function () {
-    var ret = this.clone();
+    const ret = this.clone();
     if (ret.value !== null) {
       if (ret._isDerived() || ret.units.length === 0 || ret.units[0].unit.offset === 0) {
         ret.value = abs(ret.value);
@@ -749,14 +744,14 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
         // To give the correct, but unexpected, results for units with an offset.
         // For example, abs(-283.15 degC) = -263.15 degC !!!
         // We must take the offset into consideration here
-        var convert = ret._numberConverter(); // convert to Fraction or BigNumber if needed
-        var unitValue = convert(ret.units[0].unit.value);
-        var nominalOffset = convert(ret.units[0].unit.offset);
-        var unitOffset = multiplyScalar(unitValue, nominalOffset);
+        const convert = ret._numberConverter(); // convert to Fraction or BigNumber if needed
+        const unitValue = convert(ret.units[0].unit.value);
+        const nominalOffset = convert(ret.units[0].unit.offset);
+        const unitOffset = multiplyScalar(unitValue, nominalOffset);
         ret.value = subtractScalar(abs(addScalar(ret.value, unitOffset)), unitOffset);
       }
     }
-    for (var i in ret.units) {
+    for (const i in ret.units) {
       if (ret.units[i].unit.name === 'VA' || ret.units[i].unit.name === 'VAR') {
         ret.units[i].unit = UNITS.W;
       }
@@ -771,8 +766,8 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @returns {Unit} Returns a clone of the unit with a fixed prefix and unit.
    */
   Unit.prototype.to = function (valuelessUnit) {
-    var value = this.value === null ? this._normalize(1) : this.value;
-    var other;
+    const value = this.value === null ? this._normalize(1) : this.value;
+    let other;
     if (typeof valuelessUnit === 'string') {
       other = Unit.parse(valuelessUnit);
     } else if ((0, _is.isUnit)(valuelessUnit)) {
@@ -781,7 +776,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       throw new Error('String or Unit expected as parameter');
     }
     if (!this.equalBase(other)) {
-      throw new Error("Units do not match ('".concat(other.toString(), "' != '").concat(this.toString(), "')"));
+      throw new Error(`Units do not match ('${other.toString()}' != '${this.toString()}')`);
     }
     if (other.value !== null) {
       throw new Error('Cannot convert to a unit with a value');
@@ -790,14 +785,14 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       other.value = (0, _object.clone)(value);
     } else {
       /* Need to adjust value by difference in offset to convert */
-      var convert = Unit._getNumberConverter((0, _is.typeOf)(value)); // convert to Fraction or BigNumber if needed
-
-      var thisUnitValue = this.units[0].unit.value;
-      var thisNominalOffset = this.units[0].unit.offset;
-      var thisUnitOffset = multiplyScalar(thisUnitValue, thisNominalOffset);
-      var otherUnitValue = other.units[0].unit.value;
-      var otherNominalOffset = other.units[0].unit.offset;
-      var otherUnitOffset = multiplyScalar(otherUnitValue, otherNominalOffset);
+      const convert = Unit._getNumberConverter((0, _is.typeOf)(value)); // convert to Fraction or BigNumber if needed
+
+      const thisUnitValue = this.units[0].unit.value;
+      const thisNominalOffset = this.units[0].unit.offset;
+      const thisUnitOffset = multiplyScalar(thisUnitValue, thisNominalOffset);
+      const otherUnitValue = other.units[0].unit.value;
+      const otherNominalOffset = other.units[0].unit.offset;
+      const otherUnitOffset = multiplyScalar(otherUnitValue, otherNominalOffset);
       other.value = addScalar(value, convert(subtractScalar(thisUnitOffset, otherUnitOffset)));
     }
     other.fixPrefix = true;
@@ -823,7 +818,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {number | BigNumber | Fraction} Returns the unit value
    */
   Unit.prototype.toNumeric = function (valuelessUnit) {
-    var other;
+    let other;
     if (valuelessUnit) {
       // Allow getting the numeric value without converting to a different unit
       other = this.to(valuelessUnit);
@@ -856,7 +851,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     return {
       mathjs: 'Unit',
       value: this._denormalize(this.value),
-      unit: this.formatUnits(),
+      unit: this.units.length > 0 ? this.formatUnits() : null,
       fixPrefix: this.fixPrefix
     };
   };
@@ -869,7 +864,8 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {Unit}
    */
   Unit.fromJSON = function (json) {
-    var unit = new Unit(json.value, json.unit);
+    var _json$unit;
+    const unit = new Unit(json.value, (_json$unit = json.unit) !== null && _json$unit !== void 0 ? _json$unit : undefined);
     unit.fixPrefix = json.fixPrefix || false;
     return unit;
   };
@@ -886,12 +882,12 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * The returned Unit will contain a list of the "best" units for formatting.
    */
   Unit.prototype.simplify = function () {
-    var ret = this.clone();
-    var proposedUnitList = [];
+    const ret = this.clone();
+    const proposedUnitList = [];
 
     // Search for a matching base
-    var matchingBase;
-    for (var key in currentUnitSystem) {
+    let matchingBase;
+    for (const key in currentUnitSystem) {
       if ((0, _object.hasOwnProperty)(currentUnitSystem, key)) {
         if (ret.hasBase(BASE_UNITS[key])) {
           matchingBase = key;
@@ -902,7 +898,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     if (matchingBase === 'NONE') {
       ret.units = [];
     } else {
-      var matchingUnit;
+      let matchingUnit;
       if (matchingBase) {
         // Does the unit system have a matching unit?
         if ((0, _object.hasOwnProperty)(currentUnitSystem, matchingBase)) {
@@ -919,9 +915,9 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
         // Multiple units or units with powers are formatted like this:
         // 5 (kg m^2) / (s^3 mol)
         // Build an representation from the base units of the current unit system
-        var missingBaseDim = false;
-        for (var i = 0; i < BASE_DIMENSIONS.length; i++) {
-          var baseDim = BASE_DIMENSIONS[i];
+        let missingBaseDim = false;
+        for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
+          const baseDim = BASE_DIMENSIONS[i];
           if (Math.abs(ret.dimensions[i] || 0) > 1e-12) {
             if ((0, _object.hasOwnProperty)(currentUnitSystem, baseDim)) {
               proposedUnitList.push({
@@ -949,14 +945,14 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * Returns a new Unit in the SI system with the same value as this one
    */
   Unit.prototype.toSI = function () {
-    var ret = this.clone();
-    var proposedUnitList = [];
+    const ret = this.clone();
+    const proposedUnitList = [];
 
     // Multiple units or units with powers are formatted like this:
     // 5 (kg m^2) / (s^3 mol)
     // Build an representation from the base units of the SI unit system
-    for (var i = 0; i < BASE_DIMENSIONS.length; i++) {
-      var baseDim = BASE_DIMENSIONS[i];
+    for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
+      const baseDim = BASE_DIMENSIONS[i];
       if (Math.abs(ret.dimensions[i] || 0) > 1e-12) {
         if ((0, _object.hasOwnProperty)(UNIT_SYSTEMS.si, baseDim)) {
           proposedUnitList.push({
@@ -987,11 +983,11 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {string}
    */
   Unit.prototype.formatUnits = function () {
-    var strNum = '';
-    var strDen = '';
-    var nNum = 0;
-    var nDen = 0;
-    for (var i = 0; i < this.units.length; i++) {
+    let strNum = '';
+    let strDen = '';
+    let nNum = 0;
+    let nDen = 0;
+    for (let i = 0; i < this.units.length; i++) {
       if (this.units[i].power > 0) {
         nNum++;
         strNum += ' ' + this.units[i].prefix.name + this.units[i].unit.name;
@@ -1003,16 +999,16 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       }
     }
     if (nDen > 0) {
-      for (var _i4 = 0; _i4 < this.units.length; _i4++) {
-        if (this.units[_i4].power < 0) {
+      for (let i = 0; i < this.units.length; i++) {
+        if (this.units[i].power < 0) {
           if (nNum > 0) {
-            strDen += ' ' + this.units[_i4].prefix.name + this.units[_i4].unit.name;
-            if (Math.abs(this.units[_i4].power + 1.0) > 1e-15) {
-              strDen += '^' + -this.units[_i4].power;
+            strDen += ' ' + this.units[i].prefix.name + this.units[i].unit.name;
+            if (Math.abs(this.units[i].power + 1.0) > 1e-15) {
+              strDen += '^' + -this.units[i].power;
             }
           } else {
-            strDen += ' ' + this.units[_i4].prefix.name + this.units[_i4].unit.name;
-            strDen += '^' + this.units[_i4].power;
+            strDen += ' ' + this.units[i].prefix.name + this.units[i].unit.name;
+            strDen += '^' + this.units[i].power;
           }
         }
       }
@@ -1028,7 +1024,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     if (nDen > 1 && nNum > 0) {
       strDen = '(' + strDen + ')';
     }
-    var str = strNum;
+    let str = strNum;
     if (nNum > 0 && nDen > 0) {
       str += ' / ';
     }
@@ -1048,15 +1044,15 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
   Unit.prototype.format = function (options) {
     // Simplfy the unit list, unless it is valueless or was created directly in the
     // constructor or as the result of to or toSI
-    var simp = this.skipAutomaticSimplification || this.value === null ? this.clone() : this.simplify();
+    const simp = this.skipAutomaticSimplification || this.value === null ? this.clone() : this.simplify();
 
     // Apply some custom logic for handling VA and VAR. The goal is to express the value of the unit as a real value, if possible. Otherwise, use a real-valued unit instead of a complex-valued one.
-    var isImaginary = false;
+    let isImaginary = false;
     if (typeof simp.value !== 'undefined' && simp.value !== null && (0, _is.isComplex)(simp.value)) {
       // TODO: Make this better, for example, use relative magnitude of re and im rather than absolute
       isImaginary = Math.abs(simp.value.re) < 1e-14;
     }
-    for (var i in simp.units) {
+    for (const i in simp.units) {
       if ((0, _object.hasOwnProperty)(simp.units, i)) {
         if (simp.units[i].unit) {
           if (simp.units[i].unit.name === 'VA' && isImaginary) {
@@ -1078,9 +1074,9 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
         simp.units[0].prefix = simp._bestPrefix();
       }
     }
-    var value = simp._denormalize(simp.value);
-    var str = simp.value !== null ? format(value, options || {}) : '';
-    var unitStr = simp.formatUnits();
+    const value = simp._denormalize(simp.value);
+    let str = simp.value !== null ? format(value, options || {}) : '';
+    const unitStr = simp.formatUnits();
     if (simp.value && (0, _is.isComplex)(simp.value)) {
       str = '(' + str + ')'; // Surround complex values with ( ) to enable better parsing
     }
@@ -1113,22 +1109,22 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     // Note: the units value can be any numeric type, but to find the best
     // prefix it's enough to work with limited precision of a regular number
     // Update: using mathjs abs since we also allow complex numbers
-    var absValue = this.value !== null ? abs(this.value) : 0;
-    var absUnitValue = abs(this.units[0].unit.value);
-    var bestPrefix = this.units[0].prefix;
+    const absValue = this.value !== null ? abs(this.value) : 0;
+    const absUnitValue = abs(this.units[0].unit.value);
+    let bestPrefix = this.units[0].prefix;
     if (absValue === 0) {
       return bestPrefix;
     }
-    var power = this.units[0].power;
-    var bestDiff = Math.log(absValue / Math.pow(bestPrefix.value * absUnitValue, power)) / Math.LN10 - 1.2;
+    const power = this.units[0].power;
+    let bestDiff = Math.log(absValue / Math.pow(bestPrefix.value * absUnitValue, power)) / Math.LN10 - 1.2;
     if (bestDiff > -2.200001 && bestDiff < 1.800001) return bestPrefix; // Allow the original prefix
     bestDiff = Math.abs(bestDiff);
-    var prefixes = this.units[0].unit.prefixes;
-    for (var p in prefixes) {
+    const prefixes = this.units[0].unit.prefixes;
+    for (const p in prefixes) {
       if ((0, _object.hasOwnProperty)(prefixes, p)) {
-        var prefix = prefixes[p];
+        const prefix = prefixes[p];
         if (prefix.scientific) {
-          var diff = Math.abs(Math.log(absValue / Math.pow(prefix.value * absUnitValue, power)) / Math.LN10 - 1.2);
+          const diff = Math.abs(Math.log(absValue / Math.pow(prefix.value * absUnitValue, power)) / Math.LN10 - 1.2);
           if (diff < bestDiff || diff === bestDiff && prefix.name.length < bestPrefix.name.length) {
             // choose the prefix with the smallest diff, or if equal, choose the one
             // with the shortest name (can happen with SHORTLONG for example)
@@ -1155,27 +1151,27 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {Array} An array of units.
    */
   Unit.prototype.splitUnit = function (parts) {
-    var x = this.clone();
-    var ret = [];
-    for (var i = 0; i < parts.length; i++) {
+    let x = this.clone();
+    const ret = [];
+    for (let i = 0; i < parts.length; i++) {
       // Convert x to the requested unit
       x = x.to(parts[i]);
       if (i === parts.length - 1) break;
 
       // Get the numeric value of this unit
-      var xNumeric = x.toNumeric();
+      const xNumeric = x.toNumeric();
 
       // Check to see if xNumeric is nearly equal to an integer,
       // since fix can incorrectly round down if there is round-off error
-      var xRounded = round(xNumeric);
-      var xFixed = void 0;
-      var isNearlyEqual = equal(xRounded, xNumeric);
+      const xRounded = round(xNumeric);
+      let xFixed;
+      const isNearlyEqual = equal(xRounded, xNumeric);
       if (isNearlyEqual) {
         xFixed = xRounded;
       } else {
         xFixed = fix(x.toNumeric());
       }
-      var y = new Unit(xFixed, parts[i].toString());
+      const y = new Unit(xFixed, parts[i].toString());
       ret.push(y);
       x = subtractScalar(x, y);
     }
@@ -1184,9 +1180,9 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     // But instead of comparing x, the remainder, with zero--we will compare the sum of
     // all the parts so far with the original value. If they are nearly equal,
     // we set the remainder to 0.
-    var testSum = 0;
-    for (var _i5 = 0; _i5 < ret.length; _i5++) {
-      testSum = addScalar(testSum, ret[_i5].value);
+    let testSum = 0;
+    for (let i = 0; i < ret.length; i++) {
+      testSum = addScalar(testSum, ret[i].value);
     }
     if (equal(testSum, this.value)) {
       x.value = 0;
@@ -1194,7 +1190,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     ret.push(x);
     return ret;
   };
-  var PREFIXES = {
+  const PREFIXES = {
     NONE: {
       '': {
         name: '',
@@ -1911,9 +1907,9 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       }
     }
   };
-  PREFIXES.SHORTLONG = (0, _extends2["default"])({}, PREFIXES.SHORT, PREFIXES.LONG);
-  PREFIXES.BINARY_SHORT = (0, _extends2["default"])({}, PREFIXES.BINARY_SHORT_SI, PREFIXES.BINARY_SHORT_IEC);
-  PREFIXES.BINARY_LONG = (0, _extends2["default"])({}, PREFIXES.BINARY_LONG_SI, PREFIXES.BINARY_LONG_IEC);
+  PREFIXES.SHORTLONG = (0, _extends2.default)({}, PREFIXES.SHORT, PREFIXES.LONG);
+  PREFIXES.BINARY_SHORT = (0, _extends2.default)({}, PREFIXES.BINARY_SHORT_SI, PREFIXES.BINARY_SHORT_IEC);
+  PREFIXES.BINARY_LONG = (0, _extends2.default)({}, PREFIXES.BINARY_LONG_SI, PREFIXES.BINARY_LONG_IEC);
 
   /* Internally, each unit is represented by a value and a dimension array. The elements of the dimensions array have the following meaning:
    * Index  Dimension
@@ -1931,8 +1927,8 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    *
    */
 
-  var BASE_DIMENSIONS = ['MASS', 'LENGTH', 'TIME', 'CURRENT', 'TEMPERATURE', 'LUMINOUS_INTENSITY', 'AMOUNT_OF_SUBSTANCE', 'ANGLE', 'BIT'];
-  var BASE_UNITS = {
+  const BASE_DIMENSIONS = ['MASS', 'LENGTH', 'TIME', 'CURRENT', 'TEMPERATURE', 'LUMINOUS_INTENSITY', 'AMOUNT_OF_SUBSTANCE', 'ANGLE', 'BIT'];
+  const BASE_UNITS = {
     NONE: {
       dimensions: [0, 0, 0, 0, 0, 0, 0, 0, 0]
     },
@@ -2009,22 +2005,20 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       dimensions: [0, 0, 0, 0, 0, 0, 0, 0, 1]
     }
   };
-  for (var key in BASE_UNITS) {
+  for (const key in BASE_UNITS) {
     if ((0, _object.hasOwnProperty)(BASE_UNITS, key)) {
       BASE_UNITS[key].key = key;
     }
   }
-  var BASE_UNIT_NONE = {};
-  var UNIT_NONE = {
+  const BASE_UNIT_NONE = {};
+  const UNIT_NONE = {
     name: '',
     base: BASE_UNIT_NONE,
     value: 1,
     offset: 0,
-    dimensions: BASE_DIMENSIONS.map(function (x) {
-      return 0;
-    })
+    dimensions: BASE_DIMENSIONS.map(x => 0)
   };
-  var UNITS = {
+  const UNITS = {
     // length
     meter: {
       name: 'meter',
@@ -2096,7 +2090,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       value: 1,
       offset: 0
     },
-    "in": {
+    in: {
       name: 'in',
       base: BASE_UNITS.LENGTH,
       prefixes: PREFIXES.NONE,
@@ -2851,14 +2845,14 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       name: 'degF',
       base: BASE_UNITS.TEMPERATURE,
       prefixes: PREFIXES.SHORT,
-      value: new _Fraction(5, 9),
+      value: new Fraction(5, 9),
       offset: 459.67
     },
     degR: {
       name: 'degR',
       base: BASE_UNITS.TEMPERATURE,
       prefixes: PREFIXES.SHORT,
-      value: new _Fraction(5, 9),
+      value: new Fraction(5, 9),
       offset: 0
     },
     kelvin: {
@@ -2879,14 +2873,14 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       name: 'fahrenheit',
       base: BASE_UNITS.TEMPERATURE,
       prefixes: PREFIXES.LONG,
-      value: new _Fraction(5, 9),
+      value: new Fraction(5, 9),
       offset: 459.67
     },
     rankine: {
       name: 'rankine',
       base: BASE_UNITS.TEMPERATURE,
       prefixes: PREFIXES.LONG,
-      value: new _Fraction(5, 9),
+      value: new Fraction(5, 9),
       offset: 0
     },
     // amount of substance
@@ -3282,7 +3276,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
 
   // aliases (formerly plurals)
   // note that ALIASES is only used at creation to create more entries in UNITS by copying the aliased units
-  var ALIASES = {
+  const ALIASES = {
     meters: 'meter',
     inches: 'inch',
     feet: 'foot',
@@ -3370,7 +3364,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     electronvolts: 'electronvolt',
     moles: 'mole',
     bit: 'bits',
-    "byte": 'bytes'
+    byte: 'bytes'
   };
 
   /**
@@ -3380,8 +3374,8 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    */
   function calculateAngleValues(config) {
     if (config.number === 'BigNumber') {
-      var pi = (0, _constants.createBigNumberPi)(_BigNumber);
-      UNITS.rad.value = new _BigNumber(1);
+      const pi = (0, _constants.createBigNumberPi)(BigNumber);
+      UNITS.rad.value = new BigNumber(1);
       UNITS.deg.value = pi.div(180); // 2 * pi / 360
       UNITS.grad.value = pi.div(200); // 2 * pi / 400
       UNITS.cycle.value = pi.times(2); // 2 * pi
@@ -3419,7 +3413,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * A user perhaps could issue a command to select a preferred unit system, or use the default (see below).
    * Auto unit system: The default unit system is updated on the fly anytime a unit is parsed. The corresponding unit in the default unit system is updated, so that answers are given in the same units the user supplies.
    */
-  var UNIT_SYSTEMS = {
+  const UNIT_SYSTEMS = {
     si: {
       // Base units
       NONE: {
@@ -3575,7 +3569,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
   UNIT_SYSTEMS.auto = JSON.parse(JSON.stringify(UNIT_SYSTEMS.si));
 
   // Set the current unit system
-  var currentUnitSystem = UNIT_SYSTEMS.auto;
+  let currentUnitSystem = UNIT_SYSTEMS.auto;
 
   /**
    * Set a unit system for formatting derived units.
@@ -3594,10 +3588,10 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {string} The current unit system.
    */
   Unit.getUnitSystem = function () {
-    for (var _key in UNIT_SYSTEMS) {
-      if ((0, _object.hasOwnProperty)(UNIT_SYSTEMS, _key)) {
-        if (UNIT_SYSTEMS[_key] === currentUnitSystem) {
-          return _key;
+    for (const key in UNIT_SYSTEMS) {
+      if ((0, _object.hasOwnProperty)(UNIT_SYSTEMS, key)) {
+        if (UNIT_SYSTEMS[key] === currentUnitSystem) {
+          return key;
         }
       }
     }
@@ -3608,18 +3602,18 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * or Fraction
    */
   Unit.typeConverters = {
-    BigNumber: function BigNumber(x) {
-      if (x !== null && x !== void 0 && x.isFraction) return new _BigNumber(x.n).div(x.d).times(x.s);
-      return new _BigNumber(x + ''); // stringify to prevent constructor error
+    BigNumber: function (x) {
+      if (x !== null && x !== void 0 && x.isFraction) return new BigNumber(x.n).div(x.d).times(x.s);
+      return new BigNumber(x + ''); // stringify to prevent constructor error
     },
-    Fraction: function Fraction(x) {
-      return new _Fraction(x);
+    Fraction: function (x) {
+      return new Fraction(x);
     },
-    Complex: function Complex(x) {
+    Complex: function (x) {
       return x;
     },
-    number: function number(x) {
-      if (x !== null && x !== void 0 && x.isFraction) return _number(x);
+    number: function (x) {
+      if (x !== null && x !== void 0 && x.isFraction) return number(x);
       return x;
     }
   };
@@ -3632,7 +3626,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @return {Function}
    */
   Unit.prototype._numberConverter = function () {
-    var convert = Unit.typeConverters[this.valueType()];
+    const convert = Unit.typeConverters[this.valueType()];
     if (convert) {
       return convert;
     }
@@ -3655,25 +3649,25 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
   };
 
   // Add dimensions to each built-in unit
-  for (var _key2 in UNITS) {
-    if ((0, _object.hasOwnProperty)(UNITS, _key2)) {
-      var unit = UNITS[_key2];
+  for (const key in UNITS) {
+    if ((0, _object.hasOwnProperty)(UNITS, key)) {
+      const unit = UNITS[key];
       unit.dimensions = unit.base.dimensions;
     }
   }
 
   // Create aliases
-  for (var _name2 in ALIASES) {
-    if ((0, _object.hasOwnProperty)(ALIASES, _name2)) {
-      var _unit2 = UNITS[ALIASES[_name2]];
-      var alias = {};
-      for (var _key3 in _unit2) {
-        if ((0, _object.hasOwnProperty)(_unit2, _key3)) {
-          alias[_key3] = _unit2[_key3];
+  for (const name in ALIASES) {
+    if ((0, _object.hasOwnProperty)(ALIASES, name)) {
+      const unit = UNITS[ALIASES[name]];
+      const alias = {};
+      for (const key in unit) {
+        if ((0, _object.hasOwnProperty)(unit, key)) {
+          alias[key] = unit[key];
         }
       }
-      alias.name = _name2;
-      UNITS[_name2] = alias;
+      alias.name = name;
+      UNITS[name] = alias;
     }
   }
 
@@ -3686,7 +3680,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     return /^[a-zA-Z]$/.test(c);
   };
   function assertUnitNameIsValid(name) {
-    for (var i = 0; i < name.length; i++) {
+    for (let i = 0; i < name.length; i++) {
       c = name.charAt(i);
       if (i === 0 && !Unit.isValidAlpha(c)) {
         throw new Error('Invalid unit name (must begin with alpha character): "' + name + '"');
@@ -3716,29 +3710,29 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
    * @param {object} options
    */
   Unit.createUnit = function (obj, options) {
-    if ((0, _typeof2["default"])(obj) !== 'object') {
+    if (typeof obj !== 'object') {
       throw new TypeError("createUnit expects first parameter to be of type 'Object'");
     }
 
     // Remove all units and aliases we are overriding
     if (options && options.override) {
-      for (var _key4 in obj) {
-        if ((0, _object.hasOwnProperty)(obj, _key4)) {
-          Unit.deleteUnit(_key4);
+      for (const key in obj) {
+        if ((0, _object.hasOwnProperty)(obj, key)) {
+          Unit.deleteUnit(key);
         }
-        if (obj[_key4].aliases) {
-          for (var i = 0; i < obj[_key4].aliases.length; i++) {
-            Unit.deleteUnit(obj[_key4].aliases[i]);
+        if (obj[key].aliases) {
+          for (let i = 0; i < obj[key].aliases.length; i++) {
+            Unit.deleteUnit(obj[key].aliases[i]);
           }
         }
       }
     }
 
     // TODO: traverse multiple times until all units have been added
-    var lastUnit;
-    for (var _key5 in obj) {
-      if ((0, _object.hasOwnProperty)(obj, _key5)) {
-        lastUnit = Unit.createUnitSingle(_key5, obj[_key5]);
+    let lastUnit;
+    for (const key in obj) {
+      if ((0, _object.hasOwnProperty)(obj, key)) {
+        lastUnit = Unit.createUnitSingle(key, obj[key]);
       }
     }
     return lastUnit;
@@ -3783,19 +3777,19 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
     // TODO: Validate name for collisions with other built-in functions (like abs or cos, for example), and for acceptable variable names. For example, '42' is probably not a valid unit. Nor is '%', since it is also an operator.
 
     assertUnitNameIsValid(name);
-    var defUnit = null; // The Unit from which the new unit will be created.
-    var aliases = [];
-    var offset = 0;
-    var definition;
-    var prefixes;
-    var baseName;
+    let defUnit = null; // The Unit from which the new unit will be created.
+    let aliases = [];
+    let offset = 0;
+    let definition;
+    let prefixes;
+    let baseName;
     if (obj && obj.type === 'Unit') {
       defUnit = obj.clone();
     } else if (typeof obj === 'string') {
       if (obj !== '') {
         definition = obj;
       }
-    } else if ((0, _typeof2["default"])(obj) === 'object') {
+    } else if (typeof obj === 'object') {
       definition = obj.definition;
       prefixes = obj.prefixes;
       offset = obj.offset;
@@ -3807,7 +3801,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       throw new TypeError('Cannot create unit "' + name + '" from "' + obj.toString() + '": expecting "string" or "Unit" or "Object"');
     }
     if (aliases) {
-      for (var i = 0; i < aliases.length; i++) {
+      for (let i = 0; i < aliases.length; i++) {
         if ((0, _object.hasOwnProperty)(UNITS, aliases[i])) {
           throw new Error('Cannot create alias "' + aliases[i] + '": a unit with that name already exists');
         }
@@ -3835,7 +3829,7 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
 
     // If defUnit is null, it is because the user did not
     // specify a defintion. So create a new base dimension.
-    var newUnit = {};
+    let newUnit = {};
     if (!defUnit) {
       // Add a new base dimension
       baseName = baseName || name + '_STUFF'; // foo --> foo_STUFF, or the essence of foo
@@ -3845,28 +3839,28 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       BASE_DIMENSIONS.push(baseName);
 
       // Push 0 onto existing base units
-      for (var b in BASE_UNITS) {
+      for (const b in BASE_UNITS) {
         if ((0, _object.hasOwnProperty)(BASE_UNITS, b)) {
           BASE_UNITS[b].dimensions[BASE_DIMENSIONS.length - 1] = 0;
         }
       }
 
       // Add the new base unit
-      var newBaseUnit = {
+      const newBaseUnit = {
         dimensions: []
       };
-      for (var _i6 = 0; _i6 < BASE_DIMENSIONS.length; _i6++) {
-        newBaseUnit.dimensions[_i6] = 0;
+      for (let i = 0; i < BASE_DIMENSIONS.length; i++) {
+        newBaseUnit.dimensions[i] = 0;
       }
       newBaseUnit.dimensions[BASE_DIMENSIONS.length - 1] = 1;
       newBaseUnit.key = baseName;
       BASE_UNITS[baseName] = newBaseUnit;
       newUnit = {
-        name: name,
+        name,
         value: 1,
         dimensions: BASE_UNITS[baseName].dimensions.slice(0),
-        prefixes: prefixes,
-        offset: offset,
+        prefixes,
+        offset,
         base: BASE_UNITS[baseName]
       };
       currentUnitSystem[baseName] = {
@@ -3875,27 +3869,27 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       };
     } else {
       newUnit = {
-        name: name,
+        name,
         value: defUnit.value,
         dimensions: defUnit.dimensions.slice(0),
-        prefixes: prefixes,
-        offset: offset
+        prefixes,
+        offset
       };
 
       // Create a new base if no matching base exists
-      var anyMatch = false;
-      for (var _i7 in BASE_UNITS) {
-        if ((0, _object.hasOwnProperty)(BASE_UNITS, _i7)) {
-          var match = true;
-          for (var j = 0; j < BASE_DIMENSIONS.length; j++) {
-            if (Math.abs((newUnit.dimensions[j] || 0) - (BASE_UNITS[_i7].dimensions[j] || 0)) > 1e-12) {
+      let anyMatch = false;
+      for (const i in BASE_UNITS) {
+        if ((0, _object.hasOwnProperty)(BASE_UNITS, i)) {
+          let match = true;
+          for (let j = 0; j < BASE_DIMENSIONS.length; j++) {
+            if (Math.abs((newUnit.dimensions[j] || 0) - (BASE_UNITS[i].dimensions[j] || 0)) > 1e-12) {
               match = false;
               break;
             }
           }
           if (match) {
             anyMatch = true;
-            newUnit.base = BASE_UNITS[_i7];
+            newUnit.base = BASE_UNITS[i];
             break;
           }
         }
@@ -3903,11 +3897,11 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       if (!anyMatch) {
         baseName = baseName || name + '_STUFF'; // foo --> foo_STUFF, or the essence of foo
         // Add the new base unit
-        var _newBaseUnit = {
+        const newBaseUnit = {
           dimensions: defUnit.dimensions.slice(0)
         };
-        _newBaseUnit.key = baseName;
-        BASE_UNITS[baseName] = _newBaseUnit;
+        newBaseUnit.key = baseName;
+        BASE_UNITS[baseName] = newBaseUnit;
         currentUnitSystem[baseName] = {
           unit: newUnit,
           prefix: PREFIXES.NONE['']
@@ -3916,16 +3910,16 @@ var createUnitClass = exports.createUnitClass = /* #__PURE__ */(0, _factory.fact
       }
     }
     Unit.UNITS[name] = newUnit;
-    for (var _i8 = 0; _i8 < aliases.length; _i8++) {
-      var aliasName = aliases[_i8];
-      var _alias = {};
-      for (var _key6 in newUnit) {
-        if ((0, _object.hasOwnProperty)(newUnit, _key6)) {
-          _alias[_key6] = newUnit[_key6];
+    for (let i = 0; i < aliases.length; i++) {
+      const aliasName = aliases[i];
+      const alias = {};
+      for (const key in newUnit) {
+        if ((0, _object.hasOwnProperty)(newUnit, key)) {
+          alias[key] = newUnit[key];
         }
       }
-      _alias.name = aliasName;
-      Unit.UNITS[aliasName] = _alias;
+      alias.name = aliasName;
+      Unit.UNITS[aliasName] = alias;
     }
 
     // delete the memoization cache because we created a new unit