w-orm-postgresql 1.0.1 → 1.0.2

package/docs/WOrmPostgresql.mjs.html

@@ -79,10 +79,13 @@ import pmSeries from 'wsemi/src/pmSeries.mjs'
  * @param {String} [opt.cl='test'] 輸入使用資料表名稱字串，預設'test'
  * @returns {Object} 回傳操作資料庫物件，各事件功能詳見說明
  */
-function WOrmPostgresql(opt = {}) {
-
-    //url
-    let url = get(opt, 'url')
+function WOrmPostgresql(opt = {}) {
+
+    //_cache
+    let _cache = null
+
+    //url
+    let url = get(opt, 'url')
     if (!isestr(url)) {
         url = 'postgresql://user:password@127.0.0.1:5432'
     }
@@ -187,10 +190,43 @@ function WOrmPostgresql(opt = {}) {
     //ee
     let ee = new events.EventEmitter()
 
-    //PgClient
-    let PgClient = pg.Client
-    // console.log('PgClient', PgClient)
-
+    //PgClient
+    let PgClient = pg.Client
+    // console.log('PgClient', PgClient)
+
+    //clearCache
+    function clearCache() {
+        _cache = null
+    }
+
+    //getCacheKey
+    function getCacheKey(find = {}, order = {}) {
+        return JSON.stringify({
+            find,
+            order,
+        })
+    }
+
+    //getCache
+    function getCache(find = {}, order = {}) {
+        if (iseobj(_cache)) {
+            let key = getCacheKey(find, order)
+            if (Object.prototype.hasOwnProperty.call(_cache, key)) {
+                return cloneDeep(_cache[key]) //與外部使用數據脫勾
+            }
+        }
+        return null
+    }
+
+    //setCache
+    function setCache(find = {}, order = {}, data = []) {
+        if (!iseobj(_cache)) {
+            _cache = {}
+        }
+        let key = getCacheKey(find, order)
+        _cache[key] = cloneDeep(data) //與外部使用數據脫勾
+    }
+
     /**
      * 創建資料表
      *
@@ -262,12 +298,15 @@ function WOrmPostgresql(opt = {}) {
         finally {
             await client.end()
             client = null
-        }
-        // console.log('res', res)
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+        }
+        // console.log('res', res)
+
+        //update
+        clearCache()
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -281,12 +320,18 @@ function WOrmPostgresql(opt = {}) {
      * @param {Object} [order={}] 輸入排序條件物件
      * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
      */
-    async function select(find = {}, order = {}) {
-        let isErr = false
-        let res = null
-
-        //client
-        let client = new PgClient({ connectionString })
+    async function select(find = {}, order = {}) {
+        let isErr = false
+        let res = null
+
+        //cache
+        let cache = getCache(find, order)
+        if (isarr(cache)) {
+            return cache
+        }
+
+        //client
+        let client = new PgClient({ connectionString })
 
         //connect
         try {
@@ -328,12 +373,17 @@ function WOrmPostgresql(opt = {}) {
             res = get(r, 'rows')
 
             //check
-            if (!isarr(res)) {
-                isErr = true
-                res = `can not select by find[${JSON.stringify(find)}]`
-            }
-
-        }
+            if (!isarr(res)) {
+                isErr = true
+                res = `can not select by find[${JSON.stringify(find)}]`
+            }
+
+            //cache
+            if (!isErr) {
+                setCache(find, order, res)
+            }
+
+        }
         catch (err) {
             isErr = true
             res = err
@@ -430,20 +480,17 @@ function WOrmPostgresql(opt = {}) {
                 .then(() => {
 
                     //res
-                    res = {
-                        n: nAll,
-                        nInserted: nInsert,
-                        ok: 1,
-                    }
-
-                    //emit
-                    ee.emit('change', 'insert', data, res)
-
-                })
-                .catch((err) => {
-                    isErr = true
-                    res = err.message
-                })
+                    res = {
+                        n: nAll,
+                        nInserted: nInsert,
+                        ok: 1,
+                    }
+
+                })
+                .catch((err) => {
+                    isErr = true
+                    res = err.message
+                })
 
         }
         catch (err) {
@@ -451,13 +498,26 @@ function WOrmPostgresql(opt = {}) {
             res = err
         }
         finally {
-            await client.end()
-            client = null
-        }
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+            await client.end()
+            client = null
+        }
+
+        //update
+        clearCache()
+
+        //emit
+        if (!isErr) {
+            try {
+                ee.emit('change', 'insert', data, res)
+            }
+            catch (err) {
+                console.log(err)
+            }
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -685,25 +745,35 @@ function WOrmPostgresql(opt = {}) {
 
                 }
 
-                return rest
-            })
-
-            //emit
-            ee.emit('change', 'save', data, res)
-
-        }
-        catch (err) {
-            isErr = true
-            res = err
-        }
+                return rest
+            })
+
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
         finally {
-            await client.end()
-            client = null
-        }
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+            await client.end()
+            client = null
+        }
+
+        //update
+        clearCache()
+
+        //emit
+        if (!isErr) {
+            try {
+                ee.emit('change', 'save', data, res)
+            }
+            catch (err) {
+                console.log(err)
+            }
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -809,26 +879,36 @@ function WOrmPostgresql(opt = {}) {
                         }
 
                     })
