w-orm-postgresql 1.0.10 → 1.0.11

package/docs/WOrmPostgresql.html

@@ -514,7 +514,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line227">line 227</a>
+        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line259">line 259</a>
     </li></ul></dd>
     
 
@@ -771,7 +771,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line1021">line 1021</a>
+        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line1094">line 1094</a>
     </li></ul></dd>
     
 
@@ -934,7 +934,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line1171">line 1171</a>
+        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line1255">line 1255</a>
     </li></ul></dd>
     
 
@@ -1115,7 +1115,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line538">line 538</a>
+        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line595">line 595</a>
     </li></ul></dd>
     
 
@@ -1283,7 +1283,7 @@ nInserted與nModified恆同時出現，無對應行為時填0。
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line675">line 675</a>
+        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line735">line 735</a>
     </li></ul></dd>
     
 
@@ -1570,7 +1570,7 @@ nInserted與nModified恆同時出現，無對應行為時填0。
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line319">line 319</a>
+        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line359">line 359</a>
     </li></ul></dd>
     
 
@@ -1791,7 +1791,7 @@ nInserted與nModified恆同時出現，無對應行為時填0。
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line414">line 414</a>
+        <a href="WOrmPostgresql.mjs.html">WOrmPostgresql.mjs</a>, <a href="WOrmPostgresql.mjs.html#line462">line 462</a>
     </li></ul></dd>
     
 
@@ -1954,7 +1954,7 @@ nInserted與nModified恆同時出現，無對應行為時填0。
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sun Aug 16 2026 23:54:17 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 Mon Aug 17 2026 09:06:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WOrmPostgresql.mjs.html

@@ -45,8 +45,7 @@
     
     <section>
         <article>
-            <pre class="prettyprint source linenums"><code>import events from 'events'
-import pg from 'pg'
+            <pre class="prettyprint source linenums"><code>import pg from 'pg'
 import mongoSql from 'mongo-sql'
 import size from 'lodash-es/size.js'
 import get from 'lodash-es/get.js'
@@ -67,6 +66,7 @@ import isint from 'wsemi/src/isint.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
 import isDate from 'wsemi/src/isDate.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
+import evem from 'wsemi/src/evem.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 
 
@@ -220,8 +220,40 @@ function WOrmPostgresql(opt = {}) {
     let connectionString = `${url}/${db}`
     // console.log('connectionString', connectionString)
 
-    //ee
-    let ee = new events.EventEmitter()
+    //ee, 採eventemitter3而不採Node內建之events.EventEmitter,
+    //因後者於'error'無監聽者時會將錯誤直接拋出, 將使操作行為隨呼叫端是否註冊監聽而異
+    let ee = evem()
+
+    //getErrMsg, 取錯誤訊息字串, 供逐筆結果之err欄位與error事件使用
+    let getErrMsg = (err) => {
+        let m = get(err, 'message')
+        if (isestr(m)) {
+            return m
+        }
+        return String(err)
+    }
+
+    //emitChange, 資料實際異動成功後發出, 事件僅為附加通知不承擔回傳義務
+    //訂閱函數拋錯不得影響本次操作, 故一律以try/catch包覆, 收斂於此以免逐處遺漏
+    let emitChange = (mode, data, res) => {
+        try {
+            ee.emit('change', mode, data, res)
+        }
+        catch (errEmit) {
+            console.log(errEmit)
+        }
+    }
+
+    //emitError, 操作發生錯誤時發出, 錯誤訊息一律轉為字串
+    //正常結果(如查無數據、主鍵未命中、內容相同而未寫入)不得發出, 以免監聽者將常態當異常
+    let emitError = (mode, data, err) => {
+        try {
+            ee.emit('error', mode, data, getErrMsg(err))
+        }
+        catch (errEmit) {
+            console.log(errEmit)
+        }
+    }
 
     //PgClient
     let PgClient = pg.Client
@@ -299,6 +331,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('createTable', arr, res)
+
             return Promise.reject(res)
         }
 
@@ -349,6 +385,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('createTable', arr, res)
+
             return Promise.reject(res)
         }
 
@@ -393,6 +433,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 讀取函數無輸入數據故data為null
+            emitError('select', null, res)
+
             return Promise.reject(res)
         }
 
@@ -441,6 +485,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 讀取函數無輸入數據故data為null
+            emitError('select', null, res)
+
             return Promise.reject(res)
         }
 
@@ -499,6 +547,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 讀取函數無輸入數據故data為null
+            emitError('selectByPk', null, res)
+
             return Promise.reject(res)
         }
 
@@ -565,6 +617,11 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 讀取函數無輸入數據故data為null
+            //主鍵未命中與主鍵值無效皆為正常結果而不設isErr, 故不會誤發error
+            emitError('selectByPk', null, res)
+
             return Promise.reject(res)
         }
 
