w-orm-mongodb 1.1.20 → 1.1.24

package/g-gfs.mjs

@@ -0,0 +1,101 @@
+import path from 'path'
+import fs from 'fs'
+import wo from './src/WOrmMongodb.mjs'
+//import wo from './dist/w-orm-mongodb.umd.js'
+
+
+let opt = {
+    url: 'mongodb://username:password@127.0.0.1:27017',
+    db: 'worm',
+    cl: 'usersGfs',
+}
+
+async function test() {
+
+
+    //w
+    let w = wo(opt)
+
+
+    //on
+    w.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')
+
+
+    //unlinkSync
+    fs.unlinkSync(fn_out)
+
+
+    //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()
+        .then(function(msg) {
+            console.log('delAllGfs then', msg)
+        })
+        .catch(function(msg) {
+            console.log('delAllGfs catch', msg)
+        })
+
+
+    //insertGfs
+    let gi = await w.insertGfs(u8a)
+    console.log('insertGfs', gi)
+
+
+    //selectGfs
+    let gs = await w.selectGfs(gi.id)
+    console.log('selectGfs', gs)
+    fs.writeFileSync(fn_out, gs)
+
+
+    //delGfs
+    let gd = await w.delGfs(gi.id)
+    console.log('delGfs', gd)
+
+
+}
+test()
+// u8a Uint8Array(47381362) [
+//     0,   0,   0,  24, 102, 116, 121, 112, 109, 112, 52,  50,
+//     0,   0,   0,   0, 105, 115, 111, 109, 109, 112, 52,  50,
+//     0,   2,  14,  73, 109, 111, 111, 118,   0,   0,  0, 108,
+//   109, 118, 104, 100,   0,   0,   0,   0, 214,  15, 24, 167,
+//   214,  15,  24, 167,   0,   1,  95, 144,   1, 106, 95,  88,
+//     0,   1,   0,   0,   1,   0,   0,   0,   0,   0,  0,   0,
+//     0,   0,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,
+//     0,   0,   0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
+//     0,   0,   0,   0,
+//   ... 47381262 more items
+// ]
+// change delAllGfs
+// delAllGfs then { n: 0, ok: 1 }
+// change insertGfs
+// insertGfs { n: 1, ok: 1, id: {random id} }
+// selectGfs Uint8Array(47381362) [
+//     0,   0,   0,  24, 102, 116, 121, 112, 109, 112, 52,  50,
+//     0,   0,   0,   0, 105, 115, 111, 109, 109, 112, 52,  50,
+//     0,   2,  14,  73, 109, 111, 111, 118,   0,   0,  0, 108,
+//   109, 118, 104, 100,   0,   0,   0,   0, 214,  15, 24, 167,
+//   214,  15,  24, 167,   0,   1,  95, 144,   1, 106, 95,  88,
+//     0,   1,   0,   0,   1,   0,   0,   0,   0,   0,  0,   0,
+//     0,   0,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,
+//     0,   0,   0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
+//     0,   0,   0,   0,
+//   ... 47381262 more items
+// ]
+// change delGfs
+// delGfs { n: 1, nDeleted: 1, ok: 1 }
+
+//node --experimental-modules --es-module-specifier-resolution=node g-gfs.mjs

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "w-orm-mongodb",
-  "version": "1.1.20",
-  "description": "An object of operator for mongodb in nodejs, like a simple ORM.",
+  "version": "1.1.24",
+  "description": "An object of operator for mongodb in nodejs.",
   "main": "dist/w-orm-mongodb.umd.js",
   "dependencies": {
-    "mongodb": "^3.6.2",
+    "mongodb": "^4.1.4",
     "saslprep": "^1.0.3",
-    "lodash": "^4.17.20",
-    "wsemi": "^1.5.26"
+    "lodash": "^4.17.21",
+    "wsemi": "^1.6.31"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.30"
+    "w-package-tools": "^1.0.59"
   },
   "scripts": {
-    "test": "./node_modules/.bin/mocha --require @babel/register",
+    "test": "mocha --parallel --timeout 60000 --experimental-modules --es-module-specifier-resolution=node",
     "deploy": "gh-pages -d docs"
   },
   "repository": {

package/src/WOrmMongodb.mjs

@@ -139,7 +139,11 @@ function WOrmMongodb(opt = {}) {
 
                     //check
                     if (res.insertedCount > 0) {
-                        res = res.result
+                        res = {
+                            n: size(data),
+                            nInserted: res.insertedCount,
+                            ok: res.acknowledged ? 1 : 0,
+                        }
                         pm.resolve(res)
                         ee.emit('change', 'insert', data, res)
                     }
@@ -199,11 +203,12 @@ function WOrmMongodb(opt = {}) {
         }
 
         //pmSeries
-        pmSeries(data, function(v) {
+        pmSeries(data, async(v) => {
             let pmm = genPm()
 
             //oper
             collection[oper]({ id: v.id }, { $set: v }, function(err, res) {
+                // console.log(oper, 'res', res)
                 if (err) {
                     pmm.reject(err)
                 }
@@ -211,18 +216,39 @@ function WOrmMongodb(opt = {}) {
 
                     //lastErrorObject for findOneAndUpdate
                     if (res.lastErrorObject) {
-                        res.result = {
+                        // console.log('res.lastErrorObject', res.lastErrorObject)
+                        res = {
+                            // lastErrorObject: { n: 1, updatedExisting: true },
+                            // value: {
+                            //   _id: new ObjectId("615c18bb6e5db9935b10d88e"),
+                            //   id: 'id-rosemary',
+                            //   name: 'rosemary',
+                            //   value: 123.456
+                            // },
+                            // ok: 1
                             n: res.lastErrorObject.n,
                             nModified: res.lastErrorObject.updatedExisting ? 1 : 0,
                             ok: 1,
                         }
                     }
+                    else {
+                        res = {
+                            // acknowledged: true,
+                            // modifiedCount: 1,
+                            // upsertedId: null,
+                            // upsertedCount: 0,
+                            // matchedCount: 1
+                            n: res.matchedCount,
+                            nModified: res.modifiedCount,
+                            ok: res.acknowledged ? 1 : 0,
+                        }
+                    }
+                    // console.log('res', res)
 
                     //autoInsert
-                    if (autoInsert && res.result.n === 0) {
+                    if (autoInsert && res.n === 0) {
                         insert(v)
                             .then(function(res) {
-                                res.nInserted = 1
                                 pmm.resolve(res)
                             })
                             .catch(function(err) {
@@ -230,7 +256,7 @@ function WOrmMongodb(opt = {}) {
                             })
                     }
                     else {
-                        pmm.resolve(res.result)
+                        pmm.resolve(res)
                     }
 
                 }
@@ -291,8 +317,11 @@ function WOrmMongodb(opt = {}) {
                         pmm.resolve(err) //找不到數據刪除採resovle回傳
                     }
                     else {
-                        res = res.result
-                        res.nDeleted = 1
+                        res = {
+                            n: res.deletedCount,
+                            nDeleted: res.deletedCount,
+                            ok: res.acknowledged ? 1 : 0,
+                        }
                         pmm.resolve(res)
                     }
                 })
@@ -340,7 +369,11 @@ function WOrmMongodb(opt = {}) {
                     pm.resolve(err) //找不到數據刪除採resovle回傳
                 }
                 else {
-                    res = res.result
+                    res = {
+                        n: res.deletedCount,
+                        nDeleted: res.deletedCount,
+                        ok: res.acknowledged ? 1 : 0,
+                    }
                     pm.resolve(res)
                     ee.emit('change', 'delAll', null, res)
                 }
@@ -559,7 +592,11 @@ function WOrmMongodb(opt = {}) {
                     pm.reject(err)
                 }
                 else {
-                    let res = { n: 1, nDeleted: 1, ok: 1 }
+                    let res = {
+                        n: 1,
+                        nDeleted: 1,
+                        ok: 1,
+                    }
 
                     //resolve
                     pm.resolve(res)
@@ -588,7 +625,11 @@ function WOrmMongodb(opt = {}) {
                 pm.reject(err)
             }
             else {
-                pm.resolve({ n: 1, nDeleted: 1, ok: 1 })
+                pm.resolve({
+                    n: 1,
+                    nDeleted: 1,
+                    ok: 1,
+                })
             }
         })
 

package/.travis.yml

@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-    - "13"
-install:
-    - npm install

package/sclb.mjs

@@ -1,64 +0,0 @@
-import wo from './src/WOrmMongodb.mjs'
-//import wo from './dist/w-orm-mongodb.umd.js'
-import fs from 'fs'
-
-
-let opt = {
-    url: 'mongodb://username:password@127.0.0.1:27017',
-    db: 'worm',
-    cl: 'usersGfs',
-}
-
-async function test() {
-
-
-    //w
-    let w = wo(opt)
-
-
-    //on
-    w.on('change', function(mode, data, res) {
-        console.log('change', mode)
-    })
-
-
-    //fn_in, fn_out
-    let fn_in = 'D:\\開源-JS-004-2-w-orm-mongodb\\data(in).dat'
-    let fn_out = 'D:\\開源-JS-004-2-w-orm-mongodb\\data(out).dat'
-
-
-    //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()
-        .then(function(msg) {
-            console.log('delAllGfs then', msg)
-        })
-        .catch(function(msg) {
-            console.log('delAllGfs catch', msg)
-        })
-
-
-    //insertGfs
-    let gi = await w.insertGfs(u8a)
-    console.log('insertGfs', gi)
-
-
-    //selectGfs
-    let gs = await w.selectGfs(gi.id)
-    console.log('selectGfs', gs)
-    fs.writeFileSync(fn_out, gs)
-
-
-    //delGfs
-    let gd = await w.delGfs(gi.id)
-    console.log('delGfs', gd)
-
-
-}
-test()