@barchart/portfolio-api-common 1.0.60 → 1.0.64

package/lib/processing/PositionContainer.js

@@ -6,8 +6,9 @@ const array = require('@barchart/common-js/lang/array'),
 	is = require('@barchart/common-js/lang/is'),
 	Tree = require('@barchart/common-js/collections/Tree');
 
+const InstrumentType = require('./../data/InstrumentType');
+
 const PositionGroup = require('./PositionGroup'),
-	PositionGroupDefinition = require('./PositionGroupDefinition'),
 	PositionItem = require('./PositionItem');
 
 module.exports = (() => {
@@ -17,7 +18,10 @@ module.exports = (() => {
 	 * @public
 	 */
 	class PositionContainer {
-		constructor(portfolios, positions, summaries, definitions) {
+		constructor(portfolios, positions, summaries, definitions, defaultCurrency) {
+			this._definitions = definitions;
+			this._defaultCurrency = defaultCurrency || Currency.CAD;
+
 			this._portfolios = portfolios.reduce((map, portfolio) => {
 				map[portfolio.portfolio] = portfolio;
 
@@ -49,11 +53,10 @@ module.exports = (() => {
 			}, [ ]);
 
 			this._symbols = this._items.reduce((map, item) => {
-				let position = item.position;
-				let symbol = null;
+				const position = item.position;
 
 				if (position.instrument && position.instrument.symbol && position.instrument.symbol.barchart) {
-					symbol = position.instrument.symbol.barchart;
+					const symbol = position.instrument.symbol.barchart;
 
 					if (!map.hasOwnProperty(symbol)) {
 						map[symbol] = [ ];
@@ -65,7 +68,21 @@ module.exports = (() => {
 				return map;
 			}, { });
 
-			this._definitions = definitions;
+			this._currencies = this._items.reduce((map, item) => {
+				const position = item.position;
+
+				if (position.instrument && position.instrument.currency) {
+					const currency = position.instrument.currency;
+
+					if (!map.hasOwnProperty(currency)) {
+						map[currency] = [ ];
+					}
+
+					map[currency].push(item);
+				}
+
+				return map;
+			}, { });
 
 			this._tree = new Tree();
 
@@ -74,6 +91,8 @@ module.exports = (() => {
 					return;
 				}
 
+				const parent = tree.getValue() || null;
+
 				const currentDefinition = definitions[0];
 				const additionalDefinitions = array.dropLeft(definitions);
 
@@ -81,13 +100,13 @@ module.exports = (() => {
 				const populatedGroups = Object.keys(populatedObjects).map(key => populatedObjects[key]).map((items) => {
 					const first = items[0];
 
-					return new PositionGroup(items, currentDefinition.currencySelector(first), currentDefinition.descriptionSelector(first), currentDefinition.single && items.length === 1);
+					return new PositionGroup(parent, items, currentDefinition.currencySelector(first), currentDefinition.descriptionSelector(first), currentDefinition.single && items.length === 1);
 				});
 
 				const missingGroups = array.difference(currentDefinition.requiredGroups.map(group => group.description), populatedGroups.map(group => group.description));
 
 				const empty = missingGroups.map((description) => {
-					return new PositionGroup([ ], currentDefinition.requiredGroups.find(group => group.description === description).currency, description);
+					return new PositionGroup(parent, [ ], currentDefinition.requiredGroups.find(group => group.description === description).currency, description);
 				});
 
 				const compositeGroups = populatedGroups.concat(empty);
@@ -132,6 +151,10 @@ module.exports = (() => {
 			createGroups(this._tree, this._items, this._definitions);
 		}
 
+		get defaultCurrency() {
+			return this._defaultCurrency;
+		}
+
 		getSymbols() {
 			return Object.keys(this._symbols);
 		}
@@ -142,6 +165,22 @@ module.exports = (() => {
 			}
 		}
 
+		getCurrencySymbols() {
+			const codes = Object.keys(this._currencies);
+
+			return codes.reduce((symbols, code) => {
+				if (code !== this._defaultCurrency) {
+					symbols.push(`^${this._defaultCurrency}${code}`);
+				}
+
+				return symbols;
+			}, [ ]);
+		}
+
+		setExchangeRage(symbol, price) {
+
+		}
+
 		getGroup(keys) {
 			const node = keys.reduce((tree, key) => {
 				tree = tree.findChild(group => group.description === key);

package/lib/processing/PositionGroup.js

@@ -11,7 +11,9 @@ module.exports = (() => {
 	 * @public
 	 */
 	class PositionGroup {
-		constructor(items, currency, description, single) {
+		constructor(parent, items, currency, description, single) {
+			this._parent = parent || null;
+
 			this._items = items;
 			this._currency = currency;
 
@@ -20,37 +22,40 @@ module.exports = (() => {
 			this._single = is.boolean(single) && single;
 
 			this._dataFormat = { };
-			this._dataRaw = { };
+			this._dataActual = { };
 			
 			this._dataFormat.description = this._description;
 
-			this._dataRaw.current = null;
-			this._dataRaw.previous = null;
-
-			this._dataFormat.current = null;
-			this._dataFormat.previous = null;
-
-			this._dataRaw.basis = null;
-			this._dataRaw.market = null;
+			this._dataActual.currentPrice = null;
+			this._dataActual.previousPrice = null;
+			this._dataActual.basis = null;
+			this._dataActual.market = null;
+			this._dataActual.marketPercent = null;
+			this._dataActual.unrealizedToday = null;
 
+			this._dataFormat.currentPrice = null;
+			this._dataFormat.previousPrice = null;
 			this._dataFormat.basis = null;
 			this._dataFormat.market = null;
+			this._dataFormat.marketPercent = null;
+			this._dataFormat.unrealizedToday = null;
 
 			this._items.forEach((item) => {
 				item.registerPriceChangeHandler((data, sender) => {
 					if (this._single) {
-						this._dataRaw.current = data.current;
-						this._dataFormat.current = format(data.current, sender.position.instrument.currency);
+						this._dataActual.currentPrice = data.currentPrice;
+						this._dataFormat.currentPrice = format(data.currentPrice, sender.position.instrument.currency);
 					} else {
-						this._dataRaw.current = null;
-						this._dataFormat.current = null;
+						this._dataActual.currentPrice = null;
+						this._dataFormat.currentPrice = null;
 					}
 
-					calculateVariablePriceData(this, item);
+					calculatePriceData(this, sender);
 				});
 			});
 
 			calculateStaticData(this);
+			calculatePriceData(this);
 		}
 
 		get items() {
@@ -78,41 +83,91 @@ module.exports = (() => {
 		}
 	}
 
-	function format(decimal, currency) {
-		return formatter.numberToString(decimal.toFloat(), currency.precision, ',', false);
+	function formatNumber(decimal, precision) {
+		if (decimal !== null) {
+			return formatter.numberToString(decimal.toFloat(), precision, ',', false);
+		} else {
+			return '--';
+		}
+	}
+
+	function formatPercent(decimal, precision) {
+		if (decimal !== null) {
+			return formatNumber(decimal.multiply(100));
+		} else {
+			return '--';
+		}
+	}
+
+	function formatCurrency(decimal, currency) {
+		return formatNumber(decimal, currency.precision);
 	}
 
 	function calculateStaticData(group) {
+		const actual = group._dataActual;
+		const format = group._dataFormat;
+
+		const currency = group.currency;
+		
 		const items = group._items;
 
-		const raw = group._dataRaw;
-		const formatted = group._dataFormat;
+		let updates = items.reduce((updates, item) => {
+			updates.basis = updates.basis.add(item.data.basis);
 
-		let updates;
+			return updates;
+		}, {
+			basis: Decimal.ZERO
+		});
 
-		if (group.single) {
-			const item = items[0];
+		actual.basis = updates.basis;
+	
+		format.basis = formatCurrency(updates.basis, currency);
+	}
 
-			updates.basis = item.basis;
-		} else {
-			updates = items.reduce(function(updates, item) {
-				const position = item.position;
-				const snapshot = item.position.snapshot;
+	function calculatePriceData(group, item) {
+		const parent = group._parent;
+
+		const actual = group._dataActual;
+		const format = group._dataFormat;
+
+		const currency = group.currency;
+
+		let updates;
 
-				updates.basis = updates.basis.add(snapshot.basis);
+		if (actual.market === null || actual.unrealizedToday === null) {
+			const items = group._items;
+
+			updates = items.reduce((updates, item) => {
+				updates.market = updates.market.add(item.data.market);
+				updates.unrealizedToday = updates.unrealizedToday.add(item.data.unrealizedToday);
 
 				return updates;
 			}, {
-				basis: Decimal.ZERO
+				market: Decimal.ZERO,
+				unrealizedToday: Decimal.ZERO
 			});
+		} else {
+			updates = {
+				market: actual.market.add(item.data.marketChange),
+				unrealizedToday: actual.unrealizedToday.add(item.data.unrealizedTodayChange)
+			};
 		}
+		
+		if (parent !== null) {
+			const parentData = parent._dataActual;
 
-		raw.basis = updates.basis;
-		formatted.basis = format(updates.basis.opposite(), Currency.USD);
-	}
-
-	function calculateVariablePriceData(group, item) {
-
+			if (parentData.market !== null && !parentData.market.getIsZero()) {
+				updates.marketPercent = updates.market.divide(parentData.market);
+			}
+		}
+		
+		actual.market = updates.market;
+		actual.marketPercent = updates.marketPercent;
+		actual.unrealizedToday = updates.unrealizedToday;
+		
+		format.market = formatCurrency(updates.market, currency);
+		format.marketPercent = formatPercent(updates.unrealizedToday, 2);
+		format.unrealizedToday = formatCurrency(updates.unrealizedToday, currency);
 	}
 
 	return PositionGroup;

package/lib/processing/PositionItem.js

@@ -3,6 +3,8 @@ const assert = require('@barchart/common-js/lang/assert'),
 	Event = require('@barchart/common-js/messaging/Event'),
 	is = require('@barchart/common-js/lang/is');
 
+const InstrumentType = require('./../data/InstrumentType');
+
 module.exports = (() => {
 	'use strict';
 
@@ -17,22 +19,19 @@ module.exports = (() => {
 
 			this._data = { };
 
-			this._data.current = null;
-			this._data.previous = position.previous || null;
-
-			const snapshot = this._position.snapshot;
+			this._data.basis = null;
 
-			this._data.basis = snapshot.basis || Decimal.ZERO;
+			this._data.currentPrice = null;
+			this._data.previousPrice = null;
 
-			/*
-			let market;
+			this._data.market = null;
+			this._data.marketChange = null;
+			
+			this._data.unrealizedToday = null;
+			this._data.unrealizedTodayChange = null;
 
-			if (position.previous) {
-				market = snapshot.open.multiply(position.previous);
-			} else {
-				market = snapshot.value;
-			}
-			*/
+			calculateStaticData(this);
+			calculatePriceData(this, null);
 
 			this._priceChangeEvent = new Event(this);
 		}
@@ -49,9 +48,13 @@ module.exports = (() => {
 			return this._summaries;
 		}
 
+		get data() {
+			return this._data;
+		}
+
 		setPrice(price) {
 			if (this._data.price !== price) {
-				this._data.price = price;
+				calculatePriceData(this, this._data.currentPrice = price);
 
 				this._priceChangeEvent.fire(this._data);
 			}
@@ -68,5 +71,75 @@ module.exports = (() => {
 		}
 	}
 
+	function calculateStaticData(item) {
+		const position = item.position;
+		const snapshot = item.position.snapshot;
+
+		const data = item._data;
+
+		data.previousPrice = position.previousPrice || null;
+
+		let basis;
+
+		if (snapshot.basis) {
+			basis = snapshot.basis.opposite();
+		} else {
+			basis = Decimal.ZERO;
+		}
+
+		data.basis = basis;
+	}
+
+	function calculatePriceData(item, price) {
+		const position = item.position;
+		const snapshot = item.position.snapshot;
+
+		const data = item._data;
+
+		let market;
+
+		if (position.instrument.type === InstrumentType.OTHER) {
+			market = snapshot.value;
+		} else if (position.instrument.type === InstrumentType.CASH) {
+			market = snapshot.open;
+		} else {
+			if (price) {
+				market = snapshot.open.multiply(price);
+			} else {
+				market = snapshot.value;
+			}
+		}
+
+		let marketChange;
+
+		if (data.market === null) {
+			marketChange = market;
+		} else {
+			marketChange = market.subtract(data.market);
+		}
+
+		data.market = market;
+		data.marketChange = marketChange;
+		
+		let unrealizedToday;
+		let unrealizedTodayChange;
+
+		if (data.previousPrice && price) {
+			unrealizedToday = market.subtract(snapshot.open.multiply(data.previousPrice));
+
+			if (data.unrealizedToday !== null) {
+				unrealizedTodayChange = unrealizedToday.subtract(data.unrealizedToday);
+			} else {
+				unrealizedTodayChange = unrealizedToday;
+			}
+		} else {
+			unrealizedToday = Decimal.ZERO;
+			unrealizedTodayChange = Decimal.ZERO;
+		}
+
+		data.unrealizedToday = unrealizedToday;
+		data.unrealizedTodayChange = unrealizedTodayChange;
+	}
+
 	return PositionItem;
 })();

package/package.json

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

package/test/SpecRunner.js

@@ -1,4 +1,95 @@
 (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');
+
+module.exports = (() => {
+	'use strict';
+
+	/**
+	 * An enumeration used to classify instruments.
+	 *
+	 * @public
+	 * @extends {Enum}
+	 * @param {String} description
+	 * @param {String} alternateDescription
+	 * @param {String} code
+	 * @param {Boolean} canReinvest
+	 */
+	class InstrumentType extends Enum {
+		constructor(code, description, alternateDescription, canReinvest) {
+			super(code, description);
+
+			this._alternateDescription = alternateDescription;
+			this._canReinvest = canReinvest;
+		}
+
+		get alternateDescription() {
+			return this._alternateDescription;
+		}
+
+		/**
+		 * Indicates if the instrument type allows automatic reinvestment.
+		 *
+		 * @returns {Boolean}
+		 */
+		get canReinvest() {
+			return this._canReinvest;
+		}
+
+		/**
+		 * Cash.
+		 *
+		 * @public
+		 * @returns {InstrumentType}
+		 */
+		static get CASH() {
+			return cash;
+		}
+
+		/**
+		 * An equity issue.
+		 *
+		 * @public
+		 * @returns {InstrumentType}
+		 */
+		static get EQUITY() {
+			return equity;
+		}
+
+		/**
+		 * A mutual fund.
+		 *
+		 * @public
+		 * @returns {InstrumentType}
+		 */
+		static get FUND() {
+			return fund;
+		}
+
+		/**
+		 * An undefined asset (e.g. a house, or a collectible, or a salvaged alien spaceship).
+		 *
+		 * @public
+		 * @returns {InstrumentType}
+		 */
+		static get OTHER() {
+			return other;
+		}
+
+		toString() {
+			return '[InstrumentType]';
+		}
+	}
+
+	const cash = new InstrumentType('CASH', 'cash', 'Cash', false);
+	const equity = new InstrumentType('EQUITY', 'equity', 'Equities', true);
+	const fund = new InstrumentType('FUND', 'mutual fund', 'Funds', true);
+	const other = new InstrumentType('OTHER', 'other', 'Other', false);
+
+	return InstrumentType;
+})();
+
+},{"@barchart/common-js/lang/Enum":15,"@barchart/common-js/lang/assert":17}],2:[function(require,module,exports){
 const array = require('@barchart/common-js/lang/array'),
 	assert = require('@barchart/common-js/lang/assert'),
 	Day = require('@barchart/common-js/lang/Day'),
@@ -185,7 +276,7 @@ module.exports = (() => {
 	return PositionSummaryFrame;
 })();
 
-},{"@barchart/common-js/lang/Day":11,"@barchart/common-js/lang/Enum":14,"@barchart/common-js/lang/array":15,"@barchart/common-js/lang/assert":16,"@barchart/common-js/lang/is":18}],2:[function(require,module,exports){
+},{"@barchart/common-js/lang/Day":12,"@barchart/common-js/lang/Enum":15,"@barchart/common-js/lang/array":16,"@barchart/common-js/lang/assert":17,"@barchart/common-js/lang/is":19}],3:[function(require,module,exports){
 const assert = require('@barchart/common-js/lang/assert'),
 	Enum = require('@barchart/common-js/lang/Enum');
 
@@ -512,7 +603,7 @@ module.exports = (() => {
 	return TransactionType;
 })();
 
-},{"@barchart/common-js/lang/Enum":14,"@barchart/common-js/lang/assert":16}],3:[function(require,module,exports){
+},{"@barchart/common-js/lang/Enum":15,"@barchart/common-js/lang/assert":17}],4:[function(require,module,exports){
 const array = require('@barchart/common-js/lang/array'),
 	ComparatorBuilder = require('@barchart/common-js/collections/sorting/ComparatorBuilder'),
 	comparators = require('@barchart/common-js/collections/sorting/comparators'),
@@ -521,8 +612,9 @@ const array = require('@barchart/common-js/lang/array'),
 	is = require('@barchart/common-js/lang/is'),
 	Tree = require('@barchart/common-js/collections/Tree');
 
+const InstrumentType = require('./../data/InstrumentType');
+
 const PositionGroup = require('./PositionGroup'),
-	PositionGroupDefinition = require('./PositionGroupDefinition'),
 	PositionItem = require('./PositionItem');
 
 module.exports = (() => {
@@ -532,7 +624,10 @@ module.exports = (() => {
 	 * @public
 	 */
 	class PositionContainer {
-		constructor(portfolios, positions, summaries, definitions) {
+		constructor(portfolios, positions, summaries, definitions, defaultCurrency) {
+			this._definitions = definitions;
+			this._defaultCurrency = defaultCurrency || Currency.CAD;
+
 			this._portfolios = portfolios.reduce((map, portfolio) => {
 				map[portfolio.portfolio] = portfolio;
 
@@ -564,11 +659,10 @@ module.exports = (() => {
 			}, [ ]);
 
 			this._symbols = this._items.reduce((map, item) => {
-				let position = item.position;
-				let symbol = null;
+				const position = item.position;
 
 				if (position.instrument && position.instrument.symbol && position.instrument.symbol.barchart) {
-					symbol = position.instrument.symbol.barchart;
+					const symbol = position.instrument.symbol.barchart;
 
 					if (!map.hasOwnProperty(symbol)) {
 						map[symbol] = [ ];
@@ -580,7 +674,21 @@ module.exports = (() => {
 				return map;
 			}, { });
 
-			this._definitions = definitions;
+			this._currencies = this._items.reduce((map, item) => {
+				const position = item.position;
+
+				if (position.instrument && position.instrument.currency) {
+					const currency = position.instrument.currency;
+
+					if (!map.hasOwnProperty(currency)) {
+						map[currency] = [ ];
+					}
+
+					map[currency].push(item);
+				}
+
+				return map;
+			}, { });
 
 			this._tree = new Tree();
 
@@ -589,6 +697,8 @@ module.exports = (() => {
 					return;
 				}
 
+				const parent = tree.getValue() || null;
+
 				const currentDefinition = definitions[0];
 				const additionalDefinitions = array.dropLeft(definitions);
 
@@ -596,13 +706,13 @@ module.exports = (() => {
 				const populatedGroups = Object.keys(populatedObjects).map(key => populatedObjects[key]).map((items) => {
 					const first = items[0];
 
-					return new PositionGroup(items, currentDefinition.currencySelector(first), currentDefinition.descriptionSelector(first), currentDefinition.single && items.length === 1);
+					return new PositionGroup(parent, items, currentDefinition.currencySelector(first), currentDefinition.descriptionSelector(first), currentDefinition.single && items.length === 1);
 				});
 
 				const missingGroups = array.difference(currentDefinition.requiredGroups.map(group => group.description), populatedGroups.map(group => group.description));
 
 				const empty = missingGroups.map((description) => {
-					return new PositionGroup([ ], currentDefinition.requiredGroups.find(group => group.description === description).currency, description);
+					return new PositionGroup(parent, [ ], currentDefinition.requiredGroups.find(group => group.description === description).currency, description);
 				});
 
 				const compositeGroups = populatedGroups.concat(empty);
@@ -647,6 +757,10 @@ module.exports = (() => {
 			createGroups(this._tree, this._items, this._definitions);
 		}
 
+		get defaultCurrency() {
+			return this._defaultCurrency;
+		}
+
 		getSymbols() {
 			return Object.keys(this._symbols);
 		}
@@ -657,6 +771,22 @@ module.exports = (() => {
 			}
 		}
 
+		getCurrencySymbols() {
+			const codes = Object.keys(this._currencies);
+
+			return codes.reduce((symbols, code) => {
+				if (code !== this._defaultCurrency) {
+					symbols.push(`^${this._defaultCurrency}${code}`);
+				}
+
+				return symbols;
+			}, [ ]);
+		}
+
+		setExchangeRage(symbol, price) {
+
+		}
+
 		getGroup(keys) {
 			const node = keys.reduce((tree, key) => {
 				tree = tree.findChild(group => group.description === key);
@@ -685,7 +815,7 @@ module.exports = (() => {
 	return PositionContainer;
 })();
 
-},{"./PositionGroup":4,"./PositionGroupDefinition":5,"./PositionItem":6,"@barchart/common-js/collections/Tree":7,"@barchart/common-js/collections/sorting/ComparatorBuilder":8,"@barchart/common-js/collections/sorting/comparators":9,"@barchart/common-js/lang/Currency":10,"@barchart/common-js/lang/array":15,"@barchart/common-js/lang/assert":16,"@barchart/common-js/lang/is":18}],4:[function(require,module,exports){
+},{"./../data/InstrumentType":1,"./PositionGroup":5,"./PositionItem":7,"@barchart/common-js/collections/Tree":8,"@barchart/common-js/collections/sorting/ComparatorBuilder":9,"@barchart/common-js/collections/sorting/comparators":10,"@barchart/common-js/lang/Currency":11,"@barchart/common-js/lang/array":16,"@barchart/common-js/lang/assert":17,"@barchart/common-js/lang/is":19}],5:[function(require,module,exports){
 const assert = require('@barchart/common-js/lang/assert'),
 	Currency = require('@barchart/common-js/lang/Currency'),
 	Decimal = require('@barchart/common-js/lang/Decimal'),
@@ -699,7 +829,9 @@ module.exports = (() => {
 	 * @public
 	 */
 	class PositionGroup {
-		constructor(items, currency, description, single) {
+		constructor(parent, items, currency, description, single) {
+			this._parent = parent || null;
+
 			this._items = items;
 			this._currency = currency;
 
@@ -708,37 +840,40 @@ module.exports = (() => {
 			this._single = is.boolean(single) && single;
 
 			this._dataFormat = { };
-			this._dataRaw = { };
+			this._dataActual = { };
 			
 			this._dataFormat.description = this._description;
 
-			this._dataRaw.current = null;
-			this._dataRaw.previous = null;
-
-			this._dataFormat.current = null;
-			this._dataFormat.previous = null;
-
-			this._dataRaw.basis = null;
-			this._dataRaw.market = null;
+			this._dataActual.currentPrice = null;
+			this._dataActual.previousPrice = null;
+			this._dataActual.basis = null;
+			this._dataActual.market = null;
+			this._dataActual.marketPercent = null;
+			this._dataActual.unrealizedToday = null;
 
+			this._dataFormat.currentPrice = null;
+			this._dataFormat.previousPrice = null;
 			this._dataFormat.basis = null;
 			this._dataFormat.market = null;
+			this._dataFormat.marketPercent = null;
+			this._dataFormat.unrealizedToday = null;
 
 			this._items.forEach((item) => {
 				item.registerPriceChangeHandler((data, sender) => {
 					if (this._single) {
-						this._dataRaw.current = data.current;
-						this._dataFormat.current = format(data.current, sender.position.instrument.currency);
+						this._dataActual.currentPrice = data.currentPrice;
+						this._dataFormat.currentPrice = format(data.currentPrice, sender.position.instrument.currency);
 					} else {
-						this._dataRaw.current = null;
-						this._dataFormat.current = null;
+						this._dataActual.currentPrice = null;
+						this._dataFormat.currentPrice = null;
 					}
 
-					calculateVariablePriceData(this, item);
+					calculatePriceData(this, sender);
 				});
 			});
 
 			calculateStaticData(this);
+			calculatePriceData(this);
 		}
 
 		get items() {
@@ -766,47 +901,97 @@ module.exports = (() => {
 		}
 	}
 
-	function format(decimal, currency) {
-		return formatter.numberToString(decimal.toFloat(), currency.precision, ',', false);
+	function formatNumber(decimal, precision) {
+		if (decimal !== null) {
+			return formatter.numberToString(decimal.toFloat(), precision, ',', false);
+		} else {
+			return '--';
+		}
+	}
+
+	function formatPercent(decimal, precision) {
+		if (decimal !== null) {
+			return formatNumber(decimal.multiply(100));
+		} else {
+			return '--';
+		}
+	}
+
+	function formatCurrency(decimal, currency) {
+		return formatNumber(decimal, currency.precision);
 	}
 
 	function calculateStaticData(group) {
+		const actual = group._dataActual;
+		const format = group._dataFormat;
+
+		const currency = group.currency;
+		
 		const items = group._items;
 
-		const raw = group._dataRaw;
-		const formatted = group._dataFormat;
+		let updates = items.reduce((updates, item) => {
+			updates.basis = updates.basis.add(item.data.basis);
 
-		let updates;
+			return updates;
+		}, {
+			basis: Decimal.ZERO
+		});
 
-		if (group.single) {
-			const item = items[0];
+		actual.basis = updates.basis;
+	
+		format.basis = formatCurrency(updates.basis, currency);
+	}
 
-			updates.basis = item.basis;
-		} else {
-			updates = items.reduce(function(updates, item) {
-				const position = item.position;
-				const snapshot = item.position.snapshot;
+	function calculatePriceData(group, item) {
+		const parent = group._parent;
+
+		const actual = group._dataActual;
+		const format = group._dataFormat;
+
+		const currency = group.currency;
+
+		let updates;
 
-				updates.basis = updates.basis.add(snapshot.basis);
+		if (actual.market === null || actual.unrealizedToday === null) {
+			const items = group._items;
+
+			updates = items.reduce((updates, item) => {
+				updates.market = updates.market.add(item.data.market);
+				updates.unrealizedToday = updates.unrealizedToday.add(item.data.unrealizedToday);
 
 				return updates;
 			}, {
-				basis: Decimal.ZERO
+				market: Decimal.ZERO,
+				unrealizedToday: Decimal.ZERO
 			});
+		} else {
+			updates = {
+				market: actual.market.add(item.data.marketChange),
+				unrealizedToday: actual.unrealizedToday.add(item.data.unrealizedTodayChange)
+			};
 		}
+		
+		if (parent !== null) {
+			const parentData = parent._dataActual;
 
-		raw.basis = updates.basis;
-		formatted.basis = format(updates.basis.opposite(), Currency.USD);
-	}
-
-	function calculateVariablePriceData(group, item) {
-
+			if (parentData.market !== null && !parentData.market.getIsZero()) {
+				updates.marketPercent = updates.market.divide(parentData.market);
+			}
+		}
+		
+		actual.market = updates.market;
+		actual.marketPercent = updates.marketPercent;
+		actual.unrealizedToday = updates.unrealizedToday;
+		
+		format.market = formatCurrency(updates.market, currency);
+		format.marketPercent = formatPercent(updates.unrealizedToday, 2);
+		format.unrealizedToday = formatCurrency(updates.unrealizedToday, currency);
 	}
 
 	return PositionGroup;
 })();
 
-},{"@barchart/common-js/lang/Currency":10,"@barchart/common-js/lang/Decimal":12,"@barchart/common-js/lang/assert":16,"@barchart/common-js/lang/formatter":17,"@barchart/common-js/lang/is":18}],5:[function(require,module,exports){
+},{"@barchart/common-js/lang/Currency":11,"@barchart/common-js/lang/Decimal":13,"@barchart/common-js/lang/assert":17,"@barchart/common-js/lang/formatter":18,"@barchart/common-js/lang/is":19}],6:[function(require,module,exports){
 const assert = require('@barchart/common-js/lang/assert'),
 	is = require('@barchart/common-js/lang/is');
 
@@ -856,12 +1041,14 @@ module.exports = (() => {
 	return PositionGroupDefinition;
 })();
 
-},{"@barchart/common-js/lang/assert":16,"@barchart/common-js/lang/is":18}],6:[function(require,module,exports){
+},{"@barchart/common-js/lang/assert":17,"@barchart/common-js/lang/is":19}],7:[function(require,module,exports){
 const assert = require('@barchart/common-js/lang/assert'),
 	Decimal = require('@barchart/common-js/lang/Decimal'),
 	Event = require('@barchart/common-js/messaging/Event'),
 	is = require('@barchart/common-js/lang/is');
 
+const InstrumentType = require('./../data/InstrumentType');
+
 module.exports = (() => {
 	'use strict';
 
@@ -876,22 +1063,19 @@ module.exports = (() => {
 
 			this._data = { };
 
-			this._data.current = null;
-			this._data.previous = position.previous || null;
-
-			const snapshot = this._position.snapshot;
+			this._data.basis = null;
 
-			this._data.basis = snapshot.basis || Decimal.ZERO;
+			this._data.currentPrice = null;
+			this._data.previousPrice = null;
 
-			/*
-			let market;
+			this._data.market = null;
+			this._data.marketChange = null;
+			
+			this._data.unrealizedToday = null;
+			this._data.unrealizedTodayChange = null;
 
-			if (position.previous) {
-				market = snapshot.open.multiply(position.previous);
-			} else {
-				market = snapshot.value;
-			}
-			*/
+			calculateStaticData(this);
+			calculatePriceData(this, null);
 
 			this._priceChangeEvent = new Event(this);
 		}
@@ -908,9 +1092,13 @@ module.exports = (() => {
 			return this._summaries;
 		}
 
+		get data() {
+			return this._data;
+		}
+
 		setPrice(price) {
 			if (this._data.price !== price) {
-				this._data.price = price;
+				calculatePriceData(this, this._data.currentPrice = price);
 
 				this._priceChangeEvent.fire(this._data);
 			}
@@ -927,10 +1115,80 @@ module.exports = (() => {
 		}
 	}
 
+	function calculateStaticData(item) {
+		const position = item.position;
+		const snapshot = item.position.snapshot;
+
+		const data = item._data;
+
+		data.previousPrice = position.previousPrice || null;
+
+		let basis;
+
+		if (snapshot.basis) {
+			basis = snapshot.basis.opposite();
+		} else {
+			basis = Decimal.ZERO;
+		}
+
+		data.basis = basis;
+	}
+
+	function calculatePriceData(item, price) {
+		const position = item.position;
+		const snapshot = item.position.snapshot;
+
+		const data = item._data;
+
+		let market;
+
+		if (position.instrument.type === InstrumentType.OTHER) {
+			market = snapshot.value;
+		} else if (position.instrument.type === InstrumentType.CASH) {
+			market = snapshot.open;
+		} else {
+			if (price) {
+				market = snapshot.open.multiply(price);
+			} else {
+				market = snapshot.value;
+			}
+		}
+
+		let marketChange;
+
+		if (data.market === null) {
+			marketChange = market;
+		} else {
+			marketChange = market.subtract(data.market);
+		}
+
+		data.market = market;
+		data.marketChange = marketChange;
+		
+		let unrealizedToday;
+		let unrealizedTodayChange;
+
+		if (data.previousPrice && price) {
+			unrealizedToday = market.subtract(snapshot.open.multiply(data.previousPrice));
+
+			if (data.unrealizedToday !== null) {
+				unrealizedTodayChange = unrealizedToday.subtract(data.unrealizedToday);
+			} else {
+				unrealizedTodayChange = unrealizedToday;
+			}
+		} else {
+			unrealizedToday = Decimal.ZERO;
+			unrealizedTodayChange = Decimal.ZERO;
+		}
+
+		data.unrealizedToday = unrealizedToday;
+		data.unrealizedTodayChange = unrealizedTodayChange;
+	}
+
 	return PositionItem;
 })();
 
-},{"@barchart/common-js/lang/Decimal":12,"@barchart/common-js/lang/assert":16,"@barchart/common-js/lang/is":18,"@barchart/common-js/messaging/Event":19}],7:[function(require,module,exports){
+},{"./../data/InstrumentType":1,"@barchart/common-js/lang/Decimal":13,"@barchart/common-js/lang/assert":17,"@barchart/common-js/lang/is":19,"@barchart/common-js/messaging/Event":20}],8:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -1239,7 +1497,7 @@ module.exports = function () {
 	return Tree;
 }();
 
-},{"./../lang/is":18}],8:[function(require,module,exports){
+},{"./../lang/is":19}],9:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -1383,7 +1641,7 @@ module.exports = function () {
 	return ComparatorBuilder;
 }();
 
-},{"./../../lang/assert":16,"./comparators":9}],9:[function(require,module,exports){
+},{"./../../lang/assert":17,"./comparators":10}],10:[function(require,module,exports){
 'use strict';
 
 var assert = require('./../../lang/assert');
@@ -1458,7 +1716,7 @@ module.exports = function () {
 	};
 }();
 
-},{"./../../lang/assert":16}],10:[function(require,module,exports){
+},{"./../../lang/assert":17}],11:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -1601,7 +1859,7 @@ module.exports = function () {
 	return Currency;
 }();
 
-},{"./Enum":14,"./assert":16,"./is":18}],11:[function(require,module,exports){
+},{"./Enum":15,"./assert":17,"./is":19}],12:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -2154,7 +2412,7 @@ module.exports = function () {
 	return Day;
 }();
 
-},{"./../collections/sorting/ComparatorBuilder":8,"./../collections/sorting/comparators":9,"./assert":16,"./is":18}],12:[function(require,module,exports){
+},{"./../collections/sorting/ComparatorBuilder":9,"./../collections/sorting/comparators":10,"./assert":17,"./is":19}],13:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -2734,7 +2992,7 @@ module.exports = function () {
 	return Decimal;
 }();
 
-},{"./Enum":14,"./assert":16,"./is":18,"big.js":20}],13:[function(require,module,exports){
+},{"./Enum":15,"./assert":17,"./is":19,"big.js":21}],14:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -2883,7 +3141,7 @@ module.exports = function () {
 	return Disposable;
 }();
 
-},{"./assert":16}],14:[function(require,module,exports){
+},{"./assert":17}],15:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -3025,7 +3283,7 @@ module.exports = function () {
 	return Enum;
 }();
 
-},{"./assert":16}],15:[function(require,module,exports){
+},{"./assert":17}],16:[function(require,module,exports){
 'use strict';
 
 var assert = require('./assert'),
@@ -3406,7 +3664,7 @@ module.exports = function () {
 	};
 }();
 
-},{"./assert":16,"./is":18}],16:[function(require,module,exports){
+},{"./assert":17,"./is":19}],17:[function(require,module,exports){
 'use strict';
 
 var is = require('./is');
@@ -3554,7 +3812,7 @@ module.exports = function () {
 	};
 }();
 
-},{"./is":18}],17:[function(require,module,exports){
+},{"./is":19}],18:[function(require,module,exports){
 'use strict';
 
 module.exports = function () {
@@ -3619,7 +3877,7 @@ module.exports = function () {
 	};
 }();
 
-},{}],18:[function(require,module,exports){
+},{}],19:[function(require,module,exports){
 'use strict';
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -3842,7 +4100,7 @@ module.exports = function () {
 	};
 }();
 
-},{}],19:[function(require,module,exports){
+},{}],20:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -4014,7 +4272,7 @@ module.exports = function () {
 	return Event;
 }();
 
-},{"./../lang/Disposable":13,"./../lang/assert":16}],20:[function(require,module,exports){
+},{"./../lang/Disposable":14,"./../lang/assert":17}],21:[function(require,module,exports){
 /*
  *  big.js v5.0.3
  *  A small, fast, easy-to-use library for arbitrary-precision decimal arithmetic.
@@ -4955,7 +5213,7 @@ module.exports = function () {
   }
 })(this);
 
-},{}],21:[function(require,module,exports){
+},{}],22:[function(require,module,exports){
 const Day = require('@barchart/common-js/lang/Day'),
 	Decimal = require('@barchart/common-js/lang/Decimal');
 
@@ -5312,10 +5570,12 @@ describe('After the PositionSummaryFrame enumeration is initialized', () => {
 	});
 });
 
-},{"./../../../lib/data/PositionSummaryFrame":1,"./../../../lib/data/TransactionType":2,"@barchart/common-js/lang/Day":11,"@barchart/common-js/lang/Decimal":12}],22:[function(require,module,exports){
+},{"./../../../lib/data/PositionSummaryFrame":2,"./../../../lib/data/TransactionType":3,"@barchart/common-js/lang/Day":12,"@barchart/common-js/lang/Decimal":13}],23:[function(require,module,exports){
 const Currency = require('@barchart/common-js/lang/Currency'),
 	Decimal = require('@barchart/common-js/lang/Decimal');
 
+const InstrumentType = require('./../../../lib/data/InstrumentType');
+
 const PositionContainer = require('./../../../lib/processing/PositionContainer'),
 	PositionGroupDefinition = require('./../../../lib/processing/PositionGroupDefinition');
 
@@ -5330,12 +5590,15 @@ describe('When a position container data is gathered', () => {
 			position: (positionCounter++).toString(),
 			instrument: {
 				symbol: {
-					barchart: symbol,
-					currency: currency || Currency.USD
-				}
+					barchart: symbol
+				},
+				currency: currency || Currency.USD,
+				type: InstrumentType.EQUITY
 			},
 			snapshot: {
-				basis: new Decimal(123)
+				basis: new Decimal(123),
+				value: new Decimal(456),
+				open: new Decimal(1)
 			}
 		}
 	}
@@ -5410,4 +5673,4 @@ describe('When a position container data is gathered', () => {
 	});
 });
 
-},{"./../../../lib/processing/PositionContainer":3,"./../../../lib/processing/PositionGroupDefinition":5,"@barchart/common-js/lang/Currency":10,"@barchart/common-js/lang/Decimal":12}]},{},[21,22]);
+},{"./../../../lib/data/InstrumentType":1,"./../../../lib/processing/PositionContainer":4,"./../../../lib/processing/PositionGroupDefinition":6,"@barchart/common-js/lang/Currency":11,"@barchart/common-js/lang/Decimal":13}]},{},[22,23]);

package/test/specs/processing/PositionContainerSpec.js

@@ -1,6 +1,8 @@
 const Currency = require('@barchart/common-js/lang/Currency'),
 	Decimal = require('@barchart/common-js/lang/Decimal');
 
+const InstrumentType = require('./../../../lib/data/InstrumentType');
+
 const PositionContainer = require('./../../../lib/processing/PositionContainer'),
 	PositionGroupDefinition = require('./../../../lib/processing/PositionGroupDefinition');
 
@@ -15,12 +17,15 @@ describe('When a position container data is gathered', () => {
 			position: (positionCounter++).toString(),
 			instrument: {
 				symbol: {
-					barchart: symbol,
-					currency: currency || Currency.USD
-				}
+					barchart: symbol
+				},
+				currency: currency || Currency.USD,
+				type: InstrumentType.EQUITY
 			},
 			snapshot: {
-				basis: new Decimal(123)
+				basis: new Decimal(123),
+				value: new Decimal(456),
+				open: new Decimal(1)
 			}
 		}
 	}