@barchart/portfolio-api-common 1.2.105 → 1.2.109

package/lib/formatters/TransactionFormatter.js

@@ -205,6 +205,7 @@ module.exports = (() => {
 
 	formatters.set(TransactionType.DISTRIBUTION_REINVEST, (t) => {
 		return {
+			boughtSold: t.quantity,
 			shares: t.snapshot.open.subtract(t.quantity),
 			price: t.dividend.price,
 			fee: t.fee,

package/lib/processing/PositionContainer.js

@@ -104,7 +104,7 @@ module.exports = (() => {
 			}, { });
 
 			this._items = positions.reduce((items, position) => {
-				const item = createPositionItem.call(this, position);
+				const item = createPositionItem.call(this, position, reportFrame ? true : false);
 
 				if (item) {
 					items.push(item);
@@ -313,7 +313,7 @@ module.exports = (() => {
 				addSummaryPrevious(this._summariesPrevious, summary, this._previousSummaryFrame, this._previousSummaryRanges);
 			});
 
-			const item = createPositionItem.call(this, position);
+			const item = createPositionItem.call(this, position, false);
 
 			addBarchartSymbol(this._symbols, item);
 			addDisplaySymbol(this._symbolsDisplay, item);
@@ -959,7 +959,7 @@ module.exports = (() => {
 		}
 	}
 
-	function createPositionItem(position, currentQuote, previousQuote) {
+	function createPositionItem(position, requireCurrentSummary) {
 		const portfolio = this._portfolios[position.portfolio];
 
 		let returnRef;
@@ -968,7 +968,11 @@ module.exports = (() => {
 			const currentSummary = this._summariesCurrent[ position.position ] || null;
 			const previousSummaries = this._summariesPrevious[ position.position ] || getSummaryArray(this._previousSummaryRanges);
 
-			returnRef = new PositionItem(portfolio, position, currentSummary, previousSummaries, this._reporting);
+			if (!requireCurrentSummary || currentSummary !== null) {
+				returnRef = new PositionItem(portfolio, position, currentSummary, previousSummaries, this._reporting);
+			} else {
+				returnRef = null;
+			}
 		} else {
 			returnRef = null;
 		}

package/lib/processing/PositionGroup.js

@@ -166,10 +166,14 @@ module.exports = (() => {
 			this._dataFormat.cashTotal = null;
 			this._dataFormat.portfolioType = null;
 
+			this._dataActual.periodPrice = null;
+			this._dataActual.periodPricePrevious = null;
 			this._dataActual.periodRealized = null;
 			this._dataActual.periodUnrealized = null;
 			this._dataActual.periodIncome = null;
 
+			this._dataFormat.periodPrice = null;
+			this._dataFormat.periodPricePrevious = null;
 			this._dataFormat.periodRealized = null;
 			this._dataFormat.periodUnrealized = null;
 			this._dataFormat.periodIncome = null;
@@ -730,16 +734,22 @@ module.exports = (() => {
 		if (group.single && group._items.length === 1) {
 			const item = group._items[0];
 
-			actual.quantity = item.position.snapshot.open;
+			actual.quantity = item.data.quantity;
 			actual.quantityPrevious = item.data.quantityPrevious;
 			
 			actual.basisPrice = item.data.basisPrice;
 
+			actual.periodPrice = item.data.periodPrice;
+			actual.periodPricePrevious = item.data.periodPricePrevious;
+
 			format.quantity = formatDecimal(actual.quantity, 2);
 			format.quantityPrevious = formatDecimal(actual.quantityPrevious, 2);
-			
+
 			format.basisPrice = formatCurrency(actual.basisPrice, currency);
 
+			format.periodPrice = formatCurrency(actual.periodPrice, currency);
+			format.periodPricePrevious = formatCurrency(actual.periodPricePrevious, currency);
+
 			format.invalid = definition.type === PositionLevelType.POSITION && item.invalid;
 			format.locked = definition.type === PositionLevelType.POSITION && item.data.locked;
 		}

package/lib/processing/PositionItem.js

@@ -71,15 +71,19 @@ module.exports = (() => {
 			this._data.marketPrevious = null;
 			this._data.marketPrevious2 = null;
 
+			this._data.quantity = null;
 			this._data.quantityPrevious = null;
-			this._data.quantityPrevious2 = null;
 			
 			this._data.realized = null;
 			this._data.income = null;
 			this._data.basisPrice = null;
 
-			this._data.realizedPeriod = null;
-			this._data.unrealizedPeriod = null;
+			this._data.periodRealized = null;
+			this._data.periodUnrealized = null;
+			this._data.periodIncome = null;
+
+			this._data.periodPrice = null;
+			this._data.periodPricePrevious = null;
 
 			this._data.newsExists = false;
 			this._data.fundamental = { };
@@ -370,16 +374,18 @@ module.exports = (() => {
 
 	function calculateStaticData(item) {
 		const position = item.position;
-		const snapshot = getSnapshot(position, item.currentSummary, item._reporting);
 
-		const previousSummaries = item.previousSummaries;
+		const currentSummary = item.currentSummary;
+
+		const previousSummary1 = getPreviousSummary(item.previousSummaries, 1);
+		const previousSummary2 = getPreviousSummary(item.previousSummaries, 2);
+		const previousSummary3 = getPreviousSummary(item.previousSummaries, 3);
 
-		const previousSummary1 = getPreviousSummary(previousSummaries, 1);
-		const previousSummary2 = getPreviousSummary(previousSummaries, 2);
-		const previousSummary3 = getPreviousSummary(previousSummaries, 3);
+		const snapshot = getSnapshot(position, currentSummary, item._reporting);
 
 		const data = item._data;
 
+		data.quantity = snapshot.open;
 		data.previousPrice = position.previous || null;
 
 		let basis;
@@ -414,6 +420,18 @@ module.exports = (() => {
 		} else {
 			data.basisPrice = basis.divide(snapshot.open);
 		}
+
+		if (currentSummary && !currentSummary.end.open.getIsZero()) {
+			data.periodPrice = currentSummary.end.value.divide(currentSummary.end.open);
+		} else {
+			data.periodPrice = null;
+		}
+
+		if (previousSummary1 && !previousSummary1.end.open.getIsZero()) {
+			data.periodPricePrevious = previousSummary1.end.value.divide(previousSummary1.end.open);
+		} else {
+			data.periodPricePrevious = null;
+		}
 	}
 
 	function calculatePriceData(item, price) {

package/package.json

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

package/test/SpecRunner.js

@@ -1528,7 +1528,7 @@ module.exports = (() => {
 			}, { });
 
 			this._items = positions.reduce((items, position) => {
-				const item = createPositionItem.call(this, position);
+				const item = createPositionItem.call(this, position, reportFrame ? true : false);
 
 				if (item) {
 					items.push(item);
@@ -1737,7 +1737,7 @@ module.exports = (() => {
 				addSummaryPrevious(this._summariesPrevious, summary, this._previousSummaryFrame, this._previousSummaryRanges);
 			});
 
-			const item = createPositionItem.call(this, position);
+			const item = createPositionItem.call(this, position, false);
 
 			addBarchartSymbol(this._symbols, item);
 			addDisplaySymbol(this._symbolsDisplay, item);
@@ -2383,7 +2383,7 @@ module.exports = (() => {
 		}
 	}
 
-	function createPositionItem(position, currentQuote, previousQuote) {
+	function createPositionItem(position, requireCurrentSummary) {
 		const portfolio = this._portfolios[position.portfolio];
 
 		let returnRef;
@@ -2392,7 +2392,11 @@ module.exports = (() => {
 			const currentSummary = this._summariesCurrent[ position.position ] || null;
 			const previousSummaries = this._summariesPrevious[ position.position ] || getSummaryArray(this._previousSummaryRanges);
 
-			returnRef = new PositionItem(portfolio, position, currentSummary, previousSummaries, this._reporting);
+			if (!requireCurrentSummary || currentSummary !== null) {
+				returnRef = new PositionItem(portfolio, position, currentSummary, previousSummaries, this._reporting);
+			} else {
+				returnRef = null;
+			}
 		} else {
 			returnRef = null;
 		}
@@ -2622,10 +2626,14 @@ module.exports = (() => {
 			this._dataFormat.cashTotal = null;
 			this._dataFormat.portfolioType = null;
 
+			this._dataActual.periodPrice = null;
+			this._dataActual.periodPricePrevious = null;
 			this._dataActual.periodRealized = null;
 			this._dataActual.periodUnrealized = null;
 			this._dataActual.periodIncome = null;
 
+			this._dataFormat.periodPrice = null;
+			this._dataFormat.periodPricePrevious = null;
 			this._dataFormat.periodRealized = null;
 			this._dataFormat.periodUnrealized = null;
 			this._dataFormat.periodIncome = null;
@@ -3186,16 +3194,22 @@ module.exports = (() => {
 		if (group.single && group._items.length === 1) {
 			const item = group._items[0];
 
-			actual.quantity = item.position.snapshot.open;
+			actual.quantity = item.data.quantity;
 			actual.quantityPrevious = item.data.quantityPrevious;
 			
 			actual.basisPrice = item.data.basisPrice;
 
+			actual.periodPrice = item.data.periodPrice;
+			actual.periodPricePrevious = item.data.periodPricePrevious;
+
 			format.quantity = formatDecimal(actual.quantity, 2);
 			format.quantityPrevious = formatDecimal(actual.quantityPrevious, 2);
-			
+
 			format.basisPrice = formatCurrency(actual.basisPrice, currency);
 
+			format.periodPrice = formatCurrency(actual.periodPrice, currency);
+			format.periodPricePrevious = formatCurrency(actual.periodPricePrevious, currency);
+
 			format.invalid = definition.type === PositionLevelType.POSITION && item.invalid;
 			format.locked = definition.type === PositionLevelType.POSITION && item.data.locked;
 		}
@@ -3458,15 +3472,19 @@ module.exports = (() => {
 			this._data.marketPrevious = null;
 			this._data.marketPrevious2 = null;
 
+			this._data.quantity = null;
 			this._data.quantityPrevious = null;
-			this._data.quantityPrevious2 = null;
 			
 			this._data.realized = null;
 			this._data.income = null;
 			this._data.basisPrice = null;
 
-			this._data.realizedPeriod = null;
-			this._data.unrealizedPeriod = null;
+			this._data.periodRealized = null;
+			this._data.periodUnrealized = null;
+			this._data.periodIncome = null;
+
+			this._data.periodPrice = null;
+			this._data.periodPricePrevious = null;
 
 			this._data.newsExists = false;
 			this._data.fundamental = { };
@@ -3757,16 +3775,18 @@ module.exports = (() => {
 
 	function calculateStaticData(item) {
 		const position = item.position;
-		const snapshot = getSnapshot(position, item.currentSummary, item._reporting);
 
-		const previousSummaries = item.previousSummaries;
+		const currentSummary = item.currentSummary;
+
+		const previousSummary1 = getPreviousSummary(item.previousSummaries, 1);
+		const previousSummary2 = getPreviousSummary(item.previousSummaries, 2);
+		const previousSummary3 = getPreviousSummary(item.previousSummaries, 3);
 
-		const previousSummary1 = getPreviousSummary(previousSummaries, 1);
-		const previousSummary2 = getPreviousSummary(previousSummaries, 2);
-		const previousSummary3 = getPreviousSummary(previousSummaries, 3);
+		const snapshot = getSnapshot(position, currentSummary, item._reporting);
 
 		const data = item._data;
 
+		data.quantity = snapshot.open;
 		data.previousPrice = position.previous || null;
 
 		let basis;
@@ -3801,6 +3821,18 @@ module.exports = (() => {
 		} else {
 			data.basisPrice = basis.divide(snapshot.open);
 		}
+
+		if (currentSummary && !currentSummary.end.open.getIsZero()) {
+			data.periodPrice = currentSummary.end.value.divide(currentSummary.end.open);
+		} else {
+			data.periodPrice = null;
+		}
+
+		if (previousSummary1 && !previousSummary1.end.open.getIsZero()) {
+			data.periodPricePrevious = previousSummary1.end.value.divide(previousSummary1.end.open);
+		} else {
+			data.periodPricePrevious = null;
+		}
 	}
 
 	function calculatePriceData(item, price) {
@@ -6268,12 +6300,11 @@ module.exports = function () {
 			}
 
 			/**
-    * Converts a string (which matches the output of {@link Day#format} into
-    * a {@link Day} instance.
+    * Clones a {@link Day} instance.
     *
     * @public
     * @static
-    * @param {String} value
+    * @param {Day} value
     * @returns {Day}
     */
 
@@ -6314,6 +6345,24 @@ module.exports = function () {
 				return this._day;
 			}
 		}], [{
+			key: 'clone',
+			value: function clone(value) {
+				assert.argumentIsRequired(value, 'value', Day, 'Day');
+
+				return new Day(value.year, value.month, value.day);
+			}
+
+			/**
+    * Converts a string (which matches the output of {@link Day#format} into
+    * a {@link Day} instance.
+    *
+    * @public
+    * @static
+    * @param {String} value
+    * @returns {Day}
+    */
+
+		}, {
 			key: 'parse',
 			value: function parse(value) {
 				assert.argumentIsRequired(value, 'value', String);
@@ -6630,15 +6679,17 @@ module.exports = function () {
     *
     * @public
     * @param {Boolean=} approximate
+    * @param {Number=} places
     * @returns {Boolean}
     */
 
 		}, {
 			key: 'getIsZero',
-			value: function getIsZero(approximate) {
+			value: function getIsZero(approximate, places) {
 				assert.argumentIsOptional(approximate, 'approximate', Boolean);
+				assert.argumentIsOptional(places, 'places', Number);
 
-				return this._big.eq(zero) || is.boolean(approximate) && approximate && this.round(20, RoundingMode.NORMAL).getIsZero();
+				return this._big.eq(zero) || is.boolean(approximate) && approximate && this.round(places || Big.DP, RoundingMode.NORMAL).getIsZero();
 			}
 
 			/**
@@ -6737,6 +6788,43 @@ module.exports = function () {
 				return this._big.eq(getBig(other));
 			}
 
+			/**
+    * Returns true if the current instance is an integer (i.e. has no decimal
+    * component).
+    *
+    * @public
+    * @return {Boolean}
+    */
+
+		}, {
+			key: 'getIsInteger',
+			value: function getIsInteger() {
+				return this.getIsEqual(this.round(0));
+			}
+
+			/**
+    * Returns the number of decimal places used.
+    *
+    * @public
+    * @returns {Number}
+    */
+
+		}, {
+			key: 'getDecimalPlaces',
+			value: function getDecimalPlaces() {
+				var matches = this.toFixed().match(/-?\d*\.(\d*)/);
+
+				var returnVal = void 0;
+
+				if (matches === null) {
+					returnVal = 0;
+				} else {
+					returnVal = matches[1].length;
+				}
+
+				return returnVal;
+			}
+
 			/**
     * Emits a floating point value that approximates the value of the current
     * instance.
@@ -6785,10 +6873,11 @@ module.exports = function () {
 			}
 
 			/**
-    * Parses the value emitted by {@link Decimal#toJSON}.
+    * Clones a {@link Decimal} instance.
     *
     * @public
-    * @param {String} value
+    * @static
+    * @param {Decimal} value
     * @returns {Decimal}
     */
 
@@ -6798,6 +6887,22 @@ module.exports = function () {
 				return '[Decimal]';
 			}
 		}], [{
+			key: 'clone',
+			value: function clone(value) {
+				assert.argumentIsRequired(value, 'value', Decimal, 'Decimal');
+
+				return new Decimal(value._big);
+			}
+
+			/**
+    * Parses the value emitted by {@link Decimal#toJSON}.
+    *
+    * @public
+    * @param {String} value
+    * @returns {Decimal}
+    */
+
+		}, {
 			key: 'parse',
 			value: function parse(value) {
 				return new Decimal(value);
@@ -7819,10 +7924,11 @@ module.exports = function () {
 			}
 
 			/**
-    * Parses the value emitted by {@link Timestamp#toJSON}.
+    * Clones a {@link Timestamp} instance.
     *
     * @public
-    * @param {Number} value
+    * @static
+    * @param {Timestamp} value
     * @returns {Timestamp}
     */
 
@@ -7858,6 +7964,22 @@ module.exports = function () {
 				return this._moment;
 			}
 		}], [{
+			key: 'clone',
+			value: function clone(value) {
+				assert.argumentIsRequired(value, 'value', Timestamp, 'Timestamp');
+
+				return new Timestamp(value._timestamp, value._timezone);
+			}
+
+			/**
+    * Parses the value emitted by {@link Timestamp#toJSON}.
+    *
+    * @public
+    * @param {Number} value
+    * @returns {Timestamp}
+    */
+
+		}, {
 			key: 'parse',
 			value: function parse(value) {
 				return new Timestamp(value);