w-trade-backtest 1.0.5 → 1.0.7

package/docs/buildKLinesTpSl.mjs.html

@@ -205,7 +205,7 @@ export default buildKLinesTpSl
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcOrders.mjs.html

@@ -265,7 +265,7 @@ export default calcOrders
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcOrdersRatio.mjs.html

@@ -133,7 +133,7 @@ export default calcOrdersRatio
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcOrdersSummary.mjs.html

@@ -493,7 +493,7 @@ export default calcOrdersSummary
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcOrdersSummarySimple.mjs.html

@@ -194,7 +194,7 @@ export default calcOrdersSummarySimple
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcSummary.mjs.html

@@ -188,7 +188,7 @@ export default calcSummary
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/closeAndSummaryOrders.mjs.html

@@ -53,8 +53,8 @@ import isestr from 'wsemi/src/isestr.mjs'
 import isarr from 'wsemi/src/isarr.mjs'
 import cint from 'wsemi/src/cint.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
+import fsWriteJson from 'wsemi/src/fsWriteJson.mjs'
 import WDataTdprovide from 'w-data-tdprovide/src/WDataTdprovide.mjs'
-import writeJson from './writeJson.mjs'
 import calcOrders from './calcOrders.mjs'
 import calcSummary from './calcSummary.mjs'
 import genReportCore from './genReportCore.mjs'
@@ -195,8 +195,8 @@ let closeAndSummaryOrders = async (ott, fdOhlc, fdParam, uIni, timeOhlcStart, ti
         //fpOrders
         let fpOrders = path.resolve(fdTest, fnOrders)
 
-        //writeJson
-        writeJson(fpOrders, r.orders, { structured: true })
+        //fsWriteJson
+        fsWriteJson(fpOrders, r.orders, { useFormat: true })
 
     }
 
@@ -215,8 +215,8 @@ let closeAndSummaryOrders = async (ott, fdOhlc, fdParam, uIni, timeOhlcStart, ti
         }
         // console.log('stsm', stsm)
 
-        //writeJson
-        writeJson(fpSummary, stsm, { structured: true })
+        //fsWriteJson
+        fsWriteJson(fpSummary, stsm, { useFormat: true })
 
         console.log('summary', r.summary, size(r.orders))
     }
@@ -252,7 +252,7 @@ export default closeAndSummaryOrders
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/genKLinesTpSl.mjs.html

@@ -141,7 +141,7 @@ export default genKLinesTpSl
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/genReport.mjs.html

@@ -46,12 +46,19 @@
     <section>
         <article>
             <pre class="prettyprint source linenums"><code>import path from 'path'
-import _ from 'lodash-es'
-import w from 'wsemi'
+import find from 'lodash-es/find.js'
+import get from 'lodash-es/get.js'
+import map from 'lodash-es/map.js'
+import max from 'lodash-es/max.js'
+import min from 'lodash-es/min.js'
+import isearr from 'wsemi/src/isearr.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
+import isnum from 'wsemi/src/isnum.mjs'
+import fsIsFile from 'wsemi/src/fsIsFile.mjs'
+import fsReadJson from 'wsemi/src/fsReadJson.mjs'
+import fsWriteJson from 'wsemi/src/fsWriteJson.mjs'
 import calcSummary from './calcSummary.mjs'
 import genReportCore from './genReportCore.mjs'
