w-orm-postgresql 1.0.0 → 1.0.1

package/g-basic.mjs

@@ -1,5 +1,5 @@
-import wo from './src/WOrmPostgresql.mjs'
-//import wo from './dist/w-orm-postgresql.umd.js'
+import WOrm from './src/WOrmPostgresql.mjs'
+//import WOrm from './dist/w-orm-postgresql.umd.js'
 
 
 let opt = {
@@ -105,11 +105,11 @@ let rsm = [
 
 async function test() {
 
-    //w
-    let w = wo(opt)
-    // console.log('w', w)
+    //wo
+    let wo = WOrm(opt)
+    // console.log('wo', wo)
 
-    await w.createTable(opt.cl, 'time', {
+    await wo.createTable(opt.cl, 'time', {
         time: '2000-01-01T00:00:00Z', //time
         name: 'abc', //string
         value: 0.1, //float
@@ -122,12 +122,12 @@ async function test() {
         })
 
     //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)
         })
@@ -136,7 +136,7 @@ async function test() {
         })
 
     //insert
-    await w.insert(rs)
+    await wo.insert(rs)
         .then(function(msg) {
             console.log('insert then', msg)
         })
@@ -145,7 +145,7 @@ async function test() {
         })
 
     //save
-    await w.save(rsm, { autoInsert: true })
+    await wo.save(rsm, { autoInsert: true })
         .then(function(msg) {
             console.log('save then', msg)
         })
@@ -154,34 +154,34 @@ async function test() {
         })
 
     //select all
-    let ss = await w.select()
+    let ss = await wo.select()
     console.log('select all', ss)
 
     //select
-    let so = await w.select({ name: 'rosemary' })
+    let so = await wo.select({ name: 'rosemary' })
     console.log('select by name', 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 = {
         time: '2024-01-01T00:00:00Z',
     }
-    await w.del(d)
+    await wo.del(d)
         .then(function(msg) {
             console.log('del then', msg)
         })
@@ -193,7 +193,7 @@ async function test() {
     let ds = ss.filter(function(v) {
         return v.name.indexOf('peter') >= 0 || v.name.indexOf('kettle') >= 0 || v.name.indexOf('sandler') >= 0
     })
-    await w.del(ds)
+    await wo.del(ds)
         .then(function(msg) {
             console.log('del then', msg)
         })
@@ -202,7 +202,7 @@ async function test() {
         })
 
     //select all final
-    let ss2 = await w.select()
+    let ss2 = await wo.select()
     console.log('select all final', ss2)
 
 }
@@ -303,4 +303,4 @@ test()
 //   }
 // ]
 
-//node --experimental-modules g-basic.mjs
+//node g-basic.mjs

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "w-orm-postgresql",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/w-orm-postgresql.umd.js",
   "dependencies": {
     "mongo-sql": "^6.2.0",
-    "pg": "^8.14.1",
+    "pg": "^8.15.6",
     "lodash-es": "^4.17.21",
-    "wsemi": "^1.7.72"
+    "wsemi": "^1.7.90"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.82"
+    "w-package-tools": "^1.0.90"
   },
   "scripts": {
-    "test": "mocha --parallel --timeout 60000 --experimental-modules",
+    "test": "mocha --parallel --timeout 60000",
     "deploy": "gh-pages -d docs"
   },
   "repository": {

package/script.txt

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

package/src/WOrmPostgresql.mjs

@@ -37,7 +37,6 @@ function WOrmPostgresql(opt = {}) {
     //url
     let url = get(opt, 'url')
     if (!isestr(url)) {
-        // url = `postgresql://${user}:${password}@${ip}:${port}`
         url = 'postgresql://user:password@127.0.0.1:5432'
     }
 
@@ -146,14 +145,14 @@ function WOrmPostgresql(opt = {}) {
     // console.log('PgClient', PgClient)
 
     /**
-         * 創建資料表
-         *
-         * @memberOf WOrmPostgresql
-         * @param {String} cl 輸入資料表名字串
-         * @param {String} pk 輸入主鍵字串
-         * @param {Array|Object} arr 輸入數據物件陣列或數據物件
-         * @returns {Promise} 回傳Promise，resolve回傳成功訊息，reject回傳錯誤訊息
-         */
+     * 創建資料表
+     *
+     * @memberOf WOrmPostgresql
+     * @param {String} cl 輸入資料表名字串
+     * @param {String} pk 輸入主鍵字串
+     * @param {Array|Object} arr 輸入數據物件陣列或數據物件
+     * @returns {Promise} 回傳Promise，resolve回傳成功訊息，reject回傳錯誤訊息
+     */
     async function createTable(cl, pk, arr) {
         let isErr = false
         let res = null
@@ -228,13 +227,13 @@ function WOrmPostgresql(opt = {}) {
     }
 
     /**
-         * 查詢數據
-         *
-         * @memberOf WOrmPostgresql
-         * @param {Object} [find={}] 輸入查詢條件物件
-         * @param {Object} [order={}] 輸入排序條件物件
-         * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
-         */
+     * 查詢數據
+     *
+     * @memberOf WOrmPostgresql
+     * @param {Object} [find={}] 輸入查詢條件物件
+     * @param {Object} [order={}] 輸入排序條件物件
+     * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
+     */
     async function select(find = {}, order = {}) {
         let isErr = false
         let res = null
@@ -307,16 +306,25 @@ function WOrmPostgresql(opt = {}) {
     }
 
     /**
-         * 插入數據
-         *
-         * @memberOf WOrmPostgresql
-         * @param {Object|Array} data 輸入數據物件或陣列
-         * @returns {Promise} 回傳Promise，resolve回傳插入結果，reject回傳錯誤訊息
-         */
+     * 插入數據
+     *
+     * @memberOf WOrmPostgresql
+     * @param {Object|Array} data 輸入數據物件或陣列
+     * @returns {Promise} 回傳Promise，resolve回傳插入結果，reject回傳錯誤訊息
+     */
     async function insert(data) {
         let isErr = false
         let res = null
 
+        //check
+        if (!iseobj(data) && !isearr(data)) {
+            return {
+                n: 0,
+                nInserted: 0,
+                ok: 1,
+            }
+        }
+
         //cloneDeep
         data = cloneDeep(data)
 
@@ -409,18 +417,23 @@ function WOrmPostgresql(opt = {}) {
     }
 
     /**
-         * 儲存數據
-         *
-         * @memberOf WOrmPostgresql
-         * @param {Object|Array} data 輸入數據物件或陣列
-         * @param {Object} [option={}] 輸入設定物件，預設為{}
-         * @param {boolean} [option.autoInsert=true] 輸入是否於儲存時發現原本無數據，則自動改以插入處理，預設為true
-         * @returns {Promise} 回傳Promise，resolve回傳儲存結果，reject回傳錯誤訊息
-         */
+     * 儲存數據
+     *
+     * @memberOf WOrmPostgresql
+     * @param {Object|Array} data 輸入數據物件或陣列
+     * @param {Object} [option={}] 輸入設定物件，預設為{}
+     * @param {boolean} [option.autoInsert=true] 輸入是否於儲存時發現原本無數據，則自動改以插入處理，預設為true
+     * @returns {Promise} 回傳Promise，resolve回傳儲存結果，reject回傳錯誤訊息
+     */
     async function save(data, option = {}) {
         let isErr = false
         let res = null
 
+        //check
+        if (!iseobj(data) && !isearr(data)) {
+            return []
+        }
+
         //cloneDeep
         data = cloneDeep(data)
 
@@ -650,16 +663,21 @@ function WOrmPostgresql(opt = {}) {
     }
 
     /**
-         * 刪除數據
-         *
-         * @memberOf WOrmPostgresql
-         * @param {Object|Array} data 輸入數據物件或陣列
-         * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
-         */
+     * 刪除數據
+     *
+     * @memberOf WOrmPostgresql
+     * @param {Object|Array} data 輸入數據物件或陣列
+     * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
+     */
     async function del(data) {
         let isErr = false
         let res = null
 
+        //check
+        if (!iseobj(data) && !isearr(data)) {
+            return []
+        }
+
         //cloneDeep
         data = cloneDeep(data)
 
@@ -770,12 +788,12 @@ function WOrmPostgresql(opt = {}) {
     }
 
     /**
-         * 刪除全部數據，需與del分開，避免未傳數據導致直接刪除全表
-         *
-         * @memberOf WOrmPostgresql
-         * @param {Object} [find={}] 輸入刪除條件物件
-         * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
-         */
+     * 刪除全部數據，需與del分開，避免未傳數據導致直接刪除全表
+     *
+     * @memberOf WOrmPostgresql
+     * @param {Object} [find={}] 輸入刪除條件物件
+     * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
+     */
     async function delAll(find = {}) {
         let isErr = false
         let res = null

package/test/basic.test.mjs

@@ -1,5 +1,5 @@
 import assert from 'assert'
-import wo from '../src/WOrmPostgresql.mjs'
+import WOrm from '../src/WOrmPostgresql.mjs'
 
 
 function isWindows() {
@@ -13,7 +13,6 @@ if (isWindows()) {
         let vans = {}
         let vget = {}
 
-
         before(async function () {
 
             let opt = {
@@ -117,15 +116,15 @@ if (isWindows()) {
                 },
             ]
 
-            //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)
             })
 
-            await w.createTable(opt.cl, 'time', {
+            await wo.createTable(opt.cl, 'time', {
                 time: '2000-01-01T00:00:00Z', //time
                 name: 'abc', //string
                 value: 0.1, //float
@@ -140,7 +139,7 @@ if (isWindows()) {
             //delAll
             rt = null
             vans[1] = { ok: 1 }
-            await w.delAll()
+            await wo.delAll()
                 .then(function(msg) {
                     // console.log('delAll then', msg)
                     //考慮有不同初始狀態, 僅比對ok欄位
@@ -157,7 +156,7 @@ if (isWindows()) {
             //insert
             rt = null
             vans[2] = { n: 13, nInserted: 13, ok: 1 }
-            await w.insert(rs)
+            await wo.insert(rs)
                 .then(function(msg) {
                     // console.log('insert then', msg)
                     rt = msg
@@ -177,7 +176,7 @@ if (isWindows()) {
                 { n: 1, nModified: 1, ok: 1 },
                 { n: 1, nInserted: 1, ok: 1 }
             ]
-            await w.save(rsm, { autoInsert: true })
+            await wo.save(rsm, { autoInsert: true })
                 .then(function(msg) {
                     // console.log('save then', msg)
                     rt = msg
@@ -206,7 +205,7 @@ if (isWindows()) {
                 { time: new Date('2025-01-01T00:12:00.000Z'), name: 'peter', value: 99 },
                 { time: new Date('2025-01-01T00:13:00.000Z'), name: 'sandler', value: null }
             ]
-            await w.select()
+            await wo.select()
                 .then(function(msg) {
                     // console.log('select all then', msg)
                     rt = msg
@@ -224,7 +223,7 @@ if (isWindows()) {
                 { time: new Date('2025-01-01T00:04:00.000Z'), name: 'rosemary', value: 123.1236 },
                 { time: new Date('2025-01-01T00:07:00.000Z'), name: 'rosemary', value: 124.76 }
             ]
-            await w.select({ name: 'rosemary' })
+            await wo.select({ name: 'rosemary' })
                 .then(function(msg) {
                     // console.log('select all then', msg)
                     rt = msg
@@ -244,7 +243,7 @@ if (isWindows()) {
                 { time: new Date('2025-01-01T00:07:00.000Z'), name: 'rosemary', value: 124.76 },
                 { time: new Date('2025-01-01T00:09:00.000Z'), name: 'peter', value: 127 }
             ]
-            await w.select({ '$and': [{ value: { '$gt': 123 } }, { value: { '$lt': 200 } }] })
+            await wo.select({ '$and': [{ value: { '$gt': 123 } }, { value: { '$lt': 200 } }] })
                 .then(function(msg) {
                     // console.log('select all then', msg)
                     rt = msg
@@ -264,7 +263,7 @@ if (isWindows()) {
                 { time: new Date('2025-01-01T00:08:00.000Z'), name: 'kettle', value: 524 },
                 { time: new Date('2025-01-01T00:11:00.000Z'), name: 'kettle(modify)', value: 447 }
             ]
-            await w.select({ '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 200 } }] })
+            await wo.select({ '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 200 } }] })
                 .then(function(msg) {
                     // console.log('select all then', msg)
                     rt = msg
@@ -284,7 +283,7 @@ if (isWindows()) {
                 { time: new Date('2025-01-01T00:08:00.000Z'), name: 'kettle', value: 524 },
                 { time: new Date('2025-01-01T00:11:00.000Z'), name: 'kettle(modify)', value: 447 }
             ]
-            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 } }] }] })
+            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 } }] }] })
                 .then(function(msg) {
                     // console.log('select all then', msg)
                     rt = msg
@@ -298,7 +297,7 @@ if (isWindows()) {
             // //select by regex
             // rt = null
             // vans[9] = []
-            // let sr = await w.select({ name: { $regex: 'PeT', $options: '$i' } })
+            // let sr = await wo.select({ name: { $regex: 'PeT', $options: '$i' } })
             //  .then(function(msg) {
             //      // console.log('select all then', msg)
             //      rt = msg
@@ -315,7 +314,7 @@ if (isWindows()) {
             let d = {
                 time: '2024-01-01T00:00:00Z',
             }
-            await w.del(d)
+            await wo.del(d)
                 .then(function(msg) {
                     // console.log('del then', msg)
                     rt = msg
@@ -340,11 +339,11 @@ if (isWindows()) {
                 { n: 1, nDeleted: 1, ok: 1 },
                 { n: 1, nDeleted: 1, ok: 1 }
             ]
-            let ss = await w.select()
+            let ss = await wo.select()
             let ds = ss.filter(function(v) {
                 return v.name.indexOf('peter') >= 0 || v.name.indexOf('kettle') >= 0 || v.name.indexOf('sandler') >= 0
             })
-            await w.del(ds)
+            await wo.del(ds)
                 .then(function(msg) {
                     // console.log('del then', msg)
                     rt = msg
@@ -363,7 +362,7 @@ if (isWindows()) {
                 { time: new Date('2025-01-01T00:07:00.000Z'), name: 'rosemary', value: 124.76 },
                 { time: new Date('2025-01-01T00:10:00.000Z'), name: 'rosemary(modify)', value: 113.98 }
             ]
-            await w.select()
+            await wo.select()
                 .then(function(msg) {
                 // console.log('select all then', msg)
                     rt = msg