@devmoods/express-extras 0.39.1 → 0.40.0

package/dist/middleware.d.ts

@@ -35,7 +35,11 @@ export declare function notFound(): RequestHandler;
  * Register middlewares that must come after the app routes.
  */
 export declare function after(): RequestHandler;
+type ResponseHeaders = Record<string, string>;
+type AnyResponseBody = Record<string, any> | string;
+type HttpResponseCode = number;
+type ResponseWrapper<TResponseBody extends AnyResponseBody> = TResponseBody | HttpResponseCode | [HttpResponseCode, TResponseBody] | [HttpResponseCode, TResponseBody, ResponseHeaders];
 /**
  * Alias of `route()`
  */
-export declare function asyncMiddleware<RequestBody, RequestQuery = object, ResponseBody = any>(fn: (req: Request<Record<string, string>, ResponseBody, RequestBody, RequestQuery, object>, res: Response<ResponseBody, object>, next: NextFunction) => ResponseBody | Promise<ResponseBody>): RequestHandler<Record<string, string>, any, RequestBody, RequestQuery>;
+export declare function asyncMiddleware<RequestBody, RequestQuery = object, ResponseBody extends AnyResponseBody = object>(fn: (req: Request<Record<string, string>, ResponseBody, RequestBody, RequestQuery, object>, res: Response<ResponseBody, object>, next: NextFunction) => ResponseWrapper<ResponseBody> | Promise<ResponseWrapper<ResponseBody>>): RequestHandler<Record<string, string>, ResponseBody, RequestBody, RequestQuery>;

package/dist/postgres.d.ts

