@barchart/portfolio-api-common 1.2.67 → 1.2.71

package/lib/data/InstrumentType.js

@@ -46,7 +46,6 @@ module.exports = (() => {
 			this._usesSymbols = usesSymbols;
 			this._hasCorporateActions = hasCorporateActions;
 			this._closeFractional = closeFractional;
-			this._closeFractional = strictOrdering;
 			this._roundQuantity = roundQuantity;
 			this._strictOrdering = strictOrdering;
 

package/lib/data/TransactionValidator.js

@@ -19,6 +19,25 @@ module.exports = (() => {
 
 		}
 
+		/**
+		 * Determines the desired sequence number for a transaction.
+		 *
+		 * @public
+		 * @param {Object} transaction
+		 * @return {Number}
+		 */
+		static getSortSequence(transaction) {
+			let effective;
+
+			if (is.number(transaction.resequence)) {
+				effective = transaction.resequence;
+			} else {
+				effective = transaction.sequence;
+			}
+
+			return effective;
+		}
+
 		/**
 		 * Given an array of transactions, ensures that all sequence numbers and dates
 		 * are properly ordered.
@@ -85,7 +104,7 @@ module.exports = (() => {
 			assert.argumentIsArray(transactions, 'transactions');
 			assert.argumentIsOptional(strict, 'strict', Boolean);
 
-			return transactions.findIndex((t, i, a) => t.sequence !== (i + 1) || (i !== 0 && t.date.getIsBefore(a[ i - 1 ].date)) || (i !== 0 && is.boolean(strict) && strict && t.date.getIsEqual(a[i - 1].date) && t.type.sequence < a[i - 1].type.sequence));
+			return transactions.findIndex((t, i, a) => TransactionValidator.getSortSequence(t) !== (i + 1) || (i !== 0 && t.date.getIsBefore(a[ i - 1 ].date)) || (i !== 0 && is.boolean(strict) && strict && t.date.getIsEqual(a[i - 1].date) && t.type.sequence < a[i - 1].type.sequence));
 		}
 
 		/**

package/lib/formatters/TransactionFormatter.js

@@ -30,13 +30,14 @@ module.exports = (() => {
 		 * @static
 		 * @param {Array.<Object>} transactions
 		 * @param {Array.<Object>} positions
-		 * @param {Boolean=} mutate
+		 * @param {Boolean=} descending
 		 * @returns {Array}
 		 */
-		static format(transactions, positions, mutate) {
+		static format(transactions, positions, mutate, descending) {
 			assert.argumentIsArray(transactions, 'transactions');
 			assert.argumentIsArray(positions, 'positions');
 			assert.argumentIsOptional(mutate, 'mutate', Boolean);
+			assert.argumentIsOptional(descending, 'descending', Boolean);
 
 			const instruments = positions.reduce((map, p) => {
 				const instrument = Object.assign({ }, p.instrument || { });
@@ -68,22 +69,20 @@ module.exports = (() => {
 						formatted = Object.assign({}, formatted, formattedTransaction);
 					}
 
-					let transactionToInsert;
-
-					if (mutate) {
-						transaction.formatted = formatted;
-
-						transactionToInsert = transaction;
-					} else {
-						transactionToInsert = formatted;
-					}
-
-					list.push(transactionToInsert);
+					list.push(formatted);
 				}
 
 				return list;
 			}, [ ]);
 
+			let comparator;
+
+			if (is.boolean(descending) && descending) {
+				comparator = comparatorDescending;
+			} else {
+				comparator = comparatorAscending;
+			}
+
 			a.sort(comparator);
 
 			a.forEach((t) => {
@@ -99,9 +98,21 @@ module.exports = (() => {
 		 * @public
 		 * @static
 		 * @param {Array.<Object>} transactions
+		 * @param {Boolean=} descending
 		 * @returns {Array}
 		 */
-		sort(transactions) {
+		sort(transactions, descending) {
+			assert.argumentIsArray(transactions, 'transactions');
+			assert.argumentIsOptional(descending, 'descending', Boolean);
+
+			let comparator;
+
+			if (is.boolean(descending) && descending) {
+				comparator = comparatorDescending;
+			} else {
+				comparator = comparatorAscending;
+			}
+
 			return transactions.sort(comparator);
 		}
 
@@ -277,15 +288,14 @@ module.exports = (() => {
 		}
 	}
 
-	const comparator = ComparatorBuilder.startWith((a, b) => {
-		return Day.compareDays(a.date, b.date);
-	}).thenBy((a, b) => {
-		return comparators.compareNumbers(getInstrumentTypePriority(a.instrument.type), getInstrumentTypePriority(b.instrument.type));
-	}).thenBy((a, b) => {
-		return comparators.compareStrings(a.instrument.id, b.instrument.id);
-	}).thenBy((a, b) => {
-		return comparators.compareNumbers(a.sequence, b.sequence);
-	}).toComparator();
+	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)))
+		.thenBy((a, b) => comparators.compareStrings(a.instrument.id, b.instrument.id))
+		.thenBy((a, b) => comparators.compareNumbers(a.sequence, b.sequence))
+		.toComparator();
+
+	const comparatorDescending = ComparatorBuilder.startWith((a, b) => comparatorAscending(b, a))
+		.toComparator();
 
 	return TransactionFormatter;
 })();

package/package.json

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

package/test/SpecRunner.js

@@ -47,7 +47,6 @@ module.exports = (() => {
 			this._usesSymbols = usesSymbols;
 			this._hasCorporateActions = hasCorporateActions;
 			this._closeFractional = closeFractional;
-			this._closeFractional = strictOrdering;
 			this._roundQuantity = roundQuantity;
 			this._strictOrdering = strictOrdering;
 
@@ -1103,6 +1102,25 @@ module.exports = (() => {
 
 		}
 
+		/**
+		 * Determines the desired sequence number for a transaction.
+		 *
+		 * @public
+		 * @param {Object} transaction
+		 * @return {Number}
+		 */
+		static getSortSequence(transaction) {
+			let effective;
+
+			if (is.number(transaction.resequence)) {
+				effective = transaction.resequence;
+			} else {
+				effective = transaction.sequence;
+			}
+
+			return effective;
+		}
+
 		/**
 		 * Given an array of transactions, ensures that all sequence numbers and dates
 		 * are properly ordered.
@@ -1169,7 +1187,7 @@ module.exports = (() => {
 			assert.argumentIsArray(transactions, 'transactions');
 			assert.argumentIsOptional(strict, 'strict', Boolean);
 
-			return transactions.findIndex((t, i, a) => t.sequence !== (i + 1) || (i !== 0 && t.date.getIsBefore(a[ i - 1 ].date)) || (i !== 0 && is.boolean(strict) && strict && t.date.getIsEqual(a[i - 1].date) && t.type.sequence < a[i - 1].type.sequence));
+			return transactions.findIndex((t, i, a) => TransactionValidator.getSortSequence(t) !== (i + 1) || (i !== 0 && t.date.getIsBefore(a[ i - 1 ].date)) || (i !== 0 && is.boolean(strict) && strict && t.date.getIsEqual(a[i - 1].date) && t.type.sequence < a[i - 1].type.sequence));
 		}
 
 		/**