w-orm-lowdb 1.0.1 → 1.0.3

package/docs/WOrmLowdb.mjs.html

@@ -29,7 +29,7 @@
 <nav >
     
     
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WOrmLowdb.html">WOrmLowdb</a><ul class='methods'><li data-type='method'><a href="WOrmLowdb.html#.del">del</a></li><li data-type='method'><a href="WOrmLowdb.html#.delAll">delAll</a></li><li data-type='method'><a href="WOrmLowdb.html#.insert">insert</a></li><li data-type='method'><a href="WOrmLowdb.html#.save">save</a></li><li data-type='method'><a href="WOrmLowdb.html#.select">select</a></li></ul></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WOrmLowdb.html">WOrmLowdb</a><ul class='methods'><li data-type='method'><a href="WOrmLowdb.html#.delAllCore">delAllCore</a></li><li data-type='method'><a href="WOrmLowdb.html#.delCore">delCore</a></li><li data-type='method'><a href="WOrmLowdb.html#.insertCore">insertCore</a></li><li data-type='method'><a href="WOrmLowdb.html#.saveCore">saveCore</a></li><li data-type='method'><a href="WOrmLowdb.html#.selectCore">selectCore</a></li></ul></li></ul>
     
 </nav>
 
@@ -48,7 +48,7 @@
             <pre class="prettyprint source linenums"><code>import events from 'events'
 import { Low } from 'lowdb'
 import { JSONFile } from 'lowdb/node'
-import { Query } from 'mingo'
+import { Query } from 'mingo' //須指定安裝6.5.6, 若6.6.0無法匯入Query
 import get from 'lodash-es/get.js'
 import each from 'lodash-es/each.js'
 import map from 'lodash-es/map.js'
@@ -64,6 +64,12 @@ import iseobj from 'wsemi/src/iseobj.mjs'
 import isearr from 'wsemi/src/isearr.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import arrPullAt from 'wsemi/src/arrPullAt.mjs'
+import waitFun from 'wsemi/src/waitFun.mjs'
+
+
+//全域鎖, 一次僅能執行一種操作函數
+//select理論上是不用鎖, 但因為操作上db.jon.tmp更名回db.json時似乎非rename而是串流寫入, 導致有機會撈到不完整json數據進而出錯, 故還是得要上鎖以策安全
+let glock = false
 
 
 /**
@@ -120,7 +126,7 @@ function WOrmLowdb(opt = {}) {
      * @param {Object} [find={}] 輸入查詢條件物件
      * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
      */
