@barchart/portfolio-api-common 1.0.181 → 1.0.185

package/lib/data/TransactionType.js

@@ -326,10 +326,10 @@ module.exports = (() => {
 	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', false, false, true, false, false);
 	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', false, false, false, true, false);
 
-	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, true, false);
-	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, true);
-	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, true);
-	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, true, false);
+	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, false, false);
+	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, false);
+	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, false);
+	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, false, false);
 
 	const valuation = new TransactionType('V', 'Valuation', 'Valuation', false, false, false, false, false);
 	const income = new TransactionType('I', 'Income', 'Income', false, false, true, false, false);

package/lib/processing/PositionContainer.js

@@ -486,7 +486,7 @@ module.exports = (() => {
 		getPositions(portfolio) {
 			assert.argumentIsRequired(portfolio, 'portfolio', String);
 
-			return getPositionItemsForPortfolio(this._items, portfolio).map(item => item.position);
+			return getPositionItemsForPortfolio(this._items, portfolio);
 		}
 
 		/**
@@ -611,7 +611,9 @@ module.exports = (() => {
 		}));
 
 		addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
-			groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+			if (!groupTree.getIsRoot()) {
+				groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+			}
 		}));
 	}
 

package/lib/processing/PositionGroup.js

@@ -78,7 +78,7 @@ module.exports = (() => {
 			this._dataActual.quantity = null;
 			this._dataActual.basisPrice = null;
 
-			if (this._single) {
+			if (this._single && items.length === 1) {
 				const item = items[0];
 
 				this._dataFormat.portfolio = item.portfolio.portfolio;
@@ -564,7 +564,7 @@ module.exports = (() => {
 
 		calculateUnrealizedPercent(group);
 
-		if (group.single) {
+		if (group.single && group._items.length === 1) {
 			const item = group._items[0];
 
 			actual.quantity = item.position.snapshot.open;

package/package.json

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

package/test/SpecRunner.js

@@ -1,4 +1,4 @@
-(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){
+(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){
 const assert = require('@barchart/common-js/lang/assert'),
 	Enum = require('@barchart/common-js/lang/Enum');
 
@@ -702,10 +702,10 @@ module.exports = (() => {
 	const distributionCash = new TransactionType('DC', 'Distribution (Cash)', 'Cash Distribution', false, false, true, false, false);
 	const distributionFund = new TransactionType('DF', 'Distribution (Units)', 'Unit Distribution', false, false, false, true, false);
 
-	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, true, false);
-	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, true);
-	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, true);
-	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, true, false);
+	const deposit = new TransactionType('D', 'Deposit', 'Deposit', false, false, false, false, false);
+	const withdrawal = new TransactionType('W', 'Withdrawal', 'Withdrawal', false, false, false, false, false);
+	const debit = new TransactionType('DR', 'Debit', 'Debit', false, false, false, false, false);
+	const credit = new TransactionType('CR', 'Credit', 'Credit', false, false, false, false, false);
 
 	const valuation = new TransactionType('V', 'Valuation', 'Valuation', false, false, false, false, false);
 	const income = new TransactionType('I', 'Income', 'Income', false, false, true, false, false);
@@ -1202,7 +1202,7 @@ module.exports = (() => {
 		getPositions(portfolio) {
 			assert.argumentIsRequired(portfolio, 'portfolio', String);
 
-			return getPositionItemsForPortfolio(this._items, portfolio).map(item => item.position);
+			return getPositionItemsForPortfolio(this._items, portfolio);
 		}
 
 		/**
@@ -1327,7 +1327,9 @@ module.exports = (() => {
 		}));
 
 		addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
-			groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+			if (!groupTree.getIsRoot()) {
+				groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+			}
 		}));
 	}
 
@@ -1604,7 +1606,7 @@ module.exports = (() => {
 			this._dataActual.quantity = null;
 			this._dataActual.basisPrice = null;
 
-			if (this._single) {
+			if (this._single && items.length === 1) {
 				const item = items[0];
 
 				this._dataFormat.portfolio = item.portfolio.portfolio;
@@ -2090,7 +2092,7 @@ module.exports = (() => {
 
 		calculateUnrealizedPercent(group);
 
-		if (group.single) {
+		if (group.single && group._items.length === 1) {
 			const item = group._items[0];
 
 			actual.quantity = item.position.snapshot.open;
@@ -3341,23 +3343,6 @@ 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.
@@ -3884,7 +3869,7 @@ module.exports = function () {
 	var Currency = function (_Enum) {
 		_inherits(Currency, _Enum);
 
-		function Currency(code, description, precision, alternateDescription) {
+		function Currency(code, description, precision) {
 			_classCallCheck(this, Currency);
 
 			var _this = _possibleConstructorReturn(this, (Currency.__proto__ || Object.getPrototypeOf(Currency)).call(this, code, description));
@@ -3892,11 +3877,7 @@ module.exports = function () {
 			assert.argumentIsRequired(precision, 'precision', Number);
 			assert.argumentIsValid(precision, 'precision', is.integer, 'is an integer');
 
-			assert.argumentIsOptional(alternateDescription, 'alternateDescription', String);
-
 			_this._precision = precision;
-
-			_this._alternateDescription = alternateDescription || description;
 			return _this;
 		}
 
@@ -3919,19 +3900,6 @@ module.exports = function () {
 				return this._precision;
 			}
 
-			/**
-    * An alternate human-readable description.
-    *
-    * @public
-    * @returns {String}
-    */
-
-		}, {
-			key: 'alternateDescription',
-			get: function get() {
-				return this._alternateDescription;
-			}
-
 			/**
     * Given a code, returns the enumeration item.
     *
@@ -3989,9 +3957,9 @@ module.exports = function () {
 		return Currency;
 	}(Enum);
 
-	var cad = new Currency('CAD', 'Canadian Dollar', 2, 'CAD$');
-	var eur = new Currency('EUR', 'Euro', 2, 'EUR');
-	var usd = new Currency('USD', 'US Dollar', 2, 'US$');
+	var cad = new Currency('CAD', 'Canadian Dollar', 2);
+	var eur = new Currency('EUR', 'Euro', 2);
+	var usd = new Currency('USD', 'US Dollar', 2);
 
 	return Currency;
 }();
@@ -4752,20 +4720,6 @@ 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.
     *
@@ -4780,20 +4734,6 @@ 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.
     *
@@ -4993,9 +4933,9 @@ module.exports = function () {
 				assert.argumentIsRequired(a, 'a', Decimal, 'Decimal');
 				assert.argumentIsRequired(b, 'b', Decimal, 'Decimal');
 
-				if (a._big.gt(b._big)) {
+				if (a._big.gt(b)) {
 					return 1;
-				} else if (a._big.lt(b._big)) {
+				} else if (a._big.lt(b)) {
 					return -1;
 				} else {
 					return 0;
@@ -5456,10 +5396,12 @@ 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');
+    Decimal = require('./Decimal'),
+    Enum = require('./Enum');
 
 module.exports = function () {
 	'use strict';
@@ -5639,7 +5581,12 @@ module.exports = function () {
 				assert.argumentIsRequired(amount, 'amount', Decimal, 'Decimal');
 				assert.argumentIsRequired(currency, 'currency', Currency, 'Currency');
 				assert.argumentIsRequired(desiredCurrency, 'desiredCurrency', Currency, 'Currency');
-				//assert.argumentIsArray(rates, 'rates', Rate, 'Rate');
+
+				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');
 
 				var converted = void 0;
 
@@ -5649,10 +5596,6 @@ 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;
 					});
@@ -5703,7 +5646,7 @@ module.exports = function () {
 	return Rate;
 }();
 
-},{"./Currency":15,"./Decimal":17,"./assert":22,"./memoize":25}],21:[function(require,module,exports){
+},{"./Currency":15,"./Decimal":17,"./Enum":19,"./assert":22,"./is":24,"./memoize":25}],21:[function(require,module,exports){
 'use strict';
 
 var assert = require('./assert'),
@@ -6080,26 +6023,6 @@ 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);
-			}
 		}
 	};
 }();