w-orm-mongodb 1.1.30 → 1.1.32

package/docs/WOrmMongodb.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line32">line 32</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line33">line 33</a>
     </li></ul></dd>
     
 
@@ -429,7 +429,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line309">line 309</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line284">line 284</a>
     </li></ul></dd>
     
 
@@ -590,7 +590,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line378">line 378</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line353">line 353</a>
     </li></ul></dd>
     
 
@@ -768,7 +768,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line736">line 736</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line711">line 711</a>
     </li></ul></dd>
     
 
@@ -946,7 +946,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line629">line 629</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line604">line 604</a>
     </li></ul></dd>
     
 
@@ -1104,7 +1104,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line115">line 115</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line116">line 116</a>
     </li></ul></dd>
     
 
@@ -1265,7 +1265,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line430">line 430</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line405">line 405</a>
     </li></ul></dd>
     
 
@@ -1638,46 +1638,6 @@
         </tr>
 
     
-
-        <tr>
-            
-                <td class="name"><code>atomic</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">boolean</span>
-
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                    <code>false</code>
-                
-                </td>
-            
-
-            <td class="description last"><p>輸入是否於儲存時採用上鎖，避免同時操作互改問題，預設為false</p></td>
-        </tr>
-
-    
     </tbody>
 </table>
 
@@ -1750,7 +1710,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line62">line 62</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line63">line 63</a>
     </li></ul></dd>
     
 
@@ -1928,7 +1888,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line517">line 517</a>
+        <a href="WOrmMongodb.mjs.html">WOrmMongodb.mjs</a>, <a href="WOrmMongodb.mjs.html#line492">line 492</a>
     </li></ul></dd>
     
 
@@ -2085,7 +2045,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Mar 20 2024 16:44:25 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 Apr 07 2024 21:30:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WOrmMongodb.mjs.html

@@ -48,14 +48,15 @@
             <pre class="prettyprint source linenums"><code>import events from 'events'
 import mongodb from 'mongodb'
 import stream from 'stream'
-import cloneDeep from 'lodash-es/cloneDeep'
-import get from 'lodash-es/get'
-import map from 'lodash-es/map'
-import omit from 'lodash-es/omit'
-import size from 'lodash-es/size'
+import cloneDeep from 'lodash-es/cloneDeep.js'
+import get from 'lodash-es/get.js'
+import map from 'lodash-es/map.js'
+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 isarr from 'wsemi/src/isarr.mjs'
+import iseobj from 'wsemi/src/iseobj.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 
 
