w-trade-solve 1.0.2 → 1.0.3

package/test/unit-estimFinder.test.mjs

@@ -2,11 +2,11 @@ import assert from 'assert'
 import fs from 'fs'
 import estimFinder from '../src/estimFinder.mjs'
 import ott from '../src/ott.mjs'
-import { buildFdTmp, buildFdData, buildSt, keySettings } from './unit-setup.mjs'
+import { buildFdTmp, buildFdData, name, symbol, interval } from './unit-setup.mjs'
 
 
 //規格來源: src/estimFinder.mjs
-//  estimFinder(ott, st, fdOhlc, fdParam, fdData, opt):
+//  estimFinder(ott, name, symbol, interval, fdOhlc, fdParam, fdData, opt):
 //    mode未給時由'long'與'short'隨機取一
 //    timeStart未給時為'2022-07-01T00:00:00'
 //    timeEnd未給時依mode給予: long為'2025-04-08T00:00:00', short為'2025-10-06T00:00:00'
@@ -19,9 +19,6 @@ import { buildFdTmp, buildFdData, buildSt, keySettings } from './unit-setup.mjs'
 let fdTmp = buildFdTmp('estimFinder')
 
 
-let st = buildSt()
-
-
 //keysParam: norm 4個、index 2個、volumn 1個, 使18種預設comps皆可取樣
 let keysNorm = ['btc_4hr_ma_1day', 'btc_4hr_ma_2day', 'btc_4hr_rsi', 'btc_4hr_kdj']
 let keysIndex = ['index_fear_greed', 'index_dxy']
@@ -39,13 +36,16 @@ let d = null
 //call: 以合法引數為底, 依ov.opt覆寫opt後呼叫
 let call = (ov = {}) => {
     let a = {
+        name,
+        symbol,
+        interval,
         fdOhlc: d.fdOhlc,
         fdParam: d.fdParam,
         fdData: d.fdData,
-        opt: { keySettings, comps: '1,0,0' },
+        opt: { comps: '1,0,0' },
         ...ov,
     }
-    return estimFinder(ott, st, a.fdOhlc, a.fdParam, a.fdData, a.opt)
+    return estimFinder(ott, a.name, a.symbol, a.interval, a.fdOhlc, a.fdParam, a.fdData, a.opt)
 }
 
 