-
-                return rest
-            })
-
-            //emit
-            ee.emit('change', 'del', data, res)
-
-        }
-        catch (err) {
-            isErr = true
-            res = err
-        }
+
+                return rest
+            })
+
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
         finally {
-            await client.end()
-            client = null
-        }
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+            await client.end()
+            client = null
+        }
+
+        //update
+        clearCache()
+
+        //emit
+        if (!isErr) {
+            try {
+                ee.emit('change', 'del', data, res)
+            }
+            catch (err) {
+                console.log(err)
+            }
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -897,20 +977,17 @@ function WOrmPostgresql(opt = {}) {
                 .then((r) => {
 
                     //res
-                    res = {
-                        n: r.rowCount,
-                        nDeleted: r.rowCount,
-                        ok: 1,
-                    }
-
-                    //emit
-                    ee.emit('change', 'delAll', null, res)
-
-                })
-                .catch((err) => {
-                    isErr = true
-                    res = err.message
-                })
+                    res = {
+                        n: r.rowCount,
+                        nDeleted: r.rowCount,
+                        ok: 1,
+                    }
+
+                })
+                .catch((err) => {
+                    isErr = true
+                    res = err.message
+                })
 
         }
         catch (err) {
@@ -918,13 +995,26 @@ function WOrmPostgresql(opt = {}) {
             res = err
         }
         finally {
-            await client.end()
-            client = null
-        }
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+            await client.end()
+            client = null
+        }
+
+        //update
+        clearCache()
+
+        //emit
+        if (!isErr) {
+            try {
+                ee.emit('change', 'delAll', null, res)
+            }
+            catch (err) {
+                console.log(err)
+            }
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -957,7 +1047,7 @@ export default WOrmPostgresql
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Sun May 11 2025 15:23:24 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.5</a> on Thu May 14 2026 20:49:12 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.4</a> on Sun May 11 2025 15:23:24 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.5</a> on Thu May 14 2026 20:49:12 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g-basic.mjs

@@ -76,7 +76,7 @@ let rs = [
     },
 ]
 
