@barchart/portfolio-api-common 1.11.0 → 1.11.4

package/lib/formatters/TransactionFormatter.js

@@ -159,11 +159,27 @@ module.exports = (() => {
 		let shares;
 
 		if (!t.dividend.rate.getIsZero()) {
-			shares = t.dividend.amount.divide(t.dividend.rate);
+			if (t.dividend.native) {
+				shares = t.dividend.native.divide(t.dividend.rate);
+			} else {
+				shares = t.dividend.amount.divide(t.dividend.rate);
+			}
 		} else {
 			shares = '';
 		}
 
+		if (shares) {
+			const rounded = shares.round(0);
+
+			if (rounded.subtract(shares).absolute().getIsLessThan(0.01)) {
+				shares = rounded;
+			} else {
+				shares = shares.round(2);
+			}
+		}
+
+		f.shares = shares;
+
 		if (t.dividend.currency) {
 			f.currency = t.dividend.currency;
 		}
@@ -171,8 +187,6 @@ module.exports = (() => {
 		if (t.dividend.native) {
 			f.native = t.dividend.native;
 		}
-
-		f.shares = shares;
 	};
 
 	const distributionCashFormatter = (t, f) => {
@@ -182,11 +196,27 @@ module.exports = (() => {
 		let shares;
 
 		if (!t.dividend.rate.getIsZero()) {
-			shares = t.dividend.amount.divide(t.dividend.rate);
+			if (t.dividend.native) {
+				shares = t.dividend.native.divide(t.dividend.rate);
+			} else {
+				shares = t.dividend.amount.divide(t.dividend.rate);
+			}
 		} else {
 			shares = '';
 		}
 
+		if (shares) {
+			const rounded = shares.round(0);
+
+			if (rounded.subtract(shares).absolute().getIsLessThan(0.01)) {
+				shares = rounded;
+			} else {
+				shares = shares.round(2);
+			}
+		}
+
+		f.shares = shares;
+
 		if (t.dividend.currency) {
 			f.currency = t.dividend.currency;
 		}
@@ -194,8 +224,6 @@ module.exports = (() => {
 		if (t.dividend.native) {
 			f.native = t.dividend.native;
 		}
-
-		f.shares = shares;
 	};
 
 	const dividendReinvestFormatter = (t, f) => {

package/lib/processing/PositionGroup.js

@@ -892,7 +892,7 @@ module.exports = (() => {
 		let marketChange = updates.market.subtract(actual.marketPrevious);
 		let marketChangePercent;
 
-		if (actual.marketPrevious.getIsZero()) {
+		if (actual.marketPrevious.getIsApproximate(Decimal.ZERO, 4)) {
 			if (marketChange.getIsPositive()) {
 				marketChangePercent = Decimal.ONE;
 			} else if (marketChange.getIsNegative()) {
@@ -950,7 +950,7 @@ module.exports = (() => {
 			if (parent && !excluded) {
 				const parentData = parent._dataActual;
 
-				if (parentData.marketAbsolute !== null && !parentData.marketAbsolute.getIsZero()) {
+				if (parentData.marketAbsolute !== null && !parentData.marketAbsolute.getIsApproximate(Decimal.ZERO, 4)) {
 					let numerator;
 
 					if (group.currency !== parent.currency) {
@@ -992,7 +992,7 @@ module.exports = (() => {
 		const numerator = actual.realized;
 		const denominator = totalBasis.subtract(openBasis);
 
-		if (denominator.getIsZero()) {
+		if (denominator.getIsApproximate(Decimal.ZERO, 4)) {
 			actual.realizedPercent = Decimal.ZERO;
 		} else {
 			actual.realizedPercent = numerator.divide(denominator);
@@ -1008,7 +1008,7 @@ module.exports = (() => {
 		const numerator = actual.unrealized;
 		const denominator = actual.basis.absolute();
 
-		if (denominator.getIsZero()) {
+		if (denominator.getIsApproximate(Decimal.ZERO, 4)) {
 			actual.unrealizedPercent = Decimal.ZERO;
 		} else {
 			actual.unrealizedPercent = numerator.divide(denominator);
@@ -1018,7 +1018,7 @@ module.exports = (() => {
 	}
 
 	function calculateGainPercent(gain, basis) {
-		return basis.getIsZero() ? Decimal.ZERO : gain.divide(basis);
+		return basis.getIsApproximate(Decimal.ZERO, 4) ? Decimal.ZERO : gain.divide(basis);
 	}
 
 	const unchanged = { up: false, down: false };

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@barchart/portfolio-api-common",
-  "version": "1.11.0",
+  "version": "1.11.4",
   "description": "Common code used by the Portfolio system",
   "author": {
     "name": "Bryan Ingle",
     "email": "bryan.ingle@barchart.com",
     "url": "http://www.barchart.com"
   },
+  "homepage": "https://github.com/barchart/portfolio-api-common#readme",
   "scripts": {},
   "dependencies": {
-    "@barchart/common-js": "^3.5.1",
+    "@barchart/common-js": "^4.9.0",
     "uuid": "^3.4.0"
   },
   "devDependencies": {

package/.jshintrc

@@ -1,6 +0,0 @@
-{
-  "esversion": 9,
-  "validthis": true,
-  "-W018": true,
-  "-W093": true
-}

package/.releases/1.10.0.md

@@ -1,3 +0,0 @@
-**New Features**
-
-* Added a new `PortfolioFailureType` for negative quantity.

package/.releases/1.11.0.md

@@ -1,3 +0,0 @@
-**New Features**
-
-* Added `native` and `currency` fields for dividends and distributions which paid in alternate currency (from underlying stock or fund).

package/.releases/1.5.0.md

@@ -1,3 +0,0 @@
-**New Features**
-
-* Added new ```Schema``` for results of a query by symbol.

package/.releases/1.5.1.md

@@ -1,3 +0,0 @@
-**Configuration Changes**
-
-* The failure message for corrupt corporate actions (e.g. two instruments with same symbol) was updated to indicate an expected time to correction (of 24 to 48 hours).

package/.releases/1.5.2.md

@@ -1,4 +0,0 @@
-**Technical Enhancements**
-
-* Added a `transaction` field into `basicFormatter` function for the `TransactionFormatter` class.
-* Changed the way to add and remove a portfolio in `PositionContainer` to support reactive changes.

package/.releases/1.6.0.md

@@ -1,3 +0,0 @@
-**New Features**
-
-* Added a new `PortfolioFailureType` for attempting to edit a transaction's type.

package/.releases/1.7.0.md

@@ -1,3 +0,0 @@
-**New Features**
-
-* Added a new `PortfolioFailureType` for attempting to reinvest a dividend when the position is short.

package/.releases/1.8.0.md

@@ -1,3 +0,0 @@
-**New Features**
-
-* Added a new `PortfolioFailureType` for attempts to switch to dividend reinvestment when the position is short.

package/.releases/1.9.0.md

@@ -1,4 +0,0 @@
-**New Features**
-
-* Added `close` field to the `Sell` transaction schema.
-* Added `close` field to the `Buy Short` transaction schema.

package/.releases/1.9.1.md

@@ -1,4 +0,0 @@
-**Bug Fixes**
-
-* Made `quantity` field optional for the `Sell` transaction schema.
-* Made `quantity` field optional for the `Buy Short` transaction schema.

package/buildspec.yml

@@ -1,15 +0,0 @@
-version: 0.2
-
-phases:
-  install:
-    runtime-versions:
-      nodejs: 12.x
-
-  pre_build:
-    commands:
-      - npm install
-
-  build:
-    commands:
-      - ./node_modules/.bin/gulp lint
-      - ./node_modules/.bin/gulp test

package/gulpfile.js

@@ -1,122 +0,0 @@
-const gulp = require('gulp');
-
-const fs = require('fs');
-
-const browserify = require('browserify'),
-	buffer = require('vinyl-buffer'),
-	exec = require('child_process').exec,
-	git = require('gulp-git'),
-	gitStatus = require('git-get-status'),
-	glob = require('glob'),
-	jasmine = require('gulp-jasmine'),
-	jshint = require('gulp-jshint'),
-	prompt = require('gulp-prompt'),
-	source = require('vinyl-source-stream');
-
-function getVersionFromPackage() {
-	return JSON.parse(fs.readFileSync('./package.json', 'utf8')).version;
-}
-
-gulp.task('ensure-clean-working-directory', (cb) => {
-	gitStatus((err, status) => {
-		if (err, !status.clean) {
-			throw new Error('Unable to proceed, your working directory is not clean.');
-		}
-
-		cb();
-	});
-});
-
-gulp.task('bump-choice', (cb) => {
-	const processor = prompt.prompt({
-		type: 'list',
-		name: 'bump',
-		message: 'What type of bump would you like to do?',
-		choices: ['patch', 'minor', 'major'],
-	}, (res) => {
-		global.bump = res.bump;
-
-		return cb();
-	});
-
-	return gulp.src(['./package.json']).pipe(processor);
-});
-
-gulp.task('bump-version', (cb) => {
-	exec(`npm version ${global.bump || 'patch'} --no-git-tag-version`, {
-		cwd: './'
-	}, (error) => {
-		if (error) {
-			cb(error);
-		}
-
-		cb();
-	});
-});
-
-gulp.task('commit-changes', () => {
-	return gulp.src([ './', './test/', './package.json' ])
-		.pipe(git.add())
-		.pipe(git.commit('Release. Bump version number'));
-});
-
-gulp.task('push-changes', (cb) => {
-	git.push('origin', 'master', cb);
-});
-
-gulp.task('create-tag', (cb) => {
-	const version = getVersionFromPackage();
-
-	git.tag(version, 'Release ' + version, (error) => {
-		if (error) {
-			return cb(error);
-		}
-
-		git.push('origin', 'master', { args: '--tags' }, cb);
-	});
-});
-
-gulp.task('build-test-bundle', () => {
-	return browserify({ entries: glob.sync('test/specs/**/*.js') })
-		.bundle()
-		.pipe(source('SpecRunner.js'))
-		.pipe(buffer())
-		.pipe(gulp.dest('test'));
-});
-
-gulp.task('execute-browser-tests', () => {
-	return gulp.src('test/SpecRunner.js')
-		.pipe(jasmine());
-});
-
-gulp.task('execute-node-tests', () => {
-	return gulp.src(['test/specs/**/*.js'])
-		.pipe(jasmine());
-});
-
-gulp.task('execute-tests', gulp.series(
-	'build-test-bundle',
-	'execute-browser-tests',
-	'execute-node-tests'
-));
-
-gulp.task('release', gulp.series(
-	'ensure-clean-working-directory',
-	'execute-tests',
-	'bump-choice',
-	'bump-version',
-	'commit-changes',
-	'push-changes',
-	'create-tag'
-));
-
-gulp.task('lint', () => {
-	return gulp.src([ './**/*.js', './test/specs/**/*.js', '!./node_modules/**', '!./test/SpecRunner.js' ])
-		.pipe(jshint({'esversion': 9}))
-		.pipe(jshint.reporter('default'))
-		.pipe(jshint.reporter('fail'));
-});
-
-gulp.task('test', gulp.series('execute-tests'));
-
-gulp.task('default', gulp.series('lint'));