@devmoods/express-extras 0.17.1 → 0.17.4

package/dist/context.d.ts

@@ -17,7 +17,7 @@ export declare const getContext: typeof useContext;
 /**
  * Set a value on the request context
  */
-export declare function setContext<T>(key: string, value: T): T | undefined;
+export declare function setContext<T>(key: string, value: T): any;
 export declare function useRequestId(): string | undefined;
 /**
  * @deprecated

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/migrate.d.ts

@@ -4,6 +4,11 @@ interface Migration {
     filename: string;
     version: number;
 }
+interface MigrationFileAPI {
+    useTransaction?: boolean;
+    up(fn: any): Promise<string> | Promise<void> | string | void;
+    down(fn: any): Promise<string> | Promise<void> | string | void;
+}
 export declare function cli(): Promise<void>;
 interface MigratorOptions {
     postgres?: ReturnType<typeof createPostgres>;
@@ -23,8 +28,8 @@ export declare class Migrator {
     runMigrations(direction: 'up' | 'down'): Promise<number>;
     log(...args: any[]): void;
     executeMigration(migrations: Migration[], currentVersion: number, direction: 'up' | 'down'): Promise<number>;
-    readMigrationFile(filename: string): Promise<any>;
-    migrate(tx: Connection, migration: Migration, direction: 'up' | 'down'): Promise<void>;
+    readMigrationFile(filename: string): Promise<MigrationFileAPI>;
+    migrate(tx: Connection, migrator: MigrationFileAPI, direction: 'up' | 'down'): Promise<void>;
     updateCurrentVersion(connection: Connection, version: number): Promise<import("pg").QueryResult<import("pg").QueryResultRow>>;
     getCurrentVersion(): Promise<number>;
     getMigrations(): Promise<{

package/dist/migrate.js

@@ -104,10 +104,22 @@ export class Migrator {
             }
             for (const migration of pendingMigrations) {
                 this.log('Running migration', migration.filename);
-                await this.postgres.transaction(async (tx) => {
-                    await this.migrate(tx, migration, direction);
-                    await this.updateCurrentVersion(tx, migration.version);
-                });
+                const migrator = await this.readMigrationFile(migration.filename);
+                if (!migrator.up || !migrator.down) {
+                    throw new Error('Migrations must export both an up() and a down() function.');
+                }
+                if (migrator.useTransaction !== false) {
+                    await this.postgres.transaction(async (tx) => {
+                        await this.migrate(tx, migrator, direction);
+                        await this.updateCurrentVersion(tx, migration.version);
+                    });
+                }
+                else {
+                    await this.postgres.withConnection(async (tx) => {
+                        await this.migrate(tx, migrator, direction);
+                        await this.updateCurrentVersion(tx, migration.version);
+                    });
+                }
             }
             this.log(chalk.green('Done!'));
             return await this.getCurrentVersion();
@@ -122,10 +134,22 @@ export class Migrator {
                 return currentVersion;
             }
             this.log('Rolling back migration', migrationToRollback.filename);
-            await this.postgres.transaction(async (tx) => {
-                await this.migrate(tx, migrationToRollback, 'down');
-                await this.updateCurrentVersion(tx, updatedVersion);
-            });
+            const migrator = await this.readMigrationFile(migrationToRollback.filename);
+            if (!migrator.up || !migrator.down) {
+                throw new Error('Migrations must export both an up() and a down() function.');
+            }
+            if (migrator.useTransaction !== false) {
+                await this.postgres.transaction(async (tx) => {
+                    await this.migrate(tx, migrator, 'down');
+                    await this.updateCurrentVersion(tx, updatedVersion);
+                });
+            }
+            else {
+                await this.postgres.withConnection(async (tx) => {
+                    await this.migrate(tx, migrator, 'down');
+                    await this.updateCurrentVersion(tx, updatedVersion);
+                });
+            }
             return await this.getCurrentVersion();
         }
         throw new Error(`Invalid direction ${direction}`);
@@ -137,6 +161,7 @@ export class Migrator {
         const content = await fs.readFile(filename, 'utf-8');
         const [up, down] = content.split('-- ROLLBACK --');
         return {
+            useTransaction: content.includes('-- NO TRANSACTION --'),
             up() {
                 return up.trim();
             },
@@ -145,11 +170,7 @@ export class Migrator {
             },
         };
     }
-    async migrate(tx, migration, direction) {
-        const migrator = await this.readMigrationFile(migration.filename);
-        if (!migrator.up || !migrator.down) {
-            throw new Error('Migrations must export both an up() and a down() function.');
-        }
+    async migrate(tx, migrator, direction) {
         try {
             const queryWithLog = (sql) => {
                 this.log(chalk.yellow(sql.toString()));

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.4",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -35,12 +35,12 @@
   "license": "ISC",
   "devDependencies": {
     "@devmoods/eslint-config": "^1.1.0",
-    "@types/node": "20.2.5",
+    "@types/node": "20.3.1",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@typescript-eslint/eslint-plugin": "^5.59.11",
+    "@typescript-eslint/parser": "^5.59.11",
     "chalk": "^5.2.0",
-    "eslint": "^8.41.0",
+    "eslint": "^8.43.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
@@ -51,37 +51,37 @@
     "prettier": "2.8.8",
     "supertest": "6.3.3",
     "ts-node": "10.9.1",
-    "typescript": "5.0.4",
-    "vitest": "^0.31.1"
+    "typescript": "5.1.3",
+    "vitest": "^0.32.2"
   },
   "dependencies": {
     "@devmoods/fetch": "^3.3.0",
     "@godaddy/terminus": "^4.12.0",
-    "@sentry/node": "^7.53.1",
-    "@sentry/tracing": "^7.53.1",
+    "@sentry/node": "^7.55.2",
+    "@sentry/tracing": "^7.55.2",
     "@types/bcrypt": "^5.0.0",
     "@types/bunyan": "^1.8.8",
-    "@types/cls-hooked": "^4.3.3",
+    "@types/cls-hooked": "^4.3.4",
     "@types/cookie-parser": "^1.4.3",
     "@types/express": "^4.17.17",
     "@types/jsonwebtoken": "^9.0.2",
     "@types/nodemailer": "^6.4.8",
-    "@types/pg": "^8.10.1",
-    "@types/uuid": "^9.0.1",
+    "@types/pg": "^8.10.2",
+    "@types/uuid": "^9.0.2",
     "ajv": "^8.12.0",
     "bcrypt": "^5.1.0",
     "bunyan": "^1.8.15",
     "cls-hooked": "^4.2.2",
     "compose-middleware": "^5.0.1",
     "cookie-parser": "^1.4.6",
-    "dotenv": "^16.0.3",
+    "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "helmet": "^7.0.0",
     "jsonwebtoken": "^9.0.0",
     "meow": "^12.0.1",
     "nodemailer": "^6.9.3",
     "pg": "^8.11.0",
-    "redis": "^4.6.6",
+    "redis": "^4.6.7",
     "sql-template-strings": "^2.2.2",
     "uuid": "^9.0.0"
   },