@devmoods/express-extras 0.13.8 → 0.14.0

package/dist/logger.js

@@ -1,33 +1,31 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoggers = exports.getLogger = exports.createLogger = void 0;
-const bunyan_1 = __importDefault(require("bunyan"));
-const context_1 = require("./context");
+import bunyan from 'bunyan';
+import { useRequestId } from './context.js';
 function defaultGetContext() {
     return {
-        requestId: (0, context_1.useRequestId)(),
+        requestId: useRequestId(),
     };
 }
 const _loggers = new Map();
-function createLogger({ name, getContext, silent = () => process.env.NODE_ENV === 'test', }) {
+let _sentryClient;
+export function attachSentryClientToLoggers(sentryClient) {
+    _sentryClient = sentryClient;
+}
+export function createLogger({ name, getContext, silent = () => process.env.NODE_ENV === 'test', }) {
     if (_loggers.has(name)) {
         throw new Error(`A logger named ${name} already exists`);
     }
-    const logger = bunyan_1.default.createLogger({
+    const logger = bunyan.createLogger({
         name,
-        serializers: bunyan_1.default.stdSerializers,
+        serializers: bunyan.stdSerializers,
     });
     _loggers.set(name, logger);
     if (silent()) {
-        logger.level(bunyan_1.default.FATAL + 1);
+        logger.level(bunyan.FATAL + 1);
     }
     function getFinalContext() {
         return {
             ...defaultGetContext(),
-            ...getContext === null || getContext === void 0 ? void 0 : getContext(),
+            ...getContext?.(),
         };
     }
     return {
@@ -41,25 +39,34 @@ function createLogger({ name, getContext, silent = () => process.env.NODE_ENV ==
             return logger.child(getFinalContext(), true).warn(context, message);
         },
         error(error, message) {
+            const context = getFinalContext();
+            if (_sentryClient != null) {
+                _sentryClient.captureException(error, {
+                    tags: context,
+                });
+            }
             return logger
-                .child(getFinalContext(), true)
-                .error(error, message || (error === null || error === void 0 ? void 0 : error.message));
+                .child(context, true)
+                .error(error, message || error?.message);
         },
         fatal(error, message) {
-            return logger.child(getFinalContext(), true).fatal(error, message);
+            const context = getFinalContext();
+            if (_sentryClient != null) {
+                _sentryClient.captureException(error, {
+                    tags: context,
+                });
+            }
+            return logger.child(context, true).fatal(error, message);
         },
     };
 }
-exports.createLogger = createLogger;
-function getLogger(name) {
+export function getLogger(name) {
     const logger = _loggers.get(name);
     if (!logger) {
         return createLogger({ name });
     }
     return logger;
 }
-exports.getLogger = getLogger;
-function getLoggers() {
+export function getLoggers() {
     return _loggers;
 }
-exports.getLoggers = getLoggers;

package/dist/middleware.d.ts

@@ -1,7 +1,9 @@
+/// <reference types="connect" />
 /// <reference types="qs" />
-import { json as jsonParser, urlencoded as urlencodedParser } from 'body-parser';
-import { RequestHandler } from 'express';
-import { ErrorHandlerOptions } from './errors';
+import bodyParser from 'body-parser';
+import type { RequestHandler } from 'express';
+import { type ErrorHandlerOptions } from './errors.js';
+declare const urlencodedParser: (options?: bodyParser.OptionsUrlencoded | undefined) => import("connect").NextHandleFunction, jsonParser: (options?: bodyParser.OptionsJson | undefined) => import("connect").NextHandleFunction;
 export { urlencodedParser, jsonParser, asyncMiddleware as route };
 export interface BeforeMiddlewareOptions {
     cookies?: boolean;

package/dist/middleware.js

@@ -1,50 +1,21 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.asyncMiddleware = exports.after = exports.notFound = exports.before = exports.route = exports.jsonParser = exports.urlencodedParser = void 0;
-const Sentry = __importStar(require("@sentry/node"));
-const body_parser_1 = require("body-parser");
-Object.defineProperty(exports, "jsonParser", { enumerable: true, get: function () { return body_parser_1.json; } });
-Object.defineProperty(exports, "urlencodedParser", { enumerable: true, get: function () { return body_parser_1.urlencoded; } });
-const compose_middleware_1 = require("compose-middleware");
-const cookie_parser_1 = __importDefault(require("cookie-parser"));
-const helmet_1 = __importDefault(require("helmet"));
-const context_1 = require("./context");
-const errors_1 = require("./errors");
+import * as Sentry from '@sentry/node';
+import bodyParser from 'body-parser';
+import { compose } from 'compose-middleware';
+import cookieParser from 'cookie-parser';
+import helmet from 'helmet';
+import { withRequestContext } from './context.js';
+import { NotFound } from './errors.js';
+const { urlencoded: urlencodedParser, json: jsonParser } = bodyParser;
+export { urlencodedParser, jsonParser, asyncMiddleware as route };
 /**
  * Register middleware that must come before the app routes.
  */
-function before({ cookies = false, helmet: useHelmet = true, json: useJson = true, allowUnsafeInlineScripts = false, } = {}) {
-    return (0, compose_middleware_1.compose)([
+export function before({ cookies = false, helmet: useHelmet = true, json: useJson = true, allowUnsafeInlineScripts = false, } = {}) {
+    return compose([
         Sentry.Handlers.requestHandler(),
         Sentry.Handlers.tracingHandler(),
         useHelmet &&
-            (0, helmet_1.default)({
+            helmet({
                 contentSecurityPolicy: {
                     directives: {
                         'default-src': ["'self'"],
@@ -65,38 +36,35 @@ function before({ cookies = false, helmet: useHelmet = true, json: useJson = tru
                     },
                 },
             }),
-        useJson && (0, body_parser_1.json)(),
-        cookies && (0, cookie_parser_1.default)(),
-        (0, context_1.withRequestContext)(),
+        useJson && jsonParser(),
+        cookies && cookieParser(),
+        withRequestContext(),
     ].filter(Boolean));
 }
-exports.before = before;
 /**
  * Middleware that sends a 404
  *
  * Add this after your routes to send a 404 for all
  * unknown routes.
  */
-function notFound() {
+export function notFound() {
     return (req, res, next) => {
-        next((0, errors_1.NotFound)(`Could not ${req.method} ${req.path}`));
+        next(NotFound(`Could not ${req.method} ${req.path}`));
     };
 }
-exports.notFound = notFound;
 /**
  * Register middlewares that must come after the app routes.
  *
  * Currently attaches:
  * - notFound()
  */
-function after() {
+export function after() {
     return notFound();
 }
-exports.after = after;
 /**
  * Alias of `route()`
  */
-function asyncMiddleware(fn) {
+export function asyncMiddleware(fn) {
     return (req, res, next) => {
         return Promise.resolve(fn(req, res, next))
             .then((result) => {
@@ -104,7 +72,7 @@ function asyncMiddleware(fn) {
                 (result.length === 2 || result.length === 3) &&
                 typeof result[0] === 'number') {
                 const [status, body, headers = {}] = result;
-                for (const header in headers) {
+                for (const header of Object.keys(headers)) {
                     res.setHeader(header, headers[header]);
                 }
                 res.status(status).send(body);
@@ -119,5 +87,3 @@ function asyncMiddleware(fn) {
             .catch(next);
     };
 }
-exports.asyncMiddleware = asyncMiddleware;
-exports.route = asyncMiddleware;

package/dist/migrate.d.ts

@@ -1,4 +1,4 @@
-import { createPostgres } from './postgres';
+import { createPostgres } from './postgres.js';
 interface Migration {
     name: string;
     filename: string;

package/dist/migrate.js

@@ -1,16 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Migrator = exports.cli = void 0;
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
-const chalk_1 = __importDefault(require("chalk"));
-const meow_1 = __importDefault(require("meow"));
-const postgres_1 = require("./postgres");
-async function cli() {
-    const cli = (0, meow_1.default)(`
+import chalk from 'chalk';
+import meow from 'meow';
+import { promises as fs } from 'node:fs';
+import * as path from 'node:path';
+import { createPostgres } from './postgres.js';
+export async function cli() {
+    const cli = meow(`
 Usage
   $ migrate init
   $ migrate up
@@ -18,8 +12,9 @@ Usage
   $ migrate create <name>
 `, {
         description: 'PostgreSQL migration tool',
+        importMeta: import.meta,
     });
-    let verbose = !cli.flags.silent;
+    const verbose = !cli.flags.silent;
     const args = cli.input.slice();
     const action = args.shift();
     function isValidAction(action) {
@@ -39,16 +34,17 @@ Usage
                     break;
                 case 'init':
                     await migrator.init();
-                    migrator.log(chalk_1.default.green('Migrations table was successfully setup.'));
+                    migrator.log(chalk.green('Migrations table was successfully setup.'));
                     break;
-                case 'create':
+                case 'create': {
                     const createdMigration = await migrator.create(args[0]);
-                    migrator.log(chalk_1.default.green('Created migration', createdMigration));
+                    migrator.log(chalk.green('Created migration', createdMigration));
                     break;
+                }
             }
         }
         catch (error) {
-            console.error(chalk_1.default.red(error.message));
+            console.error(chalk.red(error.message));
         }
         finally {
             process.exit(0);
@@ -56,9 +52,8 @@ Usage
     }
     run(action, ...args);
 }
-exports.cli = cli;
-class Migrator {
-    constructor({ postgres = (0, postgres_1.createPostgres)(), pathToMigrations = path_1.default.resolve(process.cwd(), 'db', 'migrations'), migrationTableName = 'migrations', verbose = true, } = {}) {
+export class Migrator {
+    constructor({ postgres = createPostgres(), pathToMigrations = path.resolve(process.cwd(), 'db', 'migrations'), migrationTableName = 'migrations', verbose = true, } = {}) {
         this.filenameRegExp = /(\d+)_(.*)\.(js|ts|mjs|mts)/;
         this.postgres = postgres;
         this.pathToMigrations = pathToMigrations;
@@ -82,9 +77,9 @@ class Migrator {
         const lastVersion = existingMigrations.length
             ? existingMigrations[existingMigrations.length - 1].version
             : 0;
-        const filename = path_1.default.join(this.pathToMigrations, `${lastVersion + 1}_${name}.ts`);
+        const filename = path.join(this.pathToMigrations, `${lastVersion + 1}_${name}.ts`);
         const template = `// Generated ${new Date()}\n\nexport function up(query: any) {\n\n}\n\nexport function down(query: any) {\n\n}\n`;
-        await fs_1.promises.writeFile(filename, template);
+        await fs.writeFile(filename, template);
         return filename;
     }
     async runMigrations(direction) {
@@ -104,7 +99,7 @@ class Migrator {
         if (direction === 'up') {
             const pendingMigrations = this.getPendingMigrations(migrations, currentVersion);
             if (!pendingMigrations.length) {
-                this.log(chalk_1.default.green('No pending migrations'));
+                this.log(chalk.green('No pending migrations'));
                 return;
             }
             for (const migration of pendingMigrations) {
@@ -112,7 +107,7 @@ class Migrator {
                 await this.migrate(migration, direction);
                 await this.updateCurrentVersion(migration.version);
             }
-            this.log(chalk_1.default.green('Done!'));
+            this.log(chalk.green('Done!'));
         }
         else {
             const previousMigrations = this.getPreviousMigrations(migrations, currentVersion);
@@ -120,7 +115,7 @@ class Migrator {
             const updatedVersion = previousMigration ? previousMigration.version : 0;
             const migrationToRollback = migrations.find((migration) => migration.version === currentVersion);
             if (!migrationToRollback) {
-                this.log(chalk_1.default.green('No migrations have been run, so nothing to rollback to.'));
+                this.log(chalk.green('No migrations have been run, so nothing to rollback to.'));
                 return;
             }
             this.log('Rolling back migration', migrationToRollback.filename);
@@ -129,11 +124,11 @@ class Migrator {
         }
     }
     queryWithLog(sql) {
-        this.log(chalk_1.default.yellow(sql.toString()));
+        this.log(chalk.yellow(sql.toString()));
         return this.postgres.query(sql);
     }
     async migrate(migration, direction) {
-        const migrator = require(migration.filename);
+        const migrator = await import(migration.filename);
         if (!migrator.up || !migrator.down) {
             throw new Error('Migrations must export both an up() and a down() function.');
         }
@@ -151,12 +146,12 @@ class Migrator {
         return result ? result.version : 0;
     }
     async getMigrations() {
-        const files = await fs_1.promises.readdir(this.pathToMigrations);
+        const files = await fs.readdir(this.pathToMigrations);
         return (files || [])
             .map((filename) => filename.match(this.filenameRegExp))
             .filter(notNullOrUndefined)
             .map(([filename, version, name]) => ({
-            filename: path_1.default.join(this.pathToMigrations, filename),
+            filename: path.join(this.pathToMigrations, filename),
             version: parseInt(version, 10),
             name,
         }))
@@ -170,7 +165,6 @@ class Migrator {
         return migrations.filter((migration) => migration.version > currentVersion);
     }
 }
-exports.Migrator = Migrator;
 function notNullOrUndefined(x) {
     return x != null;
 }