w-orm-reladb 1.0.32 → 1.0.36

package/.eslintrc.js

@@ -1,50 +1,54 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true,
-        "mocha": true
-    },
-    "extends": ["plugin:vue/base", "plugin:vue/essential", "standard"],
-    "plugins": [
-        "vue"
-    ],
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parser": "vue-eslint-parser",
-    "parserOptions": {
-        "parser": "babel-eslint",
-        "ecmaVersion": 2019,
-        "sourceType": "module",
-    },
-    rules: {
-        'generator-star-spacing': 'off',
-        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-        'indent': ['error', 4],
-        'no-console': 'off',
-        'comma-dangle': ['error', {
-            'arrays': 'ignore',
-            'objects': 'ignore',
-            'imports': 'never',
-            'exports': 'never',
-            'functions': 'ignore'
-        }],
-        'no-multiple-empty-lines': ['error', { 'max': 2, 'maxEOF': 2 }],
-        //'space-before-function-paren': ['error', { 'anonymous': 'always', 'named': 'never' }],
-        'space-before-function-paren': 'off',
-        'spaced-comment': 'off',
-        'brace-style': ['error', 'stroustrup'],
-        'padded-blocks': 'off',
-        'no-constant-condition': 'off',
-        'camelcase': 'off',
-        'no-new': 'off',
-        'prefer-const': 'off',
-        'quote-props': ['error', 'consistent'],
-        'dot-notation': 'off',
-        'standard/no-callback-literal': 'off',
-        'quotes': ['error', 'single', { 'allowTemplateLiterals': true }],
-        'prefer-promise-reject-errors': 'off',
-        'no-unused-vars': ['error', { 'args': 'none', 'ignoreRestSiblings': true, 'argsIgnorePattern': '^_' }],
-    }
+module.exports = {
+    "env": {
+        "browser": true,
+        "es6": true,
+        "mocha": true
+    },
+    "extends": ["plugin:vue/base", "plugin:vue/essential", "standard"],
+    "plugins": [
+        "vue"
+    ],
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parser": "vue-eslint-parser",
+    "parserOptions": {
+        "parser": "babel-eslint",
+        "ecmaVersion": 2019,
+        "sourceType": "module",
+    },
+    rules: {
+        'generator-star-spacing': 'off',
+        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+        'indent': ['error', 4],
+        'no-console': 'off',
+        'comma-dangle': ['error', {
+            'arrays': 'ignore',
+            'objects': 'ignore',
+            'imports': 'never',
+            'exports': 'never',
+            'functions': 'ignore'
+        }],
+        'no-multiple-empty-lines': ['error', { 'max': 2, 'maxEOF': 2 }],
+        //'space-before-function-paren': ['error', { 'anonymous': 'always', 'named': 'never' }],
+        'space-before-function-paren': 'off',
+        'spaced-comment': 'off',
+        'brace-style': ['error', 'stroustrup'],
+        'padded-blocks': 'off',
+        'no-constant-condition': 'off',
+        'camelcase': 'off',
+        'no-new': 'off',
+        'prefer-const': 'off',
+        'quote-props': ['error', 'consistent'],
+        'dot-notation': 'off',
+        'standard/no-callback-literal': 'off',
+        'quotes': ['error', 'single', { 'allowTemplateLiterals': true }],
+        'prefer-promise-reject-errors': 'off',
+        'no-unused-vars': ['error', { 'args': 'none', 'ignoreRestSiblings': true, 'argsIgnorePattern': '^_' }],
+        'node/no-callback-literal': 'off',
+        'prefer-regex-literals': 'off',
+        'array-callback-return': 'off',
+        'no-unreachable-loop': 'off',
+    }
 };