@@ -1,5 +1,4 @@
-import pg, { type PoolClient, type PoolConfig, type QueryResult, type QueryResultRow } from 'pg';
-import { SQL, type SQLStatement } from 'sql-template-strings';
+import pg, { escapeIdentifier, escapeLiteral, type PoolClient, type PoolConfig, type QueryResult, type QueryResultRow } from 'pg';
 export interface PostgresOptions extends PoolConfig {
     onError?: (error: Error, client: any) => void;
     url?: PoolConfig['connectionString'];
@@ -44,5 +43,32 @@ export declare function createPostgres({ onError, url, ...config }?: PostgresOpt
     clear: (force?: boolean) => Promise<void>;
     end(): Promise<void>;
 };
-export declare const sql: typeof SQL;
-export {};
+declare class SQLStatement {
+    stringsAndValues: [string, unknown | undefined][];
+    constructor(strings: string[], values: unknown[]);
+    _extract(strings: string[], values: unknown[]): void;
+    append(statement: SQLStatement | string): this;
+    get values(): ({} | null)[];
+    get text(): string;
+}
+export declare const sql: {
+    (strings: TemplateStringsArray, ...values: unknown[]): SQLStatement;
+    identifier(name: string): {
+        name: string;
+        raw: boolean;
+    };
+    raw(name: string): {
+        name: string;
+        raw: boolean;
+    };
+    literal(name: string): {
+        name: string;
+        raw: boolean;
+    };
+    spreadUpdate: typeof spreadUpdate;
+    spreadInsert: typeof spreadInsert;
+};
+declare function spreadUpdate(data: Record<string, any>): SQLStatement;
+declare function spreadInsert<TData extends Record<string, any>>(data: TData | TData[]): SQLStatement;
+export declare function joinStatements(statements: SQLStatement[], separator: string): SQLStatement;
+export { escapeIdentifier, escapeLiteral };

package/dist/postgres.js

@@ -1,5 +1,4 @@
-import pg, {} from 'pg';
-import { SQL } from 'sql-template-strings';
+import pg, { escapeIdentifier, escapeLiteral, } from 'pg';
 import { readEnv } from './utils.js';
 export class DoesNotExistError extends Error {
     constructor(message) {
@@ -156,4 +155,119 @@ export function createPostgres({ onError, url = readEnv('POSTGRES_URL'), ...conf
         },
     };
 }
-export const sql = SQL;
+const isRaw = (value) => {
+    return (typeof value === 'object' && value !== null && 'raw' in value && !!value.raw);
+};
+class SQLStatement {
+    constructor(strings, values) {
+        this.stringsAndValues = [];
+        this._extract(strings, values);
+    }
+    _extract(strings, values) {
+        for (let i = 0; i < strings.length; i++) {
+            const string = strings[i];
+            const value = values[i];
+            if (isRaw(value)) {
+                this.stringsAndValues.push([string + value.name, undefined]);
+            }
+            else if (value instanceof SQLStatement) {
+                this.stringsAndValues.push([string, undefined]);
+                this.stringsAndValues.push(...value.stringsAndValues);
+            }
+            else {
+                this.stringsAndValues.push([string, value]);
+            }
+        }
+    }
+    append(statement) {
+        if (statement instanceof SQLStatement) {
+            this.stringsAndValues.push(...statement.stringsAndValues);
+        }
+        else {
+            this.stringsAndValues.push([statement, undefined]);
+        }
+        return this;
+    }
+    get values() {
+        return this.stringsAndValues
+            .map(([, value]) => value)
+            .filter((x) => x !== undefined);
+    }
+    get text() {
+        let i = 1;
+        let result = '';
+        for (const [string, value] of this.stringsAndValues) {
+            if (value == null) {
+                result += string;
+            }
+            else {
+                result += `${string}$${i}`;
+                i += 1;
+            }
+        }
+        return result;
+    }
+}
+export const sql = (strings, ...values) => {
+    return new SQLStatement(Array.from(strings), values);
+};
+function spreadUpdate(data) {
+    const entries = Object.entries(data);
+    if (entries.length === 0) {
+        return sql ``;
+    }
+    return joinStatements(entries.map(([key, value]) => sql `${sql.identifier(key)} = ${value}`), ', ');
+}
+function spreadInsert(data) {
+    const rows = Array.isArray(data) ? data : [data];
+    if (rows.length === 0) {
+        return sql ``;
+    }
+    const statement = sql `(`;
+    statement.append(Object.keys(rows[0])
+        .map((k) => escapeIdentifier(k))
+        .join(', '));
+    statement.append(sql `) VALUES `);
+    const toInsert = [];
+    for (const row of rows) {
+        const values = Object.values(row);
+        if (values.length === 0) {
+            continue;
+        }
+        toInsert.push(sql `(${joinStatements(values.map((value) => sql `${value ?? sql.raw('NULL')}`), ', ')})`);
+    }
+    statement.append(joinStatements(toInsert, ', '));
+    return statement;
+}
+/**
+ * Inject an identifier into the template string
+ */
+sql.identifier = (name) => {
+    return { name: escapeIdentifier(name), raw: true };
+};
+/**
+ * Inject a raw value into the template string
+ */
+sql.raw = (name) => {
+    return { name, raw: true };
+};
+/**
+ * Inject a literal value into the template string
+ */
+sql.literal = (name) => {
+    return { name: escapeLiteral(name), raw: true };
+};
+sql.spreadUpdate = spreadUpdate;
+sql.spreadInsert = spreadInsert;
+export function joinStatements(statements, separator) {
+    let i = 0;
+    const statement = sql ``;
+    for (const o of statements) {
+        if (i++ !== 0) {
+            statement.append(separator);
+        }
+        statement.append(o);
+    }
+    return statement;
+}
+export { escapeIdentifier, escapeLiteral };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -20,11 +20,11 @@
   "devDependencies": {
     "@devmoods/eslint-config": "^1.15.0",
     "@types/koa-compose": "^3.2.8",
-    "@types/node": "22.8.6",
+    "@types/node": "22.9.3",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^8.12.2",
-    "@typescript-eslint/parser": "^8.12.2",
-    "@vitest/coverage-v8": "^2.1.4",
+    "@typescript-eslint/eslint-plugin": "^8.15.0",
+    "@typescript-eslint/parser": "^8.15.0",
+    "@vitest/coverage-v8": "^2.1.5",
     "cookiejar": "^2.1.4",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.31.0",
@@ -34,20 +34,20 @@
     "supertest": "7.0.0",
     "ts-node": "10.9.2",
     "tsx": "^4.19.2",
-    "typescript": "5.6.3",
-    "vitest": "^2.1.4",
+    "typescript": "5.7.2",
+    "vitest": "^2.1.5",
     "vitest-fail-on-console": "^0.7.1"
   },
   "dependencies": {
     "@devmoods/fetch": "^4.0.1",
-    "@sentry/node": "^8.36.0",
-    "@sentry/profiling-node": "^8.36.0",
+    "@sentry/node": "^8.40.0",
+    "@sentry/profiling-node": "^8.40.0",
     "@types/bcrypt": "^5.0.2",
     "@types/body-parser": "^1.19.5",
     "@types/cookie-parser": "^1.4.7",
     "@types/express": "^5.0.0",
     "@types/jsonwebtoken": "^9.0.7",
-    "@types/nodemailer": "^6.4.16",
+    "@types/nodemailer": "^6.4.17",
     "@types/pg": "^8.11.10",
     "@types/superagent": "^8.1.9",
     "@types/uuid": "^10.0.0",
@@ -65,8 +65,7 @@
     "nodemailer": "^6.9.16",
     "pg": "^8.13.1",
     "redis": "^4.7.0",
-    "sql-template-strings": "^2.2.2",
-    "uuid": "^11.0.2"
+    "uuid": "^11.0.3"
   },
   "prettier": {
     "singleQuote": true