@barchart/portfolio-api-common 1.0.148 → 1.0.152

package/lib/processing/PositionContainer.js

@@ -34,10 +34,9 @@ module.exports = (() => {
 	 * @param {Array.<Object>} portfolios
 	 * @param {Array.<Object>} positions
 	 * @param {Array.<Object>} summaries
-	 * @param {Object=} exclusionDependencies
 	 */
 	class PositionContainer {
-		constructor(definitions, portfolios, positions, summaries, exclusionDependencies) {
+		constructor(definitions, portfolios, positions, summaries) {
 			assert.argumentIsArray(definitions, 'definitions', PositionTreeDefinition, 'PositionTreeDefinition');
 			assert.argumentIsArray(portfolios, 'portfolios');
 			assert.argumentIsArray(positions, 'positions');
@@ -244,19 +243,9 @@ module.exports = (() => {
 								}
 							}, false);
 
-							const treeName = treeDefinition.name;
-
-							if (exclusionDependencies && exclusionDependencies.hasOwnProperty(treeName)) {
-								let dependantNames = exclusionDependencies[treeName];
-
-								if (is.string(dependantNames)) {
-									dependantNames = [ dependantNames ];
-								} else if (!is.array(dependantNames)) {
-									dependantNames = [ ];
-								}
-
-								const dependantTrees = dependantNames.reduce((trees, name) => {
-									if ( this._trees.hasOwnProperty(name)) {
+							if (treeDefinition.exclusionDependencies.length > 0) {
+								const dependantTrees = treeDefinition.exclusionDependencies.reduce((trees, name) => {
+									if (this._trees.hasOwnProperty(name)) {
 										trees.push(this._trees[name]);
 									}
 
@@ -266,7 +255,7 @@ module.exports = (() => {
 								if (dependantTrees.length > 0) {
 									let excludedItems = [ ];
 
-									groupTree.walk((childGroup) => {
+									tree.walk((childGroup) => {
 										if (childGroup.excluded) {
 											excludedItems = excludedItems.concat(childGroup.items);
 										}

package/lib/processing/PositionGroup.js

@@ -102,6 +102,8 @@ module.exports = (() => {
 			this._dataFormat.quoteChangePercent = null;
 			this._dataFormat.quoteTime = null;
 			this._dataFormat.quoteVolume = null;
+			this._dataFormat.quoteChangeDirection = unchanged;
+			this._dataFormat.quoteChangeNegative = false;
 
 			this._dataActual.currentPrice = null;
 			this._dataActual.previousPrice = null;
@@ -161,6 +163,9 @@ module.exports = (() => {
 						this._dataFormat.quoteChangePercent = formatPercent(new Decimal(this._dataActual.quoteChangePercent || 0), 2);
 						this._dataFormat.quoteTime = this._dataActual.quoteTime;
 						this._dataFormat.quoteVolume = formatNumber(this._dataActual.quoteVolume, 0);
+
+						setTimeout(() => this._dataFormat.quoteChangeDirection = { up: this._dataActual.quoteChange.getIsPositive(), down: this._dataActual.quoteChange.getIsNegative() });
+						this._dataFormat.quoteChangeNegative = this._dataActual.quoteChange.getIsNegative();
 					} else {
 						this._dataActual.currentPrice = null;
 						this._dataFormat.currentPrice = null;
@@ -185,7 +190,7 @@ module.exports = (() => {
 		}
 
 		/**
-		 * A unique (and otherwise meaningless) idenfitifer for the group.
+		 * A unique (and otherwise meaningless) identifier for the group.
 		 *
 		 * @public
 		 * @returns {Number}
@@ -545,18 +550,6 @@ module.exports = (() => {
 				summaryTotalCurrent: actual.summaryTotalCurrent.add(translate(item, item.data.summaryTotalCurrentChange))
 			};
 		}
-		
-		if (parent !== null) {
-			const parentData = parent._dataActual;
-
-			if (parentData.market !== null && !parentData.market.getIsZero()) {
-				updates.marketPercent = updates.market.divide(parentData.market);
-			} else {
-				updates.marketPercent = null;
-			}
-		} else {
-			updates.marketPercent = null;
-		}
 
 		actual.market = updates.market;
 		actual.unrealized = updates.unrealized;
@@ -593,13 +586,14 @@ module.exports = (() => {
 		}
 
 		const parent = group._parent;
+		const excluded = group._excluded;
 
 		const actual = group._dataActual;
 		const format = group._dataFormat;
 		
 		let marketPercent;
 		
-		if (parent !== null) {
+		if (parent !== null && !excluded) {
 			const parentData = parent._dataActual;
 
 			if (parentData.market !== null && !parentData.market.getIsZero()) {

package/lib/processing/definitions/PositionTreeDefinition.js

@@ -13,12 +13,17 @@ module.exports = (() => {
 	 * @param {Array.<PositionLevelDefinition>} definitions
 	 */
 	class PositionTreeDefinitions {
-		constructor(name, definitions) {
+		constructor(name, definitions, exclusionDependencies) {
 			assert.argumentIsRequired(name, 'name', String);
 			assert.argumentIsArray(definitions, 'definitions', PositionLevelDefinition, 'PositionLevelDefinition');
 
+			if (exclusionDependencies) {
+				assert.argumentIsArray(exclusionDependencies, 'exclusionDependencies', String);
+			}
+
 			this._name = name;
 			this._definitions = definitions;
+			this._exclusionDependencies = exclusionDependencies || [ ];
 		}
 
 		/**
@@ -44,6 +49,17 @@ module.exports = (() => {
 			return this._definitions;
 		}
 
+		/**
+		 * Returns the names of other trees which should be impacted when a
+		 * group (from the current tree) is excluded.
+		 *
+		 * @public
+		 * @return {Array.<String>}
+		 */
+		get exclusionDependencies() {
+			return this._exclusionDependencies;
+		}
+
 		toString() {
 			return '[PositionTreeDefinitions]';
 		}

package/package.json

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

package/test/SpecRunner.js

@@ -750,10 +750,9 @@ module.exports = (() => {
 	 * @param {Array.<Object>} portfolios
 	 * @param {Array.<Object>} positions
 	 * @param {Array.<Object>} summaries
-	 * @param {Object=} exclusionDependencies
 	 */
 	class PositionContainer {
-		constructor(definitions, portfolios, positions, summaries, exclusionDependencies) {
+		constructor(definitions, portfolios, positions, summaries) {
 			assert.argumentIsArray(definitions, 'definitions', PositionTreeDefinition, 'PositionTreeDefinition');
 			assert.argumentIsArray(portfolios, 'portfolios');
 			assert.argumentIsArray(positions, 'positions');
@@ -960,19 +959,9 @@ module.exports = (() => {
 								}
 							}, false);
 
-							const treeName = treeDefinition.name;
-
-							if (exclusionDependencies && exclusionDependencies.hasOwnProperty(treeName)) {
-								let dependantNames = exclusionDependencies[treeName];
-
-								if (is.string(dependantNames)) {
-									dependantNames = [ dependantNames ];
-								} else if (!is.array(dependantNames)) {
-									dependantNames = [ ];
-								}
-
-								const dependantTrees = dependantNames.reduce((trees, name) => {
-									if ( this._trees.hasOwnProperty(name)) {
+							if (treeDefinition.exclusionDependencies.length > 0) {
+								const dependantTrees = treeDefinition.exclusionDependencies.reduce((trees, name) => {
+									if (this._trees.hasOwnProperty(name)) {
 										trees.push(this._trees[name]);
 									}
 
@@ -982,7 +971,7 @@ module.exports = (() => {
 								if (dependantTrees.length > 0) {
 									let excludedItems = [ ];
 
-									groupTree.walk((childGroup) => {
+									tree.walk((childGroup) => {
 										if (childGroup.excluded) {
 											excludedItems = excludedItems.concat(childGroup.items);
 										}
@@ -1359,6 +1348,8 @@ module.exports = (() => {
 			this._dataFormat.quoteChangePercent = null;
 			this._dataFormat.quoteTime = null;
 			this._dataFormat.quoteVolume = null;
+			this._dataFormat.quoteChangeDirection = unchanged;
+			this._dataFormat.quoteChangeNegative = false;
 
 			this._dataActual.currentPrice = null;
 			this._dataActual.previousPrice = null;
@@ -1418,6 +1409,9 @@ module.exports = (() => {
 						this._dataFormat.quoteChangePercent = formatPercent(new Decimal(this._dataActual.quoteChangePercent || 0), 2);
 						this._dataFormat.quoteTime = this._dataActual.quoteTime;
 						this._dataFormat.quoteVolume = formatNumber(this._dataActual.quoteVolume, 0);
+
+						setTimeout(() => this._dataFormat.quoteChangeDirection = { up: this._dataActual.quoteChange.getIsPositive(), down: this._dataActual.quoteChange.getIsNegative() });
+						this._dataFormat.quoteChangeNegative = this._dataActual.quoteChange.getIsNegative();
 					} else {
 						this._dataActual.currentPrice = null;
 						this._dataFormat.currentPrice = null;
@@ -1442,7 +1436,7 @@ module.exports = (() => {
 		}
 
 		/**
-		 * A unique (and otherwise meaningless) idenfitifer for the group.
+		 * A unique (and otherwise meaningless) identifier for the group.
 		 *
 		 * @public
 		 * @returns {Number}
@@ -1802,18 +1796,6 @@ module.exports = (() => {
 				summaryTotalCurrent: actual.summaryTotalCurrent.add(translate(item, item.data.summaryTotalCurrentChange))
 			};
 		}
-		
-		if (parent !== null) {
-			const parentData = parent._dataActual;
-
-			if (parentData.market !== null && !parentData.market.getIsZero()) {
-				updates.marketPercent = updates.market.divide(parentData.market);
-			} else {
-				updates.marketPercent = null;
-			}
-		} else {
-			updates.marketPercent = null;
-		}
 
 		actual.market = updates.market;
 		actual.unrealized = updates.unrealized;
@@ -1850,13 +1832,14 @@ module.exports = (() => {
 		}
 
 		const parent = group._parent;
+		const excluded = group._excluded;
 
 		const actual = group._dataActual;
 		const format = group._dataFormat;
 		
 		let marketPercent;
 		
-		if (parent !== null) {
+		if (parent !== null && !excluded) {
 			const parentData = parent._dataActual;
 
 			if (parentData.market !== null && !parentData.market.getIsZero()) {
@@ -2444,12 +2427,17 @@ module.exports = (() => {
 	 * @param {Array.<PositionLevelDefinition>} definitions
 	 */
 	class PositionTreeDefinitions {
-		constructor(name, definitions) {
+		constructor(name, definitions, exclusionDependencies) {
 			assert.argumentIsRequired(name, 'name', String);
 			assert.argumentIsArray(definitions, 'definitions', PositionLevelDefinition, 'PositionLevelDefinition');
 
+			if (exclusionDependencies) {
+				assert.argumentIsArray(exclusionDependencies, 'exclusionDependencies', String);
+			}
+
 			this._name = name;
 			this._definitions = definitions;
+			this._exclusionDependencies = exclusionDependencies || [ ];
 		}
 
 		/**
@@ -2475,6 +2463,17 @@ module.exports = (() => {
 			return this._definitions;
 		}
 
+		/**
+		 * Returns the names of other trees which should be impacted when a
+		 * group (from the current tree) is excluded.
+		 *
+		 * @public
+		 * @return {Array.<String>}
+		 */
+		get exclusionDependencies() {
+			return this._exclusionDependencies;
+		}
+
 		toString() {
 			return '[PositionTreeDefinitions]';
 		}