@barchart/portfolio-api-common 1.2.48 → 1.2.52

package/lib/data/InstrumentType.js

@@ -192,7 +192,7 @@ module.exports = (() => {
 			} else if (code === 5 || code == 15) {
 				return InstrumentType.FUND;
 			} else {
-				throw new Error('Unable to determine InstrumentType for [', code, ']');
+				throw new Error(`Unable to determine InstrumentType for [ ${code} ]`);
 			}
 		}
 

package/lib/data/TransactionType.js

@@ -12,6 +12,7 @@ module.exports = (() => {
 	 * @param {String} code
 	 * @param {String} description
 	 * @param {String} display
+	 * @param {Number} sequence
 	 * @param {Boolean} purchase
 	 * @param {Boolean} sale
 	 * @param {Boolean} income
@@ -21,12 +22,14 @@ module.exports = (() => {
 	 * @param {Boolean} corporateAction
 	 * @param {Boolean} initial
 	 * @param {Boolean} significant
-	 */
+	 * @param {Boolean} eod
+ 	 */
 	class TransactionType extends Enum {
-		constructor(code, description, display, purchase, sale, income, opening, closing, fee, corporateAction, initial, significant) {
+		constructor(code, description, display, sequence, purchase, sale, income, opening, closing, fee, corporateAction, initial, significant) {
 			super(code, description);
 
 			assert.argumentIsRequired(display, 'display', String);
+			assert.argumentIsRequired(sequence, 'sequence', Number);
 			assert.argumentIsRequired(purchase, 'purchase', Boolean);
 			assert.argumentIsRequired(sale, 'sale', Boolean);
 			assert.argumentIsRequired(income, 'income', Boolean);
@@ -38,6 +41,7 @@ module.exports = (() => {
 			assert.argumentIsRequired(significant, 'significant', Boolean);
 
 			this._display = display;
+			this._sequence = sequence;
 			this._purchase = purchase;
 			this._sale = sale;
 			this._income = income;
@@ -59,6 +63,17 @@ module.exports = (() => {
 			return this._display;
 		}
 
+		/**
+		 * Specifies ordering when multiple transactions occur on the same day, for
+		 * the same position.
+		 *
+		 * @public
+		 * @returns {Number}
+		 */
+		get sequence() {
+			return this._sequence;
+		}
+
 		/**
 		 * Indicates if the transaction was a trade.
 		 *
@@ -376,28 +391,28 @@ module.exports = (() => {
 		}
 	}
 
-	const buy = new TransactionType('B', 'Buy', 'Buy', true, false, false, true, false, false, false, true, true);
-	const sell = new TransactionType('S', 'Sell', 'Sell', false, true, false, false, true, false, false, false, true);
-	const buyShort = new TransactionType('BS', 'Buy To Cover', 'Buy To Cover', true, false, false, false, true, false, false, false, true);
-	const sellShort = new TransactionType('SS', 'Sell Short', 'Sell Short', false, true, false, true, false, false, false, true, true);
-	const dividend = new TransactionType('DV', 'Dividend', 'Dividend', false, false, true, false, false, false, true, false, false);
-	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', 'Dividend Reinvest', false, false, false, true, false, false, true, false, false);
-	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', 'Dividend Stock', false, false, false, true, false, false, true, false, false);
-	const split = new TransactionType('SP', 'Split', 'Split', false, false, false, true, false, false, true, false, false);
-	const fee = new TransactionType('F', 'Fee', 'Fee', false, false, false, false, false, true, false, false, false);
-	const feeUnits = new TransactionType('FU', 'Fee Units', 'Fee', false, false, false, false, true, false, false, false, false);
-
-	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', false, false, true, false, false, false, true, false, false);
-	const distributionReinvest = new TransactionType('DY', 'Distribution (Reinvested)', 'Distribution Reinvest', false, false, false, true, false, false, true, false, false);
-	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', false, false, false, true, false, false, true, false, false);
-
-	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, false, false, false, false, true, true);
-	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, false, false, false, true, true);
-	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, false, false, false, true, true);
-	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, false, false, false, false, true, true);
-
-	const valuation = new TransactionType('V', 'Valuation', 'Valuation', false, false, false, false, false, false, false, false, false);
-	const income = new TransactionType('I', 'Income', 'Income', false, false, true, false, false, false, false, false, false);
+	const buy = new TransactionType('B', 'Buy', 'Buy', 0, true, false, false, true, false, false, false, true, true);
+	const sell = new TransactionType('S', 'Sell', 'Sell', 0, false, true, false, false, true, false, false, false, true);
+	const buyShort = new TransactionType('BS', 'Buy To Cover', 'Buy To Cover', 0, true, false, false, false, true, false, false, false, true);
+	const sellShort = new TransactionType('SS', 'Sell Short', 'Sell Short', 0, false, true, false, true, false, false, false, true, true);
+	const dividend = new TransactionType('DV', 'Dividend', 'Dividend', 0, false, false, true, false, false, false, true, false, false);
+	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', 'Dividend Reinvest', 1, false, false, false, true, false, false, true, false, false);
+	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', 'Dividend Stock', 1, false, false, false, true, false, false, true, false, false);
+	const split = new TransactionType('SP', 'Split', 'Split', 2, false, false, false, true, false, false, true, false, false);
+	const fee = new TransactionType('F', 'Fee', 'Fee', 0, false, false, false, false, false, true, false, false, false);
+	const feeUnits = new TransactionType('FU', 'Fee Units', 'Fee', 0, false, false, false, false, true, false, false, false, false);
+
+	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', 1, false, false, true, false, false, false, true, false, false);
+	const distributionReinvest = new TransactionType('DY', 'Distribution (Reinvested)', 'Distribution Reinvest', 1, false, false, false, true, false, false, true, false, false);
+	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', 1, false, false, false, true, false, false, true, false, false);
+
+	const deposit = new TransactionType('D', 'Deposit', 'Deposit', 0, false, false, false, false, false, false, false, true, true);
+	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', 0, false, false, false, false, false, false, false, true, true);
+	const debit = new TransactionType('DR', 'Debit', 'Debit', 0, false, false, false, false, false, false, false, true, true);
+	const credit = new TransactionType('CR', 'Credit', 'Credit', 0, false, false, false, false, false, false, false, true, true);
+
+	const valuation = new TransactionType('V', 'Valuation', 'Valuation', 0, false, false, false, false, false, false, false, false, false);
+	const income = new TransactionType('I', 'Income', 'Income', 0, false, false, true, false, false, false, false, false, false);
 
 	return TransactionType;
 })();

package/lib/formatters/TransactionFormatter.js

@@ -146,13 +146,18 @@ module.exports = (() => {
 	});
 
 	formatters.set(TransactionType.DIVIDEND_STOCK, (t) => {
-		const rate = (is.object(t.dividend) && is.string(t.dividend.rate)) || '';
-
-		return {
+		const data = {
 			boughtSold: t.quantity,
-			shares: t.snapshot.open.subtract(t.quantity),
-			rate: rate
+			fee: t.fee
 		};
+
+		if (t.dividend && t.dividend.rate && t.dividend.price) {
+			data.shares = t.snapshot.open.subtract(t.quantity);
+			data.price = t.dividend.price;
+			data.rate = t.dividend.rate;
+		}
+
+		return data;
 	});
 
 	formatters.set(TransactionType.DIVIDEND_REINVEST, (t) => {
@@ -174,10 +179,18 @@ module.exports = (() => {
 	});
 
 	formatters.set(TransactionType.DISTRIBUTION_FUND, (t) => {
-		return {
-			shares: t.quantity,
+		const data = {
+			boughtSold: t.quantity,
 			fee: t.fee
 		};
+
+		if (t.dividend && t.dividend.rate && t.dividend.price) {
+			data.shares = t.snapshot.open.subtract(t.quantity);
+			data.price = t.dividend.price;
+			data.rate = t.dividend.rate;
+		}
+
+		return data;
 	});
 
 	formatters.set(TransactionType.DISTRIBUTION_REINVEST, (t) => {
@@ -204,7 +217,6 @@ module.exports = (() => {
 
 	formatters.set(TransactionType.FEE_UNITS, (t) => {
 		return {
-			total: t.charge.amount,
 			boughtSold: t.quantity
 		};
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-api-common",
-  "version": "1.2.48",
+  "version": "1.2.52",
   "description": "Common classes used by the Portfolio system",
   "author": {
     "name": "Bryan Ingle",

package/test/SpecRunner.js

@@ -193,7 +193,7 @@ module.exports = (() => {
 			} else if (code === 5 || code == 15) {
 				return InstrumentType.FUND;
 			} else {
-				throw new Error('Unable to determine InstrumentType for [', code, ']');
+				throw new Error(`Unable to determine InstrumentType for [ ${code} ]`);
 			}
 		}
 
@@ -635,6 +635,7 @@ module.exports = (() => {
 	 * @param {String} code
 	 * @param {String} description
 	 * @param {String} display
+	 * @param {Number} sequence
 	 * @param {Boolean} purchase
 	 * @param {Boolean} sale
 	 * @param {Boolean} income
@@ -644,12 +645,14 @@ module.exports = (() => {
 	 * @param {Boolean} corporateAction
 	 * @param {Boolean} initial
 	 * @param {Boolean} significant
-	 */
+	 * @param {Boolean} eod
+ 	 */
 	class TransactionType extends Enum {
-		constructor(code, description, display, purchase, sale, income, opening, closing, fee, corporateAction, initial, significant) {
+		constructor(code, description, display, sequence, purchase, sale, income, opening, closing, fee, corporateAction, initial, significant) {
 			super(code, description);
 
 			assert.argumentIsRequired(display, 'display', String);
+			assert.argumentIsRequired(sequence, 'sequence', Number);
 			assert.argumentIsRequired(purchase, 'purchase', Boolean);
 			assert.argumentIsRequired(sale, 'sale', Boolean);
 			assert.argumentIsRequired(income, 'income', Boolean);
@@ -661,6 +664,7 @@ module.exports = (() => {
 			assert.argumentIsRequired(significant, 'significant', Boolean);
 
 			this._display = display;
+			this._sequence = sequence;
 			this._purchase = purchase;
 			this._sale = sale;
 			this._income = income;
@@ -682,6 +686,17 @@ module.exports = (() => {
 			return this._display;
 		}
 
+		/**
+		 * Specifies ordering when multiple transactions occur on the same day, for
+		 * the same position.
+		 *
+		 * @public
+		 * @returns {Number}
+		 */
+		get sequence() {
+			return this._sequence;
+		}
+
 		/**
 		 * Indicates if the transaction was a trade.
 		 *
@@ -999,28 +1014,28 @@ module.exports = (() => {
 		}
 	}
 
-	const buy = new TransactionType('B', 'Buy', 'Buy', true, false, false, true, false, false, false, true, true);
-	const sell = new TransactionType('S', 'Sell', 'Sell', false, true, false, false, true, false, false, false, true);
-	const buyShort = new TransactionType('BS', 'Buy To Cover', 'Buy To Cover', true, false, false, false, true, false, false, false, true);
-	const sellShort = new TransactionType('SS', 'Sell Short', 'Sell Short', false, true, false, true, false, false, false, true, true);
-	const dividend = new TransactionType('DV', 'Dividend', 'Dividend', false, false, true, false, false, false, true, false, false);
-	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', 'Dividend Reinvest', false, false, false, true, false, false, true, false, false);
-	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', 'Dividend Stock', false, false, false, true, false, false, true, false, false);
-	const split = new TransactionType('SP', 'Split', 'Split', false, false, false, true, false, false, true, false, false);
-	const fee = new TransactionType('F', 'Fee', 'Fee', false, false, false, false, false, true, false, false, false);
-	const feeUnits = new TransactionType('FU', 'Fee Units', 'Fee', false, false, false, false, true, false, false, false, false);
-
-	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', false, false, true, false, false, false, true, false, false);
-	const distributionReinvest = new TransactionType('DY', 'Distribution (Reinvested)', 'Distribution Reinvest', false, false, false, true, false, false, true, false, false);
-	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', false, false, false, true, false, false, true, false, false);
-
-	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, false, false, false, false, true, true);
-	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, false, false, false, true, true);
-	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, false, false, false, true, true);
-	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, false, false, false, false, true, true);
-
-	const valuation = new TransactionType('V', 'Valuation', 'Valuation', false, false, false, false, false, false, false, false, false);
-	const income = new TransactionType('I', 'Income', 'Income', false, false, true, false, false, false, false, false, false);
+	const buy = new TransactionType('B', 'Buy', 'Buy', 0, true, false, false, true, false, false, false, true, true);
+	const sell = new TransactionType('S', 'Sell', 'Sell', 0, false, true, false, false, true, false, false, false, true);
+	const buyShort = new TransactionType('BS', 'Buy To Cover', 'Buy To Cover', 0, true, false, false, false, true, false, false, false, true);
+	const sellShort = new TransactionType('SS', 'Sell Short', 'Sell Short', 0, false, true, false, true, false, false, false, true, true);
+	const dividend = new TransactionType('DV', 'Dividend', 'Dividend', 0, false, false, true, false, false, false, true, false, false);
+	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', 'Dividend Reinvest', 1, false, false, false, true, false, false, true, false, false);
+	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', 'Dividend Stock', 1, false, false, false, true, false, false, true, false, false);
+	const split = new TransactionType('SP', 'Split', 'Split', 2, false, false, false, true, false, false, true, false, false);
+	const fee = new TransactionType('F', 'Fee', 'Fee', 0, false, false, false, false, false, true, false, false, false);
+	const feeUnits = new TransactionType('FU', 'Fee Units', 'Fee', 0, false, false, false, false, true, false, false, false, false);
+
+	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', 1, false, false, true, false, false, false, true, false, false);
+	const distributionReinvest = new TransactionType('DY', 'Distribution (Reinvested)', 'Distribution Reinvest', 1, false, false, false, true, false, false, true, false, false);
+	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', 1, false, false, false, true, false, false, true, false, false);
+
+	const deposit = new TransactionType('D', 'Deposit', 'Deposit', 0, false, false, false, false, false, false, false, true, true);
+	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', 0, false, false, false, false, false, false, false, true, true);
+	const debit = new TransactionType('DR', 'Debit', 'Debit', 0, false, false, false, false, false, false, false, true, true);
+	const credit = new TransactionType('CR', 'Credit', 'Credit', 0, false, false, false, false, false, false, false, true, true);
+
+	const valuation = new TransactionType('V', 'Valuation', 'Valuation', 0, false, false, false, false, false, false, false, false, false);
+	const income = new TransactionType('I', 'Income', 'Income', 0, false, false, true, false, false, false, false, false, false);
 
 	return TransactionType;
 })();
@@ -5134,8 +5149,8 @@ module.exports = function () {
    * Compares two strings (in ascending order), using {@link String#localeCompare}.
    *
    * @static
-   * @param {String} a
-   * @param {String} b
+   * @param {Number} a
+   * @param {Number} b
    * @returns {Number}
    */
 		compareStrings: function compareStrings(a, b) {
@@ -5825,7 +5840,7 @@ module.exports = function () {
     * @returns {String}
     */
 			value: function format() {
-				return leftPad(this._year, 4, '0') + '-' + leftPad(this._month, 2, '0') + '-' + leftPad(this._day, 2, '0');
+				return this._year + '-' + leftPad(this._month) + '-' + leftPad(this._day);
 			}
 
 			/**
@@ -5942,7 +5957,7 @@ module.exports = function () {
     *
     * @static
     * @public
-    * @returns {Day}
+    * @return {Day}
     */
 
 		}, {
@@ -6034,11 +6049,8 @@ module.exports = function () {
 
 	var dayRegex = /^([0-9]{4}).?([0-9]{2}).?([0-9]{2})$/;
 
-	function leftPad(value, digits, character) {
-		var string = value.toString();
-		var padding = digits - string.length;
-
-		return '' + character.repeat(padding) + string;
+	function leftPad(value) {
+		return value < 10 ? '0' + value : '' + value;
 	}
 
 	var comparator = ComparatorBuilder.startWith(function (a, b) {
@@ -6393,7 +6405,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @returns {Boolean}
+    * @return {Boolean}
     */
 			value: function getIsZero(instance) {
 				assert.argumentIsRequired(instance, 'instance', Decimal, 'Decimal');
@@ -6406,7 +6418,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @returns {Boolean}
+    * @return {Boolean}
     */
 
 		}, {
@@ -6422,7 +6434,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @returns {Boolean}
+    * @return {Boolean}
     */
 
 		}, {
@@ -6438,7 +6450,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @returns {Boolean}
+    * @return {Boolean}
     */
 
 		}, {
@@ -6454,7 +6466,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @returns {Boolean}
+    * @return {Boolean}
     */
 
 		}, {
@@ -6470,7 +6482,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @returns {Boolean}
+    * @return {Boolean}
     */
 
 		}, {
@@ -6860,7 +6872,6 @@ module.exports = function () {
 		/**
    * The unique code.
    *
-   * @public
    * @returns {String}
    */
 
@@ -6873,7 +6884,6 @@ module.exports = function () {
     * Returns true if the provided {@link Enum} argument is equal
     * to the instance.
     *
-    * @public
     * @param {Enum} other
     * @returns {boolean}
     */
@@ -6898,7 +6908,6 @@ module.exports = function () {
     * Looks up a enumeration item; given the enumeration type and the enumeration
     * item's value. If no matching item can be found, a null value is returned.
     *
-    * @public
     * @param {Function} type - The enumeration type.
     * @param {String} code - The enumeration item's code.
     * @returns {*|null}
@@ -6918,7 +6927,6 @@ module.exports = function () {
 			/**
     * The description.
     *
-    * @public
     * @returns {String}
     */
 
@@ -6938,7 +6946,6 @@ module.exports = function () {
 			/**
     * Returns all of the enumeration's items (given an enumeration type).
     *
-    * @public
     * @param {Function} type - The enumeration to list.
     * @returns {Array}
     */
@@ -7396,7 +7403,7 @@ module.exports = function () {
     * Parses the value emitted by {@link Timestamp#toJSON}.
     *
     * @public
-    * @param {Number} value
+    * @param {String} value
     * @returns {Timestamp}
     */
 
@@ -8032,7 +8039,7 @@ module.exports = function () {
 
 				if (typeof itemConstraint === 'function' && itemConstraint !== Function) {
 					itemValidator = function itemValidator(value, index) {
-						return itemConstraint.prototype !== undefined && value instanceof itemConstraint || itemConstraint(value, variableName + '[' + index + ']');
+						return value instanceof itemConstraint || itemConstraint(value, variableName + '[' + index + ']');
 					};
 				} else {
 					itemValidator = function itemValidator(value, index) {
@@ -8142,7 +8149,7 @@ module.exports = function () {
    *
    * @static
    * @param {Object} target - The object to check for existence of the property.
-   * @param {String|Array.<String>} propertyNames - The property to check -- either a string with separators, or an array of strings (already split by separator).
+   * @param {String|Array<String>} propertyNames - The property to check -- either a string with separators, or an array of strings (already split by separator).
    * @param {String=} separator - The separator (defaults to a period character).
    * @returns {boolean}
    */
@@ -8168,7 +8175,7 @@ module.exports = function () {
    *
    * @static
    * @param {Object} target - The object to read from.
-   * @param {String|Array.<String>} propertyNames - The property to read -- either a string with separators, or an array of strings (already split by separator).
+   * @param {String|Array<String>} propertyNames - The property to read -- either a string with separators, or an array of strings (already split by separator).
    * @param {String=} separator - The separator (defaults to a period character).
    * @returns {*}
    */
@@ -8203,8 +8210,7 @@ module.exports = function () {
    *
    * @static
    * @param {Object} target - The object to write to.
-   * @param {String|Array.<String>} propertyNames - The property to write -- either a string with separators, or an array of strings (already split by separator).
-   * @param {*} value - The value to assign.
+   * @param {String|Array<String>} propertyNames - The property to write -- either a string with separators, or an array of strings (already split by separator).
    * @param {String=} separator - The separator (defaults to a period character).
    */
 		write: function write(target, propertyNames, value, separator) {
@@ -8230,7 +8236,7 @@ module.exports = function () {
    *
    * @static
    * @param {Object} target - The object to erase a property from.
-   * @param {String|Array.<String>} propertyNames - The property to write -- either a string with separators, or an array of strings (already split by separator).
+   * @param {String|Array<String>} propertyNames - The property to write -- either a string with separators, or an array of strings (already split by separator).
    * @param {String=} separator - The separator (defaults to a period character).
    */
 		erase: function erase(target, propertyNames, separator) {
@@ -9483,7 +9489,7 @@ module.exports = function () {
 			}
 
 			/**
-    * Generates a function suitable for use by {@link JSON.parse}.
+    * Generates a function suitable for use by JSON.parse.
     *
     * @public
     * @returns {Function}
@@ -13608,9 +13614,9 @@ moment.tz.load(require('./data/packed/latest.json'));
 
             mom = createUTC([2000, 1]).day(i);
             if (strict && !this._fullWeekdaysParse[i]) {
-                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i');
-                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i');
-                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i');
+                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i');
+                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i');
+                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\.?') + '$', 'i');
             }
             if (!this._weekdaysParse[i]) {
                 regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
@@ -14413,7 +14419,7 @@ moment.tz.load(require('./data/packed/latest.json'));
 
     function preprocessRFC2822(s) {
         // Remove comments and folding whitespace and replace multiple-spaces with a single space
-        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').trim();
     }
 
     function checkWeekday(weekdayStr, parsedInput, config) {
@@ -16592,7 +16598,7 @@ moment.tz.load(require('./data/packed/latest.json'));
     // Side effect imports
 
 
-    hooks.version = '2.22.2';
+    hooks.version = '2.22.1';
 
     setHookCallback(createLocal);