w-dwdata-tweq 1.0.0 → 1.0.2

package/docs/WDwdataTweq.mjs.html

@@ -50,7 +50,9 @@ import get from 'lodash-es/get.js'
 import each from 'lodash-es/each.js'
 import reverse from 'lodash-es/reverse.js'
 import isestr from 'wsemi/src/isestr.mjs'
+import isnum from 'wsemi/src/isnum.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
+import cint from 'wsemi/src/cint.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsCleanFolder from 'wsemi/src/fsCleanFolder.mjs'
 import fsCreateFolder from 'wsemi/src/fsCreateFolder.mjs'
@@ -72,7 +74,7 @@ import cropPic from './cropPic.mjs'
  * @param {String} [opt.keyId] 輸入各筆數據之主鍵字串，預設keyId
  * @param {String} [opt.fdDwAttime] 輸入當前下載數據資料夾字串，預設'./_dwAttime'
  * @param {String} [opt.fdDwCurrent] 輸入已下載數據資料夾字串，預設'./_dwCurrent'
- * @param {String} [opt.fdResult] 輸入已下載數據所連動生成數據資料夾字串，預設'./_result'
+ * @param {String} [opt.fdResult] 輸入已下載數據所連動生成數據資料夾字串，預設`./_result`
  * @param {String} [opt.fdTaskCpSrc] 輸入任務狀態之來源端資料夾字串，預設'./_taskCpSrc'
  * @param {Function} [opt.funDownload] 輸入自定義下載函數，回傳資料陣列
  * @param {Function} [opt.funGetCurrent] 輸入自定義取得當前資料函數，回傳資料陣列
@@ -111,6 +113,18 @@ import cropPic from './cropPic.mjs'
  */
 let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
 
