@nestjs-kitchen/connextion-postgres 2.0.2 → 2.0.4

package/dist/types.d.ts

@@ -1,12 +1,9 @@
-import { PoolConfig, PoolClient } from 'pg';
-
-type ALSQueryType = Error | true;
-interface ALSType {
+import type { PoolClient, PoolConfig } from 'pg';
+export type ALSQueryType = Error | true;
+export interface ALSType {
     client: Promise<PoolClient>;
     queries: Promise<ALSQueryType>[];
 }
-type PostgresInstanceOptions = PoolConfig & {
+export type PostgresInstanceOptions = PoolConfig & {
     debug?: boolean | ((data: Record<any, any>) => void);
 };
-
-export type { ALSQueryType, ALSType, PostgresInstanceOptions };

package/dist/types.js

@@ -1,15 +1,2 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils.d.ts

@@ -1,16 +1,15 @@
-import { Submittable, PoolClient } from 'pg';
-
-declare const isSubmittable: (val: any) => val is Submittable;
-declare const isObject: (val: any) => val is object;
-declare const normalizeStrings: (strs?: string[]) => string[];
-declare const plainPromise: <T>(promise: Promise<T> | T) => Promise<[T, undefined] | [undefined, any]>;
-declare const truncateString: (str: string, maxLength: number) => string;
-declare const printTable: (logData: Record<string, any>) => string;
-declare const getCurrentDateStr: () => string;
-declare const formatArray: (arr?: any) => string;
-declare const extraceQueryTextAndValues: (...rest: any[]) => [text: string, values: any[]];
-declare const createDebugLogger: (defaultLogger: (...rest: any) => void, customFormater?: Boolean | ((data: Record<any, any>) => void)) => (data: Record<any, any>) => void;
-declare const debugFactroy: (name: string, queryId: string, logger: (data: Record<any, any>) => void) => {
+import { type PoolClient, type Submittable } from 'pg';
+export declare const isSubmittable: (val: any) => val is Submittable;
+export declare const isObject: (val: any) => val is object;
+export declare const normalizeStrings: (strs?: string[]) => string[];
+export declare const plainPromise: <T>(promise: Promise<T> | T) => Promise<[T, undefined] | [undefined, any]>;
+export declare const truncateString: (str: string, maxLength: number) => string;
+export declare const printTable: (logData: Record<string, any>) => string;
+export declare const getCurrentDateStr: () => string;
+export declare const formatArray: (arr?: any) => string;
+export declare const extraceQueryTextAndValues: (...rest: any[]) => [text: string, values: any[]];
+export declare const createDebugLogger: (defaultLogger: (...rest: any) => void, customFormater?: Boolean | ((data: Record<any, any>) => void)) => (data: Record<any, any>) => void;
+export declare const debugFactroy: (name: string, queryId: string, logger: (data: Record<any, any>) => void) => {
     pool: {
         connect: <T extends () => Promise<PoolClient>>(callback: T) => () => Promise<PoolClient>;
     };
@@ -19,13 +18,11 @@ declare const debugFactroy: (name: string, queryId: string, logger: (data: Recor
         release: <T extends (...rest: unknown[]) => void>(callback: T) => (...rest: Parameters<T>) => void;
     };
 };
-declare const copyMethodMetadata: (from: any, to: any) => void;
-declare const getTransactionMetdata: (target: any) => any;
-declare const setTransactionMetdata: (target: any) => void;
-declare const withResolvers: <T>() => {
+export declare const copyMethodMetadata: (from: any, to: any) => void;
+export declare const getTransactionMetdata: (target: any) => any;
+export declare const setTransactionMetdata: (target: any) => void;
+export declare const withResolvers: <T>() => {
     promise: Promise<T>;
     resolve: (value: T | PromiseLike<T>) => void;
     reject: (reason?: any) => void;
 };
-
-export { copyMethodMetadata, createDebugLogger, debugFactroy, extraceQueryTextAndValues, formatArray, getCurrentDateStr, getTransactionMetdata, isObject, isSubmittable, normalizeStrings, plainPromise, printTable, setTransactionMetdata, truncateString, withResolvers };

package/dist/utils.js

@@ -1,278 +1,230 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withResolvers = exports.setTransactionMetdata = exports.getTransactionMetdata = exports.copyMethodMetadata = exports.debugFactroy = exports.createDebugLogger = exports.extraceQueryTextAndValues = exports.formatArray = exports.getCurrentDateStr = exports.printTable = exports.truncateString = exports.plainPromise = exports.normalizeStrings = exports.isObject = exports.isSubmittable = void 0;
+const dayjs_1 = __importDefault(require("dayjs"));
+const constants_1 = require("./constants");
+const isSubmittable = (val) => {
+    return val && typeof val.submit === 'function';
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  copyMethodMetadata: () => copyMethodMetadata,
-  createDebugLogger: () => createDebugLogger,
-  debugFactroy: () => debugFactroy,
-  extraceQueryTextAndValues: () => extraceQueryTextAndValues,
-  formatArray: () => formatArray,
-  getCurrentDateStr: () => getCurrentDateStr,
-  getTransactionMetdata: () => getTransactionMetdata,
-  isObject: () => isObject,
-  isSubmittable: () => isSubmittable,
-  normalizeStrings: () => normalizeStrings,
-  plainPromise: () => plainPromise,
-  printTable: () => printTable,
-  setTransactionMetdata: () => setTransactionMetdata,
-  truncateString: () => truncateString,
-  withResolvers: () => withResolvers
-});
-module.exports = __toCommonJS(utils_exports);
-var import_dayjs = __toESM(require("dayjs"));
-var import_constants = require("./constants");
-const isSubmittable = /* @__PURE__ */ __name((val) => {
-  return val && typeof val.submit === "function";
-}, "isSubmittable");
-const isObject = /* @__PURE__ */ __name((val) => {
-  return Object.prototype.toString.call(val) === "[object Object]";
-}, "isObject");
-const normalizeStrings = /* @__PURE__ */ __name((strs) => {
-  if (!strs) {
-    return [];
-  }
-  return Array.from(new Set(strs.filter(Boolean).map((ele) => ele.trim())));
-}, "normalizeStrings");
-const plainPromise = /* @__PURE__ */ __name(async (promise) => {
-  let result = void 0;
-  let err = void 0;
-  try {
-    result = await promise;
-  } catch (error) {
-    err = error;
-  }
-  return [
-    result,
-    err
-  ];
-}, "plainPromise");
-const truncateString = /* @__PURE__ */ __name((str, maxLength) => {
-  if (str.length <= maxLength) {
-    return str;
-  }
-  const truncatedLength = maxLength - 3;
-  if (truncatedLength <= 0) {
-    return "...";
-  }
-  return str.slice(0, truncatedLength) + "...";
-}, "truncateString");
-const printTable = /* @__PURE__ */ __name((logData) => {
-  const maxKeyLength = import_constants.MAX_LENGTH / 3;
-  const maxValueLength = import_constants.MAX_LENGTH;
-  const separatorTop = "\u2500".repeat(maxKeyLength + 2) + "\u252C" + "\u2500".repeat(maxValueLength + 2);
-  const separatorBottom = "\u2500".repeat(maxKeyLength + 2) + "\u2534" + "\u2500".repeat(maxValueLength + 2);
-  const lines = [
-    `\u250C${separatorTop}\u2510`,
-    ...Object.entries(logData).filter(([_, value]) => value).map(([key, value]) => `\u2502 ${key.padEnd(maxKeyLength)} \u2502 ${truncateString(String(value), import_constants.MAX_LENGTH).padEnd(maxValueLength)} \u2502`),
-    `\u2514${separatorBottom}\u2518`
-  ];
-  return lines.join("\n");
-}, "printTable");
-const getCurrentDateStr = /* @__PURE__ */ __name(() => {
-  return (0, import_dayjs.default)().format(import_constants.DATE_FORMAT);
-}, "getCurrentDateStr");
-const formatArray = /* @__PURE__ */ __name((arr) => {
-  return Array.isArray(arr) ? `[${arr.map(String).join(", ")}]` : "null";
-}, "formatArray");
-const extraceQueryTextAndValues = /* @__PURE__ */ __name((...rest) => {
-  const [arg0, arg1] = rest;
-  if (arg0 && (isSubmittable(arg0) || isObject(arg0))) {
-    return [
-      arg0.text,
-      arg1 ?? arg0.values
+exports.isSubmittable = isSubmittable;
+const isObject = (val) => {
+    return Object.prototype.toString.call(val) === '[object Object]';
+};
+exports.isObject = isObject;
+const normalizeStrings = (strs) => {
+    if (!strs) {
+        return [];
+    }
+    return Array.from(new Set(strs.filter(Boolean).map((ele) => ele.trim())));
+};
+exports.normalizeStrings = normalizeStrings;
+const plainPromise = async (promise) => {
+    let result = undefined;
+    let err = undefined;
+    try {
+        result = await promise;
+    }
+    catch (error) {
+        err = error;
+    }
+    return [result, err];
+};
+exports.plainPromise = plainPromise;
+const truncateString = (str, maxLength) => {
+    if (str.length <= maxLength) {
+        return str;
+    }
+    const truncatedLength = maxLength - 3;
+    if (truncatedLength <= 0) {
+        return '...';
+    }
+    return str.slice(0, truncatedLength) + '...';
+};
+exports.truncateString = truncateString;
+const printTable = (logData) => {
+    const maxKeyLength = constants_1.MAX_LENGTH / 3;
+    const maxValueLength = constants_1.MAX_LENGTH;
+    const separatorTop = '─'.repeat(maxKeyLength + 2) + '┬' + '─'.repeat(maxValueLength + 2);
+    const separatorBottom = '─'.repeat(maxKeyLength + 2) + '┴' + '─'.repeat(maxValueLength + 2);
+    const lines = [
+        `┌${separatorTop}┐`,
+        ...Object.entries(logData)
+            .filter(([_, value]) => value)
+            .map(([key, value]) => `│ ${key.padEnd(maxKeyLength)} │ ${(0, exports.truncateString)(String(value), constants_1.MAX_LENGTH).padEnd(maxValueLength)} │`),
+        `└${separatorBottom}┘`
     ];
-  }
-  return [
-    arg0,
-    arg1
-  ];
-}, "extraceQueryTextAndValues");
-const createDebugLogger = /* @__PURE__ */ __name((defaultLogger, customFormater) => {
-  if (typeof customFormater === "function") {
+    return lines.join('\n');
+};
+exports.printTable = printTable;
+const getCurrentDateStr = () => {
+    return (0, dayjs_1.default)().format(constants_1.DATE_FORMAT);
+};
+exports.getCurrentDateStr = getCurrentDateStr;
+const formatArray = (arr) => {
+    return Array.isArray(arr) ? `[${arr.map(String).join(', ')}]` : 'null';
+};
+exports.formatArray = formatArray;
+const extraceQueryTextAndValues = (...rest) => {
+    const [arg0, arg1] = rest;
+    if (arg0 && ((0, exports.isSubmittable)(arg0) || (0, exports.isObject)(arg0))) {
+        return [arg0.text, arg1 ?? arg0.values];
+    }
+    return [arg0, arg1];
+};
+exports.extraceQueryTextAndValues = extraceQueryTextAndValues;
+const createDebugLogger = (defaultLogger, customFormater) => {
+    if (typeof customFormater === 'function') {
+        return (data) => {
+            defaultLogger(customFormater(data));
+        };
+    }
     return (data) => {
-      defaultLogger(customFormater(data));
+        const firstLine = `Executing Postgres command\n`;
+        defaultLogger(firstLine + (0, exports.printTable)(data));
     };
-  }
-  return (data) => {
-    const firstLine = `Executing Postgres command
-`;
-    defaultLogger(firstLine + printTable(data));
-  };
-}, "createDebugLogger");
-const debugFactroy = /* @__PURE__ */ __name((name, queryId, logger) => {
-  return {
-    pool: {
-      connect: /* @__PURE__ */ __name((callback) => {
-        return async () => {
-          const startOn = getCurrentDateStr();
-          let err = void 0;
-          try {
-            return await callback();
-          } catch (error) {
-            err = error;
-            throw err;
-          } finally {
-            logger({
-              Instance: name,
-              Client: queryId,
-              Type: "Request new client",
-              "Started On": startOn,
-              "Ended On": getCurrentDateStr(),
-              Status: err ? "Failed" : "Successful",
-              Error: err
-            });
-          }
-        };
-      }, "connect")
-    },
-    client: {
-      query: /* @__PURE__ */ __name((callback) => {
-        return async (...rest) => {
-          const [text, values] = extraceQueryTextAndValues(...rest);
-          const submittable = isSubmittable(rest[0]);
-          const startOn = getCurrentDateStr();
-          let err = void 0;
-          if (submittable) {
-            rest[0].on("end", () => {
-              logger({
-                Instance: name,
-                Client: queryId,
-                Type: "Submittable",
-                Text: text,
-                Values: formatArray(values),
-                "Started On": startOn,
-                "Ended On": getCurrentDateStr(),
-                Status: "Successful"
-              });
-            });
-            rest[0].on("error", (err2) => {
-              logger({
-                Instance: name,
-                Client: queryId,
-                Type: "Submittable",
-                Text: text,
-                Values: formatArray(values),
-                "Started On": startOn,
-                "Ended On": getCurrentDateStr(),
-                Status: "Failed",
-                Error: err2
-              });
-            });
-          }
-          try {
-            return await callback(...rest);
-          } catch (error) {
-            err = error;
-            throw err;
-          } finally {
-            if (!submittable) {
-              logger({
-                Instance: name,
-                Client: queryId,
-                Type: "Query",
-                Text: text,
-                Values: formatArray(values),
-                "Started On": startOn,
-                "Ended On": getCurrentDateStr(),
-                Status: err ? "Failed" : "Successful",
-                Error: err
-              });
+};
+exports.createDebugLogger = createDebugLogger;
+const debugFactroy = (name, queryId, logger) => {
+    return {
+        pool: {
+            connect: (callback) => {
+                return async () => {
+                    const startOn = (0, exports.getCurrentDateStr)();
+                    let err = undefined;
+                    try {
+                        return await callback();
+                    }
+                    catch (error) {
+                        err = error;
+                        throw err;
+                    }
+                    finally {
+                        logger({
+                            Instance: name,
+                            Client: queryId,
+                            Type: 'Request new client',
+                            'Started On': startOn,
+                            'Ended On': (0, exports.getCurrentDateStr)(),
+                            Status: err ? 'Failed' : 'Successful',
+                            Error: err
+                        });
+                    }
+                };
             }
-          }
-        };
-      }, "query"),
-      release: /* @__PURE__ */ __name((callback) => {
-        return (...rest) => {
-          const startOn = getCurrentDateStr();
-          let err = void 0;
-          try {
-            return callback(...rest);
-          } catch (error) {
-            err = error;
-            throw err;
-          } finally {
-            logger({
-              Instance: name,
-              Client: queryId,
-              Type: "Release client",
-              "Started On": startOn,
-              "Ended On": getCurrentDateStr(),
-              Status: err ? "Failed" : "Successful",
-              Error: err
-            });
-          }
-        };
-      }, "release")
-    }
-  };
-}, "debugFactroy");
-const copyMethodMetadata = /* @__PURE__ */ __name((from, to) => {
-  const metadataKeys = Reflect.getMetadataKeys(from);
-  metadataKeys.map((key) => {
-    const value = Reflect.getMetadata(key, from);
-    Reflect.defineMetadata(key, value, to);
-  });
-}, "copyMethodMetadata");
-const getTransactionMetdata = /* @__PURE__ */ __name((target) => {
-  return Reflect.getMetadata(import_constants.TRANSACTION_META, target);
-}, "getTransactionMetdata");
-const setTransactionMetdata = /* @__PURE__ */ __name((target) => {
-  return Reflect.defineMetadata(import_constants.TRANSACTION_META, true, target);
-}, "setTransactionMetdata");
-const withResolvers = /* @__PURE__ */ __name(() => {
-  let resolve;
-  let reject;
-  const promise = new Promise((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-  return {
-    promise,
-    resolve,
-    reject
-  };
-}, "withResolvers");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  copyMethodMetadata,
-  createDebugLogger,
-  debugFactroy,
-  extraceQueryTextAndValues,
-  formatArray,
-  getCurrentDateStr,
-  getTransactionMetdata,
-  isObject,
-  isSubmittable,
-  normalizeStrings,
-  plainPromise,
-  printTable,
-  setTransactionMetdata,
-  truncateString,
-  withResolvers
-});
+        },
+        client: {
+            query: (callback) => {
+                return async (...rest) => {
+                    const [text, values] = (0, exports.extraceQueryTextAndValues)(...rest);
+                    const submittable = (0, exports.isSubmittable)(rest[0]);
+                    const startOn = (0, exports.getCurrentDateStr)();
+                    let err = undefined;
+                    if (submittable) {
+                        rest[0].on('end', () => {
+                            logger({
+                                Instance: name,
+                                Client: queryId,
+                                Type: 'Submittable',
+                                Text: text,
+                                Values: (0, exports.formatArray)(values),
+                                'Started On': startOn,
+                                'Ended On': (0, exports.getCurrentDateStr)(),
+                                Status: 'Successful'
+                            });
+                        });
+                        rest[0].on('error', (err) => {
+                            logger({
+                                Instance: name,
+                                Client: queryId,
+                                Type: 'Submittable',
+                                Text: text,
+                                Values: (0, exports.formatArray)(values),
+                                'Started On': startOn,
+                                'Ended On': (0, exports.getCurrentDateStr)(),
+                                Status: 'Failed',
+                                Error: err
+                            });
+                        });
+                    }
+                    try {
+                        return await callback(...rest);
+                    }
+                    catch (error) {
+                        err = error;
+                        throw err;
+                    }
+                    finally {
+                        if (!submittable) {
+                            logger({
+                                Instance: name,
+                                Client: queryId,
+                                Type: 'Query',
+                                Text: text,
+                                Values: (0, exports.formatArray)(values),
+                                'Started On': startOn,
+                                'Ended On': (0, exports.getCurrentDateStr)(),
+                                Status: err ? 'Failed' : 'Successful',
+                                Error: err
+                            });
+                        }
+                    }
+                };
+            },
+            release: (callback) => {
+                return (...rest) => {
+                    const startOn = (0, exports.getCurrentDateStr)();
+                    let err = undefined;
+                    try {
+                        return callback(...rest);
+                    }
+                    catch (error) {
+                        err = error;
+                        throw err;
+                    }
+                    finally {
+                        logger({
+                            Instance: name,
+                            Client: queryId,
+                            Type: 'Release client',
+                            'Started On': startOn,
+                            'Ended On': (0, exports.getCurrentDateStr)(),
+                            Status: err ? 'Failed' : 'Successful',
+                            Error: err
+                        });
+                    }
+                };
+            }
+        }
+    };
+};
+exports.debugFactroy = debugFactroy;
+// Ref: https://github.com/Papooch/nestjs-cls/blob/main/packages/core/src/utils/copy-method-metadata.ts#L10
+const copyMethodMetadata = (from, to) => {
+    const metadataKeys = Reflect.getMetadataKeys(from);
+    metadataKeys.map((key) => {
+        const value = Reflect.getMetadata(key, from);
+        Reflect.defineMetadata(key, value, to);
+    });
+};
+exports.copyMethodMetadata = copyMethodMetadata;
+const getTransactionMetdata = (target) => {
+    return Reflect.getMetadata(constants_1.TRANSACTION_META, target);
+};
+exports.getTransactionMetdata = getTransactionMetdata;
+const setTransactionMetdata = (target) => {
+    return Reflect.defineMetadata(constants_1.TRANSACTION_META, true, target);
+};
+exports.setTransactionMetdata = setTransactionMetdata;
+const withResolvers = () => {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    return { promise, resolve: resolve, reject: reject };
+};
+exports.withResolvers = withResolvers;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@nestjs-kitchen/connextion-postgres",
   "private": false,
   "description": "A flexible module to provide node-postgres interface in NextJS.",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "homepage": "https://github.com/yikenman/nestjs-kitchen",
   "repository": "https://github.com/yikenman/nestjs-kitchen",
   "author": "yikenman",
@@ -26,12 +26,13 @@
     "@types/jest": "^29.5.14",
     "@types/node": "^22.13.9",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.6",
+    "rimraf": "^6.0.1",
+    "ts-jest": "^29.3.0",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
-    "@nestjs-kitchen/connextion": "2.0.2"
+    "@nestjs-kitchen/connextion": "2.0.4"
   },
   "engines": {
     "node": ">=20.13.0"
@@ -51,11 +52,11 @@
     "@types/pg": "^8.11.10",
     "pg": "^8.13.1",
     "reflect-metadata": "^0.2.2",
-    "@nestjs-kitchen/connextion": "2.0.2"
+    "@nestjs-kitchen/connextion": "2.0.4"
   },
   "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
+    "build": "rimraf dist && tsc -p tsconfig.build.json",
+    "dev": "rimraf dist && tsc -p tsconfig.build.json --watch",
     "test": "jest",
     "test:ci": "jest --coverage",
     "test:cov": "jest --coverage",