package/.github/workflows/ci-test.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [16.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -17,6 +17,7 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - run: npm cache clean -f
     - run: npm install
     - run: npm test
       env:

package/README.md

@@ -1,9 +1,8 @@
 # w-orm-reladb
-An object of operator for relational database in nodejs, like a simple ORM.
+An object of operator for relational database in nodejs.
 
 ![language](https://img.shields.io/badge/language-JavaScript-orange.svg) 
 [![npm version](http://img.shields.io/npm/v/w-orm-reladb.svg?style=flat)](https://npmjs.org/package/w-orm-reladb) 
-[![Build Status](https://travis-ci.org/yuda-lyu/w-orm-reladb.svg?branch=master)](https://travis-ci.org/yuda-lyu/w-orm-reladb) 
 [![license](https://img.shields.io/npm/l/w-orm-reladb.svg?style=flat)](https://npmjs.org/package/w-orm-reladb) 
 [![gzip file size](http://img.badgesize.io/yuda-lyu/w-orm-reladb/master/dist/w-orm-reladb.umd.js.svg?compression=gzip)](https://github.com/yuda-lyu/w-orm-reladb)
 [![npm download](https://img.shields.io/npm/dt/w-orm-reladb.svg)](https://npmjs.org/package/w-orm-reladb) 
@@ -21,7 +20,7 @@ To view documentation or get support, visit [docs](https://yuda-lyu.github.io/w-
 
 ## Installation
 ### Using npm(ES6 module):
-> **Note:** `w-orm-reladb` depends on `sequelize`, `mssql`, `sqlite3` and `w-auto-sequelize`.
+> **Note:** `w-orm-reladb` is mainly dependent on `sequelize`, `mssql`, `sqlite3` and `w-auto-sequelize`.
 
 > **Note:** `@journeyapps/sqlcipher` is not compiled into the *.umd file by default, and it is not tied to the dependents for general use in package.json.
 
@@ -30,7 +29,7 @@ npm i w-orm-reladb
 ```
 
 #### Example for mssql
-> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/sp-mssql.mjs)]
+> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/g-mssql.mjs)]
 ```alias
 import wo from 'w-orm-reladb'
 
@@ -192,14 +191,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 },
@@ -230,7 +230,7 @@ test()
 ```
 
 #### Example of commit transaction for mssql
-> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/sp-mssql-transaction-commit.mjs)]
+> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/g-mssql-transaction-commit.mjs)]
 ```alias
 import wo from 'w-orm-reladb'
 
@@ -421,12 +421,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 [
@@ -446,7 +447,7 @@ testCommit()
 ```
 
 #### Example of rollback transaction for mssql
-> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/sp-mssql-transaction-rollback.mjs)]
+> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/g-mssql-transaction-rollback.mjs)]
 ```alias
 import wo from 'w-orm-reladb'
 
@@ -631,15 +632,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 [
@@ -656,10 +658,10 @@ testRollback()
 ```
 
 #### Example for sqlite
-> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/sp-sqlite.mjs)]
+> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/g-sqlite.mjs)]
 ```alias
-import wo from 'w-orm-reladb'
 import fs from 'fs'
+import wo from 'w-orm-reladb'
 
 
 let username = 'username'
@@ -826,14 +828,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 },
@@ -864,10 +867,10 @@ test()
 ```
 
 #### Example commit transaction for sqlite
-> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/sp-sqlite-transaction-commit.mjs)]
+> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/g-sqlite-transaction-commit.mjs)]
 ```alias
-import wo from 'w-orm-reladb'
 import fs from 'fs'
+import wo from 'w-orm-reladb'
 
 
 let username = 'username'
@@ -1059,15 +1062,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 [
@@ -1087,10 +1091,10 @@ testCommit()
 ```
 
 #### Example rollback transaction for sqlite
-> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/sp-sqlite-transaction-rollback.mjs)]
+> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/g-sqlite-transaction-rollback.mjs)]
 ```alias
-import wo from 'w-orm-reladb'
 import fs from 'fs'
+import wo from 'w-orm-reladb'
 
 
 let username = 'username'
@@ -1279,15 +1283,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 [
@@ -1304,10 +1309,10 @@ testRollback()
 ```
 
 #### Example of sqlcipher for sqlite
-> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/sp-sqlite-encryption.mjs)]
+> **Link:** [[dev source code](https://github.com/yuda-lyu/w-orm-reladb/blob/master/g-sqlite-encryption.mjs)]
 ```alias
-import wo from 'w-orm-reladb'
 import fs from 'fs'
+import wo from 'w-orm-reladb'
 
 
 let username = 'username'
@@ -1481,14 +1486,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 },

package/SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security issues to `firsemisphere@gmail.com`