@barchart/portfolio-api-common 1.3.9 → 1.3.13

package/lib/formatters/TransactionFormatter.js

@@ -126,6 +126,7 @@ module.exports = (() => {
 		f.code = t.type.code;
 		f.sequence = t.sequence;
 		f.position = t.position;
+		f.open = t.snapshot.open;
 	};
 
 	const averageCostFormatter = (t, f) => {
@@ -151,53 +152,87 @@ module.exports = (() => {
 	};
 
 	const dividendFormatter = (t, f) => {
-		f.shares = t.snapshot.open;
 		f.total = t.dividend.amount;
 		f.rate = t.dividend.rate;
+
+		f.shares = t.dividend.amount.divide(t.dividend.rate);
 	};
 
-	const dividendStockFormatter = (t, f) => {
-		f.boughtSold = t.quantity;
-		f.fee = t.fee;
+	const distributionCashFormatter = (t, f) => {
+		f.total = t.dividend.amount;
+		f.rate = t.dividend.rate;
 
-		if (t.dividend && t.dividend.rate && t.dividend.price) {
-			f.shares = t.snapshot.open.subtract(t.quantity);
-			f.price = t.dividend.price;
-			f.rate = t.dividend.rate;
-		}
+		f.shares = t.dividend.amount.divide(t.dividend.rate);
 	};
 
 	const dividendReinvestFormatter = (t, f) => {
 		f.boughtSold = t.quantity;
-		f.shares = t.snapshot.open.subtract(t.quantity);
+
+		if (f.fee && !f.fee.getIsZero()) {
+			f.fee = t.fee;
+		}
+
 		f.price = t.dividend.price;
-		f.fee = t.fee;
 		f.rate = t.dividend.rate;
+
+		f.shares = t.snapshot.open.subtract(t.quantity);
 	};
 
-	const distributionCashFormatter = (t, f) => {
-		f.shares = t.snapshot.open;
-		f.total = t.dividend.amount;
+	const distributionReinvestFormatter = (t, f) => {
+		f.boughtSold = t.quantity;
+
+		if (f.fee && !f.fee.getIsZero()) {
+			f.fee = t.fee;
+		}
+
+		f.price = t.dividend.price;
 		f.rate = t.dividend.rate;
+
+		f.shares = t.snapshot.open.subtract(t.quantity);
 	};
 
-	const distributionFundFormatter = (t, f) => {
-		f.boughtSold =t.quantity;
-		f.fee = t.fee;
+	const dividendStockFormatter = (t, f) => {
+		f.boughtSold = t.quantity;
+
+		if (f.fee && !f.fee.getIsZero()) {
+			f.fee = t.fee;
+		}
 
-		if (t.dividend && t.dividend.rate && t.dividend.price) {
-			f.shares = t.snapshot.open.subtract(t.quantity);
-			f.price = t.dividend.price;
-			f.rate = t.dividend.rate;
+		if (t.dividend) {
+			if (t.dividend.numerator && t.dividend.denominator) {
+				f.rate = t.dividend.numerator.divide(t.dividend.denominator);
+			} else if (t.dividend.rate) {
+				f.rate = t.dividend.rate;
+			}
+
+			if (t.dividend.price) {
+				f.price = t.dividend.price;
+			}
 		}
+
+		f.shares = t.snapshot.open.subtract(t.quantity);
 	};
 
-	const distributionReinvestFormatter = (t, f) => {
+	const distributionFundFormatter = (t, f) => {
 		f.boughtSold = t.quantity;
+
+		if (f.fee && !f.fee.getIsZero()) {
+			f.fee = t.fee;
+		}
+
+		if (t.dividend) {
+			if (t.dividend.numerator && t.dividend.denominator) {
+				f.rate = t.dividend.numerator.divide(t.dividend.denominator);
+			} else if (t.dividend.rate) {
+				f.rate = t.dividend.rate;
+			}
+
+			if (t.dividend.price) {
+				f.price = t.dividend.price;
+			}
+		}
+
 		f.shares = t.snapshot.open.subtract(t.quantity);
-		f.price = t.dividend.price;
-		f.fee = t.fee;
-		f.rate = t.dividend.rate;
 	};
 
 	const incomeFormatter = (t, f) => {
@@ -214,8 +249,11 @@ module.exports = (() => {
 	};
 
 	const splitFormatter = (t, f) => {
-		f.shares = t.quantity;
+		f.boughtSold = t.quantity;
+
 		f.rate = t.split.numerator.divide(t.split.denominator);
+
+		f.shares = t.snapshot.open.subtract(t.quantity);
 	};
 
 	const valuationFormatter = (t, f) => {

package/lib/websockets/WebsocketActionType.js

@@ -1,148 +1,148 @@
 const assert = require('@barchart/common-js/lang/assert'),
-  Enum = require('@barchart/common-js/lang/Enum');
+	Enum = require('@barchart/common-js/lang/Enum');
 
 module.exports = (() => {
-  'use strict';
-
-  /**
-   * Types of websocket response actions.
-   *
-   * @public
-   * @extends {Enum}
-   * @param {String} code
-   * @param {String} description
-   * @param {String} action
-   */
-  class WebsocketActionType extends Enum {
-    constructor(code, description, action) {
-      super(code, description);
-
-      assert.argumentIsRequired(action, 'action', String);
-
-      this._action = action;
-    }
-
-    /**
-     * An action of websocket response
-     *
-     * @public
-     * @returns {String}
-     */
-    get action() {
-      return this._action;
-    }
-
-    /**
-     * Action type for creating new portfolio.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get PORTFOLIO_CREATE() {
-      return portfolioCreate;
-    }
-
-    /**
-     * Action type for deleting portfolio.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get PORTFOLIO_DELETE() {
-      return portfolioDelete;
-    }
-
-    /**
-     * Action type for updating new portfolio.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get PORTFOLIO_UPDATE() {
-      return portfolioUpdate;
-    }
-
-    /**
-     * Action type for creating new transaction.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get TRANSACTION_CREATE() {
-      return transactionCreate;
-    }
-
-    /**
-     * Action type for deleting transaction.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get TRANSACTION_DELETE() {
-      return transactionDelete;
-    }
-
-    /**
-     * Action type for editing transaction.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get TRANSACTION_EDIT() {
-      return transactionEdit;
-    }
-
-    /**
-     * Action type for batching transaction.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get TRANSACTION_BATCH() {
-      return transactionBatch;
-    }
-
-    /**
-     * Action type for deleting position.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get POSITION_DELETE() {
-      return positionDelete;
-    }
-
-    /**
-     * Action type for updating position.
-     *
-     * @public
-     * @static
-     * @returns {WebsocketActionType}
-     */
-    static get POSITION_UPDATE() {
-      return positionUpdate;
-    }
-  }
-
-  const portfolioCreate = new WebsocketActionType('PORTFOLIO_CREATE', 'Create portfolio action', 'portfolio/create');
-  const portfolioDelete = new WebsocketActionType('PORTFOLIO_DELETE', 'Delete portfolio action', 'portfolio/delete');
-  const portfolioUpdate = new WebsocketActionType('PORTFOLIO_UPDATE', 'Update portfolio action', 'portfolio/update');
-
-  const transactionCreate = new WebsocketActionType('TRANSACTION_CREATE', 'Create transaction action', 'transaction/create');
-  const transactionDelete = new WebsocketActionType('TRANSACTION_DELETE', 'Delete transaction action', 'transaction/delete');
-  const transactionEdit = new WebsocketActionType('TRANSACTION_EDIT', 'Edit transaction action', 'transaction/edit');
-  const transactionBatch = new WebsocketActionType('TRANSACTION_BATCH', 'Batch transaction action', 'transaction/batch');
-
-  const positionDelete = new WebsocketActionType('POSITION_DELETE', 'Delete position action', 'position/delete');
-  const positionUpdate = new WebsocketActionType('POSITION_UPDATE', 'Update position action', 'position/update');
-
-  return WebsocketActionType;
+	'use strict';
+
+	/**
+	 * Types of websocket response actions.
+	 *
+	 * @public
+	 * @extends {Enum}
+	 * @param {String} code
+	 * @param {String} description
+	 * @param {String} action
+	 */
+	class WebsocketActionType extends Enum {
+		constructor(code, description, action) {
+			super(code, description);
+
+			assert.argumentIsRequired(action, 'action', String);
+
+			this._action = action;
+		}
+
+		/**
+		 * An action of websocket response
+		 *
+		 * @public
+		 * @returns {String}
+		 */
+		get action() {
+			return this._action;
+		}
+
+		/**
+		 * Action type for creating new portfolio.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get PORTFOLIO_CREATE() {
+			return portfolioCreate;
+		}
+
+		/**
+		 * Action type for deleting portfolio.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get PORTFOLIO_DELETE() {
+			return portfolioDelete;
+		}
+
+		/**
+		 * Action type for updating new portfolio.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get PORTFOLIO_UPDATE() {
+			return portfolioUpdate;
+		}
+
+		/**
+		 * Action type for creating new transaction.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get TRANSACTION_CREATE() {
+			return transactionCreate;
+		}
+
+		/**
+		 * Action type for deleting transaction.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get TRANSACTION_DELETE() {
+			return transactionDelete;
+		}
+
+		/**
+		 * Action type for editing transaction.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get TRANSACTION_EDIT() {
+			return transactionEdit;
+		}
+
+		/**
+		 * Action type for batching transaction.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get TRANSACTION_BATCH() {
+			return transactionBatch;
+		}
+
+		/**
+		 * Action type for deleting position.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get POSITION_DELETE() {
+			return positionDelete;
+		}
+
+		/**
+		 * Action type for updating position.
+		 *
+		 * @public
+		 * @static
+		 * @returns {WebsocketActionType}
+		 */
+		static get POSITION_UPDATE() {
+			return positionUpdate;
+		}
+	}
+
+	const portfolioCreate = new WebsocketActionType('PORTFOLIO_CREATE', 'Create portfolio action', 'portfolio/create');
+	const portfolioDelete = new WebsocketActionType('PORTFOLIO_DELETE', 'Delete portfolio action', 'portfolio/delete');
+	const portfolioUpdate = new WebsocketActionType('PORTFOLIO_UPDATE', 'Update portfolio action', 'portfolio/update');
+
+	const transactionCreate = new WebsocketActionType('TRANSACTION_CREATE', 'Create transaction action', 'transaction/create');
+	const transactionDelete = new WebsocketActionType('TRANSACTION_DELETE', 'Delete transaction action', 'transaction/delete');
+	const transactionEdit = new WebsocketActionType('TRANSACTION_EDIT', 'Edit transaction action', 'transaction/edit');
+	const transactionBatch = new WebsocketActionType('TRANSACTION_BATCH', 'Batch transaction action', 'transaction/batch');
+
+	const positionDelete = new WebsocketActionType('POSITION_DELETE', 'Delete position action', 'position/delete');
+	const positionUpdate = new WebsocketActionType('POSITION_UPDATE', 'Update position action', 'position/update');
+
+	return WebsocketActionType;
 })();

package/package.json

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

package/test/SpecRunner.js

@@ -5888,8 +5888,7 @@ module.exports = (() => {
 })();
 
 },{"./../../lang/Disposable":23,"./../../lang/assert":29,"./../../lang/is":33,"./../Stack":14}],19:[function(require,module,exports){
-const assert = require('./assert'),
-      is = require('./is');
+const assert = require('./assert');
 
 module.exports = (() => {
 	'use strict';
@@ -5952,7 +5951,7 @@ module.exports = (() => {
 	return AdHoc;
 })();
 
-},{"./assert":29,"./is":33}],20:[function(require,module,exports){
+},{"./assert":29}],20:[function(require,module,exports){
 const assert = require('./assert'),
       Enum = require('./Enum'),
       is = require('./is');
@@ -8856,8 +8855,7 @@ module.exports = (() => {
 })();
 
 },{}],34:[function(require,module,exports){
-const assert = require('./assert'),
-      is = require('./is');
+const assert = require('./assert');
 
 module.exports = (() => {
 	'use strict';
@@ -8925,7 +8923,7 @@ module.exports = (() => {
 	};
 })();
 
-},{"./assert":29,"./is":33}],35:[function(require,module,exports){
+},{"./assert":29}],35:[function(require,module,exports){
 const assert = require('./../lang/assert'),
       Disposable = require('./../lang/Disposable');