+    //check yearStart
+    if (!isnum(yearStart)) {
+        throw new Error(`yearStart is not a number`)
+    }
+    yearStart = cint(yearStart)
+
+    //check yearEnd
+    if (!isnum(yearEnd)) {
+        throw new Error(`yearEnd is not a number`)
+    }
+    yearEnd = cint(yearEnd)
+
     //keyId
     let keyId = get(opt, 'keyId')
     if (!isestr(keyId)) {
@@ -138,7 +152,7 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
     //fdResult
     let fdResult = get(opt, 'fdResult')
     if (!isestr(fdResult)) {
-        fdResult = './_result'
+        fdResult = `./_result`
     }
     if (!fsIsFolder(fdResult)) {
         fsCreateFolder(fdResult)
@@ -305,7 +319,7 @@ export default WDwdataTweq
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Sat Aug 23 2025 22:29:56 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.4</a> on Sun Aug 24 2025 23:30:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/global.html

@@ -146,7 +146,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WDwdataTweq.mjs.html">WDwdataTweq.mjs</a>, <a href="WDwdataTweq.mjs.html#line65">line 65</a>
+        <a href="WDwdataTweq.mjs.html">WDwdataTweq.mjs</a>, <a href="WDwdataTweq.mjs.html#line67">line 67</a>
     </li></ul></dd>
     
 
@@ -489,7 +489,7 @@
 
             
 
-            <td class="description last"><p>輸入已下載數據所連動生成數據資料夾字串，預設'./_result'</p></td>
+            <td class="description last"><p>輸入已下載數據所連動生成數據資料夾字串，預設<code>./_result</code></p></td>
         </tr>
 
     
@@ -768,7 +768,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Sat Aug 23 2025 22:29:56 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.4</a> on Sun Aug 24 2025 23:30:15 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.4</a> on Sat Aug 23 2025 22:29:56 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.4</a> on Sun Aug 24 2025 23:30:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.mjs

@@ -14,7 +14,7 @@ let fdDwCurrent = `./_dwCurrent`
 w.fsCleanFolder(fdDwCurrent)
 
 //fdResult
-let fdResult = './_result'
+let fdResult = `./_result`
 w.fsCleanFolder(fdResult)
 
 let yearStart = 2022
@@ -50,4 +50,5 @@ ev.on('change', (msg) => {
 // change { event: 'proc-add-callfun-add', id: '111002', msg: 'done' }
 // ...
 
+
 //node g.mjs

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "w-dwdata-tweq",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "dist/w-dwdata-tweq.umd.js",
   "dependencies": {
     "axios": "^1.11.0",
     "lodash-es": "^4.17.21",
     "sharp": "^0.34.3",
-    "w-dwdata-builder": "^1.0.1",
+    "w-dwdata-builder": "^1.0.2",
     "wsemi": "^1.8.18"
   },
   "devDependencies": {
@@ -31,4 +31,4 @@
   ],
   "author": "yuda-lyu(semisphere)",
   "license": "MIT"
-}
+}

package/src/WDwdataTweq.mjs

@@ -3,7 +3,9 @@ import get from 'lodash-es/get.js'
 import each from 'lodash-es/each.js'
 import reverse from 'lodash-es/reverse.js'
 import isestr from 'wsemi/src/isestr.mjs'
+import isnum from 'wsemi/src/isnum.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
+import cint from 'wsemi/src/cint.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsCleanFolder from 'wsemi/src/fsCleanFolder.mjs'
 import fsCreateFolder from 'wsemi/src/fsCreateFolder.mjs'
@@ -25,7 +27,7 @@ import cropPic from './cropPic.mjs'
  * @param {String} [opt.keyId] 輸入各筆數據之主鍵字串，預設keyId
  * @param {String} [opt.fdDwAttime] 輸入當前下載數據資料夾字串，預設'./_dwAttime'
  * @param {String} [opt.fdDwCurrent] 輸入已下載數據資料夾字串，預設'./_dwCurrent'
- * @param {String} [opt.fdResult] 輸入已下載數據所連動生成數據資料夾字串，預設'./_result'
+ * @param {String} [opt.fdResult] 輸入已下載數據所連動生成數據資料夾字串，預設`./_result`
  * @param {String} [opt.fdTaskCpSrc] 輸入任務狀態之來源端資料夾字串，預設'./_taskCpSrc'
  * @param {Function} [opt.funDownload] 輸入自定義下載函數，回傳資料陣列
  * @param {Function} [opt.funGetCurrent] 輸入自定義取得當前資料函數，回傳資料陣列
@@ -64,6 +66,18 @@ import cropPic from './cropPic.mjs'
  */
 let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
 
+    //check yearStart
+    if (!isnum(yearStart)) {
+        throw new Error(`yearStart is not a number`)
+    }
+    yearStart = cint(yearStart)
+
+    //check yearEnd
+    if (!isnum(yearEnd)) {
+        throw new Error(`yearEnd is not a number`)
+    }
+    yearEnd = cint(yearEnd)
+
     //keyId
     let keyId = get(opt, 'keyId')
     if (!isestr(keyId)) {
@@ -91,7 +105,7 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
     //fdResult
     let fdResult = get(opt, 'fdResult')
     if (!isestr(fdResult)) {
-        fdResult = './_result'
+        fdResult = `./_result`
     }
     if (!fsIsFolder(fdResult)) {
         fsCreateFolder(fdResult)

package/src/parseData.mjs

@@ -6,7 +6,7 @@ import cint from 'wsemi/src/cint.mjs'
 import ot from 'dayjs'
 
 
-let parserEq = (o) => {
+let parseData = (o) => {
     //heads:
     //   "eArea": "小區域有感地震",
     //   "eDetailsEvent": "第{0}號",
@@ -149,4 +149,4 @@ let parserEq = (o) => {
 }
 
 
-export default parserEq
+export default parseData

package/test/WDwdataTweq.test.mjs

@@ -22,7 +22,7 @@ describe('WDwdataTweq', function() {
         w.fsCleanFolder(fdDwCurrent)
 
         //fdResult
-        let fdResult = './_result'
+        let fdResult = `./_result`
         w.fsCleanFolder(fdResult)
 
         //funDownload