@@ -75,19 +75,19 @@ describe('estimFinder', function() {
 
         it('未給opt.timeStart時使用2022-07-01T00:00:00', async function() {
             //測試資料恰自2022-07-01起算, 故預設timeStart通過而停在timeEnd檢核
-            let msg = await catchMsg(call({ opt: { keySettings, comps: '1,0,0', mode: 'long' } }))
+            let msg = await catchMsg(call({ opt: { comps: '1,0,0', mode: 'long' } }))
             assert.match(msg, /timeEnd/, `實得: ${msg}`)
             assert.doesNotMatch(msg, /timeStartData/, `實得: ${msg}`)
         })
 
         it('資料起始晚於預設timeStart時, 錯誤訊息指出預設之timeStart', async function() {
             let dd = buildFdData(fdTmp, 'ts-late', keysNorm, { n: 10, base: Date.UTC(2023, 0, 1) })
-            let msg = await catchMsg(estimFinder(ott, st, dd.fdOhlc, dd.fdParam, dd.fdData, { keySettings, comps: '1,0,0', mode: 'long' }))
+            let msg = await catchMsg(estimFinder(ott, name, symbol, interval, dd.fdOhlc, dd.fdParam, dd.fdData, { comps: '1,0,0', mode: 'long' }))
             assert.match(msg, /timeStart\[2022-07-01T00:00:00\]/, `實得: ${msg}`)
         })
 
         it('給予opt.timeStart時以其覆寫預設值', async function() {
-            let msg = await catchMsg(call({ opt: { keySettings, comps: '1,0,0', mode: 'long', timeStart: '1990-01-01T00:00:00' } }))
+            let msg = await catchMsg(call({ opt: { comps: '1,0,0', mode: 'long', timeStart: '1990-01-01T00:00:00' } }))
             assert.match(msg, /timeStart\[1990-01-01T00:00:00\]/, `實得: ${msg}`)
         })
 
@@ -96,18 +96,18 @@ describe('estimFinder', function() {
     describe('timeEnd預設與覆寫', function() {
 
         it('mode為long時預設timeEnd為2025-04-08T00:00:00', async function() {
-            let msg = await catchMsg(call({ opt: { keySettings, comps: '1,0,0', mode: 'long' } }))
+            let msg = await catchMsg(call({ opt: { comps: '1,0,0', mode: 'long' } }))
             assert.match(msg, /timeEnd\[2025-04-08T00:00:00\]/, `實得: ${msg}`)
         })
 
         it('mode為short時預設timeEnd為2025-10-06T00:00:00', async function() {
-            let msg = await catchMsg(call({ opt: { keySettings, comps: '1,0,0', mode: 'short' } }))
+            let msg = await catchMsg(call({ opt: { comps: '1,0,0', mode: 'short' } }))
             assert.match(msg, /timeEnd\[2025-10-06T00:00:00\]/, `實得: ${msg}`)
         })
 
         it('給予opt.timeEnd時以其覆寫預設值, 不再依mode區分', async function() {
-            let msgLong = await catchMsg(call({ opt: { keySettings, comps: '1,0,0', mode: 'long', timeEnd: '2099-01-01T00:00:00' } }))
-            let msgShort = await catchMsg(call({ opt: { keySettings, comps: '1,0,0', mode: 'short', timeEnd: '2099-01-01T00:00:00' } }))
+            let msgLong = await catchMsg(call({ opt: { comps: '1,0,0', mode: 'long', timeEnd: '2099-01-01T00:00:00' } }))
+            let msgShort = await catchMsg(call({ opt: { comps: '1,0,0', mode: 'short', timeEnd: '2099-01-01T00:00:00' } }))
             assert.match(msgLong, /timeEnd\[2099-01-01T00:00:00\]/, `實得: ${msgLong}`)
             assert.match(msgShort, /timeEnd\[2099-01-01T00:00:00\]/, `實得: ${msgShort}`)
         })
@@ -122,7 +122,7 @@ describe('estimFinder', function() {
             //以預設timeEnd反推所用之mode: long對應2025-04-08, short對應2025-10-06
             let got = new Set()
             for (let i = 0; i < 40; i++) {
-                let msg = await catchMsg(call({ opt: { keySettings, comps: '1,0,0' } }))
+                let msg = await catchMsg(call({ opt: { comps: '1,0,0' } }))
                 if (msg.indexOf('timeEnd[2025-04-08T00:00:00]') >= 0) {
                     got.add('long')
                 }
@@ -138,7 +138,7 @@ describe('estimFinder', function() {
 
         it('給予opt.mode時不再隨機', async function() {
             for (let i = 0; i < 10; i++) {
-                let msg = await catchMsg(call({ opt: { keySettings, comps: '1,0,0', mode: 'short' } }))
+                let msg = await catchMsg(call({ opt: { comps: '1,0,0', mode: 'short' } }))
                 assert.match(msg, /timeEnd\[2025-10-06T00:00:00\]/, `實得: ${msg}`)
             }
         })
@@ -148,24 +148,37 @@ describe('estimFinder', function() {
     describe('comps預設與覆寫', function() {
 
         it('未給opt.comps時由預設組成隨機取一, 挑出之keys非空', async function() {
-            //opt未給keySettings, keys非空時停在estimKeys之opt.keySettings檢核
+            //keys非空時通過keys檢核, 續於預設timeEnd超出資料範圍處reject
             for (let i = 0; i < 20; i++) {
-                await assert.rejects(call({ opt: {} }), /invalid opt.keySettings/)
+                await assert.rejects(call({ opt: {} }), /timeEnd\[/)
             }
         })
 
         it('給予opt.comps時以其覆寫, 三段皆為0則未挑任何key', async function() {
-            await assert.rejects(call({ opt: { keySettings, comps: '0,0,0' } }), /invalid keys/)
+            await assert.rejects(call({ opt: { comps: '0,0,0' } }), /invalid keys/)
         })
 
         it('給予非3段之opt.comps時throw', async function() {
-            await assert.rejects(call({ opt: { keySettings, comps: '1,2' } }), /非預期/)
+            await assert.rejects(call({ opt: { comps: '1,2' } }), /非預期/)
         })
 
     })
 
     describe('輸入檢核', function() {
 
+        it('name非有效字串時reject', async function() {
+            await assert.rejects(call({ name: '' }), /invalid name/)
+            await assert.rejects(call({ name: null }), /invalid name/)
+        })
+
+        it('symbol非有效字串時reject', async function() {
+            await assert.rejects(call({ symbol: '' }), /invalid symbol/)
+        })
+
+        it('interval非有效字串時reject', async function() {
+            await assert.rejects(call({ interval: '' }), /invalid interval/)
+        })
+
         it('fdOhlc非有效字串時reject', async function() {
             await assert.rejects(call({ fdOhlc: '' }), /invalid fdOhlc/)
             await assert.rejects(call({ fdOhlc: null }), /invalid fdOhlc/)

package/test/unit-estimKeys.test.mjs

@@ -6,14 +6,14 @@ import readStrategies from '../src/readStrategies.mjs'
 import genTid from '../src/genTid.mjs'
 import cont from '../src/cont.mjs'
 import ott from '../src/ott.mjs'
-import { buildFdTmp, buildFdData, buildSt, keySettings } from './unit-setup.mjs'
+import { buildFdTmp, buildFdData, name, symbol, interval } from './unit-setup.mjs'
 
 
 //規格來源: src/estimKeys.mjs
-//  estimKeys(ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, keys, fdData, opt):
+//  estimKeys(ott, name, symbol, interval, fdOhlc, fdParam, timeStart, timeEnd, mode, keys, fdData, opt):
 //    設計變數為[止損, 止盈, ...各key門檻], 止損止盈由opt.thsSl與opt.thsTp之百分比清單除以100離散取值
 //    各key門檻由rang(-2,2,40)之41點各自平移+10與-10為82點, 解值>0代表'>'條件、<0代表'<'條件, 還原時扣除平移值
-//    以omlPSO求解, 各次以runStrategy回測並經calcFitness計算適應值
+//    以opt.methodOml指定之演算法求解(預設PSO), 各次以runStrategy回測並經calcFitness計算適應值
 //    滿足thNumTrade、thRWin與thREquivalentCumuProfitOrLossFinalNormYear三門檻者, 以genStrategyFileName存入fdData
 //    同tkid(tid+級距)已有策略時, 僅於等效年化盈虧更佳時抽換並刪除較差者, 故同tkid恆僅一檔
 //    fdData不存在時自動建立
@@ -22,12 +22,8 @@ import { buildFdTmp, buildFdData, buildSt, keySettings } from './unit-setup.mjs'
 let fdTmp = buildFdTmp('estimKeys')
 
 
-let st = buildSt()
-
-
 //optBase: 三門檻皆放寬, 使求解過程之可用參數組必然寫出策略檔
 let optBase = {
-    keySettings,
     thsTp: [3],
     thsSl: [2],
     thNumTrade: 1,
@@ -51,7 +47,7 @@ describe('estimKeys', function() {
         before(async function() {
             this.timeout(120000)
             d = buildFdData(fdTmp, 'solve', keys, { n: 20 })
-            m = await estimKeys(ott, st, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, d.fdData, optBase)
+            m = await estimKeys(ott, name, symbol, interval, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, d.fdData, optBase)
         })
 
         it('回傳omlPSO之求解結果, 含bestSolution與停止資訊', function() {
@@ -167,7 +163,7 @@ describe('estimKeys', function() {
             let keys = ['btc_4hr_ma_1day']
             let d = buildFdData(fdTmp, 'nosave', keys, { n: 20 })
 
-            await estimKeys(ott, st, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, d.fdData, {
+            await estimKeys(ott, name, symbol, interval, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, d.fdData, {
                 ...optBase,
                 thNumTrade: 1e9, //資料僅20根K線, 無從達成
             })
@@ -200,7 +196,7 @@ describe('estimKeys', function() {
         //call: 以獨立之策略資料夾執行求解
         let call = (tag, extra = {}) => {
             let fdData = path.resolve(fdTmp, 'pso', `s-${tag}`)
-            return estimKeys(ott, st, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, fdData, {
+            return estimKeys(ott, name, symbol, interval, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, fdData, {
                 ...optBase,
                 ...optPso,
                 ...extra,
@@ -295,7 +291,7 @@ describe('estimKeys', function() {
 
         it('PSO設定與estimKeys自身設定可同時給予且互不干擾', async function() {
             let fdData = path.resolve(fdTmp, 'pso', 's-mix')
-            let m = await estimKeys(ott, st, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, fdData, {
+            let m = await estimKeys(ott, name, symbol, interval, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, fdData, {
                 ...optBase,
                 ...optPso,
                 NContiguous: 5,
@@ -319,6 +315,97 @@ describe('estimKeys', function() {
 
     })
 
+    describe('methodOml演算法選擇', function() {
+
+        //各演算法之超參數集合不同, 以funGenerationBefore所收到之params鍵集合判別實際採用者
+        //  迴圈數之欄位名亦不同: RGA與DE為Ng、HS為Ni、PSO與ACO為Nl, 故一次給齊各欄位後,
+        //  由stopMode所標明之欄位名即可看出實際採用之演算法
+
+        let keys = ['btc_4hr_ma_1day']
+        let d = null
+
+        before(function() {
+            d = buildFdData(fdTmp, 'method', keys, { n: 20 })
+        })
+
+        //kpParams: 各演算法於funGenerationBefore所提供之超參數鍵(已排序)
+        let kpParams = {
+            RGA: ['LocalSearchMethod', 'ModeOutLimit', 'rgaCrossover', 'rgaElitism', 'rgaMutation', 'rgaMutationRate', 'rgaSelection'],
+            DE: ['LocalSearchMethod', 'ModeOutLimit', 'deCrossoverFactor', 'deF', 'deLanda', 'deMutation'],
+            HS: ['LocalSearchMethod', 'ModeOutLimit', 'hsHMC', 'hsHMCR', 'hsPA', 'hsPAR'],
+            PSO: ['LocalSearchMethod', 'ModeOutLimit', 'psoBeta', 'psoC1', 'psoC2', 'psoGamma', 'psoInertiaMin'],
+            ACO: ['LocalSearchMethod', 'ModeOutLimit', 'acoAlpha', 'acoExploitationRate', 'acoRo'],
+        }
+
+        //kpKeyIteration: 各演算法之迴圈數欄位名
+        let kpKeyIteration = {
+            RGA: 'Ng',
+            DE: 'Ng',
+            HS: 'Ni',
+            PSO: 'Nl',
+            ACO: 'Nl',
+        }
+
+        //optStop: 一次給齊各演算法之迴圈數與族群數欄位, 各演算法僅取用自身認得者
+        let optStop = {
+            Ng: 2,
+            Ni: 2,
+            Nl: 2,
+            Np: 6,
+            Ns: 6,
+            Na: 6,
+            UseRepeat: false,
+            UseImmigration: false,
+        }
+
+        //run: 執行求解並回傳{m, params}
+        let run = async (tag, extra = {}) => {
+            let fdData = path.resolve(fdTmp, 'method', `s-${tag}`)
+            let params = null
+            let m = await estimKeys(ott, name, symbol, interval, d.fdOhlc, d.fdParam, d.timeStart, d.timeEnd, 'long', keys, fdData, {
+                ...optBase,
+                ...optStop,
+                ...extra,
+                funGenerationBefore: (o) => {
+                    if (params === null) {
+                        params = o.params
+                    }
+                },
+            })
+            return { m, params }
+        }
+
+        Object.keys(kpParams).forEach((methodOml) => {
+            it(`methodOml為${methodOml}時採用該演算法`, async function() {
+                let { m, params } = await run(methodOml, { methodOml })
+                assert.deepStrictEqual(Object.keys(params).sort(), kpParams[methodOml], `${methodOml}之超參數集合非預期`)
+                assert.match(m.stopMode, new RegExp(`^stop by ${kpKeyIteration[methodOml]}\\[2\\]$`), `${methodOml}實得: ${m.stopMode}`)
+                assert.strictEqual(m.stopIteration, 2)
+            })
+        })
+
+        it('未給methodOml時採PSO', async function() {
+            let { m, params } = await run('default')
+            assert.deepStrictEqual(Object.keys(params).sort(), kpParams.PSO)
+            assert.match(m.stopMode, /^stop by Nl\[2\]$/, `實得: ${m.stopMode}`)
+        })
+
+        it('methodOml非五者之一時亦採PSO', async function() {
+            let { m, params } = await run('unknown', { methodOml: 'XXX' })
+            assert.deepStrictEqual(Object.keys(params).sort(), kpParams.PSO)
+            assert.match(m.stopMode, /^stop by Nl\[2\]$/, `實得: ${m.stopMode}`)
+        })
+
+        it('各演算法之求解結果皆含bestSolution與停止資訊', async function() {
+            let { m } = await run('shape', { methodOml: 'DE' })
+            assert.ok(Number.isFinite(m.bestSolution.fitness))
+            assert.strictEqual(m.bestSolution.ps.length, 2 + keys.length)
+            assert.ok(typeof m.stopMode === 'string' && m.stopMode.length > 0)
+            assert.ok(m.stopExecutions > 0)
+        })
+
+    })
+
     describe('輸入檢核', function() {
 
         let keys = ['btc_4hr_ma_1day']
@@ -331,6 +418,9 @@ describe('estimKeys', function() {
         //call: 以合法引數為底, 依opt覆寫指定引數後呼叫
         let call = (ov = {}) => {
             let a = {
+                name,
+                symbol,
+                interval,
                 fdOhlc: d.fdOhlc,
                 fdParam: d.fdParam,
                 timeStart: d.timeStart,
@@ -341,9 +431,22 @@ describe('estimKeys', function() {
                 opt: optBase,
                 ...ov,
             }
-            return estimKeys(ott, st, a.fdOhlc, a.fdParam, a.timeStart, a.timeEnd, a.mode, a.keys, a.fdData, a.opt)
+            return estimKeys(ott, a.name, a.symbol, a.interval, a.fdOhlc, a.fdParam, a.timeStart, a.timeEnd, a.mode, a.keys, a.fdData, a.opt)
         }
 
+        it('name非有效字串時reject', async function() {
+            await assert.rejects(call({ name: '' }), /invalid name/)
+            await assert.rejects(call({ name: null }), /invalid name/)
+        })
+
+        it('symbol非有效字串時reject', async function() {
+            await assert.rejects(call({ symbol: '' }), /invalid symbol/)
+        })
+
+        it('interval非有效字串時reject', async function() {
+            await assert.rejects(call({ interval: '' }), /invalid interval/)
+        })
+
         it('fdOhlc非有效字串時reject', async function() {
             await assert.rejects(call({ fdOhlc: '' }), /invalid fdOhlc/)
             await assert.rejects(call({ fdOhlc: null }), /invalid fdOhlc/)
@@ -375,11 +478,6 @@ describe('estimKeys', function() {
             await assert.rejects(call({ fdData: '' }), /invalid fdData/)
         })
 
-        it('opt.keySettings非有效字串時reject', async function() {
-            await assert.rejects(call({ opt: {} }), /invalid opt.keySettings/)
-            await assert.rejects(call({ opt: { keySettings: 123 } }), /invalid opt.keySettings/)
-        })
-
         it('回測時間範圍超出資料範圍時reject', async function() {
             //w-data-tdprovide之getTimeSeriesFullByTimeRange檢核起訖時間
             await assert.rejects(call({ timeStart: '1990-01-01T00:00:00' }), /timeStartData/)

package/test/unit-estimPicks.test.mjs

@@ -2,11 +2,11 @@ import assert from 'assert'
 import fs from 'fs'
 import estimPicks from '../src/estimPicks.mjs'
 import ott from '../src/ott.mjs'
-import { buildFdTmp, buildFdData, buildSt, keySettings } from './unit-setup.mjs'
+import { buildFdTmp, buildFdData, name, symbol, interval } from './unit-setup.mjs'
 
 
 //規格來源: src/estimPicks.mjs
-//  estimPicks(ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, funPickKeys, fdData, opt):
+//  estimPicks(ott, name, symbol, interval, fdOhlc, fdParam, timeStart, timeEnd, mode, funPickKeys, fdData, opt):
 //    由fdParam列舉全部指標key後分3類: 開頭為'index_'者為keysIndex, 含'_vbs_'者為keysVolumn, 其餘為keysNorm
 //    分類後各類依序經opt.funFilterKeysNorm、opt.funFilterKeysIndex、opt.funFilterKeysVolumn過濾(皆await)
 //    再呼叫funPickKeys({keysNorm,keysIndex,keysVolumn})取得keys, 最後交由estimKeys求解
@@ -16,9 +16,6 @@ import { buildFdTmp, buildFdData, buildSt, keySettings } from './unit-setup.mjs'
 let fdTmp = buildFdTmp('estimPicks')
 
 
-let st = buildSt()
-
-
 //keysParam: 涵蓋3類, index_開頭為指數類, 含_vbs_為成交量類, 其餘為一般類
 let keyNormA = 'btc_4hr_ma_1day'
 let keyNormB = 'btc_4hr_rsi'
@@ -33,6 +30,9 @@ let d = null
 //call: 以合法引數為底, 依ov覆寫指定引數後呼叫
 let call = (ov = {}) => {
     let a = {
+        name,
+        symbol,
+        interval,
         fdOhlc: d.fdOhlc,
         fdParam: d.fdParam,
         timeStart: d.timeStart,
@@ -42,10 +42,10 @@ let call = (ov = {}) => {
             return []
         },
         fdData: d.fdData,
-        opt: { keySettings },
+        opt: {},
         ...ov,
     }
-    return estimPicks(ott, st, a.fdOhlc, a.fdParam, a.timeStart, a.timeEnd, a.mode, a.funPickKeys, a.fdData, a.opt)
+    return estimPicks(ott, a.name, a.symbol, a.interval, a.fdOhlc, a.fdParam, a.timeStart, a.timeEnd, a.mode, a.funPickKeys, a.fdData, a.opt)
 }
 
 
@@ -92,10 +92,10 @@ describe('estimPicks', function() {
         it('僅開頭為index_者歸為指數類, 名稱中段含index_者仍為一般類', async function() {
             let dd = buildFdData(fdTmp, 'cls-index', ['btc_index_rsi', 'index_rsi'], { n: 10 })
             let got = null
-            await assert.rejects(estimPicks(ott, st, dd.fdOhlc, dd.fdParam, dd.timeStart, dd.timeEnd, 'long', (o) => {
+            await assert.rejects(estimPicks(ott, name, symbol, interval, dd.fdOhlc, dd.fdParam, dd.timeStart, dd.timeEnd, 'long', (o) => {
                 got = o
                 return []
-            }, dd.fdData, { keySettings }), /invalid keys/)
+            }, dd.fdData, {}), /invalid keys/)
 
             assert.deepStrictEqual(got.keysIndex, ['index_rsi'])
             assert.deepStrictEqual(got.keysNorm, ['btc_index_rsi'])
@@ -105,10 +105,10 @@ describe('estimPicks', function() {
             //判斷順序為index_開頭 → 含_vbs_ → 其餘
             let dd = buildFdData(fdTmp, 'cls-vbs', ['index_a_vbs_b', 'btc_vbs_c'], { n: 10 })
             let got = null
-            await assert.rejects(estimPicks(ott, st, dd.fdOhlc, dd.fdParam, dd.timeStart, dd.timeEnd, 'long', (o) => {
+            await assert.rejects(estimPicks(ott, name, symbol, interval, dd.fdOhlc, dd.fdParam, dd.timeStart, dd.timeEnd, 'long', (o) => {
                 got = o
                 return []
-            }, dd.fdData, { keySettings }), /invalid keys/)
+            }, dd.fdData, {}), /invalid keys/)
 
             assert.deepStrictEqual(got.keysIndex, ['index_a_vbs_b'])
             assert.deepStrictEqual(got.keysVolumn, ['btc_vbs_c'])
@@ -123,7 +123,6 @@ describe('estimPicks', function() {
             let got = null
             await assert.rejects(call({
                 opt: {
-                    keySettings,
                     funFilterKeysNorm: (ks) => {
                         return ks.filter((v) => {
                             return v === keyNormA
@@ -143,7 +142,6 @@ describe('estimPicks', function() {
             let got = null
             await assert.rejects(call({
                 opt: {
-                    keySettings,
                     funFilterKeysIndex: () => {
                         return []
                     },
@@ -166,7 +164,6 @@ describe('estimPicks', function() {
             let got = null
             await assert.rejects(call({
                 opt: {
-                    keySettings,
                     funFilterKeysNorm: async (ks) => {
                         return ks.slice(0, 1)
                     },
@@ -194,19 +191,32 @@ describe('estimPicks', function() {
         })
 
         it('funPickKeys回傳非空陣列時通過keys檢核, 續往後續檢核', async function() {
-            //opt未給keySettings, 故停在estimKeys之opt.keySettings檢核, 代表keys已通過
+            //以超出資料範圍之timeEnd呼叫, 停在w-data-tdprovide之時間範圍檢核, 代表keys已通過
             await assert.rejects(call({
                 funPickKeys: () => {
                     return [keyNormA]
                 },
-                opt: {},
-            }), /invalid opt.keySettings/)
+                timeEnd: '2099-01-01T00:00:00',
+            }), /timeEndData/)
         })
 
     })
 
     describe('輸入檢核', function() {
 
+        it('name非有效字串時reject', async function() {
+            await assert.rejects(call({ name: '' }), /invalid name/)
+            await assert.rejects(call({ name: null }), /invalid name/)
+        })
+
+        it('symbol非有效字串時reject', async function() {
+            await assert.rejects(call({ symbol: '' }), /invalid symbol/)
+        })
+
+        it('interval非有效字串時reject', async function() {
+            await assert.rejects(call({ interval: '' }), /invalid interval/)
+        })
+
         it('fdOhlc非有效字串時reject', async function() {
             await assert.rejects(call({ fdOhlc: '' }), /invalid fdOhlc/)
         })

package/test/unit-setup.mjs

@@ -11,21 +11,14 @@ import path from 'path'
 let buildFdTmp = (name) => path.resolve(`./test/tmp-unit-${name}`)
 
 
-//st: estim系列所需之設定物件, 以keySettings為鍵取用
-let keySettings = 'btc4hr'
-let buildSt = () => {
-    return {
-        [keySettings]: {
-            name: 'btc',
-            symbol: 'BTCUSDT',
-            interval: '4hr',
-        },
-    }
-}
+//name, symbol, interval: estim系列前置之幣種設定
+let name = 'btc'
+let symbol = 'BTCUSDT'
+let interval = '4hr'
 
 
 //keyOhlc: 依estimKeys內`${name}_price_${interval}`規則組出之K線序列key
-let keyOhlc = 'btc_price_4hr'
+let keyOhlc = `${name}_price_${interval}`
 
 
 //tBase, tStep: 基準起始時間2020-01-01T00:00:00, 每根K線間隔4小時
@@ -109,8 +102,9 @@ let buildFdData = (fdTmp, fd, keysParam, opt = {}) => {
 
 export {
     buildFdTmp,
-    keySettings,
-    buildSt,
+    name,
+    symbol,
+    interval,
     keyOhlc,
     genTimes,
     genArrOhlc,