w-dwdata-tweq 1.0.21 → 1.0.22

package/docs/WDwdataTweq.mjs.html

@@ -76,6 +76,7 @@ import cropPic from './cropPic.mjs'
  * @param {Integer} yearEnd 輸入數據結束年整數
  * @param {Object} [opt={}] 輸入設定物件，預設{}
  * @param {String} [opt.keyId='keyId'] 輸入各筆數據之主鍵字串，預設'keyId'
+ * @param {String} [opt.fdTagRemove='./_tagRemove'] 輸入暫存標記為刪除數據資料夾字串，預設'./_tagRemove'
  * @param {String} [opt.fdDwAttime='./_dwAttime'] 輸入當前下載數據資料夾字串，預設'./_dwAttime'
  * @param {String} [opt.fdDwCurrent='./_dwCurrent'] 輸入已下載數據資料夾字串，預設'./_dwCurrent'
  * @param {String} [opt.fdResult='./_result'] 輸入已下載數據所連動生成數據資料夾字串，預設'./_result'
@@ -91,11 +92,49 @@ import cropPic from './cropPic.mjs'
  * @returns {Object} 回傳事件物件，可呼叫函數on監聽change事件
  * @example
  *
+ * import w from 'wsemi'
  * import WDwdataTweq from './src/WDwdataTweq.mjs'
  *
+ * //fdTagRemove
+ * let fdTagRemove = `./_tagRemove`
+ * w.fsCleanFolder(fdTagRemove)
+ *
+ * //fdDwAttime
+ * let fdDwAttime = `./_dwAttime`
+ * w.fsCleanFolder(fdDwAttime)
+ *
+ * //fdDwCurrent
+ * let fdDwCurrent = `./_dwCurrent`
+ * w.fsCleanFolder(fdDwCurrent)
+ *
+ * //fdResult
+ * let fdResult = `./_result`
+ * w.fsCleanFolder(fdResult)
+ *
+ * //fdTaskCpActualSrc
+ * let fdTaskCpActualSrc = `./_taskCpActualSrc`
+ * w.fsCleanFolder(fdTaskCpActualSrc)
+ *
+ * //fdTaskCpSrc
+ * let fdTaskCpSrc = `./_taskCpSrc`
+ * w.fsCleanFolder(fdTaskCpSrc)
+ *
  * let yearStart = 2022
  * let yearEnd = 2022