@@ -616,6 +673,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('insert', data, res)
+
             return Promise.reject(res)
         }
 
@@ -686,16 +747,15 @@ function WOrmPostgresql(opt = {}) {
 
         //emit
         if (!isErr) {
-            try {
-                ee.emit('change', 'insert', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
+            emitChange('insert', data, res)
         }
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('insert', data, res)
+
             return Promise.reject(res)
         }
 
@@ -752,6 +812,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('save', data, res)
+
             return Promise.reject(res)
         }
 
@@ -1017,6 +1081,16 @@ function WOrmPostgresql(opt = {}) {
 
                 }
 
+                //emit, 該筆經插入而產生者另發mode為insert之change事件, 供呼叫端區辨新增與更新
+                if (rest.nInserted === 1) {
+                    emitChange('insert', [v], rest)
+                }
+
+                //emit, 逐筆失敗於該筆結果定案後發出, 每筆一次
+                if (rest.ok === 0) {
+                    emitError('save', [v], rest.err)
+                }
+
                 return rest
             })
 
@@ -1037,16 +1111,15 @@ function WOrmPostgresql(opt = {}) {
 
         //emit
         if (!isErr) {
-            try {
-                ee.emit('change', 'save', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
+            emitChange('save', data, res)
         }
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('save', data, res)
+
             return Promise.reject(res)
         }
 
@@ -1095,6 +1168,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('del', data, res)
+
             return Promise.reject(res)
         }
 
@@ -1130,6 +1207,9 @@ function WOrmPostgresql(opt = {}) {
                         err: `invalid ${pkName}[${pkv}]`,
                     }
 
+                    //emit, 逐筆失敗於該筆結果定案後發出, 每筆一次
+                    emitError('del', [v], rest.err)
+
                     return rest
                 }
 
@@ -1169,6 +1249,11 @@ function WOrmPostgresql(opt = {}) {
 
                     })
 
+                //emit, 逐筆失敗於該筆結果定案後發出, 每筆一次
+                if (rest.ok === 0) {
+                    emitError('del', [v], rest.err)
+                }
+
                 return rest
             })
 
@@ -1189,16 +1274,15 @@ function WOrmPostgresql(opt = {}) {
 
         //emit
         if (!isErr) {
-            try {
-                ee.emit('change', 'del', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
+            emitChange('del', data, res)
         }
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('del', data, res)
+
             return Promise.reject(res)
         }
 
@@ -1237,6 +1321,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 無輸入數據故data為null
+            emitError('delAll', null, res)
+
             return Promise.reject(res)
         }
 
@@ -1300,16 +1388,15 @@ function WOrmPostgresql(opt = {}) {
 
         //emit
         if (!isErr) {
-            try {
-                ee.emit('change', 'delAll', null, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
+            emitChange('delAll', null, res)
         }
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('delAll', null, res)
+
             return Promise.reject(res)
         }
 
@@ -1344,7 +1431,7 @@ export default WOrmPostgresql
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sun Aug 16 2026 23:54:17 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 Mon Aug 17 2026 09:06:32 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.5</a> on Sun Aug 16 2026 23:54:17 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 Mon Aug 17 2026 09:06:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g-basic.mjs

@@ -369,6 +369,7 @@ test()
 //     value: 447
 //   }
 // ]
+// change insert
 // change save
 // save then [ { n: 1, nInserted: 1, nModified: 0, ok: 1 } ]
 // change del

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-orm-postgresql",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "main": "dist/w-orm-postgresql.umd.js",
   "dependencies": {
     "mongo-sql": "^6.2.0",

package/src/WOrmPostgresql.mjs

@@ -1,4 +1,3 @@
-import events from 'events'
 import pg from 'pg'
 import mongoSql from 'mongo-sql'
 import size from 'lodash-es/size.js'
@@ -20,6 +19,7 @@ import isint from 'wsemi/src/isint.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
 import isDate from 'wsemi/src/isDate.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
+import evem from 'wsemi/src/evem.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 
 
@@ -173,8 +173,40 @@ function WOrmPostgresql(opt = {}) {
     let connectionString = `${url}/${db}`
     // console.log('connectionString', connectionString)
 
-    //ee
-    let ee = new events.EventEmitter()
+    //ee, 採eventemitter3而不採Node內建之events.EventEmitter,
+    //因後者於'error'無監聽者時會將錯誤直接拋出, 將使操作行為隨呼叫端是否註冊監聽而異
+    let ee = evem()
+
+    //getErrMsg, 取錯誤訊息字串, 供逐筆結果之err欄位與error事件使用
+    let getErrMsg = (err) => {
+        let m = get(err, 'message')
+        if (isestr(m)) {
+            return m
+        }
+        return String(err)
+    }
+
+    //emitChange, 資料實際異動成功後發出, 事件僅為附加通知不承擔回傳義務
+    //訂閱函數拋錯不得影響本次操作, 故一律以try/catch包覆, 收斂於此以免逐處遺漏
+    let emitChange = (mode, data, res) => {
+        try {
+            ee.emit('change', mode, data, res)
+        }
+        catch (errEmit) {
+            console.log(errEmit)
+        }
+    }
+
+    //emitError, 操作發生錯誤時發出, 錯誤訊息一律轉為字串
+    //正常結果(如查無數據、主鍵未命中、內容相同而未寫入)不得發出, 以免監聽者將常態當異常
+    let emitError = (mode, data, err) => {
+        try {
+            ee.emit('error', mode, data, getErrMsg(err))
+        }
+        catch (errEmit) {
+            console.log(errEmit)
+        }
+    }
 
     //PgClient
     let PgClient = pg.Client
@@ -252,6 +284,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('createTable', arr, res)
+
             return Promise.reject(res)
         }
 
@@ -302,6 +338,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('createTable', arr, res)
+
             return Promise.reject(res)
         }
 
@@ -346,6 +386,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 讀取函數無輸入數據故data為null
+            emitError('select', null, res)
+
             return Promise.reject(res)
         }
 
@@ -394,6 +438,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 讀取函數無輸入數據故data為null
+            emitError('select', null, res)
+
             return Promise.reject(res)
         }
 
@@ -452,6 +500,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 讀取函數無輸入數據故data為null
+            emitError('selectByPk', null, res)
+
             return Promise.reject(res)
         }
 
