@barchart/portfolio-api-common 1.11.7 → 1.11.8

package/lib/formatters/TransactionFormatter.js

@@ -129,7 +129,7 @@ module.exports = (() => {
 		f.open = t.snapshot.open;
 		f.transaction = t.transaction;
 
-		f.raw.open = f.open.toFloat();
+		f.raw.open = getRawForDecimal(f.open);
 	};
 
 	const averageCostFormatter = (t, f) => {
@@ -152,9 +152,9 @@ module.exports = (() => {
 		f.price = t.trade.price;
 		f.fee = t.fee;
 		f.total = t.amount;
-		f.raw.total = f.total.toFloat();
-		f.raw.price = f.price.toFloat();
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.total = getRawForDecimal(f.total);
+		f.raw.price = getRawForDecimal(f.price);
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const dividendFormatter = (t, f) => {
@@ -162,24 +162,28 @@ module.exports = (() => {
 		f.rate = t.dividend.rate;
 
 		let shares;
-
-		if (!t.dividend.rate.getIsZero()) {
-			if (t.dividend.native) {
-				shares = t.dividend.native.divide(t.dividend.rate);
+		
+		if (t.dividend.open) {
+			shares = t.dividend.open;
+		} else {
+			if (!t.dividend.rate.getIsZero()) {
+				if (t.dividend.native) {
+					shares = t.dividend.native.divide(t.dividend.rate);
+				} else {
+					shares = t.dividend.amount.divide(t.dividend.rate);
+				}
 			} else {
-				shares = t.dividend.amount.divide(t.dividend.rate);
+				shares = '';
 			}
-		} else {
-			shares = '';
-		}
 
-		if (shares) {
-			const rounded = shares.round(0);
+			if (shares) {
+				const rounded = shares.round(0);
 
-			if (rounded.subtract(shares).absolute().getIsLessThan(0.01)) {
-				shares = rounded;
-			} else {
-				shares = shares.round(2);
+				if (rounded.subtract(shares).absolute().getIsLessThan(0.01)) {
+					shares = rounded;
+				} else {
+					shares = shares.round(2);
+				}
 			}
 		}
 
@@ -191,12 +195,12 @@ module.exports = (() => {
 
 		if (t.dividend.native) {
 			f.native = t.dividend.native;
-			f.raw.native = f.native.toFloat();
+			f.raw.native = getRawForDecimal(f.native);
 		}
 
-		f.raw.rate = f.rate.toFloat();
-		f.raw.shares = f.shares.toFloat();
-		f.raw.total = f.total.toFloat();
+		f.raw.rate = getRawForDecimal(f.rate);
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.total = getRawForDecimal(f.total);
 	};
 
 	const distributionCashFormatter = (t, f) => {
@@ -205,24 +209,28 @@ module.exports = (() => {
 
 		let shares;
 
-		if (!t.dividend.rate.getIsZero()) {
-			if (t.dividend.native) {
-				shares = t.dividend.native.divide(t.dividend.rate);
+		if (t.dividend.open) {
+			shares = t.dividend.open;
+		} else {
+			if (!t.dividend.rate.getIsZero()) {
+				if (t.dividend.native) {
+					shares = t.dividend.native.divide(t.dividend.rate);
+				} else {
+					shares = t.dividend.amount.divide(t.dividend.rate);
+				}
 			} else {
-				shares = t.dividend.amount.divide(t.dividend.rate);
+				shares = '';
 			}
-		} else {
-			shares = '';
-		}
 
-		if (shares) {
-			const rounded = shares.round(0);
+			if (shares) {
+				const rounded = shares.round(0);
 
-			if (rounded.subtract(shares).absolute().getIsLessThan(0.01)) {
-				shares = rounded;
-			} else {
-				shares = shares.round(2);
-			}
+				if (rounded.subtract(shares).absolute().getIsLessThan(0.01)) {
+					shares = rounded;
+				} else {
+					shares = shares.round(2);
+				}
+			}	
 		}
 
 		f.shares = shares;
@@ -233,12 +241,12 @@ module.exports = (() => {
 
 		if (t.dividend.native) {
 			f.native = t.dividend.native;
-			f.raw.native = f.native.toFloat();
+			f.raw.native = getRawForDecimal(f.native);
 		}
 
-		f.raw.rate = f.rate.toFloat();
-		f.raw.shares = f.shares.toFloat();
-		f.raw.total = f.total.toFloat();
+		f.raw.rate = getRawForDecimal(f.rate);
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.total = getRawForDecimal(f.total);
 	};
 
 	const dividendReinvestFormatter = (t, f) => {
@@ -257,10 +265,10 @@ module.exports = (() => {
 
 		f.shares = t.snapshot.open.subtract(t.quantity);
 
-		f.raw.rate = f.rate.toFloat();
-		f.raw.shares = f.shares.toFloat();
-		f.raw.price = f.price.toFloat();
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.rate = getRawForDecimal(f.rate);
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.price = getRawForDecimal(f.price);
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const distributionReinvestFormatter = (t, f) => {
@@ -279,10 +287,10 @@ module.exports = (() => {
 
 		f.shares = t.snapshot.open.subtract(t.quantity);
 
-		f.raw.rate = f.rate.toFloat();
-		f.raw.shares = f.shares.toFloat();
-		f.raw.price = f.price.toFloat();
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.rate = getRawForDecimal(f.rate);
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.price = getRawForDecimal(f.price);
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const dividendStockFormatter = (t, f) => {
@@ -307,18 +315,18 @@ module.exports = (() => {
 
 			f.rate = rate;
 
-			f.raw.rate = f.rate.toFloat();
+			f.raw.rate = getRawForDecimal(f.rate);
 
 			if (t.dividend.price) {
 				f.price = t.dividend.price;
-				f.raw.price = f.price.toFloat();
+				f.raw.price = getRawForDecimal(f.price);
 			}
 		}
 
 		f.shares = t.snapshot.open.subtract(t.quantity);
 
-		f.raw.shares = f.shares.toFloat();
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const distributionFundFormatter = (t, f) => {
@@ -343,34 +351,34 @@ module.exports = (() => {
 
 			f.rate = rate;
 
-			f.raw.rate = f.rate.toFloat();
+			f.raw.rate = getRawForDecimal(f.rate);
 
 			if (t.dividend.price) {
 				f.price = t.dividend.price;
-				f.raw.price = f.price.toFloat();
+				f.raw.price = getRawForDecimal(f.price);
 			}
 		}
 
 		f.shares = t.snapshot.open.subtract(t.quantity);
 
-		f.raw.shares = f.shares.toFloat();
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const incomeFormatter = (t, f) => {
 		f.total = t.income.amount;
-		f.raw.total = f.total.toFloat();
+		f.raw.total = getRawForDecimal(f.total);
 	};
 
 	const feeFormatter = (t, f) => {
 		f.fee = t.charge.amount;
 		f.total = t.charge.amount;
-		f.raw.total = f.total.toFloat();
+		f.raw.total = getRawForDecimal(f.total);
 	};
 
 	const feeUnitsFormatter = (t, f) => {
 		f.boughtSold = t.quantity;
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const splitFormatter = (t, f) => {
@@ -388,9 +396,9 @@ module.exports = (() => {
 
 		f.shares = t.snapshot.open.subtract(t.quantity);
 
-		f.raw.rate = f.rate.toFloat();
-		f.raw.shares = f.shares.toFloat();
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.rate = getRawForDecimal(f.rate);
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const valuationFormatter = (t, f) => {
@@ -409,12 +417,12 @@ module.exports = (() => {
 		}
 
 		f.price = rate;
-		f.raw.price = f.price.toFloat();
+		f.raw.price = getRawForDecimal(f.price);
 	};
 
 	const cashFormatter = (t, f) => {
 		f.total = t.quantity;
-		f.raw.total = f.total.toFloat();
+		f.raw.total = getRawForDecimal(f.total);
 	};
 
 	const debitFormatter = (t, f) => {
@@ -440,9 +448,9 @@ module.exports = (() => {
 
 		f.shares = t.snapshot.open.subtract(t.quantity);
 
-		f.raw.rate = f.rate.toFloat();
-		f.raw.shares = f.shares.toFloat();
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.rate = getRawForDecimal(f.rate);
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const spinoffFormatter = (t, f) => {
@@ -460,9 +468,9 @@ module.exports = (() => {
 
 		f.shares = t.snapshot.open.subtract(t.quantity);
 
-		f.raw.rate = f.rate.toFloat();
-		f.raw.shares = f.shares.toFloat();
-		f.raw.boughtSold = f.boughtSold.toFloat();
+		f.raw.rate = getRawForDecimal(f.rate);
+		f.raw.shares = getRawForDecimal(f.shares);
+		f.raw.boughtSold = getRawForDecimal(f.boughtSold);
 	};
 
 	const formatters = new Map();
@@ -499,6 +507,10 @@ module.exports = (() => {
 			return 0;
 		}
 	}
+	
+	function getRawForDecimal(value) {
+		return value && value instanceof Decimal ? value.toFloat() : value;
+	}
 
 	const comparatorAscending = ComparatorBuilder.startWith((a, b) => Day.compareDays(a.date, b.date))
 		.thenBy((a, b) => comparators.compareNumbers(getInstrumentTypePriority(a.instrument.type), getInstrumentTypePriority(b.instrument.type)))

package/package.json

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