- * let opt = {}
+ * let opt = {
+ *     fdTagRemove,
+ *     fdDwAttime,
+ *     fdDwCurrent,
+ *     fdResult,
+ *     fdTaskCpActualSrc,
+ *     fdTaskCpSrc,
+ *     // fdLog,
+ *     // funDownload,
+ *     // funGetCurrent,
+ *     // funRemove,
+ *     // funAdd,
+ *     // funModify,
+ * }
  * let ev = await WDwdataTweq(yearStart, yearEnd, opt)
  *     .catch((err) => {
  *         console.log(err)
@@ -140,6 +179,12 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         keyId = `id`
     }
 
+    //fdTagRemove, 暫存標記為刪除數據資料夾
+    let fdTagRemove = get(opt, 'fdTagRemove')
+    if (!isestr(fdTagRemove)) {
+        fdTagRemove = `./_tagRemove`
+    }
+
     //fdDwAttime
     let fdDwAttime = get(opt, 'fdDwAttime')
     if (!isestr(fdDwAttime)) {
@@ -167,6 +212,15 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         fsCreateFolder(fdResult)
     }
 
+    //fdTaskCpActualSrc, 儲存完整任務狀態資料夾
+    let fdTaskCpActualSrc = get(opt, 'fdTaskCpActualSrc')
+    if (!isestr(fdTaskCpActualSrc)) {
+        fdTaskCpActualSrc = `./_taskCpActualSrc`
+    }
+    if (!fsIsFolder(fdTaskCpActualSrc)) {
+        fsCreateFolder(fdTaskCpActualSrc)
+    }
+
     //fdTaskCpSrc
     let fdTaskCpSrc = get(opt, 'fdTaskCpSrc')
     if (!isestr(fdTaskCpSrc)) {
@@ -317,11 +371,12 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         funModify = funModifyDef
     }
 
-    //WDwdataBuilder
     let optBdr = {
+        fdTagRemove,
         fdDwAttime,
         fdDwCurrent,
-        fdResult,
+        // fdResult, //WDwdataBuilder不需要
+        fdTaskCpActualSrc,
         fdTaskCpSrc,
         fdLog,
         funDownload,
@@ -352,7 +407,7 @@ export default WDwdataTweq
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Fri Sep 12 2025 12:04:08 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 Fri Sep 12 2025 14:51:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/global.html

@@ -147,7 +147,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#line76">line 76</a>
+        <a href="WDwdataTweq.mjs.html">WDwdataTweq.mjs</a>, <a href="WDwdataTweq.mjs.html#line115">line 115</a>
     </li></ul></dd>
     
 
@@ -194,7 +194,7 @@
 
     <h5 class="h5-examples">Example</h5>
     
-    <pre class="prettyprint"><code>import WDwdataTweq from './src/WDwdataTweq.mjs'
    .catch((err) => {
        console.log(err)
    })
    delete msg.type
    console.log('change', msg)
+    <pre class="prettyprint"><code>import w from 'wsemi'
    fdTagRemove,
    fdDwAttime,
    fdDwCurrent,
    fdResult,
    fdTaskCpActualSrc,
    fdTaskCpSrc,
    // fdLog,
    // funDownload,
    // funGetCurrent,
    // funRemove,
    // funAdd,
    // funModify,
    .catch((err) => {
        console.log(err)
    })
    delete msg.type
    console.log('change', msg)
 
 
 
@@ -401,6 +401,46 @@
 
     
 
+        <tr>
+            
+                <td class="name"><code>fdTagRemove</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">String</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>'./_tagRemove'</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入暫存標記為刪除數據資料夾字串，預設'./_tagRemove'</p></td>
+        </tr>
+
+    
+
         <tr>
             
                 <td class="name"><code>fdDwAttime</code></td>
@@ -951,7 +991,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Fri Sep 12 2025 12:04:08 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 Fri Sep 12 2025 14:51: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 Fri Sep 12 2025 12:04:08 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 Fri Sep 12 2025 14:51:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.funDownload.mjs

@@ -102,6 +102,10 @@ let kpEqs = {
     3: eqs3,
 }
 
+//fdTagRemove
+let fdTagRemove = `./_tagRemove`
+w.fsCleanFolder(fdTagRemove)
+
 //fdDwAttime
 let fdDwAttime = `./_dwAttime`
 w.fsCleanFolder(fdDwAttime)
@@ -114,6 +118,14 @@ w.fsCleanFolder(fdDwCurrent)
 let fdResult = `./_result`
 w.fsCleanFolder(fdResult)
 
+//fdTaskCpActualSrc
+let fdTaskCpActualSrc = `./_taskCpActualSrc`
+w.fsCleanFolder(fdTaskCpActualSrc)
+
+//fdTaskCpSrc
+let fdTaskCpSrc = `./_taskCpSrc`
+w.fsCleanFolder(fdTaskCpSrc)
+
 let i = 0
 let run = async() => {
     i++
@@ -134,9 +146,13 @@ let run = async() => {
     let yearStart = 2022
     let yearEnd = 2022
     let opt = {
+        fdTagRemove,
         fdDwAttime,
         fdDwCurrent,
         fdResult,
+        fdTaskCpActualSrc,
+        fdTaskCpSrc,
+        // fdLog,
         funDownload,
         // funGetCurrent,
         // funRemove,

package/g.mjs

@@ -5,6 +5,10 @@ import w from 'wsemi'
 import WDwdataTweq from './src/WDwdataTweq.mjs'
 
 
+//fdTagRemove
+let fdTagRemove = `./_tagRemove`
+w.fsCleanFolder(fdTagRemove)
+
 //fdDwAttime
 let fdDwAttime = `./_dwAttime`
 w.fsCleanFolder(fdDwAttime)
@@ -17,12 +21,24 @@ w.fsCleanFolder(fdDwCurrent)
 let fdResult = `./_result`
 w.fsCleanFolder(fdResult)
 
+//fdTaskCpActualSrc
+let fdTaskCpActualSrc = `./_taskCpActualSrc`
+w.fsCleanFolder(fdTaskCpActualSrc)
+
+//fdTaskCpSrc
+let fdTaskCpSrc = `./_taskCpSrc`
+w.fsCleanFolder(fdTaskCpSrc)
+
 let yearStart = 2022
 let yearEnd = 2022
 let opt = {
+    fdTagRemove,
     fdDwAttime,
     fdDwCurrent,
     fdResult,
+    fdTaskCpActualSrc,
+    fdTaskCpSrc,
+    // fdLog,
     // funDownload,
     // funGetCurrent,
     // funRemove,

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "w-dwdata-tweq",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "main": "dist/w-dwdata-tweq.umd.js",
   "dependencies": {
     "axios": "^1.12.0",
     "lodash-es": "^4.17.21",
     "sharp": "^0.34.3",
-    "w-dwdata-builder": "^1.0.25",
+    "w-dwdata-builder": "^1.0.26",
     "wsemi": "^1.8.20"
   },
   "devDependencies": {

package/src/WDwdataTweq.mjs

@@ -29,6 +29,7 @@ import cropPic from './cropPic.mjs'
  * @param {Integer} yearEnd 輸入數據結束年整數
  * @param {Object} [opt={}] 輸入設定物件，預設{}
  * @param {String} [opt.keyId='keyId'] 輸入各筆數據之主鍵字串，預設'keyId'
+ * @param {String} [opt.fdTagRemove='./_tagRemove'] 輸入暫存標記為刪除數據資料夾字串，預設'./_tagRemove'
  * @param {String} [opt.fdDwAttime='./_dwAttime'] 輸入當前下載數據資料夾字串，預設'./_dwAttime'
  * @param {String} [opt.fdDwCurrent='./_dwCurrent'] 輸入已下載數據資料夾字串，預設'./_dwCurrent'
  * @param {String} [opt.fdResult='./_result'] 輸入已下載數據所連動生成數據資料夾字串，預設'./_result'
@@ -44,11 +45,49 @@ import cropPic from './cropPic.mjs'
  * @returns {Object} 回傳事件物件，可呼叫函數on監聽change事件
  * @example
  *
+ * import w from 'wsemi'
  * import WDwdataTweq from './src/WDwdataTweq.mjs'
  *
+ * //fdTagRemove
+ * let fdTagRemove = `./_tagRemove`
+ * w.fsCleanFolder(fdTagRemove)
+ *
+ * //fdDwAttime
+ * let fdDwAttime = `./_dwAttime`
+ * w.fsCleanFolder(fdDwAttime)
+ *
+ * //fdDwCurrent
+ * let fdDwCurrent = `./_dwCurrent`
+ * w.fsCleanFolder(fdDwCurrent)
+ *
+ * //fdResult
+ * let fdResult = `./_result`
+ * w.fsCleanFolder(fdResult)
+ *
+ * //fdTaskCpActualSrc
+ * let fdTaskCpActualSrc = `./_taskCpActualSrc`
+ * w.fsCleanFolder(fdTaskCpActualSrc)
+ *
+ * //fdTaskCpSrc
+ * let fdTaskCpSrc = `./_taskCpSrc`
+ * w.fsCleanFolder(fdTaskCpSrc)
+ *
  * let yearStart = 2022
  * let yearEnd = 2022
- * let opt = {}
+ * let opt = {
+ *     fdTagRemove,
+ *     fdDwAttime,
+ *     fdDwCurrent,
+ *     fdResult,
+ *     fdTaskCpActualSrc,
+ *     fdTaskCpSrc,
+ *     // fdLog,
+ *     // funDownload,
+ *     // funGetCurrent,
+ *     // funRemove,
+ *     // funAdd,
+ *     // funModify,
+ * }
  * let ev = await WDwdataTweq(yearStart, yearEnd, opt)
  *     .catch((err) => {
  *         console.log(err)
@@ -93,6 +132,12 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         keyId = `id`
     }
 
+    //fdTagRemove, 暫存標記為刪除數據資料夾
+    let fdTagRemove = get(opt, 'fdTagRemove')
+    if (!isestr(fdTagRemove)) {
+        fdTagRemove = `./_tagRemove`
+    }
+
     //fdDwAttime
     let fdDwAttime = get(opt, 'fdDwAttime')
     if (!isestr(fdDwAttime)) {
@@ -120,6 +165,15 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         fsCreateFolder(fdResult)
     }
 
+    //fdTaskCpActualSrc, 儲存完整任務狀態資料夾
+    let fdTaskCpActualSrc = get(opt, 'fdTaskCpActualSrc')
+    if (!isestr(fdTaskCpActualSrc)) {
+        fdTaskCpActualSrc = `./_taskCpActualSrc`
+    }
+    if (!fsIsFolder(fdTaskCpActualSrc)) {
+        fsCreateFolder(fdTaskCpActualSrc)
+    }
+
     //fdTaskCpSrc
     let fdTaskCpSrc = get(opt, 'fdTaskCpSrc')
     if (!isestr(fdTaskCpSrc)) {
@@ -270,11 +324,12 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         funModify = funModifyDef
     }
 
-    //WDwdataBuilder
     let optBdr = {
+        fdTagRemove,
         fdDwAttime,
         fdDwCurrent,
-        fdResult,
+        // fdResult, //WDwdataBuilder不需要
+        fdTaskCpActualSrc,
         fdTaskCpSrc,
         fdLog,
         funDownload,

package/test/multi.test.mjs

@@ -107,6 +107,10 @@ describe('multi', function() {
             3: eqs3,
         }
 
+        //fdTagRemove
+        let fdTagRemove = `./_multi_tagRemove`
+        w.fsCleanFolder(fdTagRemove)
+
         //fdDwAttime
         let fdDwAttime = `./_multi_dwAttime`
         w.fsCleanFolder(fdDwAttime)
@@ -119,6 +123,14 @@ describe('multi', function() {
         let fdResult = `./_multi_result`
         w.fsCleanFolder(fdResult)
 
+        //fdTaskCpActualSrc
+        let fdTaskCpActualSrc = `./_multi_taskCpActualSrc`
+        w.fsCleanFolder(fdTaskCpActualSrc)
+
+        //fdTaskCpSrc
+        let fdTaskCpSrc = `./_multi_taskCpSrc`
+        w.fsCleanFolder(fdTaskCpSrc)
+
         let i = 0
         let run = async() => {
             i++
@@ -139,9 +151,13 @@ describe('multi', function() {
             let yearStart = 2022
             let yearEnd = 2022
             let opt = {
+                fdTagRemove,
                 fdDwAttime,
                 fdDwCurrent,
                 fdResult,
+                fdTaskCpActualSrc,
+                fdTaskCpSrc,
+                // fdLog,
                 funDownload,
                 // funGetCurrent,
                 // funRemove,
@@ -179,11 +195,14 @@ describe('multi', function() {
             await run()
         })
 
+        w.fsDeleteFolder(fdTagRemove)
         w.fsDeleteFolder(fdDwAttime)
         w.fsDeleteFolder(fdDwCurrent)
         w.fsDeleteFolder(fdResult)
+        w.fsDeleteFolder(fdTaskCpActualSrc)
+        w.fsDeleteFolder(fdTaskCpSrc)
 
-        console.log('ms', ms)
+        // console.log('ms', ms)
         return ms
     }
     let ms = [

package/test/once.test.mjs

@@ -13,6 +13,10 @@ describe('once', function() {
 
         let ms = []
 
+        //fdTagRemove
+        let fdTagRemove = `./_once_tagRemove`
+        w.fsCleanFolder(fdTagRemove)
+
         //fdDwAttime
         let fdDwAttime = `./_once_dwAttime`
         w.fsCleanFolder(fdDwAttime)
@@ -25,6 +29,14 @@ describe('once', function() {
         let fdResult = `./_once_result`
         w.fsCleanFolder(fdResult)
 
+        //fdTaskCpActualSrc
+        let fdTaskCpActualSrc = `./_once_taskCpActualSrc`
+        w.fsCleanFolder(fdTaskCpActualSrc)
+
+        //fdTaskCpSrc
+        let fdTaskCpSrc = `./_once_taskCpSrc`
+        w.fsCleanFolder(fdTaskCpSrc)
+
         //funDownload
         let funDownload = async() => {
 
@@ -80,9 +92,13 @@ describe('once', function() {
         let yearStart = 2022
         let yearEnd = 2022
         let opt = {
+            fdTagRemove,
             fdDwAttime,
             fdDwCurrent,
             fdResult,
+            fdTaskCpActualSrc,
+            fdTaskCpSrc,
+            // fdLog,
             funDownload,
             // funGetCurrent,
             // funRemove,
@@ -102,9 +118,14 @@ describe('once', function() {
             ms.push(msg)
         })
         ev.on('end', () => {
+
+            w.fsDeleteFolder(fdTagRemove)
             w.fsDeleteFolder(fdDwAttime)
             w.fsDeleteFolder(fdDwCurrent)
             w.fsDeleteFolder(fdResult)
+            w.fsDeleteFolder(fdTaskCpActualSrc)
+            w.fsDeleteFolder(fdTaskCpSrc)
+
             // console.log('ms', ms)
             pm.resolve(ms)
         })