@ch20026103/anysis 0.0.15-alpha → 0.0.16-beta

package/demo/main.js

@@ -1,12 +1,10 @@
 /* eslint @typescript-eslint/no-var-requires: "off" */
 const axios = require("axios");
-const {
-  Rsi,
-} = require("../dist/cjs/index.js");
-
+const { Week, Kd } = require("../dist/cjs/index.js");
 
 // 使用示例
-const rsi = new Rsi();
+const week = new Week();
+const kd = new Kd();
 function DemoDay(stockId) {
   axios
     .get(
@@ -16,13 +14,17 @@ function DemoDay(stockId) {
       res = res.data.replace(/^\(|\);$/g, "");
       let parse = JSON.parse(res);
       let data = parse.ta;
-      const rsis = rsi.calculateRSI(data, 5);
-      let rsi5Data = rsi.init(data[0],5);
+      let weekData = week.init(data[0]);
+
       for (let i = 1; i < data.length; i++) {
-        rsi5Data = rsi.next(data[i], rsi5Data, 5);
+        weekData = week.next(data[i], weekData);
+      }
+
+      let kdData = kd.init(weekData.week[0], 9);
+      for (let i = 0; i < weekData.week.length; i++) {
+        kdData = kd.next(weekData.week[i], kdData, 9);
       }
-      console.log("rsi", rsis[rsis.length - 2]);
-      console.log("rsi", rsi5Data);
+      console.log(kdData);
     })
     .catch((error) => {
       console.error(error);

package/dist/cjs/index.d.ts

@@ -15,7 +15,7 @@ export { default as Macd } from "./stockSkills/macd.js";
 export { default as Obv } from "./stockSkills/obv.js";
 export { default as Rsi } from "./stockSkills/rsi.js";
 export { default as dateFormat } from "./stockSkills/utils/dateFormat.js";
-export { default as getWeekLine } from "./stockSkills/utils/getWeekLine.js";
+export { default as Week } from "./stockSkills/week.js";
 export { default as Vma } from "./stockSkills/vma.js";
 export { default as Williams } from "./stockSkills/williams.js";
 export { add } from "./test/add.js";

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLsusbOutput = exports.isJSON = exports.calculateDivisionFactor = exports.minus = exports.add = exports.Williams = exports.Vma = exports.getWeekLine = exports.dateFormat = exports.Rsi = exports.Obv = exports.Macd = exports.Ma = exports.Kd = exports.Gold = exports.Ema = exports.Boll = exports.calcSeasonalIndicesNoTrend = exports.weightMovingAverages = exports.movingAverages = exports.exponentialSmoothing = exports.findTroughByGradient = exports.findPeaksByGradient = exports.SwingExtremesType = exports.SwingExtremes = exports.slope = exports.simpleRegressionModel = exports.Angle = void 0;
+exports.parseLsusbOutput = exports.isJSON = exports.calculateDivisionFactor = exports.minus = exports.add = exports.Williams = exports.Vma = exports.Week = exports.dateFormat = exports.Rsi = exports.Obv = exports.Macd = exports.Ma = exports.Kd = exports.Gold = exports.Ema = exports.Boll = exports.calcSeasonalIndicesNoTrend = exports.weightMovingAverages = exports.movingAverages = exports.exponentialSmoothing = exports.findTroughByGradient = exports.findPeaksByGradient = exports.SwingExtremesType = exports.SwingExtremes = exports.slope = exports.simpleRegressionModel = exports.Angle = void 0;
 /*
   請注意，在 src/index.ts 中，我的導入包含文件擴展名(.js)。
   如果需要支持 Node.js 和構建工具（ex: webpack），則不需要這樣做。 **因為commonJs默認js副檔名**
@@ -41,8 +41,8 @@ var rsi_js_1 = require("./stockSkills/rsi.js");
 Object.defineProperty(exports, "Rsi", { enumerable: true, get: function () { return rsi_js_1.default; } });
 var dateFormat_js_1 = require("./stockSkills/utils/dateFormat.js");
 Object.defineProperty(exports, "dateFormat", { enumerable: true, get: function () { return dateFormat_js_1.default; } });
-var getWeekLine_js_1 = require("./stockSkills/utils/getWeekLine.js");
-Object.defineProperty(exports, "getWeekLine", { enumerable: true, get: function () { return getWeekLine_js_1.default; } });
+var week_js_1 = require("./stockSkills/week.js");
+Object.defineProperty(exports, "Week", { enumerable: true, get: function () { return week_js_1.default; } });
 var vma_js_1 = require("./stockSkills/vma.js");
 Object.defineProperty(exports, "Vma", { enumerable: true, get: function () { return vma_js_1.default; } });
 var williams_js_1 = require("./stockSkills/williams.js");

package/dist/cjs/stockSkills/boll.d.ts

@@ -1,59 +1,34 @@
-type ItemType = {
-    c: number;
-    [key: string]: unknown;
-};
-type ListType = ItemType[];
+import { StockListType, StockType } from "./types";
 export type BollResType = {
-    [key: string]: unknown;
-    bollMa: number | null;
-    bollUb: number | null;
-    bollLb: number | null;
-}[];
-interface BollType {
-    init: (data: ItemType) => {
-        dataset: ListType;
-        bollMa: number | null;
-        bollUb: number | null;
-        bollLb: number | null;
-    };
-    next: (data: ItemType, preList: {
-        dataset: ListType;
-        bollMa: number | null;
-        bollUb: number | null;
-        bollLb: number | null;
-    }, type: number) => {
-        dataset: ListType;
-        bollMa: number | null;
-        bollUb: number | null;
-        bollLb: number | null;
-    };
-    getBoll: (list: ListType, type: number) => BollResType;
+    dataset: StockListType;
+    bollMa: number;
+    bollUb: number;
+    bollLb: number;
+};
+interface BollClassType {
+    init: (data: StockType) => BollResType;
+    next: (data: StockType, preList: BollResType, type: number) => BollResType;
+    getBoll: (list: StockListType, type: number) => {
+        [key: string]: unknown;
+        bollMa: number;
+        bollUb: number;
+        bollLb: number;
+    }[];
 }
-export default class Boll implements BollType {
-    init(data: ItemType): {
-        dataset: ListType;
-        bollMa: number | null;
-        bollUb: number | null;
-        bollLb: number | null;
-    };
-    next(data: ItemType, preList: {
-        dataset: ListType;
-        bollMa: number | null;
-        bollUb: number | null;
-        bollLb: number | null;
-    }, type: number): {
-        dataset: ListType;
-        type: number;
-        bollMa: null;
-        bollUb: null;
-        bollLb: null;
-    } | {
-        dataset: ListType;
+export default class Boll implements BollClassType {
+    init(data: StockType): BollResType;
+    next(data: StockType, preList: BollResType, type: number): {
+        dataset: StockListType;
         type: number;
         bollMa: number;
         bollUb: number;
         bollLb: number;
     };
-    getBoll(list: ListType, type: number): BollResType;
+    getBoll(list: StockListType, type: number): {
+        [key: string]: unknown;
+        bollMa: number;
+        bollUb: number;
+        bollLb: number;
+    }[];
 }
 export {};

package/dist/cjs/stockSkills/boll.js

@@ -21,9 +21,9 @@ var Boll = /** @class */ (function () {
         value: function (data) {
             return {
                 dataset: [data],
-                bollMa: null,
-                bollUb: null,
-                bollLb: null,
+                bollMa: 0,
+                bollUb: 0,
+                bollLb: 0,
             };
         }
     });
@@ -37,9 +37,9 @@ var Boll = /** @class */ (function () {
                 return {
                     dataset: preList.dataset,
                     type: type,
-                    bollMa: null,
-                    bollUb: null,
-                    bollLb: null,
+                    bollMa: 0,
+                    bollUb: 0,
+                    bollLb: 0,
                 };
             }
             else {
@@ -49,7 +49,7 @@ var Boll = /** @class */ (function () {
                 var sum = preList.dataset.reduce(function (pre, current) { return pre + current.c; }, 0);
                 var bollMa_1 = Math.round((sum / type) * 100) / 100;
                 var difference = preList.dataset.reduce(function (pre, current) {
-                    return bollMa_1 !== null ? pre + Math.pow(current.c - bollMa_1, 2) : pre;
+                    return bollMa_1 !== 0 ? pre + Math.pow(current.c - bollMa_1, 2) : pre;
                 }, 0);
                 var std = Math.round(Math.sqrt(difference / type) * 100) / 100;
                 return {
@@ -70,7 +70,7 @@ var Boll = /** @class */ (function () {
             var res = [];
             var _loop_1 = function (i) {
                 if (i < type)
-                    res[i] = __assign(__assign({}, list[i]), { bollMa: null, bollUb: null, bollLb: null });
+                    res[i] = __assign(__assign({}, list[i]), { bollMa: 0, bollUb: 0, bollLb: 0 });
                 else {
                     // bollMa
                     var sumMa = list
@@ -81,9 +81,7 @@ var Boll = /** @class */ (function () {
                     var difference = res
                         .slice(i - (type - 1), i + 1)
                         .reduce(function (pre, current) {
-                        return bollMa_2 !== null
-                            ? pre + Math.pow(current.c - bollMa_2, 2)
-                            : pre;
+                        return bollMa_2 !== 0 ? pre + Math.pow(current.c - bollMa_2, 2) : pre;
                     }, 0);
                     var std = Math.round(Math.sqrt(difference / type) * 100) / 100;
                     res[i] = __assign(__assign({}, list[i]), { bollMa: bollMa_2, bollUb: bollMa_2 + 2 * std, bollLb: bollMa_2 - 2 * std });

package/dist/cjs/stockSkills/ema.d.ts

@@ -1,40 +1,18 @@
-type ItemType = {
-    c: number;
-    [key: string]: unknown;
+import { StockListType, StockType } from "./types";
+export type EmaResType = {
+    dataset: StockListType;
+    ema: number;
+    type: number;
 };
-type ListType = ItemType[];
-interface EmaType {
-    init: (data: ItemType, type: number) => {
-        dataset: ListType;
-        ema: number;
-        type: number;
-    };
-    next: (data: ItemType, preList: {
-        dataset: ListType;
-        ema: number;
-        type: number;
-    }, type: number) => {
-        dataset: ListType;
-        ema: number;
-        type: number;
-    };
+interface EmaClassType {
+    init: (data: StockType, type: number) => EmaResType;
+    next: (data: StockType, preList: EmaResType, type: number) => EmaResType;
     getStartEma: (list: number[], period: number) => number;
     getEma: (list: number[], period: number) => (number | null)[];
 }
-export default class Ema implements EmaType {
-    init(data: ItemType, type: number): {
-        dataset: ListType;
-        ema: number;
-        type: number;
-    };
-    next(data: ItemType, preList: {
-        dataset: ListType;
-        ema: number;
-    }, type: number): {
-        dataset: ListType;
-        ema: number;
-        type: number;
-    };
+export default class Ema implements EmaClassType {
+    init(data: StockType, type: number): EmaResType;
+    next(data: StockType, preList: EmaResType, type: number): EmaResType;
     getStartEma(list: number[], period: number): number;
     getEma(list: number[], period: number): (number | null)[];
 }

package/dist/cjs/stockSkills/gold.d.ts

@@ -1,3 +1,6 @@
+import { StockType } from "./types";
+type NewStockType = Required<Pick<StockType, 'v'>> & StockType;
+type NewStockListType = NewStockType[];
 export type GetGoldResType = {
     lowestPoint: number;
     highestPoint: number;
@@ -7,42 +10,20 @@ export type GetGoldResType = {
     weak: number;
     superWeak: number;
 };
-type ListType = {
-    h: number;
-    t: number;
-    o: number;
-    c: number;
-    l: number;
-    [key: string]: unknown;
-}[];
-type FindHightestResType = {
-    [key: string]: {
-        h: number;
-        t: number;
-        o: number;
-        c: number;
-        l: number;
-        [key: string]: unknown;
-    };
+export type FindHightestResType = {
+    [key: string]: NewStockType;
 };
-type FindLowestResType = {
-    [key: string]: {
-        h: number;
-        t: number;
-        o: number;
-        c: number;
-        l: number;
-        [key: string]: unknown;
-    };
+export type FindLowestResType = {
+    [key: string]: NewStockType;
 };
-interface GoldType {
-    findHighPoint: (list: ListType) => FindHightestResType;
-    findLowPoint: (list: ListType) => FindLowestResType;
+interface GoldClassType {
+    findHighPoint: (list: NewStockListType) => FindHightestResType;
+    findLowPoint: (list: NewStockListType) => FindLowestResType;
     getGold: (highestPoint: number, lowestPoint: number) => GetGoldResType;
 }
-export default class Gold implements GoldType {
-    findHighPoint(list: ListType): FindHightestResType;
-    findLowPoint(list: ListType): FindLowestResType;
+export default class Gold implements GoldClassType {
+    findHighPoint(list: NewStockListType): FindHightestResType;
+    findLowPoint(list: NewStockListType): FindLowestResType;
     getGold(highestPoint: number, lowestPoint: number): GetGoldResType;
 }
 export {};

package/dist/cjs/stockSkills/kd.d.ts

@@ -1,78 +1,35 @@
-interface KdType {
-    getRSV: (list: ListType) => ResRSV;
-    getKD: (list: ListType) => ResKD;
-}
-type DataType = {
-    c: number;
-    h: number;
-    l: number;
-};
-type ListType = DataType[];
+import { StockListType, StockType } from "./types";
 type ResRSV = {
     c: number;
-    rsv: number | null;
-}[];
+    rsv: number;
+    [key: string]: unknown;
+};
 type ResKD = {
     c: number;
-    rsv: number | null;
-    k: number | null;
-    d: number | null;
-    "k-d": number | null;
-}[];
-export default class Kd implements KdType {
-    init(data: DataType): {
-        dataset: ListType;
-        rsv: number | null;
-        k: number | null;
-        d: number | null;
-        "k-d": number | null;
-    };
-    next(data: DataType, preList: {
-        dataset: ListType;
-        rsv: number | null;
-        k: number | null;
-        d: number | null;
-        "k-d": number | null;
-    }, type: number): {
-        dataset: ListType;
-        rsv: null;
-        k: null;
-        d: null;
-        "k-d": null;
-    } | {
-        dataset: ListType;
-        rsv: number;
-        k: number;
-        d: number;
-        "k-d": number;
-    };
-    getRSV(list: ListType): ({
-        rsv: null;
-        c: number;
-        h: number;
-        l: number;
-    } | {
-        rsv: number;
-        c: number;
-        h: number;
-        l: number;
-    })[];
-    getKD(list: ListType): ({
-        rsv: null;
-        k: null;
-        d: null;
-        "k-d": null;
-        c: number;
-        h: number;
-        l: number;
-    } | {
-        rsv: number;
-        k: number;
-        d: number;
-        "k-d": number;
-        c: number;
-        h: number;
-        l: number;
-    })[];
+    rsv: number;
+    k: number;
+    d: number;
+    "k-d": number;
+    [key: string]: unknown;
+};
+export type KdResType = {
+    dataset: StockListType;
+    rsv: number;
+    k: number;
+    d: number;
+    "k-d": number;
+    type: number;
+};
+interface KdClassType {
+    init: (data: StockType, type: number) => KdResType;
+    next: (data: StockType, preList: KdResType, type: number) => KdResType;
+    getRSV: (list: StockListType) => ResRSV[];
+    getKD: (list: StockListType) => ResKD[];
+}
+export default class Kd implements KdClassType {
+    init(data: StockType, type: number): KdResType;
+    next(data: StockType, preList: KdResType, type: number): KdResType;
+    getRSV(list: StockListType): ResRSV[];
+    getKD(list: StockListType): ResKD[];
 }
 export {};

package/dist/cjs/stockSkills/kd.js

@@ -18,13 +18,14 @@ var Kd = /** @class */ (function () {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function (data) {
+        value: function (data, type) {
             return {
                 dataset: [data],
-                rsv: null,
-                k: null,
-                d: null,
-                "k-d": null,
+                rsv: 0,
+                k: 0,
+                d: 0,
+                "k-d": 0,
+                type: type,
             };
         }
     });
@@ -37,10 +38,11 @@ var Kd = /** @class */ (function () {
             if (preList.dataset.length < type) {
                 return {
                     dataset: preList.dataset,
-                    rsv: null,
-                    k: null,
-                    d: null,
-                    "k-d": null,
+                    rsv: 0,
+                    k: 0,
+                    d: 0,
+                    "k-d": 0,
+                    type: type,
                 };
             }
             else {
@@ -64,6 +66,7 @@ var Kd = /** @class */ (function () {
                     k: k,
                     d: d,
                     "k-d": k_d,
+                    type: type,
                 };
             }
         }
@@ -76,7 +79,7 @@ var Kd = /** @class */ (function () {
             var res = [];
             for (var i = 0; i < list.length; i++) {
                 if (i < 8)
-                    res[i] = __assign(__assign({}, list[i]), { rsv: null });
+                    res[i] = __assign(__assign({}, list[i]), { rsv: 0 });
                 else {
                     var low = Math.min.apply(Math, list.slice(i - 8, i + 1).map(function (item) { return item.l; }));
                     var hight = Math.max.apply(Math, list.slice(i - 8, i + 1).map(function (item) { return item.h; }));
@@ -99,7 +102,7 @@ var Kd = /** @class */ (function () {
             var yesterdayD = 50;
             for (var i = 0; i < list.length; i++) {
                 if (i < 8)
-                    res[i] = __assign(__assign({}, list[i]), { rsv: null, k: null, d: null, "k-d": null });
+                    res[i] = __assign(__assign({}, list[i]), { rsv: 0, k: 0, d: 0, "k-d": 0 });
                 else {
                     var low = Math.min.apply(Math, list.slice(i - 8, i + 1).map(function (item) { return item.l; }));
                     var hight = Math.max.apply(Math, list.slice(i - 8, i + 1).map(function (item) { return item.h; }));

package/dist/cjs/stockSkills/kd.test.js

@@ -7,7 +7,7 @@ describe("test kd methods", function () {
         var index = test_data_test_1.data_9904.length - 1;
         var kd = new kd_1.default();
         var realData = kd.getKD(test_data_test_1.data_9904)[index];
-        var init = kd.init(test_data_test_1.data_9904[0]);
+        var init = kd.init(test_data_test_1.data_9904[0], 9);
         var res = init;
         for (var i = 1; i <= index; i++) {
             var item = test_data_test_1.data_9904[i];

package/dist/cjs/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 {};