qmwts 1.1.44 → 1.1.46

package/dist/class/local-date.d.ts

@@ -1,7 +1,8 @@
 export default class LocalDate {
-    private date;
-    constructor(...args: any[]);
-    static now: () => LocalDate;
-    static of: (year: any, month: any, date: any) => LocalDate;
-    toString: () => string;
+    private readonly date;
+    constructor();
+    constructor(date: Date);
+    static now(): LocalDate;
+    static of(year: number, month: number, date: number): LocalDate;
+    toString(): string;
 }

package/dist/class/local-date.js

@@ -1,37 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var number_utils_1 = require("../utils/number-utils");
-var prototype_utils_1 = require("../utils/prototype-utils");
 // https://juejin.cn/post/7098891689955164168
 var LocalDate = /** @class */ (function () {
-    function LocalDate() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var _this = this;
-        this.toString = function () {
-            return [
-                _this.date.getFullYear(),
-                number_utils_1.default.leftPadZero(_this.date.getMonth() + 1, 2),
-                number_utils_1.default.leftPadZero(_this.date.getDate(), 2)
-            ].join('-');
-        };
-        this.date = new Date();
-        if (number_utils_1.default.isNumber(args[0]))
-            this.date.setFullYear(+args[0]);
-        if (number_utils_1.default.isNumber(args[1]))
-            this.date.setMonth(+args[1] - 1);
-        if (number_utils_1.default.isNumber(args[2]))
-            this.date.setDate(args[2]);
-        if (prototype_utils_1.default.isDate(args[0]))
-            this.date = args[0];
+    function LocalDate(date) {
+        if (date == void 0)
+            this.date = new Date();
+        else
+            this.date = date;
     }
     LocalDate.now = function () {
         return new LocalDate();
     };
     LocalDate.of = function (year, month, date) {
-        return new LocalDate(year, month, date);
+        return new LocalDate(new Date(year, month - 1, date));
+    };
+    LocalDate.prototype.toString = function () {
+        return [
+            this.date.getFullYear().toString(),
+            (this.date.getMonth() + 1).toString().padStart(2, '0'),
+            this.date.getDate().toString().padStart(2, '0')
+        ].join('-');
     };
     return LocalDate;
 }());

package/dist/class/year-month.d.ts

@@ -1,7 +1,8 @@
 export default class YearMonth {
-    private date;
-    constructor(...args: any[]);
-    static now: () => YearMonth;
-    static of: (year: any, month: any) => YearMonth;
-    toString: () => string;
+    private readonly date;
+    constructor();
+    constructor(date: Date);
+    static now(): YearMonth;
+    static of(year: number, month: number): YearMonth;
+    toString(): string;
 }

package/dist/class/year-month.js

@@ -1,33 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var number_utils_1 = require("../utils/number-utils");
-var prototype_utils_1 = require("../utils/prototype-utils");
 var YearMonth = /** @class */ (function () {
-    function YearMonth() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var _this = this;
-        this.toString = function () {
-            return [
-                _this.date.getFullYear(),
-                number_utils_1.default.leftPadZero(_this.date.getMonth() + 1, 2)
-            ].join('-');
-        };
-        this.date = new Date();
-        if (number_utils_1.default.isNumber(args[0]))
-            this.date.setFullYear(+args[0]);
-        if (number_utils_1.default.isNumber(args[1]))
-            this.date.setMonth(+args[1] - 1);
-        if (prototype_utils_1.default.isDate(args[0]))
-            this.date = args[0];
+    function YearMonth(date) {
+        if (date == void 0)
+            this.date = new Date();
+        else
+            this.date = date;
     }
     YearMonth.now = function () {
         return new YearMonth();
     };
     YearMonth.of = function (year, month) {
-        return new YearMonth(year, month);
+        return new YearMonth(new Date(year, month - 1));
+    };
+    YearMonth.prototype.toString = function () {
+        return [
+            this.date.getFullYear().toString(),
+            (this.date.getMonth() + 1).toString().padStart(2, '0')
+        ].join('-');
     };
     return YearMonth;
 }());

package/dist/index.d.ts