@@ -239,7 +240,6 @@ 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 = {}) {
@@ -248,9 +248,8 @@ function WOrmMongodb(opt = {}) {
         //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 +269,6 @@ function WOrmMongodb(opt = {}) {
                 data = [data]
             }
 
-            //oper
-            let oper = null
-            if (atomic) {
-                oper = 'findOneAndUpdate'
-            }
-            else {
-                oper = 'updateOne'
-            }
-
             //pmSeries
             res = await pmSeries(data, async(v) => {
 
@@ -286,38 +276,23 @@ 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)
 
-                //lastErrorObject for findOneAndUpdate
-                if (rest.lastErrorObject) {
-                    // console.log('rest.lastErrorObject', rest.lastErrorObject)
+                if (iseobj(rest)) {
                     rest = {
-                        // lastErrorObject: { n: 1, updatedExisting: true },
-                        // value: {
-                        //   _id: new ObjectId("615c18bb6e5db9935b10d88e"),
-                        //   id: 'id-rosemary',
-                        //   name: 'rosemary',
-                        //   value: 123.456
-                        // },
-                        // ok: 1
-                        n: rest.lastErrorObject.n,
-                        nModified: rest.lastErrorObject.updatedExisting ? 1 : 0,
+                        n: 1,
+                        nModified: 1,
                         ok: 1,
                     }
                 }
                 else {
                     rest = {
-                        // acknowledged: true,
-                        // modifiedCount: 1,
-                        // upsertedId: null,
-                        // upsertedCount: 0,
-                        // matchedCount: 1
-                        n: rest.matchedCount,
-                        nModified: rest.modifiedCount,
-                        ok: rest.acknowledged ? 1 : 0,
+                        n: 0,
+                        nModified: 0,
+                        ok: 1,
                     }
                 }
-                // console.log('rest', rest)
 
                 //autoInsert
                 if (autoInsert &amp;&amp; rest.n === 0) {
@@ -872,7 +847,7 @@ export default WOrmMongodb
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Mar 20 2024 16:44:25 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 Apr 07 2024 21:30:47 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 Wed Mar 20 2024 16:44:25 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 Apr 07 2024 21:30:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g-basic.mjs

@@ -75,7 +75,7 @@ async function test() {
 
 
     //save
-    await w.save(rsm, { autoInsert: false, atomic: true })
+    await w.save(rsm, { autoInsert: false })
         .then(function(msg) {
             console.log('save then', msg)
         })
@@ -173,4 +173,4 @@ test()
 // change del
 // del then [ { n: 1, nDeleted: 1, ok: 1 } ]
 
-//node --experimental-modules --es-module-specifier-resolution=node g-basic.mjs
+//node --experimental-modules g-basic.mjs

package/g-gfs.mjs

@@ -109,4 +109,4 @@ test()
 // change delGfs
 // delGfs { n: 1, nDeleted: 1, ok: 1 }
 
-//node --experimental-modules --es-module-specifier-resolution=node g-gfs.mjs
+//node --experimental-modules g-gfs.mjs

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "w-orm-mongodb",
-  "version": "1.1.30",
+  "version": "1.1.32",
   "main": "dist/w-orm-mongodb.umd.js",
   "dependencies": {
     "mongodb": "^6.5.0",
     "saslprep": "^1.0.3",
     "lodash-es": "^4.17.21",
-    "wsemi": "^1.7.47"
+    "wsemi": "^1.7.49"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.73"
+    "w-package-tools": "^1.0.75"
   },
   "scripts": {
     "test": "mocha --parallel --timeout 60000 --experimental-modules --es-module-specifier-resolution=node",

package/script.txt

@@ -0,0 +1,18 @@
+#node --experimental-modules --es-module-specifier-resolution=node toolg/addVersion.mjs
+node --experimental-modules --es-module-specifier-resolution=node toolg/modifyReadme.mjs
+
+node --experimental-modules --es-module-specifier-resolution=node toolg/cleanFolder.mjs
+./node_modules/.bin/jsdoc -c .jsdoc
+
+node --experimental-modules --es-module-specifier-resolution=node toolg/gDistRollup.mjs
+
+git add .  -A
+git commit -m 'modify: '
+git push origin master:master
+
+npm run deploy
+
+#npm test
+
+#npm publish
+

package/src/WOrmMongodb.mjs

@@ -1,14 +1,15 @@
 import events from 'events'
 import mongodb from 'mongodb'
 import stream from 'stream'
-import cloneDeep from 'lodash-es/cloneDeep'
-import get from 'lodash-es/get'
-import map from 'lodash-es/map'
-import omit from 'lodash-es/omit'
-import size from 'lodash-es/size'
+import cloneDeep from 'lodash-es/cloneDeep.js'
+import get from 'lodash-es/get.js'
+import map from 'lodash-es/map.js'
+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 isarr from 'wsemi/src/isarr.mjs'
+import iseobj from 'wsemi/src/iseobj.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 
 
@@ -192,7 +193,6 @@ 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 = {}) {
@@ -201,9 +201,8 @@ function WOrmMongodb(opt = {}) {
         //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)
@@ -223,15 +222,6 @@ function WOrmMongodb(opt = {}) {
                 data = [data]
             }
 
-            //oper
-            let oper = null
-            if (atomic) {
-                oper = 'findOneAndUpdate'
-            }
-            else {
-                oper = 'updateOne'
-            }
-
             //pmSeries
             res = await pmSeries(data, async(v) => {
 
@@ -239,38 +229,23 @@ 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)
 
-                //lastErrorObject for findOneAndUpdate
-                if (rest.lastErrorObject) {
-                    // console.log('rest.lastErrorObject', rest.lastErrorObject)
+                if (iseobj(rest)) {
                     rest = {
-                        // lastErrorObject: { n: 1, updatedExisting: true },
-                        // value: {
-                        //   _id: new ObjectId("615c18bb6e5db9935b10d88e"),
-                        //   id: 'id-rosemary',
-                        //   name: 'rosemary',
-                        //   value: 123.456
-                        // },
-                        // ok: 1
-                        n: rest.lastErrorObject.n,
-                        nModified: rest.lastErrorObject.updatedExisting ? 1 : 0,
+                        n: 1,
+                        nModified: 1,
                         ok: 1,
                     }
                 }
                 else {
                     rest = {
-                        // acknowledged: true,
-                        // modifiedCount: 1,
-                        // upsertedId: null,
-                        // upsertedCount: 0,
-                        // matchedCount: 1
-                        n: rest.matchedCount,
-                        nModified: rest.modifiedCount,
-                        ok: rest.acknowledged ? 1 : 0,
+                        n: 0,
+                        nModified: 0,
+                        ok: 1,
                     }
                 }
-                // console.log('rest', rest)
 
                 //autoInsert
                 if (autoInsert && rest.n === 0) {