@devmoods/express-extras 0.17.1 → 0.17.2

package/dist/errors.js

@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/node';
 import { errors } from 'compose-middleware';
 import { STATUS_CODES } from 'node:http';
+import { IntegrityError } from './postgres.js';
 export class ApiError extends Error {
 }
 export const BadRequest = (reason) => makeError(400, 'Invalid Params', { reason });
@@ -36,6 +37,12 @@ export function mapToProblem(error) {
         status: 500,
     };
 }
+function convertToAPIError(error) {
+    if (error instanceof IntegrityError) {
+        return Conflict(error.message);
+    }
+    return error;
+}
 function _errorHandler({ onError }) {
     return (err, req, res, next // eslint-disable-line
     ) => {
@@ -43,7 +50,8 @@ function _errorHandler({ onError }) {
             err = makeError(500);
         }
         onError?.(err);
-        const problem = mapToProblem(err);
+        const apiError = convertToAPIError(err);
+        const problem = mapToProblem(apiError);
         res.status(problem.status).json(problem);
     };
 }

package/dist/postgres.d.ts

@@ -9,6 +9,9 @@ export declare class DoesNotExistError extends Error {
 export declare class MultipleRowsReturnedError extends Error {
     constructor(message: string);
 }
+export declare class IntegrityError extends Error {
+    constructor(message: string);
+}
 type Value = null | string | number | Date;
 export declare class Connection {
     client: PoolClient;

package/dist/postgres.js

@@ -12,12 +12,26 @@ export class MultipleRowsReturnedError extends Error {
         this.name = 'MultipleRowsReturnedError';
     }
 }
+export class IntegrityError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'IntegrityError';
+    }
+}
 export class Connection {
     constructor(client) {
         this.client = client;
     }
     async query(text, values) {
-        return this.client.query(text, values);
+        try {
+            return await this.client.query(text, values);
+        }
+        catch (error) {
+            if (error.code && error.code === '23505') {
+                throw new IntegrityError(`${error.message}: ${error.detail}`);
+            }
+            throw error;
+        }
     }
     async all(text, values) {
         const result = await this.client.query(text, values);
@@ -27,7 +41,7 @@ export class Connection {
         return [];
     }
     async insert(text, values) {
-        return await this.client.query(text, values);
+        return await this.query(text, values);
     }
     async first(text, values) {
         const result = await this.client.query(text, values);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -37,8 +37,8 @@
     "@devmoods/eslint-config": "^1.1.0",
     "@types/node": "20.2.5",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.8",
     "chalk": "^5.2.0",
     "eslint": "^8.41.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",
@@ -52,7 +52,7 @@
     "supertest": "6.3.3",
     "ts-node": "10.9.1",
     "typescript": "5.0.4",
-    "vitest": "^0.31.1"
+    "vitest": "^0.31.2"
   },
   "dependencies": {
     "@devmoods/fetch": "^3.3.0",
@@ -74,7 +74,7 @@
     "cls-hooked": "^4.2.2",
     "compose-middleware": "^5.0.1",
     "cookie-parser": "^1.4.6",
-    "dotenv": "^16.0.3",
+    "dotenv": "^16.1.0",
     "express": "^4.18.2",
     "helmet": "^7.0.0",
     "jsonwebtoken": "^9.0.0",