@@ -1,4 +1,6 @@
-import ArrayUtils from './utils/array-utils';
+export { default as ArrayUtils } from './utils/array-utils';
+export { default as FinanceUtils } from './utils/finance-utils';
+export type { XIRREntity } from './utils/finance-utils';
 import Downloader from './utils/downloader';
 import NumberUtils from './utils/number-utils';
 import JsonUtils from './utils/json-utils';
@@ -6,8 +8,7 @@ import UUIDUtils from './utils/uuid-utils';
 import PrototypeUtils from './utils/prototype-utils';
 import RequestDataGenerator from './utils/request-data-generator';
 import FileUtils from './utils/file-utils';
-import DateUtils from './utils/date-utils';
 import LocalDate from './class/local-date';
 import LocalDateTime from './class/local-date-time';
 import YearMonth from './class/year-month';
-export { ArrayUtils, Downloader, NumberUtils, JsonUtils, UUIDUtils, PrototypeUtils, RequestDataGenerator, FileUtils, DateUtils, LocalDate, LocalDateTime, YearMonth, };
+export { Downloader, NumberUtils, JsonUtils, UUIDUtils, PrototypeUtils, RequestDataGenerator, FileUtils, LocalDate, LocalDateTime, YearMonth, };

package/dist/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.YearMonth = exports.LocalDateTime = exports.LocalDate = exports.DateUtils = exports.FileUtils = exports.RequestDataGenerator = exports.PrototypeUtils = exports.UUIDUtils = exports.JsonUtils = exports.NumberUtils = exports.Downloader = exports.ArrayUtils = void 0;
+exports.YearMonth = exports.LocalDateTime = exports.LocalDate = exports.FileUtils = exports.RequestDataGenerator = exports.PrototypeUtils = exports.UUIDUtils = exports.JsonUtils = exports.NumberUtils = exports.Downloader = exports.FinanceUtils = exports.ArrayUtils = void 0;
 // https://www.jianshu.com/p/8fa2c50720e4
 var array_utils_1 = require("./utils/array-utils");
-exports.ArrayUtils = array_utils_1.default;
+Object.defineProperty(exports, "ArrayUtils", { enumerable: true, get: function () { return array_utils_1.default; } });
+var finance_utils_1 = require("./utils/finance-utils");
+Object.defineProperty(exports, "FinanceUtils", { enumerable: true, get: function () { return finance_utils_1.default; } });
 var downloader_1 = require("./utils/downloader");
 exports.Downloader = downloader_1.default;
 var number_utils_1 = require("./utils/number-utils");
@@ -18,8 +20,6 @@ var request_data_generator_1 = require("./utils/request-data-generator");
 exports.RequestDataGenerator = request_data_generator_1.default;
 var file_utils_1 = require("./utils/file-utils");
 exports.FileUtils = file_utils_1.default;
-var date_utils_1 = require("./utils/date-utils");
-exports.DateUtils = date_utils_1.default;
 var local_date_1 = require("./class/local-date");
 exports.LocalDate = local_date_1.default;
 var local_date_time_1 = require("./class/local-date-time");

package/dist/utils/finance-utils.d.ts

@@ -0,0 +1,8 @@
+declare const _default: {
+    XIRR(entities: XIRREntity[], guess?: number): number | null;
+};
+export default _default;
+export interface XIRREntity {
+    date: Date;
+    amount: number;
+}

package/dist/utils/finance-utils.js

@@ -0,0 +1,44 @@
+"use strict";
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// 货币相关工具类
+exports.default = {
+    // https://support.microsoft.com/zh-cn/office/xirr-%E5%87%BD%E6%95%B0-de1242ec-6477-445b-b11b-a303ad9adc9d
+    // 不定期投资收益率
+    XIRR: function (entities, guess) {
+        if (guess === void 0) { guess = 0.1; }
+        // 按照日期从小到大排列
+        var list = __spreadArray([], entities, true).sort(function (a, b) { return a.date.getTime() - b.date.getTime(); });
+        var d0 = list[0].date.getTime();
+        var npv = function (rate) {
+            var total = 0;
+            for (var i = list.length - 1; i >= 0; i--) {
+                var daysDiff = (list[i].date.getTime() - d0) / (1000 * 3600 * 24);
+                total += list[i].amount / Math.pow(1 + rate, daysDiff / 365);
+            }
+            return total;
+        };
+        var epsilon = 1e-6; // 精度
+        var x0 = guess;
+        var x1;
+        var iteration = 0;
+        while (iteration < 100) {
+            var f0 = npv(x0);
+            var fPrime = (npv(x0 + epsilon) - f0) / epsilon;
+            x1 = x0 - f0 / fPrime;
+            if (Math.abs(x1 - x0) < epsilon)
+                return x1;
+            x0 = x1;
+            iteration++;
+        }
+        return null;
+    },
+};

