w-orm-postgresql 1.0.0 → 1.0.2

package/docs/WOrmPostgresql.mjs.html

@@ -79,12 +79,14 @@ 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}@${ip}:${port}`
         url = 'postgresql://user:password@127.0.0.1:5432'
     }
 
@@ -188,19 +190,52 @@ 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) //與外部使用數據脫勾
+    }
+
     /**
-         * 創建資料表
-         *
-         * @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
@@ -263,31 +298,40 @@ 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
     }
 
     /**
-         * 查詢數據
-         *
-         * @memberOf WOrmPostgresql
-         * @param {Object} [find={}] 輸入查詢條件物件
-         * @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 })
+     * 查詢數據
+     *
+     * @memberOf WOrmPostgresql
+     * @param {Object} [find={}] 輸入查詢條件物件
+     * @param {Object} [order={}] 輸入排序條件物件
+     * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
+     */
+    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 {
@@ -329,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
@@ -354,16 +403,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)
 
@@ -422,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) {
@@ -443,31 +498,49 @@ 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
     }
 
     /**
-         * 儲存數據
-         *
-         * @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)
 
@@ -672,41 +745,56 @@ 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
     }
 
     /**
-         * 刪除數據
-         *
-         * @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)
 
@@ -791,38 +879,48 @@ 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
     }
 
     /**
-         * 刪除全部數據，需與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
@@ -879,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) {
@@ -900,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
@@ -939,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 Mar 23 2025 21:47:56 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 Mar 23 2025 21:47:56 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>