-    async function select(find = {}) {
+    async function selectCore(find = {}) {
         let isErr = false
 
         //res
@@ -162,6 +168,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function select(find = {}) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await selectCore(find)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     /**
      * 插入數據，插入同樣數據會自動產生不同_id，故insert前需自行判斷有無重複
@@ -170,7 +188,7 @@ function WOrmLowdb(opt = {}) {
      * @param {Object|Array} data 輸入數據物件或陣列
      * @returns {Promise} 回傳Promise，resolve回傳插入結果，reject回傳錯誤訊息
      */
-    async function insert(data) {
+    async function insertCore(data) {
         let isErr = false
 
         //check
@@ -260,6 +278,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function insert(data) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await insertCore(data)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     /**
      * 儲存數據
@@ -270,7 +300,7 @@ function WOrmLowdb(opt = {}) {
      * @param {boolean} [option.autoInsert=true] 輸入是否於儲存時發現原本無數據，則自動改以插入處理，預設為true
      * @returns {Promise} 回傳Promise，resolve回傳儲存結果，reject回傳錯誤訊息
      */
-    async function save(data, option = {}) {
+    async function saveCore(data, option = {}) {
         let isErr = false
 
         //check
@@ -322,11 +352,8 @@ function WOrmLowdb(opt = {}) {
                 //rest
                 let rest = null
 
-                //id
-                let id = get(v, 'id', '')
-
-                //查找資料表內v.id為_v
-                let r = get(kp, id, null)
+                //查找資料表內v.id
+                let r = get(kp, v.id, null)
 
                 //check
                 if (iseobj(r)) {
@@ -363,7 +390,7 @@ function WOrmLowdb(opt = {}) {
 
                 //autoInsert
                 if (autoInsert &amp;&amp; rest.n === 0) {
-                    rest = await insert(v)
+                    rest = await insertCore(v)
                 }
 
                 return rest
@@ -388,6 +415,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function save(data, option = {}) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await saveCore(data, option)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     /**
      * 刪除數據
@@ -396,7 +435,7 @@ function WOrmLowdb(opt = {}) {
      * @param {Object|Array} data 輸入數據物件或陣列
      * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
      */
-    async function del(data) {
+    async function delCore(data) {
         let isErr = false
 
         //check
@@ -516,6 +555,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function del(data) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await delCore(data)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     /**
      * 刪除全部數據，需與del分開，避免未傳數據導致直接刪除全表
@@ -524,7 +575,7 @@ function WOrmLowdb(opt = {}) {
      * @param {Object} [find={}] 輸入刪除條件物件
      * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
      */
-    async function delAll(find = {}) {
+    async function delAllCore(find = {}) {
         let isErr = false
 
         //res
@@ -629,6 +680,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function delAll(find = {}) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await delAllCore(find)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     //bind
     ee.select = select
@@ -656,7 +719,7 @@ export default WOrmLowdb
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Wed Apr 02 2025 11:25:26 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 May 09 2025 12:29:37 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -29,7 +29,7 @@
 <nav >
     
     
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WOrmLowdb.html">WOrmLowdb</a><ul class='methods'><li data-type='method'><a href="WOrmLowdb.html#.del">del</a></li><li data-type='method'><a href="WOrmLowdb.html#.delAll">delAll</a></li><li data-type='method'><a href="WOrmLowdb.html#.insert">insert</a></li><li data-type='method'><a href="WOrmLowdb.html#.save">save</a></li><li data-type='method'><a href="WOrmLowdb.html#.select">select</a></li></ul></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WOrmLowdb.html">WOrmLowdb</a><ul class='methods'><li data-type='method'><a href="WOrmLowdb.html#.delAllCore">delAllCore</a></li><li data-type='method'><a href="WOrmLowdb.html#.delCore">delCore</a></li><li data-type='method'><a href="WOrmLowdb.html#.insertCore">insertCore</a></li><li data-type='method'><a href="WOrmLowdb.html#.saveCore">saveCore</a></li><li data-type='method'><a href="WOrmLowdb.html#.selectCore">selectCore</a></li></ul></li></ul>
     
 </nav>
 
@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Wed Apr 02 2025 11:25:26 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 May 09 2025 12:29:37 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g-basic.mjs

@@ -1,5 +1,5 @@
-import wo from './src/WOrmLowdb.mjs'
-//import wo from './dist/w-orm-lowdb.umd.js'
+import WOrm from './src/WOrmLowdb.mjs'
+//import WOrm from './dist/w-orm-lowdb.umd.js'
 // import w from 'wsemi'
 
 
@@ -46,19 +46,16 @@ let rsm = [
 
 async function test() {
 
-
-    //w
-    let w = wo(opt)
-
+    //wo
+    let wo = WOrm(opt)
 
     //on
-    w.on('change', function(mode, data, res) {
+    wo.on('change', function(mode, data, res) {
         console.log('change', mode)
     })
 
-
     //delAll
-    await w.delAll()
+    await wo.delAll()
         .then(function(msg) {
             console.log('delAll then', msg)
         })
@@ -66,9 +63,8 @@ async function test() {
             console.log('delAll catch', msg)
         })
 
-
     //insert
-    await w.insert(rs)
+    await wo.insert(rs)
         .then(function(msg) {
             console.log('insert then', msg)
         })
@@ -76,9 +72,8 @@ async function test() {
             console.log('insert catch', msg)
         })
 
-
     //save
-    await w.save(rsm, { autoInsert: false })
+    await wo.save(rsm, { autoInsert: false })
         .then(function(msg) {
             console.log('save then', msg)
         })
@@ -86,42 +81,35 @@ async function test() {
             console.log('save catch', msg)
         })
 
-
     //select all
-    let ss = await w.select()
+    let ss = await wo.select()
     console.log('select all', ss)
 
-
     //select
-    let so = await w.select({ id: 'id-rosemary' })
+    let so = await wo.select({ id: 'id-rosemary' })
     console.log('select', so)
 
-
     //select by $and, $gt, $lt
-    let spa = await w.select({ '$and': [{ value: { '$gt': 123 } }, { value: { '$lt': 200 } }] })
+    let spa = await wo.select({ '$and': [{ value: { '$gt': 123 } }, { value: { '$lt': 200 } }] })
     console.log('select by $and, $gt, $lt', spa)
 
-
     //select by $or, $gte, $lte
-    let spb = await w.select({ '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 200 } }] })
+    let spb = await wo.select({ '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 200 } }] })
     console.log('select by $or, $gte, $lte', spb)
 
-
     //select by $or, $and, $ne, $in, $nin
-    let spc = await w.select({ '$or': [{ '$and': [{ value: { '$ne': 123 } }, { value: { '$in': [123, 321, 123.456, 456] } }, { value: { '$nin': [456, 654] } }] }, { '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 400 } }] }] })
+    let spc = await wo.select({ '$or': [{ '$and': [{ value: { '$ne': 123 } }, { value: { '$in': [123, 321, 123.456, 456] } }, { value: { '$nin': [456, 654] } }] }, { '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 400 } }] }] })
     console.log('select by $or, $and, $ne, $in, $nin', spc)
 
-
     // //select by regex //mingo不支援regex
-    // let sr = await w.select({ name: { $regex: 'PeT', $options: '$i' } })
+    // let sr = await wo.select({ name: { $regex: 'PeT', $options: '$i' } })
     // console.log('selectReg', sr)
 
-
     //del
     let d = ss.filter(function(v) {
         return v.name === 'kettle'
     })
-    await w.del(d)
+    await wo.del(d)
         .then(function(msg) {
             console.log('del then', msg)
         })
@@ -129,7 +117,6 @@ async function test() {
             console.log('del catch', msg)
         })
 
-
 }
 test()
 // change delAll
@@ -175,4 +162,5 @@ test()
 // change del
 // del then [ { n: 1, nDeleted: 1, ok: 1 } ]
 
-//node --experimental-modules g-basic.mjs
+
+//node g-basic.mjs

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "w-orm-lowdb",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "dist/w-orm-lowdb.umd.js",
   "dependencies": {
     "lodash-es": "^4.17.21",
     "lowdb": "^7.0.1",
-    "mingo": "^6.5.6",
-    "wsemi": "^1.7.74"
+    "mingo": "^6.6.1",
+    "wsemi": "^1.7.90"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.85"
+    "w-package-tools": "^1.0.90"
   },
   "scripts": {
-    "test": "mocha --parallel --timeout 60000 --experimental-modules",
+    "test": "mocha --parallel --timeout 60000",
     "deploy": "gh-pages -d docs"
   },
   "repository": {

package/script.txt

@@ -1,10 +1,10 @@
-#node --experimental-modules toolg/addVersion.mjs
-node --experimental-modules toolg/modifyReadme.mjs
+#node toolg/addVersion.mjs
+node toolg/modifyReadme.mjs
 
-node --experimental-modules toolg/cleanFolder.mjs
+node toolg/cleanFolder.mjs
 ./node_modules/.bin/jsdoc -c .jsdoc
 
-node --experimental-modules toolg/gDistRollup.mjs
+node toolg/gDistRollup.mjs
 
 git add .  -A
 git commit -m 'modify: '

package/src/WOrmLowdb.mjs

@@ -1,7 +1,7 @@
 import events from 'events'
 import { Low } from 'lowdb'
 import { JSONFile } from 'lowdb/node'
-import { Query } from 'mingo'
+import { Query } from 'mingo' //須指定安裝6.5.6, 若6.6.0無法匯入Query
 import get from 'lodash-es/get.js'
 import each from 'lodash-es/each.js'
 import map from 'lodash-es/map.js'
@@ -17,6 +17,12 @@ import iseobj from 'wsemi/src/iseobj.mjs'
 import isearr from 'wsemi/src/isearr.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import arrPullAt from 'wsemi/src/arrPullAt.mjs'
+import waitFun from 'wsemi/src/waitFun.mjs'
+
+
+//全域鎖, 一次僅能執行一種操作函數
+//select理論上是不用鎖, 但因為操作上db.jon.tmp更名回db.json時似乎非rename而是串流寫入, 導致有機會撈到不完整json數據進而出錯, 故還是得要上鎖以策安全
+let glock = false
 
 
 /**
@@ -73,7 +79,7 @@ function WOrmLowdb(opt = {}) {
      * @param {Object} [find={}] 輸入查詢條件物件
      * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
      */
-    async function select(find = {}) {
+    async function selectCore(find = {}) {
         let isErr = false
 
         //res
@@ -115,6 +121,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function select(find = {}) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await selectCore(find)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     /**
      * 插入數據，插入同樣數據會自動產生不同_id，故insert前需自行判斷有無重複
@@ -123,7 +141,7 @@ function WOrmLowdb(opt = {}) {
      * @param {Object|Array} data 輸入數據物件或陣列
      * @returns {Promise} 回傳Promise，resolve回傳插入結果，reject回傳錯誤訊息
      */
-    async function insert(data) {
+    async function insertCore(data) {
         let isErr = false
 
         //check
@@ -213,6 +231,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function insert(data) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await insertCore(data)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     /**
      * 儲存數據
@@ -223,7 +253,7 @@ function WOrmLowdb(opt = {}) {
      * @param {boolean} [option.autoInsert=true] 輸入是否於儲存時發現原本無數據，則自動改以插入處理，預設為true
      * @returns {Promise} 回傳Promise，resolve回傳儲存結果，reject回傳錯誤訊息
      */
-    async function save(data, option = {}) {
+    async function saveCore(data, option = {}) {
         let isErr = false
 
         //check
@@ -275,11 +305,8 @@ function WOrmLowdb(opt = {}) {
                 //rest
                 let rest = null
 
-                //id
-                let id = get(v, 'id', '')
-
-                //查找資料表內v.id為_v
-                let r = get(kp, id, null)
+                //查找資料表內v.id
+                let r = get(kp, v.id, null)
 
                 //check
                 if (iseobj(r)) {
@@ -316,7 +343,7 @@ function WOrmLowdb(opt = {}) {
 
                 //autoInsert
                 if (autoInsert && rest.n === 0) {
-                    rest = await insert(v)
+                    rest = await insertCore(v)
                 }
 
                 return rest
@@ -341,6 +368,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function save(data, option = {}) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await saveCore(data, option)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     /**
      * 刪除數據
@@ -349,7 +388,7 @@ function WOrmLowdb(opt = {}) {
      * @param {Object|Array} data 輸入數據物件或陣列
      * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
      */
-    async function del(data) {
+    async function delCore(data) {
         let isErr = false
 
         //check
@@ -469,6 +508,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function del(data) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await delCore(data)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     /**
      * 刪除全部數據，需與del分開，避免未傳數據導致直接刪除全表
@@ -477,7 +528,7 @@ function WOrmLowdb(opt = {}) {
      * @param {Object} [find={}] 輸入刪除條件物件
      * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
      */
-    async function delAll(find = {}) {
+    async function delAllCore(find = {}) {
         let isErr = false
 
         //res
@@ -582,6 +633,18 @@ function WOrmLowdb(opt = {}) {
         }
         return res
     }
+    async function delAll(find = {}) {
+        if (glock) {
+            await waitFun(() => {
+                return !glock
+            })
+        }
+        glock = true
+        return await delAllCore(find)
+            .finally(() => {
+                glock = false
+            })
+    }
 
     //bind
     ee.select = select