package/dist/utils/number-utils.d.ts

@@ -3,6 +3,5 @@ declare const _default: {
     isNumber(...number: any[]): boolean;
     thousandths(number: any, fixed?: number): string;
     summation(array?: any[]): number;
-    leftPadZero(num: number, pad: number): string;
 };
 export default _default;

package/dist/utils/number-utils.js

@@ -33,7 +33,4 @@ exports.default = {
         if (array === void 0) { array = []; }
         return array.reduce(function (prev, curr) { return prev + _this.ifNaN(curr, 0); }, 0);
     },
-    leftPadZero: function (num, pad) {
-        return ('0' + num).slice(-pad);
-    }
 };

package/dist/utils/prototype-utils.d.ts

@@ -1,4 +1,5 @@
 declare const _default: {
+    is(o: any, type: string): boolean;
     isObject(o: any): boolean;
     isArray(o: any): boolean;
     isFile(o: any): boolean;

package/dist/utils/prototype-utils.js

@@ -1,28 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
+    is: function (o, type) {
+        return Object.prototype.toString.call(o) === "[object ".concat(type, "]");
+    },
     isObject: function (o) {
-        return Object.prototype.toString.call(o) === '[object Object]';
+        return this.is(o, 'Object');
     },
     isArray: function (o) {
-        return Object.prototype.toString.call(o) === '[object Array]';
+        return this.is(o, 'Array');
     },
     isFile: function (o) {
-        return Object.prototype.toString.call(o) === '[object File]';
+        return this.is(o, 'File');
     },
     isNumber: function (o) {
-        return Object.prototype.toString.call(o) === '[object Number]';
+        return this.is(o, 'Number');
     },
     isDate: function (o) {
-        return Object.prototype.toString.call(o) === '[object Date]';
+        return this.is(o, 'Date');
     },
     isFunction: function (o) {
-        return Object.prototype.toString.call(o) === '[object Function]';
+        return this.is(o, 'Function');
     },
     isBoolean: function (o) {
-        return Object.prototype.toString.call(o) === '[object Boolean]';
+        return this.is(o, 'Boolean');
     },
     isString: function (o) {
-        return Object.prototype.toString.call(o) === '[object String]';
+        return this.is(o, 'String');
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmwts",
-  "version": "1.1.44",
+  "version": "1.1.46",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/utils/date-utils.d.ts

@@ -1,6 +0,0 @@
-declare const _default: {
-    isToday(date: Date): boolean;
-    toDateString(date: Date): string;
-    toDateTimeString(date: Date): string;
-};
-export default _default;

package/dist/utils/date-utils.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    isToday: function (date) {
-        var today = new Date();
-        return today.getFullYear() === date.getFullYear()
-            && today.getMonth() === date.getMonth()
-            && today.getDate() === date.getDate();
-    },
-    toDateString: function (date) {
-        return '';
-    },
-    toDateTimeString: function (date) {
-        return '';
-    }
-};

package/dist/utils/html-utils.js

@@ -1,17 +0,0 @@
-"use strict";
-Promise.resolve().then(function () {
-    console.log(0);
-    return Promise.resolve(4);
-}).then(function (res) {
-    console.log(res);
-});
-Promise.resolve().then(function () {
-    console.log(1);
-}).then(function () {
-    console.log(2);
-}).then(function () {
-    console.log(3);
-}).then(function () {
-    console.log(5);
-    console.log(6);
-});