-let rsm = [
+let rsm = [
     { //相同
         time: '2025-01-01T00:09:00Z',
         name: 'peter',
@@ -100,10 +100,17 @@ let rsm = [
     { //無time須新增且新增數據無value
         time: '2025-01-01T00:13:00Z',
         name: 'sandler',
-    },
-]
-
-async function test() {
+    },
+]
+
+let rsa = [
+    {
+        time: '2025-01-01T00:13:00Z',
+        name: 'sandler',
+    },
+]
+
+async function test() {
 
     //wo
     let wo = WOrm(opt)
@@ -144,18 +151,18 @@ async function test() {
             console.log('insert catch', msg)
         })
 
-    //save
-    await wo.save(rsm, { autoInsert: true })
-        .then(function(msg) {
-            console.log('save then', msg)
-        })
-        .catch(function(msg) {
-            console.log('save catch', msg)
-        })
-
-    //select all
-    let ss = await wo.select()
-    console.log('select all', ss)
+    //save
+    await wo.save(rsm, { autoInsert: false })
+        .then(function(msg) {
+            console.log('save then', msg)
+        })
+        .catch(function(msg) {
+            console.log('save catch', msg)
+        })
+
+    //select all
+    let ss = await wo.select()
+    console.log('select all', ss)
 
     //select
     let so = await wo.select({ name: 'rosemary' })
@@ -173,13 +180,22 @@ async function test() {
     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 wo.select({ name: { $regex: 'PeT', $options: '$i' } })
-    // console.log('selectReg', sr)
-
-    //del
-    let d = {
-        time: '2024-01-01T00:00:00Z',
+    // //select by regex
+    // let sr = await wo.select({ name: { $regex: 'PeT', $options: '$i' } })
+    // console.log('selectReg', sr)
+
+    //save
+    await wo.save(rsa, { autoInsert: true })
+        .then(function(msg) {
+            console.log('save then', msg)
+        })
+        .catch(function(msg) {
+            console.log('save catch', msg)
+        })
+
+    //del
+    let d = {
+        time: '2024-01-01T00:00:00Z',
     }
     await wo.del(d)
         .then(function(msg) {
@@ -187,12 +203,13 @@ async function test() {
         })
         .catch(function(msg) {
             console.log('del catch', msg)
-        })
-
-    //del
-    let ds = ss.filter(function(v) {
-        return v.name.indexOf('peter') >= 0 || v.name.indexOf('kettle') >= 0 || v.name.indexOf('sandler') >= 0
-    })
+        })
+
+    //del
+    let ssDel = await wo.select()
+    let ds = ssDel.filter(function(v) {
+        return v.name.indexOf('peter') >= 0 || v.name.indexOf('kettle') >= 0 || v.name.indexOf('sandler') >= 0
+    })
     await wo.del(ds)
         .then(function(msg) {
             console.log('del then', msg)
@@ -213,13 +230,13 @@ test()
 // insert then { n: 13, nInserted: 13, ok: 1 }
 // change save
 // save then [
-//   { n: 1, nModified: 0, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 1, nInserted: 1, ok: 1 }
-// ]
-// select all [
+//   { n: 1, nModified: 0, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 0, nModified: 0, ok: 1 }
+// ]
+// select all [
 //   { time: 2025-01-01T00:00:00.000Z, name: 'peter', value: 123 },
 //   { time: 2025-01-01T00:01:00.000Z, name: 'rosemary', value: 123.456 },
 //   { time: 2025-01-01T00:02:00.000Z, name: 'kettle', value: 456 },
@@ -238,11 +255,10 @@ test()
 //   {
 //     time: 2025-01-01T00:11:00.000Z,
 //     name: 'kettle(modify)',
-//     value: 447
-//   },
-//   { time: 2025-01-01T00:12:00.000Z, name: 'peter', value: 99 },
-//   { time: 2025-01-01T00:13:00.000Z, name: 'sandler', value: null }
-// ]
+//     value: 447
+//   },
+//   { time: 2025-01-01T00:12:00.000Z, name: 'peter', value: 99 }
+// ]
 // select by name [
 //   { time: 2025-01-01T00:01:00.000Z, name: 'rosemary', value: 123.456 },
 //   { time: 2025-01-01T00:04:00.000Z, name: 'rosemary', value: 123.1236 },
@@ -274,11 +290,13 @@ test()
 //   {
 //     time: 2025-01-01T00:11:00.000Z,
 //     name: 'kettle(modify)',
-//     value: 447
-//   }
-// ]
-// change del
-// del then [ { n: 1, nDeleted: 0, ok: 1 } ]
+//     value: 447
+//   }
+// ]
+// change save
+// save then [ { n: 1, nInserted: 1, ok: 1 } ]
+// change del
+// del then [ { n: 1, nDeleted: 0, ok: 1 } ]
 // change del
 // del then [
 //   { n: 1, nDeleted: 1, ok: 1 },

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "w-orm-postgresql",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "dist/w-orm-postgresql.umd.js",
   "dependencies": {
     "mongo-sql": "^6.2.0",
-    "pg": "^8.15.6",
-    "lodash-es": "^4.17.21",
-    "wsemi": "^1.7.90"
+    "pg": "^8.20.0",
+    "lodash-es": "^4.18.1",
+    "wsemi": "^1.8.52"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.90"
+    "w-package-tools": "^1.1.5"
   },
   "scripts": {
     "test": "mocha --parallel --timeout 60000",

package/script.txt

@@ -15,4 +15,3 @@ npm run deploy
 #npm test
 
 #npm publish
-