@barchart/portfolio-api-common 1.0.259 → 1.0.263

package/lib/data/PositionSummaryFrame.js

@@ -20,18 +20,34 @@ module.exports = (() => {
 	 * @param {Function} descriptionCalculator
 	 */
 	class PositionSummaryFrame extends Enum {
-		constructor(code, description, rangeCalculator, startDateCalculator, descriptionCalculator) {
+		constructor(code, description, unique, rangeCalculator, startDateCalculator, descriptionCalculator) {
 			super(code, description);
 
+			assert.argumentIsRequired(unique, 'unique', Boolean);
+
 			assert.argumentIsRequired(rangeCalculator, 'rangeCalculator', Function);
 			assert.argumentIsRequired(startDateCalculator, 'startDateCalculator', Function);
 			assert.argumentIsRequired(descriptionCalculator, 'descriptionCalculator', Function);
 
+			this._unique = unique;
+
 			this._rangeCalculator = rangeCalculator;
 			this._startDateCalculator = startDateCalculator;
 			this._descriptionCalculator = descriptionCalculator;
 		}
 
+		/**
+		 * If true, only one summary, of the given type, can exist for a
+		 * position. If false, multiple summaries, of the given type, can
+		 * exist for a position.
+		 *
+		 * @public
+		 * @return {Boolean}
+		 */
+		get unique() {
+			return this._unique;
+		}
+
 		/**
 		 * Returns a human-readable description of the frame, given
 		 * start and end dates.
@@ -129,10 +145,10 @@ module.exports = (() => {
 		}
 	}
 
-	const yearly = new PositionSummaryFrame('YEARLY', 'year', getYearlyRanges, getYearlyStartDate, getYearlyRangeDescription);
-	const quarterly = new PositionSummaryFrame('QUARTER', 'quarter', getQuarterlyRanges, getQuarterlyStartDate, getQuarterlyRangeDescription);
-	const monthly = new PositionSummaryFrame('MONTH', 'month', getMonthlyRanges, getMonthlyStartDate, getMonthlyRangeDescription);
-	const ytd = new PositionSummaryFrame('YTD', 'year-to-date', getYearToDateRanges, getYearToDateStartDate, getYearToDateRangeDescription);
+	const yearly = new PositionSummaryFrame('YEARLY', 'year', false, getYearlyRanges, getYearlyStartDate, getYearlyRangeDescription);
+	const quarterly = new PositionSummaryFrame('QUARTER', 'quarter', false, getQuarterlyRanges, getQuarterlyStartDate, getQuarterlyRangeDescription);
+	const monthly = new PositionSummaryFrame('MONTH', 'month', false, getMonthlyRanges, getMonthlyStartDate, getMonthlyRangeDescription);
+	const ytd = new PositionSummaryFrame('YTD', 'year-to-date', true, getYearToDateRanges, getYearToDateStartDate, getYearToDateRangeDescription);
 
 	/**
 	 * The start and and date for a {@link PositionSummaryFrame}

package/lib/data/TransactionType.js

@@ -18,9 +18,10 @@ module.exports = (() => {
 	 * @param {Boolean} opening
 	 * @param {Boolean} closing
 	 * @param {Boolean} fee
+	 * @param {Boolean} corporateAction
 	 */
 	class TransactionType extends Enum {
-		constructor(code, description, display, purchase, sale, income, opening, closing, fee) {
+		constructor(code, description, display, purchase, sale, income, opening, closing, fee, corporateAction) {
 			super(code, description);
 
 			assert.argumentIsRequired(display, 'display', String);
@@ -30,6 +31,7 @@ module.exports = (() => {
 			assert.argumentIsRequired(opening, 'opening', Boolean);
 			assert.argumentIsRequired(closing, 'closing', Boolean);
 			assert.argumentIsRequired(fee, 'fee', Boolean);
+			assert.argumentIsRequired(corporateAction, 'corporateAction', Boolean);
 
 			this._display = display;
 			this._purchase = purchase;
@@ -38,6 +40,7 @@ module.exports = (() => {
 			this._opening = opening;
 			this._closing = closing;
 			this._fee = fee;
+			this._corporateAction = corporateAction;
 		}
 
 		/**
@@ -123,6 +126,16 @@ module.exports = (() => {
 			return this._fee;
 		}
 
+		/**
+		 * Indicates if the transaction is a corporate action.
+		 *
+		 * @public
+		 * @returns {Boolean}
+		 */
+		get corporateAction() {
+			return this._corporateAction;
+		}
+
 		/**
 		 * A purchase.
 		 *
@@ -326,27 +339,27 @@ module.exports = (() => {
 		}
 	}
 
-	const buy = new TransactionType('B', 'Buy', 'Buy', true, false, false, true,  false, false);
-	const sell = new TransactionType('S', 'Sell', 'Sell', false, true, false, false, true, false);
-	const buyShort = new TransactionType('BS', 'Buy To Cover', 'Buy To Cover', true, false, false, false, true, false);
-	const sellShort = new TransactionType('SS', 'Sell Short', 'Sell Short', false, true, false, true, false, false);
-	const dividend = new TransactionType('DV', 'Dividend', 'Dividend', false, false, true, false, false, false);
-	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', 'Dividend Reinvest', false, false, false, true, false, false);
-	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', 'Dividend Stock', false, false, false, true, false, false);
-	const split = new TransactionType('SP', 'Split', 'Split', false, false, false, true, false, false);
-	const fee = new TransactionType('F', 'Fee', 'Fee', false, false, false, false, false, true);
-	const feeUnits = new TransactionType('FU', 'Fee Units', 'Fee', false, false, false, false, true, false);
-
-	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', false, false, true, false, false, false);
-	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', false, false, false, true, false, false);
-
-	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, false, false, false);
-	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, false, false);
-	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, false, false);
-	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, false, false, false);
-
-	const valuation = new TransactionType('V', 'Valuation', 'Valuation', false, false, false, false, false, false);
-	const income = new TransactionType('I', 'Income', 'Income', false, false, true, false, false, false);
+	const buy = new TransactionType('B', 'Buy', 'Buy', true, false, false, true,  false, false, false);
+	const sell = new TransactionType('S', 'Sell', 'Sell', false, true, false, false, true, false, false);
+	const buyShort = new TransactionType('BS', 'Buy To Cover', 'Buy To Cover', true, false, false, false, true, false, false);
+	const sellShort = new TransactionType('SS', 'Sell Short', 'Sell Short', false, true, false, true, false, false, false);
+	const dividend = new TransactionType('DV', 'Dividend', 'Dividend', false, false, true, false, false, false, true);
+	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', 'Dividend Reinvest', false, false, false, true, false, false, true);
+	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', 'Dividend Stock', false, false, false, true, false, false, true);
+	const split = new TransactionType('SP', 'Split', 'Split', false, false, false, true, false, false, true);
+	const fee = new TransactionType('F', 'Fee', 'Fee', false, false, false, false, false, true, false);
+	const feeUnits = new TransactionType('FU', 'Fee Units', 'Fee', false, false, false, false, true, false, false);
+
+	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', false, false, true, false, false, false, true);
+	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', false, false, false, true, false, false, true);
+
+	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, false, false, false, false);
+	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, false, false, false);
+	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, false, false, false);
+	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, false, false, false, false);
+
+	const valuation = new TransactionType('V', 'Valuation', 'Valuation', false, false, false, false, false, false, false);
+	const income = new TransactionType('I', 'Income', 'Income', false, false, true, false, false, false, false);
 
 	return TransactionType;
 })();

package/lib/processing/PositionContainer.js

@@ -123,7 +123,7 @@ module.exports = (() => {
 
 			this._forexSymbols = forexCurrencyCodes.reduce((symbols, code) => {
 				if (code !== DEFAULT_CURRENCY.code) {
-					symbols.push(`^${DEFAULT_CURRENCY.code}${code}`);
+					symbols.push(`^${code}${DEFAULT_CURRENCY.code}`);
 				}
 
 				return symbols;

package/lib/serialization/TransactionSchema.js

@@ -233,7 +233,6 @@ module.exports = (() => {
 		.withField('dividend.effective', DataType.DAY, true)
 		.withField('dividend.price', DataType.DECIMAL, true)
 		.withField('dividend.amount', DataType.DECIMAL, true)
-		.withField('dividend.reference', DataType.STRING, true)
 		.withField('split.numerator', DataType.DECIMAL, true)
 		.withField('split.denominator', DataType.DECIMAL, true)
 		.withField('split.effective', DataType.DAY, true)
@@ -283,6 +282,7 @@ module.exports = (() => {
 		.withField('quantity', DataType.DECIMAL)
 		.withField('fee', DataType.DECIMAL, true)
 		.withField('force', DataType.BOOLEAN, true)
+		.withField('force', DataType.BOOLEAN, true)
 		.schema
 	);
 

package/package.json

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

package/test/SpecRunner.js

@@ -1,4 +1,4 @@
-(function(){function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}return e})()({1:[function(require,module,exports){
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 const uuid = require('uuid');
 
 const assert = require('@barchart/common-js/lang/assert'),
@@ -208,18 +208,34 @@ module.exports = (() => {
 	 * @param {Function} descriptionCalculator
 	 */
 	class PositionSummaryFrame extends Enum {
-		constructor(code, description, rangeCalculator, startDateCalculator, descriptionCalculator) {
+		constructor(code, description, unique, rangeCalculator, startDateCalculator, descriptionCalculator) {
 			super(code, description);
 
+			assert.argumentIsRequired(unique, 'unique', Boolean);
+
 			assert.argumentIsRequired(rangeCalculator, 'rangeCalculator', Function);
 			assert.argumentIsRequired(startDateCalculator, 'startDateCalculator', Function);
 			assert.argumentIsRequired(descriptionCalculator, 'descriptionCalculator', Function);
 
+			this._unique = unique;
+
 			this._rangeCalculator = rangeCalculator;
 			this._startDateCalculator = startDateCalculator;
 			this._descriptionCalculator = descriptionCalculator;
 		}
 
+		/**
+		 * If true, only one summary, of the given type, can exist for a
+		 * position. If false, multiple summaries, of the given type, can
+		 * exist for a position.
+		 *
+		 * @public
+		 * @return {Boolean}
+		 */
+		get unique() {
+			return this._unique;
+		}
+
 		/**
 		 * Returns a human-readable description of the frame, given
 		 * start and end dates.
@@ -317,10 +333,10 @@ module.exports = (() => {
 		}
 	}
 
-	const yearly = new PositionSummaryFrame('YEARLY', 'year', getYearlyRanges, getYearlyStartDate, getYearlyRangeDescription);
-	const quarterly = new PositionSummaryFrame('QUARTER', 'quarter', getQuarterlyRanges, getQuarterlyStartDate, getQuarterlyRangeDescription);
-	const monthly = new PositionSummaryFrame('MONTH', 'month', getMonthlyRanges, getMonthlyStartDate, getMonthlyRangeDescription);
-	const ytd = new PositionSummaryFrame('YTD', 'year-to-date', getYearToDateRanges, getYearToDateStartDate, getYearToDateRangeDescription);
+	const yearly = new PositionSummaryFrame('YEARLY', 'year', false, getYearlyRanges, getYearlyStartDate, getYearlyRangeDescription);
+	const quarterly = new PositionSummaryFrame('QUARTER', 'quarter', false, getQuarterlyRanges, getQuarterlyStartDate, getQuarterlyRangeDescription);
+	const monthly = new PositionSummaryFrame('MONTH', 'month', false, getMonthlyRanges, getMonthlyStartDate, getMonthlyRangeDescription);
+	const ytd = new PositionSummaryFrame('YTD', 'year-to-date', true, getYearToDateRanges, getYearToDateStartDate, getYearToDateRangeDescription);
 
 	/**
 	 * The start and and date for a {@link PositionSummaryFrame}
@@ -463,9 +479,10 @@ module.exports = (() => {
 	 * @param {Boolean} opening
 	 * @param {Boolean} closing
 	 * @param {Boolean} fee
+	 * @param {Boolean} corporateAction
 	 */
 	class TransactionType extends Enum {
-		constructor(code, description, display, purchase, sale, income, opening, closing, fee) {
+		constructor(code, description, display, purchase, sale, income, opening, closing, fee, corporateAction) {
 			super(code, description);
 
 			assert.argumentIsRequired(display, 'display', String);
@@ -475,6 +492,7 @@ module.exports = (() => {
 			assert.argumentIsRequired(opening, 'opening', Boolean);
 			assert.argumentIsRequired(closing, 'closing', Boolean);
 			assert.argumentIsRequired(fee, 'fee', Boolean);
+			assert.argumentIsRequired(corporateAction, 'corporateAction', Boolean);
 
 			this._display = display;
 			this._purchase = purchase;
@@ -483,6 +501,7 @@ module.exports = (() => {
 			this._opening = opening;
 			this._closing = closing;
 			this._fee = fee;
+			this._corporateAction = corporateAction;
 		}
 
 		/**
@@ -568,6 +587,16 @@ module.exports = (() => {
 			return this._fee;
 		}
 
+		/**
+		 * Indicates if the transaction is a corporate action.
+		 *
+		 * @public
+		 * @returns {Boolean}
+		 */
+		get corporateAction() {
+			return this._corporateAction;
+		}
+
 		/**
 		 * A purchase.
 		 *
@@ -771,27 +800,27 @@ module.exports = (() => {
 		}
 	}
 
-	const buy = new TransactionType('B', 'Buy', 'Buy', true, false, false, true,  false, false);
-	const sell = new TransactionType('S', 'Sell', 'Sell', false, true, false, false, true, false);
-	const buyShort = new TransactionType('BS', 'Buy To Cover', 'Buy To Cover', true, false, false, false, true, false);
-	const sellShort = new TransactionType('SS', 'Sell Short', 'Sell Short', false, true, false, true, false, false);
-	const dividend = new TransactionType('DV', 'Dividend', 'Dividend', false, false, true, false, false, false);
-	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', 'Dividend Reinvest', false, false, false, true, false, false);
-	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', 'Dividend Stock', false, false, false, true, false, false);
-	const split = new TransactionType('SP', 'Split', 'Split', false, false, false, true, false, false);
-	const fee = new TransactionType('F', 'Fee', 'Fee', false, false, false, false, false, true);
-	const feeUnits = new TransactionType('FU', 'Fee Units', 'Fee', false, false, false, false, true, false);
+	const buy = new TransactionType('B', 'Buy', 'Buy', true, false, false, true,  false, false, false);
+	const sell = new TransactionType('S', 'Sell', 'Sell', false, true, false, false, true, false, false);
+	const buyShort = new TransactionType('BS', 'Buy To Cover', 'Buy To Cover', true, false, false, false, true, false, false);
+	const sellShort = new TransactionType('SS', 'Sell Short', 'Sell Short', false, true, false, true, false, false, false);
+	const dividend = new TransactionType('DV', 'Dividend', 'Dividend', false, false, true, false, false, false, true);
+	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', 'Dividend Reinvest', false, false, false, true, false, false, true);
+	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', 'Dividend Stock', false, false, false, true, false, false, true);
+	const split = new TransactionType('SP', 'Split', 'Split', false, false, false, true, false, false, true);
+	const fee = new TransactionType('F', 'Fee', 'Fee', false, false, false, false, false, true, false);
+	const feeUnits = new TransactionType('FU', 'Fee Units', 'Fee', false, false, false, false, true, false, false);
 
-	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', false, false, true, false, false, false);
-	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', false, false, false, true, false, false);
+	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', false, false, true, false, false, false, true);
+	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', false, false, false, true, false, false, true);
 
-	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, false, false, false);
-	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, false, false);
-	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, false, false);
-	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, false, false, false);
+	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, false, false, false, false);
+	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, false, false, false);
+	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, false, false, false);
+	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, false, false, false, false);
 
-	const valuation = new TransactionType('V', 'Valuation', 'Valuation', false, false, false, false, false, false);
-	const income = new TransactionType('I', 'Income', 'Income', false, false, true, false, false, false);
+	const valuation = new TransactionType('V', 'Valuation', 'Valuation', false, false, false, false, false, false, false);
+	const income = new TransactionType('I', 'Income', 'Income', false, false, true, false, false, false, false);
 
 	return TransactionType;
 })();
@@ -922,7 +951,7 @@ module.exports = (() => {
 
 			this._forexSymbols = forexCurrencyCodes.reduce((symbols, code) => {
 				if (code !== DEFAULT_CURRENCY.code) {
-					symbols.push(`^${DEFAULT_CURRENCY.code}${code}`);
+					symbols.push(`^${code}${DEFAULT_CURRENCY.code}`);
 				}
 
 				return symbols;
@@ -3635,14 +3664,31 @@ module.exports = function () {
 		}
 
 		/**
-   * Returns the parent node. If this is the root node, a null value is returned.
+   * Gets the root node.
    *
    * @public
-   * @returns {Tree|null}
+   * @returns {Tree}
    */
 
 
 		_createClass(Tree, [{
+			key: 'getRoot',
+			value: function getRoot() {
+				if (this.getIsRoot()) {
+					return this;
+				} else {
+					return this._parent.getRoot();
+				}
+			}
+
+			/**
+    * Returns the parent node. If this is the root node, a null value is returned.
+    *
+    * @public
+    * @returns {Tree|null}
+    */
+
+		}, {
 			key: 'getParent',
 			value: function getParent() {
 				return this._parent;
@@ -3743,6 +3789,23 @@ module.exports = function () {
 				}
 			}
 
+			/**
+    * Removes the current node from the parent tree. Use on a root node
+    * has no effect.
+    *
+    * @public
+    */
+
+		}, {
+			key: 'sever',
+			value: function sever() {
+				if (this.getIsRoot()) {
+					return;
+				}
+
+				this.getParent().removeChild(this);
+			}
+
 			/**
     * Searches the children nodes for the first child node that matches the
     * predicate.
@@ -3847,6 +3910,33 @@ module.exports = function () {
 				}
 			}
 
+			/**
+    * Climbs the tree, evaluating each parent until a predicate is matched. Once matched,
+    * the {@link Tree} node is returned. Otherwise, if the predicate cannot be matched,
+    * a null value is returned.
+    *
+    * @public
+    * @param {Tree~nodePredicate} predicate - A predicate that tests each child node. The predicate takes two arguments -- the node's value, and the node itself.
+    * @param {boolean=} includeCurrentNode - If true, the predicate will be applied to the current node.
+    * @returns {Tree|null}
+    */
+
+		}, {
+			key: 'findParent',
+			value: function findParent(predicate, includeCurrentNode) {
+				var returnRef = void 0;
+
+				if (is.boolean(includeCurrentNode) && includeCurrentNode && predicate(this.getValue(), this)) {
+					returnRef = this;
+				} else if (this._parent !== null) {
+					returnRef = this._parent.findParent(predicate, true);
+				} else {
+					returnRef = null;
+				}
+
+				return returnRef;
+			}
+
 			/**
     * Creates a representation of the tree using JavaScript objects and arrays.
     *
@@ -5137,6 +5227,20 @@ module.exports = function () {
 				return this._big.gt(getBig(other));
 			}
 
+			/**
+    * Returns true if the current instance is greater than or equal to the value.
+    *
+    * @public
+    * @param {Decimal|Number|String} other - The value to compare.
+    * @returns {Boolean}
+    */
+
+		}, {
+			key: 'getIsGreaterThanOrEqual',
+			value: function getIsGreaterThanOrEqual(other) {
+				return this._big.gte(getBig(other));
+			}
+
 			/**
     * Returns true if the current instance is less than the value.
     *
@@ -5151,6 +5255,20 @@ module.exports = function () {
 				return this._big.lt(getBig(other));
 			}
 
+			/**
+    * Returns true if the current instance is less than or equal to the value.
+    *
+    * @public
+    * @param {Decimal|Number|String} other - The value to compare.
+    * @returns {Boolean}
+    */
+
+		}, {
+			key: 'getIsLessThanOrEqual',
+			value: function getIsLessThanOrEqual(other) {
+				return this._big.lte(getBig(other));
+			}
+
 			/**
     * Returns true if the current instance is equal to the value.
     *
@@ -5350,9 +5468,9 @@ module.exports = function () {
 				assert.argumentIsRequired(a, 'a', Decimal, 'Decimal');
 				assert.argumentIsRequired(b, 'b', Decimal, 'Decimal');
 
-				if (a._big.gt(b)) {
+				if (a._big.gt(b._big)) {
 					return 1;
-				} else if (a._big.lt(b)) {
+				} else if (a._big.lt(b._big)) {
 					return -1;
 				} else {
 					return 0;
@@ -5813,12 +5931,10 @@ var _createClass = function () { function defineProperties(target, props) { for
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 var assert = require('./assert'),
-    is = require('./is'),
     memoize = require('./memoize');
 
 var Currency = require('./Currency'),
-    Decimal = require('./Decimal'),
-    Enum = require('./Enum');
+    Decimal = require('./Decimal');
 
 module.exports = function () {
 	'use strict';
@@ -5998,12 +6114,7 @@ module.exports = function () {
 				assert.argumentIsRequired(amount, 'amount', Decimal, 'Decimal');
 				assert.argumentIsRequired(currency, 'currency', Currency, 'Currency');
 				assert.argumentIsRequired(desiredCurrency, 'desiredCurrency', Currency, 'Currency');
-
-				for (var _len = arguments.length, rates = Array(_len > 3 ? _len - 3 : 0), _key = 3; _key < _len; _key++) {
-					rates[_key - 3] = arguments[_key];
-				}
-
-				assert.argumentIsArray(rates, 'rates', Rate, 'Rate');
+				//assert.argumentIsArray(rates, 'rates', Rate, 'Rate');
 
 				var converted = void 0;
 
@@ -6013,6 +6124,10 @@ module.exports = function () {
 					var numerator = desiredCurrency;
 					var denominator = currency;
 
+					for (var _len = arguments.length, rates = Array(_len > 3 ? _len - 3 : 0), _key = 3; _key < _len; _key++) {
+						rates[_key - 3] = arguments[_key];
+					}
+
 					var rate = rates.find(function (r) {
 						return r.numerator === numerator && r.denominator === denominator || r.numerator === denominator && r.denominator === numerator;
 					});
@@ -6063,7 +6178,7 @@ module.exports = function () {
 	return Rate;
 }();
 
-},{"./Currency":15,"./Decimal":17,"./Enum":19,"./assert":22,"./is":24,"./memoize":25}],21:[function(require,module,exports){
+},{"./Currency":15,"./Decimal":17,"./assert":22,"./memoize":25}],21:[function(require,module,exports){
 'use strict';
 
 var assert = require('./assert'),
@@ -6440,6 +6555,26 @@ module.exports = function () {
 			});
 
 			return returnRef;
+		},
+
+
+		/**
+   * Removes the first item from an array which matches a predicate.
+   *
+   * @static
+   * @public
+   * @param {Array} a
+   * @param {Function} predicate
+   */
+		remove: function remove(a, predicate) {
+			assert.argumentIsArray(a, 'a');
+			assert.argumentIsRequired(predicate, 'predicate', Function);
+
+			var index = a.findIndex(predicate);
+
+			if (!(index < 0)) {
+				a.splice(index, 1);
+			}
 		}
 	};
 }();