@barchart/portfolio-api-common 1.2.46 → 1.2.47

package/lib/formatters/TransactionFormatter.js

@@ -182,11 +182,16 @@ module.exports = (() => {
 
 	formatters.set(TransactionType.DISTRIBUTION_REINVEST, (t) => {
 		return {
+<<<<<<< HEAD
+			shares: t.quantity,
+			fee: t.fee
+=======
 			boughtSold: t.quantity,
 			shares: t.snapshot.open.subtract(t.quantity),
 			price: t.dividend.price,
 			fee: t.fee,
 			rate: t.dividend.rate
+>>>>>>> ec3861f5eeab5fdbfa9275d5ef3f5b988b90999b
 		};
 	});
 

package/package.json

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

package/test/SpecRunner.js

@@ -5134,8 +5134,8 @@ module.exports = function () {
    * Compares two strings (in ascending order), using {@link String#localeCompare}.
    *
    * @static
-   * @param {Number} a
-   * @param {Number} b
+   * @param {String} a
+   * @param {String} b
    * @returns {Number}
    */
 		compareStrings: function compareStrings(a, b) {
@@ -5825,7 +5825,7 @@ module.exports = function () {
     * @returns {String}
     */
 			value: function format() {
-				return this._year + '-' + leftPad(this._month) + '-' + leftPad(this._day);
+				return leftPad(this._year, 4, '0') + '-' + leftPad(this._month, 2, '0') + '-' + leftPad(this._day, 2, '0');
 			}
 
 			/**
@@ -5942,7 +5942,7 @@ module.exports = function () {
     *
     * @static
     * @public
-    * @return {Day}
+    * @returns {Day}
     */
 
 		}, {
@@ -6034,8 +6034,11 @@ module.exports = function () {
 
 	var dayRegex = /^([0-9]{4}).?([0-9]{2}).?([0-9]{2})$/;
 
-	function leftPad(value) {
-		return value < 10 ? '0' + value : '' + value;
+	function leftPad(value, digits, character) {
+		var string = value.toString();
+		var padding = digits - string.length;
+
+		return '' + character.repeat(padding) + string;
 	}
 
 	var comparator = ComparatorBuilder.startWith(function (a, b) {
@@ -6390,7 +6393,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @return {Boolean}
+    * @returns {Boolean}
     */
 			value: function getIsZero(instance) {
 				assert.argumentIsRequired(instance, 'instance', Decimal, 'Decimal');
@@ -6403,7 +6406,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @return {Boolean}
+    * @returns {Boolean}
     */
 
 		}, {
@@ -6419,7 +6422,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @return {Boolean}
+    * @returns {Boolean}
     */
 
 		}, {
@@ -6435,7 +6438,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @return {Boolean}
+    * @returns {Boolean}
     */
 
 		}, {
@@ -6451,7 +6454,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @return {Boolean}
+    * @returns {Boolean}
     */
 
 		}, {
@@ -6467,7 +6470,7 @@ module.exports = function () {
     *
     * @public
     * @param {Decimal} instance
-    * @return {Boolean}
+    * @returns {Boolean}
     */
 
 		}, {
@@ -6857,6 +6860,7 @@ module.exports = function () {
 		/**
    * The unique code.
    *
+   * @public
    * @returns {String}
    */
 
@@ -6869,6 +6873,7 @@ module.exports = function () {
     * Returns true if the provided {@link Enum} argument is equal
     * to the instance.
     *
+    * @public
     * @param {Enum} other
     * @returns {boolean}
     */
@@ -6893,6 +6898,7 @@ module.exports = function () {
     * Looks up a enumeration item; given the enumeration type and the enumeration
     * item's value. If no matching item can be found, a null value is returned.
     *
+    * @public
     * @param {Function} type - The enumeration type.
     * @param {String} code - The enumeration item's code.
     * @returns {*|null}
@@ -6912,6 +6918,7 @@ module.exports = function () {
 			/**
     * The description.
     *
+    * @public
     * @returns {String}
     */
 
@@ -6931,6 +6938,7 @@ module.exports = function () {
 			/**
     * Returns all of the enumeration's items (given an enumeration type).
     *
+    * @public
     * @param {Function} type - The enumeration to list.
     * @returns {Array}
     */
@@ -7388,7 +7396,7 @@ module.exports = function () {
     * Parses the value emitted by {@link Timestamp#toJSON}.
     *
     * @public
-    * @param {String} value
+    * @param {Number} value
     * @returns {Timestamp}
     */
 
@@ -8024,7 +8032,7 @@ module.exports = function () {
 
 				if (typeof itemConstraint === 'function' && itemConstraint !== Function) {
 					itemValidator = function itemValidator(value, index) {
-						return value instanceof itemConstraint || itemConstraint(value, variableName + '[' + index + ']');
+						return itemConstraint.prototype !== undefined && value instanceof itemConstraint || itemConstraint(value, variableName + '[' + index + ']');
 					};
 				} else {
 					itemValidator = function itemValidator(value, index) {
@@ -8134,7 +8142,7 @@ module.exports = function () {
    *
    * @static
    * @param {Object} target - The object to check for existence of the property.
-   * @param {String|Array<String>} propertyNames - The property to check -- either a string with separators, or an array of strings (already split by separator).
+   * @param {String|Array.<String>} propertyNames - The property to check -- either a string with separators, or an array of strings (already split by separator).
    * @param {String=} separator - The separator (defaults to a period character).
    * @returns {boolean}
    */
@@ -8160,7 +8168,7 @@ module.exports = function () {
    *
    * @static
    * @param {Object} target - The object to read from.
-   * @param {String|Array<String>} propertyNames - The property to read -- either a string with separators, or an array of strings (already split by separator).
+   * @param {String|Array.<String>} propertyNames - The property to read -- either a string with separators, or an array of strings (already split by separator).
    * @param {String=} separator - The separator (defaults to a period character).
    * @returns {*}
    */
@@ -8195,7 +8203,8 @@ module.exports = function () {
    *
    * @static
    * @param {Object} target - The object to write to.
-   * @param {String|Array<String>} propertyNames - The property to write -- either a string with separators, or an array of strings (already split by separator).
+   * @param {String|Array.<String>} propertyNames - The property to write -- either a string with separators, or an array of strings (already split by separator).
+   * @param {*} value - The value to assign.
    * @param {String=} separator - The separator (defaults to a period character).
    */
 		write: function write(target, propertyNames, value, separator) {
@@ -8221,7 +8230,7 @@ module.exports = function () {
    *
    * @static
    * @param {Object} target - The object to erase a property from.
-   * @param {String|Array<String>} propertyNames - The property to write -- either a string with separators, or an array of strings (already split by separator).
+   * @param {String|Array.<String>} propertyNames - The property to write -- either a string with separators, or an array of strings (already split by separator).
    * @param {String=} separator - The separator (defaults to a period character).
    */
 		erase: function erase(target, propertyNames, separator) {
@@ -9474,7 +9483,7 @@ module.exports = function () {
 			}
 
 			/**
-    * Generates a function suitable for use by JSON.parse.
+    * Generates a function suitable for use by {@link JSON.parse}.
     *
     * @public
     * @returns {Function}
@@ -13599,9 +13608,9 @@ moment.tz.load(require('./data/packed/latest.json'));
 
             mom = createUTC([2000, 1]).day(i);
             if (strict && !this._fullWeekdaysParse[i]) {
-                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i');
-                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i');
-                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\.?') + '$', 'i');
+                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i');
+                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i');
+                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i');
             }
             if (!this._weekdaysParse[i]) {
                 regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
@@ -14404,7 +14413,7 @@ moment.tz.load(require('./data/packed/latest.json'));
 
     function preprocessRFC2822(s) {
         // Remove comments and folding whitespace and replace multiple-spaces with a single space
-        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').trim();
+        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, '');
     }
 
     function checkWeekday(weekdayStr, parsedInput, config) {
@@ -16583,7 +16592,7 @@ moment.tz.load(require('./data/packed/latest.json'));
     // Side effect imports
 
 
-    hooks.version = '2.22.1';
+    hooks.version = '2.22.2';
 
     setHookCallback(createLocal);