@ch20026103/anysis 0.0.15-alpha → 0.0.16-beta

package/dist/esm/stockSkills/ma.d.ts

@@ -1,76 +1,55 @@
-type DataType = {
-    c: number;
-    [key: string]: unknown;
+import { StockListType, StockType } from "./types";
+export type MaResType = {
+    dataset: StockListType;
+    ma: number;
+    type: number;
+    exclusionValue: {
+        "d+1": number;
+        d: number;
+        "d-1": number;
+    };
 };
-type ListType = DataType[];
 type ResMa5 = {
     c: number;
-    ma5: number | null;
+    ma5: number;
 }[];
 type ResMa10 = {
     c: number;
-    ma10: number | null;
+    ma10: number;
 }[];
 type ResMa20 = {
     c: number;
-    ma20: number | null;
+    ma20: number;
 }[];
 type ResMa60 = {
     c: number;
-    ma60: number | null;
+    ma60: number;
 }[];
 type ResMa = {
     c: number;
-    ma: number | null;
+    ma: number;
 }[];
 type ResAllMa = {
     c: number;
-    ma5: number | null;
-    ma10: number | null;
-    ma20: number | null;
-    ma25: number | null;
-    ma60: number | null;
+    ma5: number;
+    ma10: number;
+    ma20: number;
+    ma25: number;
+    ma60: number;
 }[];
 interface MaType {
-    init: (data: DataType, type: number) => {
-        dataset: ListType;
-        ma: number;
-        type: number;
-        exclusionValue: {
-            "d+1": number;
-            d: number;
-            "d-1": number;
-        };
-    };
-    next: (data: DataType, preList: {
-        dataset: ListType;
-        ma: number;
-        type: number;
-        exclusionValue: {
-            "d+1": number;
-            d: number;
-            "d-1": number;
-        };
-    }, type: number) => {
-        dataset: ListType;
-        ma: number;
-        type: number;
-        exclusionValue: {
-            "d+1": number;
-            d: number;
-            "d-1": number;
-        };
-    };
-    getAllMa: (list: ListType) => ResAllMa;
-    getMa5: (list: ListType) => ResMa5;
-    getMa10: (list: ListType) => ResMa10;
-    getMa20: (list: ListType) => ResMa20;
-    getMa60: (list: ListType) => ResMa60;
-    getMa: (list: ListType, self: number) => ResMa;
+    init: (data: StockType, type: number) => MaResType;
+    next: (data: StockType, preList: MaResType, type: number) => MaResType;
+    getAllMa: (list: StockListType) => ResAllMa;
+    getMa5: (list: StockListType) => ResMa5;
+    getMa10: (list: StockListType) => ResMa10;
+    getMa20: (list: StockListType) => ResMa20;
+    getMa60: (list: StockListType) => ResMa60;
+    getMa: (list: StockListType, self: number) => ResMa;
 }
 export default class Ma implements MaType {
-    init(data: DataType, type: number): {
-        dataset: DataType[];
+    init(data: StockType, type: number): {
+        dataset: StockType[];
         ma: number;
         type: number;
         exclusionValue: {
@@ -79,12 +58,12 @@ export default class Ma implements MaType {
             "d-1": number;
         };
     };
-    next(data: DataType, preList: {
-        dataset: ListType;
+    next(data: StockType, preList: {
+        dataset: StockListType;
         ma: number;
         type: number;
     }, type: number): {
-        dataset: ListType;
+        dataset: StockListType;
         ma: number;
         type: number;
         exclusionValue: {
@@ -93,11 +72,11 @@ export default class Ma implements MaType {
             "d-1": number;
         };
     };
-    getAllMa(list: ListType): ResAllMa;
-    getMa5(list: ListType): ResMa5;
-    getMa10(list: ListType): ResMa10;
-    getMa20(list: ListType): ResMa20;
-    getMa60(list: ListType): ResMa60;
-    getMa(list: ListType, self: number): ResMa;
+    getAllMa(list: StockListType): ResAllMa;
+    getMa5(list: StockListType): ResMa5;
+    getMa10(list: StockListType): ResMa10;
+    getMa20(list: StockListType): ResMa20;
+    getMa60(list: StockListType): ResMa60;
+    getMa(list: StockListType, self: number): ResMa;
 }
 export {};

package/dist/esm/stockSkills/ma.js

@@ -17,7 +17,12 @@ var Ma = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (data, type) {
-            return { dataset: [data], ma: 0, type: type, exclusionValue: { "d+1": 0, d: 0, "d-1": 0 } };
+            return {
+                dataset: [data],
+                ma: 0,
+                type: type,
+                exclusionValue: { "d+1": 0, d: 0, "d-1": 0 },
+            };
         }
     });
     Object.defineProperty(Ma.prototype, "next", {
@@ -35,7 +40,11 @@ var Ma = /** @class */ (function () {
                 };
             }
             else {
-                var exclusionValue = { "d+1": preList.dataset[1].c, d: preList.dataset[0].c, "d-1": 0 };
+                var exclusionValue = {
+                    "d+1": preList.dataset[1].c,
+                    d: preList.dataset[0].c,
+                    "d-1": 0,
+                };
                 if (preList.dataset.length > type) {
                     exclusionValue["d-1"] = exclusionValue.d;
                     preList.dataset.shift();
@@ -72,7 +81,7 @@ var Ma = /** @class */ (function () {
             var res = [];
             for (var i = 0; i < list.length; i++) {
                 if (i < 4)
-                    res[i] = __assign(__assign({}, list[i]), { ma5: null });
+                    res[i] = __assign(__assign({}, list[i]), { ma5: 0 });
                 else {
                     var sum = list
                         .slice(i - 4, i + 1)
@@ -92,7 +101,7 @@ var Ma = /** @class */ (function () {
             var res = [];
             for (var i = 0; i < list.length; i++) {
                 if (i < 9)
-                    res[i] = __assign(__assign({}, list[i]), { ma10: null });
+                    res[i] = __assign(__assign({}, list[i]), { ma10: 0 });
                 else {
                     var sum = list
                         .slice(i - 9, i + 1)
@@ -112,7 +121,7 @@ var Ma = /** @class */ (function () {
             var res = [];
             for (var i = 0; i < list.length; i++) {
                 if (i < 19)
-                    res[i] = __assign(__assign({}, list[i]), { ma20: null });
+                    res[i] = __assign(__assign({}, list[i]), { ma20: 0 });
                 else {
                     var sum = list
                         .slice(i - 19, i + 1)
@@ -132,7 +141,7 @@ var Ma = /** @class */ (function () {
             var res = [];
             for (var i = 0; i < list.length; i++) {
                 if (i < 59)
-                    res[i] = __assign(__assign({}, list[i]), { ma60: null });
+                    res[i] = __assign(__assign({}, list[i]), { ma60: 0 });
                 else {
                     var sum = list
                         .slice(i - 59, i + 1)
@@ -152,7 +161,7 @@ var Ma = /** @class */ (function () {
             var res = [];
             for (var i = 0; i < list.length; i++) {
                 if (i < self - 1)
-                    res[i] = __assign(__assign({}, list[i]), { ma: null });
+                    res[i] = __assign(__assign({}, list[i]), { ma: 0 });
                 else {
                     var sum = list
                         .slice(i - (self - 1), i + 1)

package/dist/esm/stockSkills/macd.d.ts

@@ -1,8 +1,4 @@
-type ItemType = {
-    h: number;
-    l: number;
-    c: number;
-};
+import { StockListType, StockType } from "./types";
 type ResEMA12Type = {
     h: number;
     l: number;
@@ -38,68 +34,41 @@ type ResAllMacdType = {
     MACD9: number | null;
     OSC: number | null;
 }[];
+export type MacdResType = {
+    dataset: StockListType;
+    ema12: number;
+    ema26: number;
+    dif: number[];
+    macd: number;
+    osc: number;
+};
 interface MacdType {
-    init: (data: ItemType) => {
-        dataset: ItemType[];
-        ema12: number | null;
-        ema26: number | null;
-        dif: number[];
-        macd: number | null;
-        osc: number | null;
-    };
-    next: (data: ItemType, preList: {
-        dataset: ItemType[];
-        ema12: number | null;
-        ema26: number | null;
-        dif: number[];
-        macd: number | null;
-        osc: number | null;
-    }) => {
-        dataset: ItemType[];
-        ema12: number | null;
-        ema26: number | null;
-        dif: number[];
-        macd: number | null;
-        osc: number | null;
-    };
-    getMACD: (list: ItemType[]) => ResAllMacdType;
-    getDI: (item: ItemType) => number;
-    getStartEMA: (list: ItemType[]) => number;
-    getEMA12: (list: ItemType[]) => ResEMA12Type;
-    getEMA26: (list: ItemType[]) => ResEMA26Type;
-    getDIF: (list: ItemType[], ResEMA12: ResEMA12Type, ResEMA26: ResEMA26Type) => ResDifType;
-    getMACD9: (list: ItemType[], DIF: ResDifType) => ResMacd9Type;
+    init: (data: StockType) => MacdResType;
+    next: (data: StockType, preList: MacdResType) => MacdResType;
+    getMACD: (list: StockType[]) => ResAllMacdType;
+    getDI: (item: StockType) => number;
+    getStartEMA: (list: StockType[]) => number;
+    getEMA12: (list: StockType[]) => ResEMA12Type;
+    getEMA26: (list: StockType[]) => ResEMA26Type;
+    getDIF: (list: StockType[], ResEMA12: ResEMA12Type, ResEMA26: ResEMA26Type) => ResDifType;
+    getMACD9: (list: StockType[], DIF: ResDifType) => ResMacd9Type;
 }
 export default class MACD implements MacdType {
-    init(data: ItemType): {
-        dataset: ItemType[];
-        ema12: number | null;
-        ema26: number | null;
-        dif: number[];
-        macd: number | null;
-        osc: number | null;
-    };
-    next(data: ItemType, preList: {
-        dataset: ItemType[];
-        ema12: number | null;
-        ema26: number | null;
-        dif: number[];
-        macd: number | null;
-        osc: number | null;
-    }): {
-        dataset: ItemType[];
-        ema12: number | null;
-        ema26: number | null;
+    init(data: StockType): MacdResType;
+    next(data: StockType, preList: MacdResType): {
+        dataset: StockListType;
+        ema12: number;
+        ema26: number;
         dif: number[];
-        macd: number | null;
-        osc: number | null;
+        macd: number;
+        osc: number;
     };
-    getMACD(list: ItemType[]): ResAllMacdType;
-    getDI(item: ItemType): number;
-    getStartEMA(arr: ItemType[]): number;
-    getEMA12(list: ItemType[]): ResEMA12Type;
-    getEMA26(list: ItemType[]): ResEMA26Type;
-    getDIF(list: ItemType[], ResEMA12: ResEMA12Type, ResEMA26: ResEMA26Type): ResDifType;
-    getMACD9(list: ItemType[], DIF: ResDifType): ResMacd9Type;
+    getMACD(list: StockType[]): ResAllMacdType;
+    getDI(item: StockType): number;
+    getStartEMA(arr: StockType[]): number;
+    getEMA12(list: StockType[]): ResEMA12Type;
+    getEMA26(list: StockType[]): ResEMA26Type;
+    getDIF(list: StockType[], ResEMA12: ResEMA12Type, ResEMA26: ResEMA26Type): ResDifType;
+    getMACD9(list: StockType[], DIF: ResDifType): ResMacd9Type;
 }
 export {};

package/dist/esm/stockSkills/macd.js

@@ -19,11 +19,11 @@ var MACD = /** @class */ (function () {
         value: function (data) {
             return {
                 dataset: [data],
-                ema12: null,
-                ema26: null,
+                ema12: 0,
+                ema26: 0,
                 dif: [],
-                macd: null,
-                osc: null,
+                macd: 0,
+                osc: 0,
             };
         }
     });
@@ -37,7 +37,7 @@ var MACD = /** @class */ (function () {
             if (preList.dataset.length > 34)
                 preList.dataset.shift();
             // EMA12
-            var ema12 = null;
+            var ema12 = 0;
             if (preList.dataset.length === 12) {
                 ema12 = this.getStartEMA(preList.dataset);
                 ema12 = (ema12 * 11) / 13 + (this.getDI(data) * 2) / 13;
@@ -48,7 +48,7 @@ var MACD = /** @class */ (function () {
                 ema12 = Math.round(ema12 * 100) / 100;
             }
             // EMA26
-            var ema26 = null;
+            var ema26 = 0;
             if (preList.dataset.length === 26) {
                 ema26 = this.getStartEMA(preList.dataset);
                 ema26 = (ema26 * 25) / 27 + (this.getDI(data) * 2) / 27;
@@ -59,36 +59,33 @@ var MACD = /** @class */ (function () {
                 ema26 = Math.round(ema26 * 100) / 100;
             }
             // DIF
-            var dif = null;
+            var dif = 0;
             if (ema12 && ema26) {
                 dif = ema12 - ema26;
                 dif = Math.round(dif * 100) / 100;
                 (_a = preList.dif) === null || _a === void 0 ? void 0 : _a.push(dif);
-                if (preList.dif.length > 9)
-                    (_b = preList.dif) === null || _b === void 0 ? void 0 : _b.shift();
             }
             // MACD & OSC
-            var macd = null;
-            var osc = null;
+            var macd = 0;
+            var osc = 0;
             if (preList.dif.length === 9) {
-                if (preList.macd === null) {
-                    macd = preList.dif.reduce(function (accumulator, currentValue) { return accumulator + currentValue; });
-                    for (var i = 0; i < 9; i++) {
-                        var item = preList.dif[i];
-                        macd = macd + ((item - macd) * 2) / 10;
-                        macd = Math.round(macd * 100) / 100;
-                        osc = item - macd;
-                        osc = Math.round(osc * 100) / 100;
-                    }
-                }
-                else {
-                    macd = preList.macd + ((dif - preList.macd) * 2) / 10;
+                macd = preList.dif.reduce(function (accumulator, currentValue) { return accumulator + currentValue; });
+                for (var i = 0; i < 9; i++) {
+                    var item = preList.dif[i];
+                    macd = macd + ((item - macd) * 2) / 10;
                     macd = Math.round(macd * 100) / 100;
-                    var item = preList.dif[preList.dif.length - 1];
                     osc = item - macd;
                     osc = Math.round(osc * 100) / 100;
                 }
             }
+            else if (preList.dif.length > 9) {
+                macd = preList.macd + ((dif - preList.macd) * 2) / 10;
+                macd = Math.round(macd * 100) / 100;
+                var item = preList.dif[preList.dif.length - 1];
+                osc = item - macd;
+                osc = Math.round(osc * 100) / 100;
+                (_b = preList.dif) === null || _b === void 0 ? void 0 : _b.shift();
+            }
             return {
                 dataset: preList.dataset,
                 ema12: ema12,

package/dist/esm/stockSkills/obv.d.ts

@@ -1,56 +1,25 @@
-type ItemType = {
-    h: number;
-    l: number;
-    c: number;
-    v: number;
-};
+import { StockListType, StockType } from "./types";
+type NewStockType = Required<Pick<StockType, 'v'>> & StockType;
+type NewStockListType = NewStockType[];
 type ResObv = {
     obv: number;
-} & ItemType;
+} & NewStockType;
+export type ObvResType = {
+    dataset: StockListType;
+    obv: number;
+    obvList: number[];
+    preClose: number;
+    obvMa: number;
+    type: number;
+};
 interface ObvType {
-    init: (data: ItemType, type: number) => {
-        dataset: ItemType[];
-        obv: number;
-        obvList: number[];
-        preClose: number;
-        obvMa: number;
-    };
-    next: (data: ItemType, preList: {
-        dataset: ItemType[];
-        obv: number;
-        obvList: number[];
-        preClose: number;
-        obvMa: number;
-    }, type: number) => {
-        dataset: ItemType[];
-        obv: number;
-        obvList: number[];
-        preClose: number;
-        obvMa: number;
-    };
-    getObv: (list: ItemType[], period: number) => ResObv[];
+    init: (data: NewStockType, type: number) => ObvResType;
+    next: (data: NewStockType, preList: ObvResType, type: number) => ObvResType;
+    getObv: (list: NewStockListType, period: number) => ResObv[];
 }
 export default class Obv implements ObvType {
-    init(data: ItemType, type: number): {
-        dataset: ItemType[];
-        obv: number;
-        obvList: number[];
-        preClose: number;
-        obvMa: number;
-    };
-    next(data: ItemType, preList: {
-        dataset: ItemType[];
-        obv: number;
-        obvList: number[];
-        preClose: number;
-        obvMa: number;
-    }, type: number): {
-        dataset: ItemType[];
-        obv: number;
-        preClose: number;
-        obvList: number[];
-        obvMa: number;
-    };
-    getObv(list: ItemType[]): ResObv[];
+    init(data: NewStockType, type: number): ObvResType;
+    next(data: NewStockType, preList: ObvResType, type: number): ObvResType;
+    getObv(list: NewStockListType): ResObv[];
 }
 export {};

package/dist/esm/stockSkills/obv.js

@@ -32,6 +32,7 @@ var Obv = /** @class */ (function () {
                 obvList: [data.v],
                 preClose: data.c,
                 obvMa: 0,
+                type: type,
             };
         }
     });
@@ -62,7 +63,8 @@ var Obv = /** @class */ (function () {
                 obv: obv,
                 preClose: currentClose,
                 obvList: obvList,
-                obvMa: vma
+                obvMa: vma,
+                type: type,
             };
         }
     });

package/dist/esm/stockSkills/rsi.d.ts

@@ -1,29 +1,13 @@
-type DataType = {
-    c: number;
-    [key: string]: unknown;
+import { StockListType, StockType } from "./types";
+export type RsiResType = {
+    dataset: StockListType;
+    rsi: number;
+    type: number;
+    avgGain: number;
+    avgLoss: number;
 };
-type ListType = DataType[];
 export default class Rsi {
-    init(data: DataType, type: number): {
-        dataset: DataType[];
-        rsi: number;
-        type: number;
-        avgGain: number;
-        avgLoss: number;
-    };
-    next(data: DataType, preList: {
-        dataset: ListType;
-        rsi: number;
-        type: number;
-        avgGain: number;
-        avgLoss: number;
-    }, type: number): {
-        rsi: number;
-        type: number;
-        avgGain: number;
-        avgLoss: number;
-        dataset: ListType;
-    };
-    calculateRSI(prices: ListType, period?: number): number[];
+    init(data: StockType, type: number): RsiResType;
+    next(data: StockType, preList: RsiResType, type: number): RsiResType;
+    calculateRSI(prices: StockListType, period?: number): number[];
 }
-export {};

package/dist/esm/stockSkills/types.d.ts

@@ -0,0 +1,10 @@
+export type StockType = {
+    c: number;
+    v?: number;
+    l: number;
+    h: number;
+    o: number;
+    t: number;
+    [key: string]: unknown;
+};
+export type StockListType = StockType[];

package/dist/esm/stockSkills/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/stockSkills/utils/dateFormat.d.ts

@@ -6,7 +6,10 @@ export declare enum Mode {
     TimeStampToNumber = 5,
     StringToNumber = 6
 }
-declare function dateFormat(date: number, mode: Mode): number;
-declare function dateFormat(date: number, mode: Mode): string;
-declare function dateFormat(date: string, mode: Mode): number;
+declare function dateFormat(date: number, mode: Mode.NumberToString): string;
+declare function dateFormat(date: number, mode: Mode.NumberToTimeStamp): number;
+declare function dateFormat(date: string, mode: Mode.StringToTimeStamp): number;
+declare function dateFormat(date: number, mode: Mode.TimeStampToString): string;
+declare function dateFormat(date: number, mode: Mode.TimeStampToNumber): number;
+declare function dateFormat(date: string, mode: Mode.StringToNumber): number;
 export default dateFormat;

package/dist/esm/stockSkills/utils/dateFormat.js

@@ -45,11 +45,11 @@ function dateFormat(date, mode) {
             return parseInt(res);
         }
         case Mode.StringToNumber: {
-            var res = date.toString().replace("-", "").replace("-", "");
+            var res = date.replace(/-/g, '');
             return parseInt(res);
         }
         default:
-            return "please setting mode";
+            throw new Error("请设置正确的模式");
     }
 }
 export default dateFormat;

package/dist/esm/stockSkills/utils/getWeekLine.d.ts

@@ -1,17 +1,8 @@
-type ListType = {
-    h: number;
-    t: number;
-    o: number;
-    c: number;
-    l: number;
-}[];
+import { StockType } from "../types";
+type NewStockType = Required<Pick<StockType, 'v'>> & StockType;
+type NewStockListType = NewStockType[];
 export type ResType = {
-    h: number;
-    t: number;
-    o: number;
-    c: number;
-    l: number;
-    detail?: ListType;
-};
-export default function getWeekLine(list: ListType, detail: boolean): ResType[];
+    detail?: NewStockListType;
+} & NewStockType;
+export default function getWeekLine(list: NewStockListType, detail: boolean): ResType[];
 export {};

package/dist/esm/stockSkills/utils/getWeekLine.js

@@ -34,6 +34,7 @@ export default function getWeekLine(list, detail) {
                     t: collectWeekData[collectWeekData.length - 1]["t"],
                     h: Math.max.apply(Math, collectWeekData.map(function (item) { return item.h; })),
                     l: Math.min.apply(Math, collectWeekData.map(function (item) { return item.l; })),
+                    v: collectWeekData.reduce(function (pre, current) { return pre + current.v; }, 0),
                 };
                 res.push(addDetail(obj, collectWeekData, detail));
                 collectWeekData = [];
@@ -47,6 +48,7 @@ export default function getWeekLine(list, detail) {
                         t: collectWeekData[collectWeekData.length - 1]["t"],
                         h: Math.max.apply(Math, collectWeekData.map(function (item) { return item.h; })),
                         l: Math.min.apply(Math, collectWeekData.map(function (item) { return item.l; })),
+                        v: collectWeekData.reduce(function (pre, current) { return pre + current.v; }, 0),
                     };
                     res.push(addDetail(obj, collectWeekData, detail));
                 }
@@ -62,6 +64,7 @@ export default function getWeekLine(list, detail) {
                         t: collectWeekData[collectWeekData.length - 1]["t"],
                         h: Math.max.apply(Math, collectWeekData.map(function (item) { return item.h; })),
                         l: Math.min.apply(Math, collectWeekData.map(function (item) { return item.l; })),
+                        v: collectWeekData.reduce(function (pre, current) { return pre + current.v; }, 0),
                     };
                     res.push(addDetail(obj, collectWeekData, detail));
                 }

package/dist/esm/stockSkills/utils/getWeekLine.test.js

@@ -9,6 +9,7 @@ describe("test getWeekLine methods", function () {
             l: 137,
             o: 155,
             t: 20211210,
+            v: 78444,
         });
     });
 });