-import readJson from './readJson.mjs'
-import writeJson from './writeJson.mjs'
 
 
 /**
@@ -108,57 +115,57 @@ import writeJson from './writeJson.mjs'
 let genReport = async (ott, fpOrders, opt = {}) => {
 
     //check
-    if (!w.isestr(fpOrders)) {
+    if (!isestr(fpOrders)) {
         throw new Error(`invalid fpOrders`)
     }
-    if (!w.fsIsFile(fpOrders)) {
+    if (!fsIsFile(fpOrders)) {
         throw new Error(`fpOrders[${fpOrders}] is not a file`)
     }
 
-    //orders
-    let orders = readJson(fpOrders)
-    if (!w.isearr(orders)) {
+    //orders, fsReadJson回傳{success}或{error}, 讀取或解析失敗時取不到success
+    let orders = get(fsReadJson(fpOrders), 'success', null)
+    if (!isearr(orders)) {
         throw new Error(`orders in fpOrders[${fpOrders}] is not an effective array`)
     }
 
     //fpOut
-    let fpOut = _.get(opt, 'fpOut', '')
-    if (!w.isestr(fpOut)) {
+    let fpOut = get(opt, 'fpOut', '')
+    if (!isestr(fpOut)) {
         fpOut = path.resolve(path.dirname(fpOrders), 'report.html')
     }
 
     //name
-    let name = _.get(opt, 'name', '')
-    if (!w.isestr(name)) {
+    let name = get(opt, 'name', '')
+    if (!isestr(name)) {
         name = path.basename(path.dirname(path.resolve(fpOrders)))
     }
 
     //uIni, 未給則由首筆已結算單推回(calcOrders 定義 uEquity = uIni + uCumuProfitOrLoss)
-    let uIni = _.get(opt, 'uIni', null)
-    if (!w.isnum(uIni)) {
-        let o = _.find(orders, (o) => w.isnum(o.uEquity) &amp;&amp; w.isnum(o.uCumuProfitOrLoss))
+    let uIni = get(opt, 'uIni', null)
+    if (!isnum(uIni)) {
+        let o = find(orders, (o) => isnum(o.uEquity) &amp;&amp; isnum(o.uCumuProfitOrLoss))
         uIni = o ? o.uEquity - o.uCumuProfitOrLoss : 1000
     }
 
     //timeOhlcStart, timeOhlcEnd, 未給則由訂單起訖推得
-    let timeOhlcStart = _.get(opt, 'timeOhlcStart', '')
-    if (!w.isestr(timeOhlcStart)) {
-        timeOhlcStart = _.min(_.map(orders, 'timeStart'))
+    let timeOhlcStart = get(opt, 'timeOhlcStart', '')
+    if (!isestr(timeOhlcStart)) {
+        timeOhlcStart = min(map(orders, 'timeStart'))
     }
-    let timeOhlcEnd = _.get(opt, 'timeOhlcEnd', '')
-    if (!w.isestr(timeOhlcEnd)) {
-        timeOhlcEnd = _.max(_.map(orders, (o) => w.isestr(o.timeEnd) ? o.timeEnd : o.timeStart))
+    let timeOhlcEnd = get(opt, 'timeOhlcEnd', '')
+    if (!isestr(timeOhlcEnd)) {
+        timeOhlcEnd = max(map(orders, (o) => isestr(o.timeEnd) ? o.timeEnd : o.timeStart))
     }
 
     //withWriteSummary
-    let withWriteSummary = _.get(opt, 'withWriteSummary', false)
+    let withWriteSummary = get(opt, 'withWriteSummary', false)
 
     //calcSummary
     let summary = await calcSummary(ott, uIni, orders, timeOhlcStart, timeOhlcEnd)
 
-    //writeJson
+    //fsWriteJson
     if (withWriteSummary) {
-        writeJson(path.resolve(path.dirname(fpOut), 'summary.json'), { name, summary }, { structured: true })
+        fsWriteJson(path.resolve(path.dirname(fpOut), 'summary.json'), { name, summary }, { useFormat: true })
     }
 
     //genReportCore
@@ -183,7 +190,7 @@ export default genReport
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/genReportCore.mjs.html

@@ -48,7 +48,7 @@
             <pre class="prettyprint source linenums"><code>import path from 'path'
 import fs from 'fs'
 import { fileURLToPath } from 'url'
-import writeTxt from './writeTxt.mjs'
+import fsWriteText from 'wsemi/src/fsWriteText.mjs'
 
 
 //模板資產(tmp.html, render*.js)與本模組同資料夾, 以模組位置解析, 不依賴 cwd
@@ -94,8 +94,8 @@ let genReportCore = (r, fpOut) => {
     h = h.replace(`{orders}`, JSON.stringify(r.orders))
     h = h.replace(`{summary}`, JSON.stringify(r.summary))
 
-    //writeTxt
-    writeTxt(fpOut, h)
+    //fsWriteText
+    fsWriteText(fpOut, h)
 
 }
 
@@ -115,7 +115,7 @@ export default genReportCore
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/global.html

@@ -3534,7 +3534,7 @@ fpOrders非有效字串或非檔案、內容非有效陣列時throw</p>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="genReport.mjs.html">genReport.mjs</a>, <a href="genReport.mjs.html#line61">line 61</a>
+        <a href="genReport.mjs.html">genReport.mjs</a>, <a href="genReport.mjs.html#line68">line 68</a>
     </li></ul></dd>
     
 
@@ -5916,7 +5916,7 @@ console.log(r.summary.numTrade, r.summary.rWin, r.summary.uEquityFinal)
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/loadKLinesTpSl.mjs.html

@@ -176,7 +176,7 @@ export default loadKLinesTpSl
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/runStrategies.mjs.html

@@ -231,7 +231,7 @@ export default runStrategies
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/runStrategiesAndBacktest.mjs.html

@@ -50,10 +50,10 @@ import get from 'lodash-es/get.js'
 import size from 'lodash-es/size.js'
 import isearr from 'wsemi/src/isearr.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
+import fsWriteJson from 'wsemi/src/fsWriteJson.mjs'
 import WDataTdprovide from 'w-data-tdprovide/src/WDataTdprovide.mjs'
 import runStrategies from './runStrategies.mjs'
 import genReportCore from './genReportCore.mjs'
-import writeJson from './writeJson.mjs'
 
 
 /**
@@ -153,8 +153,8 @@ let runStrategiesAndBacktest = async (ott, fdOhlc, fdParam, strategies, timeStar
         //fpOrders
         let fpOrders = path.resolve(fdTest, fnOrders)
 
-        //writeJson
-        writeJson(fpOrders, r.orders, { structured: true })
+        //fsWriteJson
+        fsWriteJson(fpOrders, r.orders, { useFormat: true })
 
     }
 
@@ -173,8 +173,8 @@ let runStrategiesAndBacktest = async (ott, fdOhlc, fdParam, strategies, timeStar
         }
         // console.log('stsm', stsm)
 
-        //writeJson
-        writeJson(fpSummary, stsm, { structured: true })
+        //fsWriteJson
+        fsWriteJson(fpSummary, stsm, { useFormat: true })
 
         console.log('summary', r.summary, size(r.orders))
     }
@@ -211,7 +211,7 @@ export default runStrategiesAndBacktest
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/runStrategy.mjs.html

@@ -442,7 +442,7 @@ export default runStrategy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 03 2026 14:28:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:22:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "w-trade-backtest",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "dist/w-trade-backtest.umd.js",
   "dependencies": {
-    "dayjs": "^1.11.21",
-    "lodash-es": "^4.18.1",
-    "w-data-tdprovide": "^1.0.3",
-    "wsemi": "^1.8.67"
+    "w-data-tdprovide": "^1.0.5",
+    "wsemi": "^1.8.68"
   },
   "devDependencies": {
     "w-package-tools": "^1.1.12"

package/src/closeAndSummaryOrders.mjs

@@ -6,8 +6,8 @@ import isestr from 'wsemi/src/isestr.mjs'
 import isarr from 'wsemi/src/isarr.mjs'
 import cint from 'wsemi/src/cint.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
+import fsWriteJson from 'wsemi/src/fsWriteJson.mjs'
 import WDataTdprovide from 'w-data-tdprovide/src/WDataTdprovide.mjs'
-import writeJson from './writeJson.mjs'
 import calcOrders from './calcOrders.mjs'
 import calcSummary from './calcSummary.mjs'
 import genReportCore from './genReportCore.mjs'
@@ -148,8 +148,8 @@ let closeAndSummaryOrders = async (ott, fdOhlc, fdParam, uIni, timeOhlcStart, ti
         //fpOrders
         let fpOrders = path.resolve(fdTest, fnOrders)
 
-        //writeJson
-        writeJson(fpOrders, r.orders, { structured: true })
+        //fsWriteJson
+        fsWriteJson(fpOrders, r.orders, { useFormat: true })
 
     }
 
@@ -168,8 +168,8 @@ let closeAndSummaryOrders = async (ott, fdOhlc, fdParam, uIni, timeOhlcStart, ti
         }
         // console.log('stsm', stsm)
 
-        //writeJson
-        writeJson(fpSummary, stsm, { structured: true })
+        //fsWriteJson
+        fsWriteJson(fpSummary, stsm, { useFormat: true })
 
         console.log('summary', r.summary, size(r.orders))
     }

package/src/genReport.mjs

@@ -1,10 +1,17 @@
 import path from 'path'
-import _ from 'lodash-es'
-import w from 'wsemi'
+import find from 'lodash-es/find.js'
+import get from 'lodash-es/get.js'
+import map from 'lodash-es/map.js'
+import max from 'lodash-es/max.js'
+import min from 'lodash-es/min.js'
+import isearr from 'wsemi/src/isearr.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
+import isnum from 'wsemi/src/isnum.mjs'
+import fsIsFile from 'wsemi/src/fsIsFile.mjs'
+import fsReadJson from 'wsemi/src/fsReadJson.mjs'
+import fsWriteJson from 'wsemi/src/fsWriteJson.mjs'
 import calcSummary from './calcSummary.mjs'
 import genReportCore from './genReportCore.mjs'
-import readJson from './readJson.mjs'
-import writeJson from './writeJson.mjs'
 
 
 /**
@@ -61,57 +68,57 @@ import writeJson from './writeJson.mjs'
 let genReport = async (ott, fpOrders, opt = {}) => {
 
     //check
-    if (!w.isestr(fpOrders)) {
+    if (!isestr(fpOrders)) {
         throw new Error(`invalid fpOrders`)
     }
-    if (!w.fsIsFile(fpOrders)) {
+    if (!fsIsFile(fpOrders)) {
         throw new Error(`fpOrders[${fpOrders}] is not a file`)
     }
 
-    //orders
-    let orders = readJson(fpOrders)
-    if (!w.isearr(orders)) {
+    //orders, fsReadJson回傳{success}或{error}, 讀取或解析失敗時取不到success
+    let orders = get(fsReadJson(fpOrders), 'success', null)
+    if (!isearr(orders)) {
         throw new Error(`orders in fpOrders[${fpOrders}] is not an effective array`)
     }
 
     //fpOut
-    let fpOut = _.get(opt, 'fpOut', '')
-    if (!w.isestr(fpOut)) {
+    let fpOut = get(opt, 'fpOut', '')
+    if (!isestr(fpOut)) {
         fpOut = path.resolve(path.dirname(fpOrders), 'report.html')
     }
 
     //name
-    let name = _.get(opt, 'name', '')
-    if (!w.isestr(name)) {
+    let name = get(opt, 'name', '')
+    if (!isestr(name)) {
         name = path.basename(path.dirname(path.resolve(fpOrders)))
     }
 
     //uIni, 未給則由首筆已結算單推回(calcOrders 定義 uEquity = uIni + uCumuProfitOrLoss)
-    let uIni = _.get(opt, 'uIni', null)
-    if (!w.isnum(uIni)) {
-        let o = _.find(orders, (o) => w.isnum(o.uEquity) && w.isnum(o.uCumuProfitOrLoss))
+    let uIni = get(opt, 'uIni', null)
+    if (!isnum(uIni)) {
+        let o = find(orders, (o) => isnum(o.uEquity) && isnum(o.uCumuProfitOrLoss))
         uIni = o ? o.uEquity - o.uCumuProfitOrLoss : 1000
     }
 
     //timeOhlcStart, timeOhlcEnd, 未給則由訂單起訖推得
-    let timeOhlcStart = _.get(opt, 'timeOhlcStart', '')
-    if (!w.isestr(timeOhlcStart)) {
-        timeOhlcStart = _.min(_.map(orders, 'timeStart'))
+    let timeOhlcStart = get(opt, 'timeOhlcStart', '')
+    if (!isestr(timeOhlcStart)) {
+        timeOhlcStart = min(map(orders, 'timeStart'))
     }
-    let timeOhlcEnd = _.get(opt, 'timeOhlcEnd', '')
-    if (!w.isestr(timeOhlcEnd)) {
-        timeOhlcEnd = _.max(_.map(orders, (o) => w.isestr(o.timeEnd) ? o.timeEnd : o.timeStart))
+    let timeOhlcEnd = get(opt, 'timeOhlcEnd', '')
+    if (!isestr(timeOhlcEnd)) {
+        timeOhlcEnd = max(map(orders, (o) => isestr(o.timeEnd) ? o.timeEnd : o.timeStart))
     }
 
     //withWriteSummary
-    let withWriteSummary = _.get(opt, 'withWriteSummary', false)
+    let withWriteSummary = get(opt, 'withWriteSummary', false)
 
     //calcSummary
     let summary = await calcSummary(ott, uIni, orders, timeOhlcStart, timeOhlcEnd)
 
-    //writeJson
+    //fsWriteJson
     if (withWriteSummary) {
-        writeJson(path.resolve(path.dirname(fpOut), 'summary.json'), { name, summary }, { structured: true })
+        fsWriteJson(path.resolve(path.dirname(fpOut), 'summary.json'), { name, summary }, { useFormat: true })
     }
 
     //genReportCore

package/src/genReportCore.mjs

@@ -1,7 +1,7 @@
 import path from 'path'
 import fs from 'fs'
 import { fileURLToPath } from 'url'
-import writeTxt from './writeTxt.mjs'
+import fsWriteText from 'wsemi/src/fsWriteText.mjs'
 
 
 //模板資產(tmp.html, render*.js)與本模組同資料夾, 以模組位置解析, 不依賴 cwd
@@ -47,8 +47,8 @@ let genReportCore = (r, fpOut) => {
     h = h.replace(`{orders}`, JSON.stringify(r.orders))
     h = h.replace(`{summary}`, JSON.stringify(r.summary))
 
-    //writeTxt
-    writeTxt(fpOut, h)
+    //fsWriteText
+    fsWriteText(fpOut, h)
 
 }
 

package/src/runStrategiesAndBacktest.mjs

@@ -3,10 +3,10 @@ import get from 'lodash-es/get.js'
 import size from 'lodash-es/size.js'
 import isearr from 'wsemi/src/isearr.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
+import fsWriteJson from 'wsemi/src/fsWriteJson.mjs'
 import WDataTdprovide from 'w-data-tdprovide/src/WDataTdprovide.mjs'
 import runStrategies from './runStrategies.mjs'
 import genReportCore from './genReportCore.mjs'
-import writeJson from './writeJson.mjs'
 
 
 /**
@@ -106,8 +106,8 @@ let runStrategiesAndBacktest = async (ott, fdOhlc, fdParam, strategies, timeStar
         //fpOrders
         let fpOrders = path.resolve(fdTest, fnOrders)
 
-        //writeJson
-        writeJson(fpOrders, r.orders, { structured: true })
+        //fsWriteJson
+        fsWriteJson(fpOrders, r.orders, { useFormat: true })
 
     }
 
@@ -126,8 +126,8 @@ let runStrategiesAndBacktest = async (ott, fdOhlc, fdParam, strategies, timeStar
         }
         // console.log('stsm', stsm)
 
-        //writeJson
-        writeJson(fpSummary, stsm, { structured: true })
+        //fsWriteJson
+        fsWriteJson(fpSummary, stsm, { useFormat: true })
 
         console.log('summary', r.summary, size(r.orders))
     }

package/test/unit-genReport.test.mjs

@@ -1,10 +1,10 @@
 import assert from 'assert'
 import fs from 'fs'
 import path from 'path'
+import fsWriteJson from 'wsemi/src/fsWriteJson.mjs'
 import calcOrders from '../src/calcOrders.mjs'
 import genReport from '../src/genReport.mjs'
 import ott from '../src/ott.mjs'
-import writeJson from '../src/writeJson.mjs'
 import { approx, t00, t16, t20, buildArrOhlc, buildOrders, buildFdTmp } from './unit-setup.mjs'
 
 
@@ -27,7 +27,7 @@ describe('genReport', function() {
     let writeSettledOrders = async (fd) => {
         let orders = await calcOrders(buildArrOhlc(), buildOrders(), { uIni: 1000 })
         let fpOrders = path.resolve(fdTmp, fd, 'orders.json')
-        writeJson(fpOrders, orders)
+        fsWriteJson(fpOrders, orders)
         return fpOrders
     }
 
@@ -106,7 +106,7 @@ describe('genReport', function() {
 
     it('orders.json內容非有效陣列時reject', async function() {
         let fp = path.resolve(fdTmp, 'gr-invalid', 'orders.json')
-        writeJson(fp, [])
+        fsWriteJson(fp, [])
         await assert.rejects(genReport(ott, fp), { message: `orders in fpOrders[${fp}] is not an effective array` })
     })
 

package/src/readJson.mjs

@@ -1,26 +0,0 @@
-import fs from 'fs'
-import w from 'wsemi'
-
-
-let readJson = (fp) => {
-
-    //check
-    if (!w.fsIsFile(fp)) {
-        throw new Error(`fp[${fp}] does not exist`)
-    }
-
-    //obj
-    let obj = null
-    try {
-        let j = fs.readFileSync(fp, 'utf8')
-        obj = JSON.parse(j)
-    }
-    catch (err) {
-        console.log(err)
-    }
-
-    return obj
-}
-
-
-export default readJson