@@ -518,6 +570,11 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 讀取函數無輸入數據故data為null
+            //主鍵未命中與主鍵值無效皆為正常結果而不設isErr, 故不會誤發error
+            emitError('selectByPk', null, res)
+
             return Promise.reject(res)
         }
 
@@ -569,6 +626,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('insert', data, res)
+
             return Promise.reject(res)
         }
 
@@ -639,16 +700,15 @@ function WOrmPostgresql(opt = {}) {
 
         //emit
         if (!isErr) {
-            try {
-                ee.emit('change', 'insert', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
+            emitChange('insert', data, res)
         }
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('insert', data, res)
+
             return Promise.reject(res)
         }
 
@@ -705,6 +765,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('save', data, res)
+
             return Promise.reject(res)
         }
 
@@ -970,6 +1034,16 @@ function WOrmPostgresql(opt = {}) {
 
                 }
 
+                //emit, 該筆經插入而產生者另發mode為insert之change事件, 供呼叫端區辨新增與更新
+                if (rest.nInserted === 1) {
+                    emitChange('insert', [v], rest)
+                }
+
+                //emit, 逐筆失敗於該筆結果定案後發出, 每筆一次
+                if (rest.ok === 0) {
+                    emitError('save', [v], rest.err)
+                }
+
                 return rest
             })
 
@@ -990,16 +1064,15 @@ function WOrmPostgresql(opt = {}) {
 
         //emit
         if (!isErr) {
-            try {
-                ee.emit('change', 'save', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
+            emitChange('save', data, res)
         }
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('save', data, res)
+
             return Promise.reject(res)
         }
 
@@ -1048,6 +1121,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('del', data, res)
+
             return Promise.reject(res)
         }
 
@@ -1083,6 +1160,9 @@ function WOrmPostgresql(opt = {}) {
                         err: `invalid ${pkName}[${pkv}]`,
                     }
 
+                    //emit, 逐筆失敗於該筆結果定案後發出, 每筆一次
+                    emitError('del', [v], rest.err)
+
                     return rest
                 }
 
@@ -1122,6 +1202,11 @@ function WOrmPostgresql(opt = {}) {
 
                     })
 
+                //emit, 逐筆失敗於該筆結果定案後發出, 每筆一次
+                if (rest.ok === 0) {
+                    emitError('del', [v], rest.err)
+                }
+
                 return rest
             })
 
@@ -1142,16 +1227,15 @@ function WOrmPostgresql(opt = {}) {
 
         //emit
         if (!isErr) {
-            try {
-                ee.emit('change', 'del', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
+            emitChange('del', data, res)
         }
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('del', data, res)
+
             return Promise.reject(res)
         }
 
@@ -1190,6 +1274,10 @@ function WOrmPostgresql(opt = {}) {
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出, 無輸入數據故data為null
+            emitError('delAll', null, res)
+
             return Promise.reject(res)
         }
 
@@ -1253,16 +1341,15 @@ function WOrmPostgresql(opt = {}) {
 
         //emit
         if (!isErr) {
-            try {
-                ee.emit('change', 'delAll', null, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
+            emitChange('delAll', null, res)
         }
 
         //check
         if (isErr) {
+
+            //emit, 整批性錯誤於reject之前發出
+            emitError('delAll', null, res)
+
             return Promise.reject(res)
         }