@devmoods/express-extras 0.13.9 → 0.15.0

package/dist/routes.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.listRoutes = void 0;
 function split(value) {
     if (typeof value === 'string') {
         return value;
@@ -11,9 +8,9 @@ function split(value) {
     else {
         const match = value
             .toString()
-            .replace('\\/?', '')
-            .replace('(?=\\/|$)', '$')
-            .match(/^\/\^((?:\\[.*+?^${}()|[\]\\\/]|[^.*+?^${}()|[\]\\\/])*)\$\//);
+            .replace('/?', '')
+            .replace('(?=/|$)', '$')
+            .match(/^\/\^((?:\\[.*+?^${}()|[\]\\/]|[^.*+?^${}()|[\]\\/])*)\$\//);
         return match
             ? match[1].replace(/\\(.)/g, '$1')
             : '<complex:' + value.toString() + '>';
@@ -35,11 +32,10 @@ function getRoutesOfLayer(path, layer) {
     }
     return [];
 }
-function listRoutes(app) {
+export function listRoutes(app) {
     const routes = [];
     for (const layer of app._router.stack) {
         routes.push(...getRoutesOfLayer('', layer));
     }
     return routes;
 }
-exports.listRoutes = listRoutes;

package/dist/sentry.d.ts

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { Application } from 'express';
+import { type Application } from 'express';
 export type { Sentry };
 export interface SentryOptions extends Sentry.NodeOptions {
 }
@@ -17,7 +17,7 @@ export declare function createSentry(options?: SentryOptions): {
 export declare function createSentryOptions(app: Application | null, options?: SentryOptions): {
     defaultIntegrations?: false | import("@sentry/types").Integration[] | undefined;
     integrations: import("@sentry/types").Integration[] | ((integrations: import("@sentry/types").Integration[]) => import("@sentry/types").Integration[]) | undefined;
-    transport?: ((transportOptions: import("@sentry/node/types/transports").NodeTransportOptions) => import("@sentry/types").Transport) | undefined;
+    transport?: ((transportOptions: import("@sentry/node/types/transports/http.js").NodeTransportOptions) => import("@sentry/types").Transport) | undefined;
     stackParser?: import("@sentry/types").StackParser | import("@sentry/types").StackLineParser[] | undefined;
     release?: string | undefined;
     environment?: string | undefined;
@@ -29,7 +29,8 @@ export declare function createSentryOptions(app: Application | null, options?: S
     autoSessionTracking?: boolean | undefined;
     sendClientReports?: boolean | undefined;
     dist?: string | undefined;
-    transportOptions?: Partial<import("@sentry/node/types/transports").NodeTransportOptions> | undefined;
+    instrumenter?: import("@sentry/types").Instrumenter | undefined;
+    transportOptions?: Partial<import("@sentry/node/types/transports/http.js").NodeTransportOptions> | undefined;
     tracesSampleRate: number;
     initialScope?: import("@sentry/types").CaptureContext | undefined;
     maxBreadcrumbs?: number | undefined;
@@ -46,8 +47,10 @@ export declare function createSentryOptions(app: Application | null, options?: S
     } | undefined;
     tracesSampler?: ((samplingContext: import("@sentry/types").SamplingContext) => number | boolean) | undefined;
     beforeSend?: ((event: Sentry.Event, hint: Sentry.EventHint) => Sentry.Event | PromiseLike<Sentry.Event | null> | null) | undefined;
+    beforeSendTransaction?: ((event: Sentry.Event, hint: Sentry.EventHint) => Sentry.Event | PromiseLike<Sentry.Event | null> | null) | undefined;
     beforeBreadcrumb?: ((breadcrumb: Sentry.Breadcrumb, hint?: Sentry.BreadcrumbHint | undefined) => Sentry.Breadcrumb | null) | undefined;
     serverName?: string | undefined;
     tracePropagationTargets?: import("@sentry/types").TracePropagationTargets | undefined;
+    shouldCreateSpanForRequest?(url: string): boolean;
     onFatalError?(error: Error): void;
 };

package/dist/sentry.js

@@ -1,35 +1,9 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSentryOptions = exports.createSentry = void 0;
-const Sentry = __importStar(require("@sentry/node"));
-const Tracing = __importStar(require("@sentry/tracing"));
+import * as Sentry from '@sentry/node';
+import * as Tracing from '@sentry/tracing';
 /**
  * Create a pre-configured Sentry client
  */
-function createSentry(options = {}) {
+export function createSentry(options = {}) {
     return {
         client: Sentry,
         init(app, getOptions = (defaultOptions) => defaultOptions) {
@@ -37,11 +11,10 @@ function createSentry(options = {}) {
         },
     };
 }
-exports.createSentry = createSentry;
 /**
  * Construct sensible Sentry default options for an Express-based app.
  */
-function createSentryOptions(app, options = {}) {
+export function createSentryOptions(app, options = {}) {
     return {
         dsn: process.env.SENTRY_DSN,
         integrations: [
@@ -52,4 +25,3 @@ function createSentryOptions(app, options = {}) {
         ...options,
     };
 }
-exports.createSentryOptions = createSentryOptions;

package/dist/slack.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSlack = void 0;
-const fetch_1 = require("@devmoods/fetch");
-const logger_1 = require("./logger");
+import { createFetch } from '@devmoods/fetch';
+import { getLogger } from './logger.js';
+const logger = getLogger();
 /**
  * Send messages to Slack using Incoming Webhooks
  *
@@ -16,8 +14,8 @@ const logger_1 = require("./logger");
  *
  * See https://api.slack.com/messaging/webhooks
  */
-function createSlack({ webhookUrl = process.env.SLACK_WEBHOOK_URL, dryRun = process.env.NODE_ENV !== 'production', } = {}) {
-    const fetch = (0, fetch_1.createFetch)();
+export function createSlack({ webhookUrl = process.env.SLACK_WEBHOOK_URL, dryRun = process.env.NODE_ENV !== 'production', } = {}) {
+    const fetch = createFetch();
     /**
      * Post a message to Slack
      *
@@ -27,6 +25,7 @@ function createSlack({ webhookUrl = process.env.SLACK_WEBHOOK_URL, dryRun = proc
      */
     async function postMessage(message, blocks) {
         if (dryRun) {
+            logger.info('slack post message (dry run)', { message });
             return;
         }
         try {
@@ -43,7 +42,7 @@ function createSlack({ webhookUrl = process.env.SLACK_WEBHOOK_URL, dryRun = proc
             return response.jsonData;
         }
         catch (error) {
-            (0, logger_1.getLogger)('core').error(error);
+            logger.error(error);
             throw error;
         }
     }
@@ -51,4 +50,3 @@ function createSlack({ webhookUrl = process.env.SLACK_WEBHOOK_URL, dryRun = proc
         postMessage,
     };
 }
-exports.createSlack = createSlack;

package/dist/validate.d.ts

@@ -1,5 +1,5 @@
-import { Options } from 'ajv';
-import { RequestHandler } from 'express';
+import { type Options } from 'ajv';
+import { type RequestHandler } from 'express';
 export declare type ValidationSchema = {
     type?: 'string' | 'number' | 'integer' | 'boolean' | 'array' | 'object' | 'null';
     format?: string;

package/dist/validate.js

@@ -1,46 +1,38 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSchema = exports.compileValidateSchema = exports.validateParams = exports.validateQuery = exports.validateBody = void 0;
-const ajv_1 = __importDefault(require("ajv"));
-const errors_1 = require("./errors");
-function validateBody(schema) {
+import _Ajv from 'ajv';
+import { BadRequest } from './errors.js';
+const Ajv = _Ajv;
+export function validateBody(schema) {
     const validate = compileValidateSchema(schema);
     return (req, res, next) => {
         const result = validate(req.body);
         if (!result.isValid) {
-            return next((0, errors_1.BadRequest)({ body: result.errors }));
+            return next(BadRequest({ body: result.errors }));
         }
         next();
     };
 }
-exports.validateBody = validateBody;
-function validateQuery(schema) {
+export function validateQuery(schema) {
     const validate = compileValidateSchema(schema, { coerceTypes: true });
     return (req, res, next) => {
         const result = validate(req.query);
         if (!result.isValid) {
-            return next((0, errors_1.BadRequest)({ query: result.errors }));
+            return next(BadRequest({ query: result.errors }));
         }
         next();
     };
 }
-exports.validateQuery = validateQuery;
-function validateParams(schema) {
+export function validateParams(schema) {
     const validate = compileValidateSchema(schema, { coerceTypes: true });
     return (req, res, next) => {
         const result = validate(req.params);
         if (!result.isValid) {
-            return next((0, errors_1.BadRequest)({ params: result.errors }));
+            return next(BadRequest({ params: result.errors }));
         }
         next();
     };
 }
-exports.validateParams = validateParams;
-function compileValidateSchema(schema, options = {}) {
-    const ajv = new ajv_1.default({
+export function compileValidateSchema(schema, options = {}) {
+    const ajv = new Ajv({
         allErrors: true,
         ...options,
     });
@@ -61,9 +53,8 @@ function compileValidateSchema(schema, options = {}) {
         };
     };
 }
-exports.compileValidateSchema = compileValidateSchema;
-function validateSchema(data, schema, options = {}) {
-    const ajv = new ajv_1.default({
+export function validateSchema(data, schema, options = {}) {
+    const ajv = new Ajv({
         allErrors: true,
         ...options,
     });
@@ -81,7 +72,6 @@ function validateSchema(data, schema, options = {}) {
         errors,
     };
 }
-exports.validateSchema = validateSchema;
 function transformAjvErrors(errors) {
     if (errors == null) {
         return [];

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.13.9",
+  "version": "0.15.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
+  "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
-    "migrate": "bin/migrate"
+    "migrate": "bin/migrate.js"
   },
   "scripts": {
-    "start": "ts-node example",
+    "start": "ts-node --esm example/index.ts",
     "clean": "rm -rf dist",
+    "lint": "eslint src",
     "test": "NODE_ENV=test jest",
-    "build": "npm run clean && tsc --declaration --project tsconfig.build.json",
+    "build": "npm run clean && tsc --project tsconfig.build.json",
     "prepublishOnly": "npm run clean && npm run build",
     "prettier": "prettier --write '**/*.{js,css,md,ts,tsx}'",
     "import-sort": "import-sort --write '**/*.{js,jsx,ts,tsx}'",
@@ -32,13 +34,20 @@
   ],
   "license": "ISC",
   "devDependencies": {
+    "@devmoods/eslint-config": "^1.0.0",
     "@types/jest": "29.2.2",
     "@types/node": "18.11.9",
     "@types/supertest": "2.0.12",
+    "@typescript-eslint/eslint-plugin": "^5.42.1",
+    "eslint": "^8.27.0",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.31.10",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "import-sort-cli": "6.0.0",
     "import-sort-style-module": "6.0.0",
     "isomorphic-fetch": "3.0.0",
-    "jest": "29.2.2",
+    "jest": "29.3.1",
     "prettier": "2.7.1",
     "supertest": "6.3.1",
     "ts-jest": "29.0.3",
@@ -48,8 +57,8 @@
   "dependencies": {
     "@devmoods/fetch": "^3.3.0",
     "@godaddy/terminus": "^4.11.2",
-    "@sentry/node": "^7.17.4",
-    "@sentry/tracing": "^7.17.4",
+    "@sentry/node": "^7.18.0",
+    "@sentry/tracing": "^7.18.0",
     "@types/bcrypt": "^5.0.0",
     "@types/bunyan": "^1.8.8",
     "@types/cls-hooked": "^4.3.3",
@@ -65,16 +74,16 @@
     "cls-hooked": "^4.2.2",
     "compose-middleware": "^5.0.1",
     "cookie-parser": "^1.4.6",
-    "dotenv-safe": "^8.2.0",
+    "dotenv": "^16.0.3",
     "express": "^4.18.2",
-    "helmet": "^5.1.1",
+    "helmet": "^6.0.0",
     "jsonwebtoken": "^8.5.1",
-    "meow": "^9.0.0",
+    "meow": "^11.0.0",
     "nodemailer": "^6.8.0",
     "pg": "^8.8.0",
     "redis": "^4.4.0",
     "sql-template-strings": "^2.2.2",
-    "uuid": "^8.3.2"
+    "uuid": "^9.0.0"
   },
   "prettier": {
     "singleQuote": true
@@ -83,5 +92,13 @@
     ".js, .jsx, .ts, .tsx": {
       "style": "module"
     }
+  },
+  "eslintConfig": {
+    "extends": "@devmoods/eslint-config",
+    "rules": {
+      "@typescript-eslint/consistent-type-imports": "warn",
+      "@typescript-eslint/no-shadow": "off",
+      "react-hooks/rules-of-hooks": "off"
+    }
   }
 }

package/bin/migrate

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-
-require('dotenv').config({
-  allowEmptyValues: true,
-});
-
-require('ts-node').register({});
-const { cli } = require('../dist/migrate.js');
-cli();