w-orm-mongodb 1.1.31 → 1.1.33

package/docs/WOrmMongodb.mjs.html

@@ -55,7 +55,10 @@ import omit from 'lodash-es/omit.js'
 import size from 'lodash-es/size.js'
 import genPm from 'wsemi/src/genPm.mjs'
 import genID from 'wsemi/src/genID.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
 import isarr from 'wsemi/src/isarr.mjs'
+import isearr from 'wsemi/src/isearr.mjs'
+import iseobj from 'wsemi/src/iseobj.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 
 
@@ -143,6 +146,7 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
         if (isErr) {
@@ -162,6 +166,15 @@ function WOrmMongodb(opt = {}) {
     async function insert(data) {
         let isErr = false
 
+        //check
+        if (!iseobj(data) && !isearr(data)) {
+            return {
+                n: 0,
+                nInserted: 0,
+                ok: 1,
+            }
+        }
+
         //cloneDeep
         data = cloneDeep(data)
 
@@ -185,7 +198,7 @@ function WOrmMongodb(opt = {}) {
 
             //check id
             data = map(data, function(v) {
-                if (!v.id) {
+                if (!isestr(v.id)) {
                     v.id = genID()
                 }
                 return v
@@ -223,6 +236,7 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
         if (isErr) {
@@ -239,18 +253,21 @@ function WOrmMongodb(opt = {}) {
      * @param {Object|Array} data 輸入數據物件或陣列
      * @param {Object} [option={}] 輸入設定物件，預設為{}
      * @param {boolean} [option.autoInsert=true] 輸入是否於儲存時發現原本無數據，則自動改以插入處理，預設為true
-     * @param {boolean} [option.atomic=false] 輸入是否於儲存時採用上鎖，避免同時操作互改問題，預設為false
      * @returns {Promise} 回傳Promise，resolve回傳儲存結果，reject回傳錯誤訊息
      */
     async function save(data, option = {}) {
         let isErr = false
 
+        //check
+        if (!iseobj(data) && !isearr(data)) {
+            return []
+        }
+
         //cloneDeep
         data = cloneDeep(data)
 
-        //autoInsert, atomic
+        //autoInsert
         let autoInsert = get(option, 'autoInsert', true)
-        let atomic = get(option, 'atomic', false)
 
         //client
         // let client = await MongoClient.connect(opt.url, optMGConn)
@@ -270,15 +287,13 @@ function WOrmMongodb(opt = {}) {
                 data = [data]
             }
 
-            //oper
-            let oper = null
-            if (atomic) {
-                oper = 'findOneAndUpdate'
-            }
-            else {
-                oper = 'updateOne'
-            }
-            // console.log('oper', oper)
+            //check id
+            data = map(data, function(v) {
+                if (!isestr(v.id)) {
+                    v.id = genID()
+                }
+                return v
+            })
 
             //pmSeries
             res = await pmSeries(data, async(v) => {
@@ -287,16 +302,10 @@ function WOrmMongodb(opt = {}) {
                 let rest = null
 
                 //oper
-                rest = await collection[oper]({ id: v.id }, { $set: v })
+                rest = await collection.findOneAndUpdate({ id: v.id }, { $set: v })
                 // console.log('rest', rest)
 
-                if (rest) {
-                    // rest {
-                    //     _id: new ObjectId('66002783fdb8a009c825f716'),
-                    //     id: 'id-peter',
-                    //     name: 'peter',
-                    //     value: 123
-                    //   }
+                if (iseobj(rest)) {
                     rest = {
                         n: 1,
                         nModified: 1,
@@ -311,36 +320,6 @@ function WOrmMongodb(opt = {}) {
                     }
                 }
 
-                // //check
-                // if (get(rest, 'lastErrorObject')) { //findOneAndUpdate
-                //     // console.log('rest.lastErrorObject', rest.lastErrorObject)
-                //     rest = {
-                //         // lastErrorObject: { n: 1, updatedExisting: true },
-                //         // value: {
-                //         //   _id: new ObjectId("615c18bb6e5db9935b10d88e"),
-                //         //   id: 'id-rosemary',
-                //         //   name: 'rosemary',
-                //         //   value: 123.456
-                //         // },
-                //         // ok: 1
-                //         n: get(rest, 'lastErrorObject.n', -1),
-                //         nModified: get(rest, 'lastErrorObject.updatedExisting', false) ? 1 : 0,
-                //         ok: 1,
-                //     }
-                // }
-                // else { //updateOne
-                //     rest = {
-                //         // acknowledged: true,
-                //         // modifiedCount: 1,
-                //         // upsertedId: null,
-                //         // upsertedCount: 0,
-                //         // matchedCount: 1
-                //         n: get(rest, 'matchedCount', -1),
-                //         nModified: get(rest, 'modifiedCount', -1),
-                //         ok: get(rest, 'acknowledged', false) ? 1 : 0,
-                //     }
-                // }
-
                 //autoInsert
                 if (autoInsert && rest.n === 0) {
                     rest = await insert(v)
@@ -359,6 +338,7 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
         if (isErr) {
@@ -378,6 +358,11 @@ function WOrmMongodb(opt = {}) {
     async function del(data) {
         let isErr = false
 
+        //check
+        if (!iseobj(data) && !isearr(data)) {
+            return []
+        }
+
         //cloneDeep
         data = cloneDeep(data)
 
@@ -428,6 +413,7 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
         if (isErr) {
@@ -480,8 +466,10 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
+
         if (isErr) {
             return Promise.reject(res)
         }
@@ -567,6 +555,7 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
         if (isErr) {
@@ -650,6 +639,7 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
         if (isErr) {
@@ -753,6 +743,7 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
         if (isErr) {
@@ -854,6 +845,7 @@ function WOrmMongodb(opt = {}) {
         }
         finally {
             await client.close()
+            client = null
         }
 
         if (isErr) {
@@ -894,7 +886,7 @@ export default WOrmMongodb
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Mar 24 2024 21:44:00 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.2</a> on Sun May 11 2025 15:22:28 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.2</a> on Sun Mar 24 2024 21:44:00 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.2</a> on Sun May 11 2025 15:22:28 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/WOrmMongodb.mjs'
-//import wo from './dist/w-orm-mongodb.umd.js'
+import WOrm from './src/WOrmMongodb.mjs'
+//import WOrm from './dist/w-orm-mongodb.umd.js'
 
 
 let opt = {
@@ -43,19 +43,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)
         })
@@ -63,9 +60,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)
         })
@@ -73,9 +69,8 @@ async function test() {
             console.log('insert catch', msg)
         })
 
-
     //save
-    await w.save(rsm, { autoInsert: false, atomic: true })
+    await wo.save(rsm, { autoInsert: false })
         .then(function(msg) {
             console.log('save then', msg)
         })
@@ -83,42 +78,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
-    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)
         })
@@ -126,7 +114,6 @@ async function test() {
             console.log('del catch', msg)
         })
 
-
 }
 test()
 // change delAll
@@ -173,4 +160,4 @@ test()
 // change del
 // del then [ { n: 1, nDeleted: 1, ok: 1 } ]
 
-//node --experimental-modules --es-module-specifier-resolution=node g-basic.mjs
+//node g-basic.mjs

package/g-gfs.mjs

@@ -1,7 +1,7 @@
 import path from 'path'
 import fs from 'fs'
-import wo from './src/WOrmMongodb.mjs'
-//import wo from './dist/w-orm-mongodb.umd.js'
+import WOrm from './src/WOrmMongodb.mjs'
+//import WOrm from './dist/w-orm-mongodb.umd.js'
 
 
 let opt = {
@@ -12,40 +12,34 @@ let opt = {
 
 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)
     })
 
-
     //fn_in, fn_out
     let fn_in = path.resolve('../', './_data', 'data(in).dat')
     let fn_out = path.resolve('../', './_data', 'data(out).dat')
     // console.log('fn_in', fn_in)
     // console.log('fn_out', fn_out)
 
-
     //unlinkSync
     try {
         fs.unlinkSync(fn_out)
     }
     catch (err) {}
 
-
     //u8a
     let b = await fs.readFileSync(fn_in)
     let u8a = new Uint8Array(b)
     // let u8a = new Uint8Array([66, 97, 115]) //Uint8Array data from nodejs or browser
     console.log('u8a', u8a)
 
-
     //delAllGfs
-    await w.delAllGfs()
+    await wo.delAllGfs()
         .then(function(msg) {
             console.log('delAllGfs then', msg)
         })
@@ -53,14 +47,12 @@ async function test() {
             console.log('delAllGfs catch', msg)
         })
 
-
     //insertGfs
-    let gi = await w.insertGfs(u8a)
+    let gi = await wo.insertGfs(u8a)
     console.log('insertGfs', gi)
 
-
     //selectGfs
-    let gs = await w.selectGfs(gi.id)
+    let gs = await wo.selectGfs(gi.id)
     console.log('selectGfs', gs)
     console.log('gs[0]', gs[0], gs[0] === 0)
     console.log('gs[1]', gs[1], gs[1] === 0)
@@ -70,12 +62,10 @@ async function test() {
     console.log('gs.length', gs.length, gs.length === 47381362)
     fs.writeFileSync(fn_out, gs)
 
-
     //delGfs
-    let gd = await w.delGfs(gi.id)
+    let gd = await wo.delGfs(gi.id)
     console.log('delGfs', gd)
 
-
 }
 test()
 // u8a Uint8Array(47381362) [
@@ -109,4 +99,4 @@ test()
 // change delGfs
 // delGfs { n: 1, nDeleted: 1, ok: 1 }
 
-//node --experimental-modules --es-module-specifier-resolution=node g-gfs.mjs
+//node g-gfs.mjs

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "w-orm-mongodb",
-  "version": "1.1.31",
+  "version": "1.1.33",
   "main": "dist/w-orm-mongodb.umd.js",
   "dependencies": {
-    "mongodb": "^6.5.0",
+    "mongodb": "^6.16.0",
     "saslprep": "^1.0.3",
     "lodash-es": "^4.17.21",
-    "wsemi": "^1.7.49"
+    "wsemi": "^1.7.90"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.75"
+    "w-package-tools": "^1.0.90"
   },
   "scripts": {
-    "test": "mocha --parallel --timeout 60000 --experimental-modules --es-module-specifier-resolution=node",
+    "test": "mocha --parallel --timeout 60000",
     "deploy": "gh-pages -d docs"
   },
   "repository": {

package/script.txt

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