w-orm-reladb 1.0.32 → 1.0.36

package/docs/WOrmReladb.html

@@ -3724,7 +3724,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Wed Jan 06 2021 10:12:59 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 3.6.7</a> on Thu Dec 16 2021 14:06:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WOrmReladb.mjs.html

@@ -57,7 +57,7 @@ import isarr from 'wsemi/src/isarr.mjs'
 import isobj from 'wsemi/src/isobj.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
-import arrhas from 'wsemi/src/arrhas.mjs'
+import arrHas from 'wsemi/src/arrHas.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 import pm2resolve from 'wsemi/src/pm2resolve.mjs'
 import pmQueue from 'wsemi/src/pmQueue.mjs'
@@ -147,7 +147,7 @@ function WOrmReladb(opt = {}) {
         console.log('no dialect in opt.url')
         return ee
     }
-    if (!arrhas(dialect, ['mssql', 'sqlite', 'mysql', 'mariadb', 'postgres'])) {
+    if (!arrHas(dialect, ['mssql', 'sqlite', 'mysql', 'mariadb', 'postgres'])) {
         console.log('invalid dialect in opt.url')
         return ee
     }
@@ -507,7 +507,7 @@ function WOrmReladb(opt = {}) {
             //bulkCreate
             await md.bulkCreate(data, setting)
                 .then((res) => {
-                    res = { n, ok: 1 }
+                    res = { n, nInserted: n, ok: 1 }
                     pm.resolve(res)
                     ee.emit('change', 'insert', data, res)
                 })
@@ -927,7 +927,7 @@ function WOrmReladb(opt = {}) {
             //destroy
             await md.destroy(setting)
                 .then((res) => {
-                    res = { n: res, ok: 1 }
+                    res = { n: res, nDeleted: res, ok: 1 }
                     pm.resolve(res)
                     ee.emit('change', 'delAll', null, res)
                 })
@@ -1108,7 +1108,7 @@ export default WOrmReladb
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Wed Jan 06 2021 10:12:59 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 3.6.7</a> on Thu Dec 16 2021 14:06:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -68,7 +68,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Wed Jan 06 2021 10:12:59 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 3.6.7</a> on Thu Dec 16 2021 14:06:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/{sp-genModelsByTabs.mjs → g-genModelsByTabs.mjs}

@@ -70,4 +70,4 @@ test()
 // generate file:  ./models/tb2.json
 // generate file:  ./models/tb3.json
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-genModelsByTabs.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-genModelsByTabs.mjs

package/{sp-mssql-concurrency.mjs → g-mssql-concurrency.mjs}

@@ -106,4 +106,4 @@ test()
 // save then 3 msg= [ { n: 1, nInserted: 1, ok: 1 } ]
 // select then 4 len= 2
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-mssql-concurrency.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-mssql-concurrency.mjs

package/{sp-mssql-timerQuery.mjs → g-mssql-timerQuery.mjs}

@@ -46,4 +46,4 @@ async function test() {
 }
 test()
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-mssql-timerQuery.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-mssql-timerQuery.mjs

package/{sp-mssql-transaction-commit.mjs → g-mssql-transaction-commit.mjs}

@@ -197,12 +197,13 @@ testCommit()
 // delAll then { n: 2, ok: 1 }
 // init
 // change insert
-// insert then { n: 3, ok: 1 }
+// insert then { n: 3, nInserted: 3, ok: 1 }
 // change save
 // save then [
 //   { n: 1, nModified: 1, ok: 1 },
 //   { n: 1, nModified: 1, ok: 1 },
-//   { n: 0, nModified: 0, ok: 1 }
+//   { n: 0, nModified: 0, ok: 1 } //autoInsert=false
+//   { n: 1, nInserted: 1, ok: 1 } //autoInsert=true
 // ]
 // change del
 // del then [
@@ -220,4 +221,4 @@ testCommit()
 // ]
 // commit success
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-mssql-transaction-commit.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-mssql-transaction-commit.mjs

package/{sp-mssql-transaction-rollback.mjs → g-mssql-transaction-rollback.mjs}

@@ -191,15 +191,16 @@ async function testRollback() {
 testRollback()
 // createStorage
 // change delAll
-// delAll then { n: 0, ok: 1 }
+// delAll then { n: 0, nDeleted: 0, ok: 1 }
 // init
 // change insert
-// insert then { n: 3, ok: 1 }
+// insert then { n: 3, nInserted: 3, ok: 1 }
 // change save
 // save then [
 //   { n: 1, nModified: 1, ok: 1 },
 //   { n: 1, nModified: 1, ok: 1 },
-//   { n: 0, nModified: 0, ok: 1 }
+//   { n: 0, nModified: 0, ok: 1 } //autoInsert=false
+//   { n: 1, nInserted: 1, ok: 1 } //autoInsert=true
 // ]
 // change del
 // del then [
@@ -214,4 +215,4 @@ testRollback()
 // select all (final) []
 // rollback success
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-mssql-transaction-rollback.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-mssql-transaction-rollback.mjs

package/{sp-mssql.mjs → g-mssql.mjs}

@@ -99,7 +99,7 @@ async function test() {
 
 
     //save
-    await w.save(rsm, { autoInsert: false })
+    await w.save(rsm, { autoInsert: true })
         .then(function(msg) {
             console.log('save then', msg)
         })
@@ -158,14 +158,15 @@ async function test() {
 test()
 // createStorage
 // change delAll
-// delAll then { n: 0, ok: 1 }
+// delAll then { n: 0, nDeleted: 0, ok: 1 }
 // change insert
-// insert then { n: 3, ok: 1 }
+// insert then { n: 3, nInserted: 3, ok: 1 }
 // change save
 // save then [
 //   { n: 1, nModified: 1, ok: 1 },
 //   { n: 1, nModified: 1, ok: 1 },
-//   { n: 0, nModified: 0, ok: 1 }
+//   { n: 0, nModified: 0, ok: 1 } //autoInsert=false
+//   { n: 1, nInserted: 1, ok: 1 } //autoInsert=true
 // ]
 // select all [
 //   { id: 'id-peter', name: 'peter(modify)', value: 123 },
@@ -194,4 +195,4 @@ test()
 //   { n: 1, nDeleted: 1, ok: 1 }
 // ]
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-mssql.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-mssql.mjs

package/{sp-sqlite-concurrency.mjs → g-sqlite-concurrency.mjs}

@@ -1,5 +1,5 @@
-import wo from './src/WOrmReladb.mjs'
 import fs from 'fs'
+import wo from './src/WOrmReladb.mjs'
 
 
 let username = ''
@@ -106,4 +106,4 @@ test()
 // save then 3 msg= [ { n: 1, nInserted: 1, ok: 1 } ]
 // select then 4 len= 2
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-sqlite-concurrency.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-sqlite-concurrency.mjs

package/g-sqlite-encryption-transaction-commit.mjs

@@ -0,0 +1,196 @@
+// import fs from 'fs'
+// import wo from './src/WOrmReladb.mjs'
+
+
+// let username = 'username'
+// let password = 'password'
+// let opt = {
+//     url: `sqlite://${username}:${password}`,
+//     db: 'worm',
+//     cl: 'users',
+//     fdModels: './models',
+//     // modelType: 'json',
+//     // autoGenPK: false,
+//     storage: './worm.sqlite',
+//     useEncryption: true,
+// }
+
+// //因worm.sqlite可能為加密數據, 若有切換useEncryption時得先刪除, 再通過createStorage重新產生
+// if (fs.existsSync(opt.storage)) {
+//     fs.unlinkSync(opt.storage)
+// }
+
+// let rs = [
+//     {
+//         id: 'id-peter',
+//         name: 'peter',
+//         value: 123,
+//     },
+//     {
+//         id: 'id-rosemary',
+//         name: 'rosemary',
+//         value: 123.456,
+//     },
+//     {
+//         id: '',
+//         name: 'kettle',
+//         value: 456,
+//     },
+// ]
+
+// let rsm = [
+//     {
+//         id: 'id-peter',
+//         name: 'peter(modify)'
+//     },
+//     {
+//         id: 'id-rosemary',
+//         name: 'rosemary(modify)'
+//     },
+//     {
+//         id: '',
+//         name: 'kettle(modify)'
+//     },
+// ]
+
+// async function testCommit() {
+
+
+//     //w
+//     let w = wo(opt)
+
+
+//     //createStorage, create table for mssql
+//     await w.createStorage()
+//     console.log('createStorage')
+
+
+//     //genModelsByDB, disable if got models
+//     // await w.genModelsByDB({
+//     //     username,
+//     //     password,
+//     //     dialect: 'mssql', //default
+//     //     host: 'localhost', //default
+//     //     port: 1433, //default
+//     //     db: opt.db,
+//     //     fdModels: opt.fdModels,
+//     // })
+
+
+//     //on
+//     w.on('change', function(mode, data, res) {
+//         console.log('change', mode)
+//     })
+//     w.on('error', function(err) {
+//         console.log('error', err)
+//     })
+
+
+//     //delAll
+//     await w.delAll()
+//         .then(function(msg) {
+//             console.log('delAll then', msg)
+//         })
+//         .catch(function(msg) {
+//             console.log('delAll catch', msg)
+//         })
+
+
+//     //connState
+//     let instance = await w.init()
+//     let transaction = await w.genTransaction()
+//     let connState = {
+//         instance, //可由外部初始化共用instance, 可單獨使用不另外給transaction
+//         transaction, //若外部使用共用之transaction, 亦需使用共用instance
+//     }
+//     console.log('init')
+
+
+//     //insert
+//     await w.insert(rs, connState)
+//         .then(function(msg) {
+//             console.log('insert then', msg)
+//         })
+//         .catch(function(msg) {
+//             console.log('insert catch', msg)
+//         })
+
+
+//     //save
+//     await w.save(rsm, { ...connState, autoInsert: false })
+//         .then(function(msg) {
+//             console.log('save then', msg)
+//         })
+//         .catch(function(msg) {
+//             console.log('save catch', msg)
+//         })
+
+
+//     //del
+//     await w.del({ id: 'id-rosemary' }, connState)
+//         .then(function(msg) {
+//             console.log('del then', msg)
+//         })
+//         .catch(function(msg) {
+//             console.log('del catch', msg)
+//         })
+
+
+//     //select all
+//     let ssBeforeCommit = await w.select(null, connState)
+//     console.log('select all (before commit)', ssBeforeCommit) //此時select可查到暫時有效的數據
+//     // => [
+//     //     { id: 'id-peter', name: 'peter(modify)', value: 123 },
+//     //     { id: '{random id}', name: 'kettle', value: 456 }
+//     // ]
+
+
+//     //commit
+//     await transaction.commit()
+//     console.log('commit')
+
+
+//     //close
+//     await instance.close()
+//     console.log('close')
+
+
+//     //select all
+//     let ssFinal = await w.select()
+//     console.log('select all (final)', ssFinal)
+//     // => [
+//     //     { id: 'id-peter', name: 'peter(modify)', value: 123 },
+//     //     { id: '{random id}', name: 'kettle', value: 456 }
+//     // ]
+
+
+//     //check
+//     let rPeter = ssFinal.filter((v) => {
+//         return v.name === 'peter(modify)'
+//     })
+//     let bPeter = rPeter?.[0]?.value === 123
+
+//     let rRosemary = ssFinal.filter((v) => {
+//         return v.name === 'rosemary(modify)'
+//     })
+//     let bRosemary = rRosemary?.[0]?.value === 123.456
+
+//     let rKettle = ssFinal.filter((v) => {
+//         return v.name === 'kettle'
+//     })
+//     let bKettle = rKettle?.[0]?.value === 456
+
+//     if (bPeter && !bRosemary && bKettle) {
+//         console.log('commit success')
+//     }
+//     else {
+//         console.log('commit error')
+//     }
+
+
+// }
+// testCommit()
+
+// @journeyapps/sqlcipher can not support transaction.
+
+//node --experimental-modules --es-module-specifier-resolution=node g-sqlite-encryption-transaction-commit.mjs

package/{sp-sqlite-encryption-transaction-rollback.mjs → g-sqlite-encryption-transaction-rollback.mjs}

@@ -1,3 +1,3 @@
 // @journeyapps/sqlcipher can not support transaction.
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-sqlite-encryption-transaction-rollback.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-sqlite-encryption-transaction-rollback.mjs

package/{sp-sqlite-encryption.mjs → g-sqlite-encryption.mjs}

@@ -1,5 +1,5 @@
-import wo from './src/WOrmReladb.mjs'
 import fs from 'fs'
+import wo from './src/WOrmReladb.mjs'
 
 
 let username = 'username'
@@ -173,14 +173,15 @@ async function test() {
 test()
 // createStorage
 // change delAll
-// delAll then { n: 0, ok: 1 }
+// delAll then { n: 0, nDeleted: 0, ok: 1 }
 // change insert
-// insert then { n: 3, ok: 1 }
+// insert then { n: 3, nInserted: 3, ok: 1 }
 // change save
 // save then [
 //   { n: 1, nModified: 1, ok: 1 },
 //   { n: 1, nModified: 1, ok: 1 },
-//   { n: 0, nModified: 0, ok: 1 }
+//   { n: 0, nModified: 0, ok: 1 } //autoInsert=false
+//   { n: 1, nInserted: 1, ok: 1 } //autoInsert=true
 // ]
 // select all [
 //   { id: 'id-peter', name: 'peter(modify)', value: 123 },
@@ -209,4 +210,4 @@ test()
 //   { n: 1, nDeleted: 1, ok: 1 }
 // ]
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-sqlite-encryption.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-sqlite-encryption.mjs

package/{sp-sqlite-transaction-commit.mjs → g-sqlite-transaction-commit.mjs}

@@ -1,5 +1,5 @@
-import wo from './src/WOrmReladb.mjs'
 import fs from 'fs'
+import wo from './src/WOrmReladb.mjs'
 
 
 let username = ''
@@ -201,15 +201,16 @@ async function testCommit() {
 testCommit()
 // createStorage
 // change delAll
-// delAll then { n: 0, ok: 1 }
+// delAll then { n: 0, nDeleted: 0, ok: 1 }
 // init
 // change insert
-// insert then { n: 3, ok: 1 }
+// insert then { n: 3, nInserted: 3, ok: 1 }
 // change save
 // save then [
 //   { n: 1, nModified: 1, ok: 1 },
 //   { n: 1, nModified: 1, ok: 1 },
-//   { n: 0, nModified: 0, ok: 1 }
+//   { n: 0, nModified: 0, ok: 1 } //autoInsert=false
+//   { n: 1, nInserted: 1, ok: 1 } //autoInsert=true
 // ]
 // change del
 // del then [
@@ -227,4 +228,4 @@ testCommit()
 // ]
 // commit success
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-sqlite-transaction-commit.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-sqlite-transaction-commit.mjs

package/{sp-sqlite-transaction-rollback.mjs → g-sqlite-transaction-rollback.mjs}

@@ -1,5 +1,5 @@
-import wo from './src/WOrmReladb.mjs'
 import fs from 'fs'
+import wo from './src/WOrmReladb.mjs'
 
 
 let username = ''
@@ -198,15 +198,16 @@ async function testRollback() {
 testRollback()
 // createStorage
 // change delAll
-// delAll then { n: 0, ok: 1 }
+// delAll then { n: 0, nDeleted: 0, ok: 1 }
 // init
 // change insert
-// insert then { n: 3, ok: 1 }
+// insert then { n: 3, nInserted: 3, ok: 1 }
 // change save
 // save then [
 //   { n: 1, nModified: 1, ok: 1 },
 //   { n: 1, nModified: 1, ok: 1 },
-//   { n: 0, nModified: 0, ok: 1 }
+//   { n: 0, nModified: 0, ok: 1 } //autoInsert=false
+//   { n: 1, nInserted: 1, ok: 1 } //autoInsert=true
 // ]
 // change del
 // del then [
@@ -221,4 +222,4 @@ testRollback()
 // select all (final) []
 // rollback success
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-sqlite-transaction-rollback.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-sqlite-transaction-rollback.mjs

package/{sp-sqlite.mjs → g-sqlite.mjs}

@@ -1,5 +1,5 @@
-import wo from './src/WOrmReladb.mjs'
 import fs from 'fs'
+import wo from './src/WOrmReladb.mjs'
 
 
 let username = ''
@@ -166,14 +166,15 @@ async function test() {
 test()
 // createStorage
 // change delAll
-// delAll then { n: 0, ok: 1 }
+// delAll then { n: 0, nDeleted: 0, ok: 1 }
 // change insert
-// insert then { n: 3, ok: 1 }
+// insert then { n: 3, nInserted: 3, ok: 1 }
 // change save
 // save then [
 //   { n: 1, nModified: 1, ok: 1 },
 //   { n: 1, nModified: 1, ok: 1 },
-//   { n: 0, nModified: 0, ok: 1 }
+//   { n: 0, nModified: 0, ok: 1 } //autoInsert=false
+//   { n: 1, nInserted: 1, ok: 1 } //autoInsert=true
 // ]
 // select all [
 //   { id: 'id-peter', name: 'peter(modify)', value: 123 },
@@ -202,4 +203,4 @@ test()
 //   { n: 1, nDeleted: 1, ok: 1 }
 // ]
 
-//node --experimental-modules --es-module-specifier-resolution=node sp-sqlite.mjs
+//node --experimental-modules --es-module-specifier-resolution=node g-sqlite.mjs

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "w-orm-reladb",
-  "version": "1.0.32",
-  "description": "An object of operator for relational database in nodejs, like a simple ORM.",
+  "version": "1.0.36",
+  "description": "An object of operator for relational database in nodejs.",
   "main": "dist/w-orm-reladb.umd.js",
   "dependencies": {
-    "json5": "^2.1.3",
-    "lodash": "^4.17.20",
-    "mssql": "^6.3.1",
-    "sqlite3": "^5.0.0",
-    "w-auto-sequelize": "^1.0.14",
-    "wsemi": "^1.5.42"
+    "json5": "^2.2.0",
+    "lodash": "^4.17.21",
+    "mssql": "^7.3.0",
+    "sqlite3": "^5.0.2",
+    "w-auto-sequelize": "^1.0.17",
+    "wsemi": "^1.6.34"
   },
   "dependenciesTemp": {
     "msg": "install sqlcipher for protection when db=sqlite",
-    "@journeyapps/sqlcipher": "^5.0.0"
+    "@journeyapps/sqlcipher": "^5.2.0"
   },
   "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/WOrmReladb.mjs

@@ -13,7 +13,7 @@ import isarr from 'wsemi/src/isarr.mjs'
 import isobj from 'wsemi/src/isobj.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
-import arrhas from 'wsemi/src/arrhas.mjs'
+import arrHas from 'wsemi/src/arrHas.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 import pm2resolve from 'wsemi/src/pm2resolve.mjs'
 import pmQueue from 'wsemi/src/pmQueue.mjs'
@@ -103,7 +103,7 @@ function WOrmReladb(opt = {}) {
         console.log('no dialect in opt.url')
         return ee
     }
-    if (!arrhas(dialect, ['mssql', 'sqlite', 'mysql', 'mariadb', 'postgres'])) {
+    if (!arrHas(dialect, ['mssql', 'sqlite', 'mysql', 'mariadb', 'postgres'])) {
         console.log('invalid dialect in opt.url')
         return ee
     }
@@ -463,7 +463,7 @@ function WOrmReladb(opt = {}) {
             //bulkCreate
             await md.bulkCreate(data, setting)
                 .then((res) => {
-                    res = { n, ok: 1 }
+                    res = { n, nInserted: n, ok: 1 }
                     pm.resolve(res)
                     ee.emit('change', 'insert', data, res)
                 })
@@ -883,7 +883,7 @@ function WOrmReladb(opt = {}) {
             //destroy
             await md.destroy(setting)
                 .then((res) => {
-                    res = { n: res, ok: 1 }
+                    res = { n: res, nDeleted: res, ok: 1 }
                     pm.resolve(res)
                     ee.emit('change', 'delAll', null, res)
                 })