postgrejs 2.22.1 → 2.22.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
+# v2.22.2
+[2024-11-04]
+
+### Changes
+
+* refactor: Improved displaying error line ([`3a6bbe9`](https://github.com/panates/postgrejs/commit/3a6bbe929efdb4f46a38c7b9626b4f28739ad341))
+
 # v2.22.1
-[2024-10-15]
+[2024-10-16]
 
 # v2.22.0
 [2024-10-15]

package/cjs/connection/connection.js

@@ -133,6 +133,7 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
      * @param options {ScriptExecuteOptions} - Execute options
      */
     async execute(sql, options) {
+        this.emit('execute', sql, options);
         return this._captureErrorStack(this._intlCon.execute(sql, options)).catch((e) => {
             throw this._handleError(e, sql);
         });
@@ -148,6 +149,7 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
                 sql,
             });
         }
+        this.emit('query', sql, options);
         const typeMap = options?.typeMap || data_type_map_js_1.GlobalTypeMap;
         const paramTypes = options?.params?.map(prm => prm instanceof bind_param_js_1.BindParam ? prm.oid : typeMap.determine(prm));
         const statement = await this.prepare(sql, { paramTypes, typeMap }).catch((e) => {
@@ -251,17 +253,16 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
         this._closing = false;
     }
     _handleError(err, script) {
-        if (err.position) {
-            const i1 = script.lastIndexOf('\n', err.position) + 1;
-            let i2 = script.indexOf('\n', err.position);
-            if (i2 < 0)
-                i2 = Number.MAX_SAFE_INTEGER;
-            err.line = script.substring(i1, i2);
-            err.lineNr = [...script.substring(0, i1).matchAll(/\n/g)].length;
+        if (err.position != null) {
+            const i1 = script.lastIndexOf('\n', err.position - 1) + 1;
+            err.lineNr = [...script.substring(0, i1).matchAll(/\n/g)].length + 1;
             err.colNr = err.position - i1;
-            err.message +=
-                `\nAt line ${err.lineNr} column ${err.colNr}` +
-                    `\n |  ${err.line}\n |  ${' '.repeat(Math.max(err.colNr - 2, 0))}-^-`;
+            const lines = script.split('\n');
+            err.line = lines[err.lineNr - 1];
+            err.message += `\n    at line ${err.lineNr} column ${err.colNr}`;
+            if (err.lineNr > 1)
+                err.message += `\n${String(err.lineNr - 1).padStart(3)}| ${lines[err.lineNr - 2]}`;
+            err.message += `\n${String(err.lineNr).padStart(3)}| ${err.line}\n    .${'-'.repeat(Math.max(err.colNr - 1, 0))}^`;
         }
         return err;
     }

package/cjs/connection/pool.js

@@ -135,6 +135,10 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
         /* istanbul ignore next */
         if (this.listenerCount('debug'))
             connection.on('debug', (...args) => this.emit('debug', ...args));
+        if (this.listenerCount('execute'))
+            connection.on('execute', (...args) => this.emit('execute', ...args));
+        if (this.listenerCount('query'))
+            connection.on('query', (...args) => this.emit('query', ...args));
         return connection;
     }
     /**

package/esm/connection/connection.js

@@ -130,6 +130,7 @@ export class Connection extends SafeEventEmitter {
      * @param options {ScriptExecuteOptions} - Execute options
      */
     async execute(sql, options) {
+        this.emit('execute', sql, options);
         return this._captureErrorStack(this._intlCon.execute(sql, options)).catch((e) => {
             throw this._handleError(e, sql);
         });
@@ -145,6 +146,7 @@ export class Connection extends SafeEventEmitter {
                 sql,
             });
         }
+        this.emit('query', sql, options);
         const typeMap = options?.typeMap || GlobalTypeMap;
         const paramTypes = options?.params?.map(prm => prm instanceof BindParam ? prm.oid : typeMap.determine(prm));
         const statement = await this.prepare(sql, { paramTypes, typeMap }).catch((e) => {
@@ -248,17 +250,16 @@ export class Connection extends SafeEventEmitter {
         this._closing = false;
     }
     _handleError(err, script) {
-        if (err.position) {
-            const i1 = script.lastIndexOf('\n', err.position) + 1;
-            let i2 = script.indexOf('\n', err.position);
-            if (i2 < 0)
-                i2 = Number.MAX_SAFE_INTEGER;
-            err.line = script.substring(i1, i2);
-            err.lineNr = [...script.substring(0, i1).matchAll(/\n/g)].length;
+        if (err.position != null) {
+            const i1 = script.lastIndexOf('\n', err.position - 1) + 1;
+            err.lineNr = [...script.substring(0, i1).matchAll(/\n/g)].length + 1;
             err.colNr = err.position - i1;
-            err.message +=
-                `\nAt line ${err.lineNr} column ${err.colNr}` +
-                    `\n |  ${err.line}\n |  ${' '.repeat(Math.max(err.colNr - 2, 0))}-^-`;
+            const lines = script.split('\n');
+            err.line = lines[err.lineNr - 1];
+            err.message += `\n    at line ${err.lineNr} column ${err.colNr}`;
+            if (err.lineNr > 1)
+                err.message += `\n${String(err.lineNr - 1).padStart(3)}| ${lines[err.lineNr - 2]}`;
+            err.message += `\n${String(err.lineNr).padStart(3)}| ${err.line}\n    .${'-'.repeat(Math.max(err.colNr - 1, 0))}^`;
         }
         return err;
     }

package/esm/connection/pool.js

@@ -132,6 +132,10 @@ export class Pool extends SafeEventEmitter {
         /* istanbul ignore next */
         if (this.listenerCount('debug'))
             connection.on('debug', (...args) => this.emit('debug', ...args));
+        if (this.listenerCount('execute'))
+            connection.on('execute', (...args) => this.emit('execute', ...args));
+        if (this.listenerCount('query'))
+            connection.on('query', (...args) => this.emit('query', ...args));
         return connection;
     }
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "postgrejs",
   "description": "Professional PostgreSQL client NodeJS",
-  "version": "2.22.1",
+  "version": "2.22.2",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
@@ -12,7 +12,7 @@
     "putil-merge": "^3.13.0",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
-    "tslib": "^2.8.0"
+    "tslib": "^2.8.1"
   },
   "type": "module",
   "exports": {