@creator.co/wapi 1.6.1 → 1.7.1-alpha1

package/dist/src/Util/Utils.js

@@ -1,43 +1,39 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Utility class containing various static methods for common operations.
  */
-var Utils = /** @class */ (function () {
-    function Utils() {
-    }
+export default class Utils {
     /**
      * Checks if the application is running in a hybridless container.
      * @returns {boolean} - True if the application is running in a hybridless container, false otherwise.
      */
-    Utils.isHybridlessContainer = function () {
+    static isHybridlessContainer() {
         return process.env.HYBRIDLESS_RUNTIME == 'true';
-    };
+    }
     /**
      * Checks if a given string is valid.
      * @param {string} string - The string to check.
      * @returns {boolean} - True if the string is valid, false otherwise.
      */
-    Utils.isValidString = function (string) {
+    static isValidString(string) {
         return (string === null || string === void 0 ? void 0 : string.length) > 0 && !Array.isArray(string);
-    };
+    }
     /**
      * Parses a string into an integer and returns null if the string is not a valid number.
      * @param {string} str - The string to parse into an integer.
      * @returns {number | null} - The parsed integer or null if the string is not a valid number.
      */
-    Utils.parseIntNullIfNaN = function (str) {
-        var n = parseInt(str || '');
+    static parseIntNullIfNaN(str) {
+        const n = parseInt(str || '');
         return isNaN(n) ? null : n;
-    };
+    }
     /**
      * Parses a JSON string and returns the resulting object. If the string is empty or
      * cannot be parsed, null is returned.
      * @param {string} string - The JSON string to parse.
      * @returns {any | null} - The parsed object or null if the string is empty or invalid.
      */
-    Utils.parseObjectNullIfEmpty = function (string) {
-        var o = null;
+    static parseObjectNullIfEmpty(string) {
+        let o = null;
         try {
             o = string ? JSON.parse(string) : null;
             if (o && Object.keys(o).length <= 0)
@@ -47,14 +43,14 @@ var Utils = /** @class */ (function () {
             /* empty */
         }
         return o;
-    };
+    }
     /**
      * Checks if a given value is a valid number.
      * @param {string} number - The value to be checked.
      * @returns {boolean} - True if the value is a valid number, false otherwise.
      */
-    Utils.isValidNumber = function (number) {
-        var validNumb = NaN;
+    static isValidNumber(number) {
+        let validNumb = NaN;
         try {
             validNumb = parseInt(number + '');
         }
@@ -62,22 +58,20 @@ var Utils = /** @class */ (function () {
             console.error('Error while validating number', e);
         }
         return !isNaN(validNumb) && !Array.isArray(number);
-    };
+    }
     /**
      * Retrieves the value from an object using a case-insensitive key lookup.
      * @param {any} obj - The object to search for the key.
      * @param {string} key - The key to search for in the object.
      * @returns {any | null} The value associated with the key, or null if the key is not found.
      */
-    Utils.caseInsensitiveObjectForKey = function (obj, key) {
+    static caseInsensitiveObjectForKey(obj, key) {
         if (!obj)
             return null;
-        var insensitiveKey = Object.keys(obj).find(function (k) { return k.toLowerCase() === key.toLowerCase(); });
+        const insensitiveKey = Object.keys(obj).find(k => k.toLowerCase() === key.toLowerCase());
         if (insensitiveKey && insensitiveKey != '')
             return obj[insensitiveKey];
         return null;
-    };
-    return Utils;
-}());
-exports.default = Utils;
+    }
+}
 //# sourceMappingURL=Utils.js.map

package/dist/src/Util/Utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/Util/Utils.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH;IAAA;IAwEA,CAAC;IAvEC;;;OAGG;IACW,2BAAqB,GAAnC;QACE,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,MAAM,CAAA;IACjD,CAAC;IAED;;;;OAIG;IACW,mBAAa,GAA3B,UAA4B,MAAc;QACxC,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACrD,CAAC;IAED;;;;OAIG;IACW,uBAAiB,GAA/B,UAAgC,GAAY;QAC1C,IAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,CAAA;QAC7B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,CAAC;IAED;;;;;OAKG;IACW,4BAAsB,GAApC,UAAqC,MAA0B;QAC7D,IAAI,CAAC,GAAG,IAAI,CAAA;QACZ,IAAI,CAAC;YACH,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YACtC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC;gBAAE,CAAC,GAAG,IAAI,CAAA;QAC/C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,WAAW;QACb,CAAC;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IAED;;;;OAIG;IACW,mBAAa,GAA3B,UAA4B,MAAc;QACxC,IAAI,SAAS,GAAG,GAAG,CAAA;QACnB,IAAI,CAAC;YACH,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;QACnC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAA;QACnD,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IAED;;;;;OAKG;IACW,iCAA2B,GAAzC,UAA0C,GAAQ,EAAE,GAAW;QAC7D,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,EAArC,CAAqC,CAAC,CAAA;QACxF,IAAI,cAAc,IAAI,cAAc,IAAI,EAAE;YAAE,OAAO,GAAG,CAAC,cAAc,CAAC,CAAA;QACtE,OAAO,IAAI,CAAA;IACb,CAAC;IACH,YAAC;AAAD,CAAC,AAxED,IAwEC"}
+{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/Util/Utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB;;;OAGG;IACI,MAAM,CAAC,qBAAqB;QACjC,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,MAAM,CAAA;IACjD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,aAAa,CAAC,MAAc;QACxC,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACrD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,iBAAiB,CAAC,GAAY;QAC1C,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,CAAA;QAC7B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,sBAAsB,CAAC,MAA0B;QAC7D,IAAI,CAAC,GAAG,IAAI,CAAA;QACZ,IAAI,CAAC;YACH,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YACtC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC;gBAAE,CAAC,GAAG,IAAI,CAAA;QAC/C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,WAAW;QACb,CAAC;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,aAAa,CAAC,MAAc;QACxC,IAAI,SAAS,GAAG,GAAG,CAAA;QACnB,IAAI,CAAC;YACH,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;QACnC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAA;QACnD,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,2BAA2B,CAAC,GAAQ,EAAE,GAAW;QAC7D,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,CAAC,CAAA;QACxF,IAAI,cAAc,IAAI,cAAc,IAAI,EAAE;YAAE,OAAO,GAAG,CAAC,cAAc,CAAC,CAAA;QACtE,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

package/dist/src/Validation/Validator.js

@@ -1,44 +1,38 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var zod_1 = require("zod");
-var Response_1 = require("../API/Response");
-var Globals_1 = require("../Globals");
+import { z } from 'zod';
+import Response from '../API/Response';
+import Globals from '../Globals';
 /**
  * Validates the given data against the provided schema.
  * @param {any} data - The data to be validated.
  * @param {z.ZodObject<any>} schema - The schema to validate against.
  * @returns {boolean | Response<ResponseErrorType>} - Returns true if the data is valid, otherwise returns a response object with an error message.
  */
-var Validator = /** @class */ (function () {
-    function Validator() {
-    }
+export default class Validator {
     /**
      * Validates the given data against the provided schema.
      * @param {any} data - The data to be validated.
      * @param {z.ZodObject<any> | z.ZodUnion<any>} schema - The schema to validate against.
      * @returns {boolean | Response<ResponseErrorType>} - Returns either true if the data is valid or a Response object with an error message if validation fails.
      */
-    Validator.validateSchema = function (data, schema) {
-        var error, validatedInput;
+    static validateSchema(data, schema) {
+        let error, validatedInput;
         // Validate body against known zod schema
         try {
             validatedInput = schema.parse(data);
         }
         catch (err) {
-            if (err instanceof zod_1.z.ZodError)
+            if (err instanceof z.ZodError)
                 error = JSON.parse(err.message);
             else
                 error = 'Unknown validation error!'; //unhandled case, hard to test
         }
         // Error validation
         if (!validatedInput || error) {
-            return Response_1.default.BadRequestResponse(Globals_1.default.ErrorResponseValidationFail, Globals_1.default.ErrorCode_InvalidInput, { validationFailure: error });
+            return Response.BadRequestResponse(Globals.ErrorResponseValidationFail, Globals.ErrorCode_InvalidInput, { validationFailure: error });
         }
         else {
             return true;
         }
-    };
-    return Validator;
-}());
-exports.default = Validator;
+    }
+}
 //# sourceMappingURL=Validator.js.map

package/dist/src/Validation/Validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validation/Validator.ts"],"names":[],"mappings":";;AAAA,2BAAuB;AAEvB,4CAA6D;AAC7D,sCAAgC;AAEhC;;;;;GAKG;AACH;IAAA;IAgCA,CAAC;IA/BC;;;;;OAKG;IACW,wBAAc,GAA5B,UACE,IAAS,EACT,MAAwE;QAExE,IAAI,KAAK,EAAE,cAAc,CAAA;QAEzB,yCAAyC;QACzC,IAAI,CAAC;YACH,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAkB,CAAA;QACtD,CAAC;QAAC,OAAO,GAAqB,EAAE,CAAC;YAC/B,IAAI,GAAG,YAAY,OAAC,CAAC,QAAQ;gBAAE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;;gBACzD,KAAK,GAAG,2BAA2B,CAAA,CAAC,8BAA8B;QACzE,CAAC;QAED,mBAAmB;QACnB,IAAI,CAAC,cAAc,IAAI,KAAK,EAAE,CAAC;YAC7B,OAAO,kBAAQ,CAAC,kBAAkB,CAChC,iBAAO,CAAC,2BAA2B,EACnC,iBAAO,CAAC,sBAAsB,EAC9B,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IACH,gBAAC;AAAD,CAAC,AAhCD,IAgCC"}
+{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validation/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,QAA+B,MAAM,iBAAiB,CAAA;AAC7D,OAAO,OAAO,MAAM,YAAY,CAAA;AAEhC;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B;;;;;OAKG;IACI,MAAM,CAAC,cAAc,CAC1B,IAAS,EACT,MAAwE;QAExE,IAAI,KAAK,EAAE,cAAc,CAAA;QAEzB,yCAAyC;QACzC,IAAI,CAAC;YACH,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAkB,CAAA;QACtD,CAAC;QAAC,OAAO,GAAqB,EAAE,CAAC;YAC/B,IAAI,GAAG,YAAY,CAAC,CAAC,QAAQ;gBAAE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;;gBACzD,KAAK,GAAG,2BAA2B,CAAA,CAAC,8BAA8B;QACzE,CAAC;QAED,mBAAmB;QACnB,IAAI,CAAC,cAAc,IAAI,KAAK,EAAE,CAAC;YAC7B,OAAO,QAAQ,CAAC,kBAAkB,CAChC,OAAO,CAAC,2BAA2B,EACnC,OAAO,CAAC,sBAAsB,EAC9B,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;CACF"}

package/jest.config.ts

@@ -3,6 +3,7 @@ import type { Config } from '@jest/types'
 const config: Config.InitialOptions = {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  modulePathIgnorePatterns: ['smoke-tests'],
   reporters: [
     'default',
     [

package/jest.smoke.config.ts

@@ -0,0 +1,35 @@
+import type { Config } from '@jest/types'
+/* eslint-env node */
+const config: Config.InitialOptions = {
+  testEnvironment: 'node',
+  // ECMA suppport https://jestjs.io/docs/ecmascript-modules
+  transform: {},
+
+  //
+  reporters: [
+    'default',
+    [
+      'jest-junit',
+      {
+        outputDirectory: 'coverage',
+        outputName: 'jest-junit.xml',
+        ancestorSeparator: ' › ',
+        uniqueOutputName: 'false',
+        suiteNameTemplate: '{filepath}',
+        classNameTemplate: '{classname}',
+        titleTemplate: '{title}',
+      },
+    ],
+  ],
+  coverageReporters: ['clover', 'json', 'lcov', ['text', { file: 'coverage.txt' }], 'json-summary'],
+  collectCoverageFrom: ['src/**/*.(t|j)s', '!src/**/*.d.(t|j)s'],
+  coverageThreshold: {
+    global: {
+      branches: 80,
+      functions: 80,
+      lines: 80,
+      statements: 80,
+    },
+  },
+}
+export default config

package/package.json

@@ -1,27 +1,29 @@
 {
   "name": "@creator.co/wapi",
-  "version": "1.6.1",
+  "version": "1.7.1-alpha1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "type": "commonjs",
+  "type": "module",
   "scripts": {
     "build": "tsc --build",
     "clean": "tsc --build --clean",
-    "lint-fix": "eslint . --ext .ts --fix",
-    "lint": "eslint . --ext .ts",
-    "test": "jest --coverage --silent --runInBand && cat coverage/coverage.txt",
+    "lint-fix": "eslint . --fix",
+    "lint": "eslint .",
+    "test": "npm run test-ts && npm run test-js",
+    "test-ts": "jest --coverage --silent --runInBand --logHeapUsage && cat coverage/coverage.txt",
+    "test-js": "rm -rf ./smoke-tests; tsc -p tsconfig.smoke.json && cd smoke-tests && npm i && NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest --config=./jest.smoke.config.js --coverage --silent --runInBand --logHeapUsage && cat coverage/coverage.txt",
     "test-dev": "jest --coverage --runInBand && cat coverage/coverage.txt"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@aws-sdk/client-kms": "^3.509.0",
-    "@aws-sdk/client-secrets-manager": "^3.509.0",
-    "@aws-sdk/client-ses": "^3.509.0",
-    "@aws-sdk/client-sns": "^3.509.0",
-    "@aws-sdk/client-ssm": "^3.509.0",
-    "@aws-sdk/credential-provider-node": "^3.509.0",
+    "@aws-sdk/client-kms": "^3.556.0",
+    "@aws-sdk/client-secrets-manager": "3.556",
+    "@aws-sdk/client-ses": "3.556",
+    "@aws-sdk/client-sns": "3.556",
+    "@aws-sdk/client-ssm": "3.556",
+    "@aws-sdk/credential-provider-node": "3.556",
     "@types/email-templates": "^10.0.1",
     "@types/nodemailer": "^6.4.10",
     "@types/object-hash": "^3.0.4",
@@ -39,30 +41,30 @@
     "node-cache": "^5.1.2",
     "object-hash": "^3.0.0",
     "parse-duration": "^1.1.0",
-    "path-to-regexp": "^6.2.1",
+    "path-to-regexp": "^6.2.2",
     "pg": "^8.11.3",
     "redis": "^4.6.13",
     "sha1": "^1.1.1",
     "stack-trace": "0.0.10",
-    "zod": "^3.22.4"
+    "zod": "^3.23.4"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/aws-lambda": "^8.10.133",
+    "@types/aws-lambda": "^8.10.137",
     "@types/chai": "^4.3.9",
     "@types/cors": "^2.8.15",
     "@types/express": "^4.17.19",
     "@types/jest": "^29.5.12",
     "@types/jsonwebtoken": "^9.0.3",
-    "@types/node": "^20.11.16",
+    "@types/node": "^20.12.7",
     "@types/path-to-regexp": "^1.7.0",
-    "@types/pg": "^8.11.0",
-    "@types/supertest": "^2.0.15",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@types/pg": "^8.11.5",
+    "@types/supertest": "^6.0.2",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "^7.7.1",
     "aws-lambda": "^1.0.7",
-    "aws-sdk-client-mock": "^3.0.0",
-    "chai": "^4.3.10",
+    "aws-sdk-client-mock": "^4.0.0",
+    "chai": "^4.4.1",
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
@@ -73,6 +75,6 @@
     "supertest": "^6.3.3",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.5"
   }
 }

package/src/Config/Configuration.ts

@@ -1,5 +1,5 @@
-import * as MemCache from 'node-cache'
-import * as DurationParser from 'parse-duration'
+import MemCache from 'node-cache'
+import DurationParser from 'parse-duration'
 
 import EnvironmentVar, { EnvironmentType } from './EnvironmentVar'
 

package/src/Crypto/JWT.ts

@@ -1,4 +1,4 @@
-import * as jwt from 'jsonwebtoken'
+import jwt from 'jsonwebtoken'
 
 /**
  * Represents the response of a JWT validation.

package/src/Database/DatabaseManager.ts

@@ -1,4 +1,4 @@
-import * as hash from 'object-hash'
+import hash from 'object-hash'
 
 import { KnexDatabase } from './integrations/knex/KnexDatabase'
 import { KyselyDatabase } from './integrations/kysely/KyselyDatabase'

package/src/Database/integrations/knex/KnexDatabase.ts

@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex'
-import * as knexStringcase from 'knex-stringcase'
+import knexStringcase from 'knex-stringcase'
 
 import { KnexTransaction, KnexTransactionImpl } from './KnexTransaction'
 import { Database } from '../../Database'

package/src/Database/integrations/kysely/KyselyDatabase.ts

@@ -1,5 +1,5 @@
 import { CamelCasePlugin, Kysely, PostgresDialect } from 'kysely'
-import { Pool } from 'pg'
+import * as pg from 'pg'
 
 import { KyselyTransaction, KyselyTransactionImpl } from './KyselyTransaction'
 import { Database } from '../../Database'
@@ -24,7 +24,7 @@ export class KyselyDatabase<DBSchema = never> extends Database<KyselyTransaction
    * A static property that represents a connection pool for PostgreSQL database connections.
    * @type {Pool}
    */
-  private static pgProvider = Pool
+  private static pgProvider = pg.Pool
   /**
    * Represents a PostgreSQL client using the PostgresDialect.
    */

package/src/Database/integrations/pgsql/PostgresDatabase.ts

@@ -1,4 +1,4 @@
-import { Pool } from 'pg'
+import * as pg from 'pg'
 
 import { PostgresTransaction, PostgresTransactionImpl } from './PostgresTransaction'
 import { Database } from '../../Database'
@@ -13,16 +13,16 @@ export class PostgresDatabase extends Database<PostgresTransaction> {
    * A public static property that represents a connection pool for a PostgreSQL database.
    * This property is used to manage and provide connections to the PostgreSQL database.
    */
-  private static pgProvider = Pool
+  private static pgProvider = pg.Pool
   /**
    * Represents a connection pool to manage multiple client connections to the database.
    */
-  public readonly client: Pool
+  public readonly client: pg.Pool
   /**
    * A private property that represents a connection pool for clients.
    * @type {Pool | undefined}
    */
-  public readonly readClient?: Pool
+  public readonly readClient?: pg.Pool
 
   /**
    * Constructor for creating a new instance of a database connection using Postgres.

package/src/Database/integrations/pgsql/PostgresTransaction.ts

@@ -1,4 +1,4 @@
-import { Pool, PoolClient } from 'pg'
+import * as pg from 'pg'
 
 import { PostgresDatabase } from './PostgresDatabase'
 import { Database } from '../../Database'
@@ -8,7 +8,7 @@ import { DatabaseTransaction } from '../../DatabaseTransaction'
  * A type alias representing a Postgres transaction. It extends the `PostgresTransactionImpl`
  * interface and includes the `PoolClient` interface.
  */
-export type PostgresTransaction = PostgresTransactionImpl & PoolClient
+export type PostgresTransaction = PostgresTransactionImpl & pg.PoolClient
 
 /**
  * Represents a transaction in a Postgres database.
@@ -18,16 +18,16 @@ export class PostgresTransactionImpl extends DatabaseTransaction {
    * A Pool object used for writing operations.
    * @readonly
    */
-  public readonly writer: Pool
+  public readonly writer: pg.Pool
   /**
    * A readonly property representing a pool reader.
    */
-  public readonly reader: Pool
+  public readonly reader: pg.Pool
   /**
    * Represents a database transaction using a PoolClient.
    * @type {PoolClient}
    */
-  protected transaction: PoolClient
+  protected transaction: pg.PoolClient
   /**
    * A protected property representing a database of type Database<PostgresTransaction>.
    * This property is used to interact with a Postgres database using transactions.
@@ -39,7 +39,7 @@ export class PostgresTransactionImpl extends DatabaseTransaction {
    * @param {PostgresDatabase} database - The Postgres database instance.
    * @param {Pool} [reader] - The reader pool for database operations (optional).
    */
-  private constructor(writer: Pool, database: PostgresDatabase, reader?: Pool) {
+  private constructor(writer: pg.Pool, database: PostgresDatabase, reader?: pg.Pool) {
     super(writer, database, reader)
   }
 
@@ -51,9 +51,9 @@ export class PostgresTransactionImpl extends DatabaseTransaction {
    * @returns {Promise<PostgresTransaction>} A promise that resolves to a new PostgresTransaction instance.
    */
   public static async newTransaction(
-    writer: Pool,
+    writer: pg.Pool,
     database: PostgresDatabase,
-    reader?: Pool
+    reader?: pg.Pool
   ): Promise<PostgresTransaction> {
     const tx = new PostgresTransactionImpl(writer, database, reader)
     await tx.begin() // defaults to opened

package/src/Globals.ts

@@ -1,4 +1,4 @@
-import * as dotenv from 'dotenv'
+import dotenv from 'dotenv'
 
 import Utils from './Util/Utils'
 

package/src/Logger/Logger.ts

@@ -1,6 +1,6 @@
-import * as abind from 'abind'
-import * as stringify from 'json-stringify-safe'
-import * as stackTrace from 'stack-trace'
+import abind from 'abind'
+import stringify from 'json-stringify-safe'
+import stackTrace from 'stack-trace'
 
 import Utils from '../Util/Utils'
 

package/src/Mailer/Mailer.ts

@@ -1,8 +1,8 @@
 import * as SES from '@aws-sdk/client-ses'
 import { defaultProvider } from '@aws-sdk/credential-provider-node'
-import * as Email from 'email-templates'
-import * as nodemailer from 'nodemailer'
-import type * as SESTransport from 'nodemailer/lib/ses-transport'
+import Email from 'email-templates'
+import nodemailer from 'nodemailer'
+import type SESTransport from 'nodemailer/lib/ses-transport'
 
 export default class Mailer {
   /**

package/src/Publisher/Publisher.ts

@@ -4,7 +4,7 @@ import {
   PublishCommandOutput,
   PublishCommandInput,
 } from '@aws-sdk/client-sns'
-import * as sha1 from 'sha1'
+import sha1 from 'sha1'
 //reusable client
 /**
  * A variable that holds the connection to the SNS client for publishing messages.

package/src/Server/Router.ts

@@ -1,6 +1,6 @@
 import { Server as HTTPServer } from 'http'
 
-import * as express from 'express'
+import express from 'express'
 import { z } from 'zod'
 
 import ContainerServer from './lib/ContainerServer'

package/src/Server/lib/container/GenericHandlerEvent.ts

@@ -1,5 +1,5 @@
 import type { APIGatewayProxyEvent, Context } from 'aws-lambda'
-import * as cuid from 'cuid'
+import cuid from 'cuid'
 import { Request } from 'express'
 
 import { parseMultiValueQueryStringParameters, parseQueryStringParameters } from './Utils'

package/src/Server/lib/container/Proxy.ts

@@ -1,16 +1,19 @@
+import fs from 'fs'
 import { Server as HTTPServer, createServer } from 'http'
 
-import * as cors from 'cors'
-import * as express from 'express'
+import cors from 'cors'
+import express from 'express'
 
 import Server from './../Server'
 import GenericHandler from './GenericHandler'
 import HealthHandler from './HealthHandler'
-import { version as appVersion } from '../../../../package.json'
 import Globals from '../../../Globals'
 import Utils from '../../../Util/Utils'
 import { RouterConfig } from '../../Router'
 
+/* Get package.json version from Wapi on ESM */
+const { version: appVersion } = JSON.parse(fs.readFileSync('package.json').toString())
+
 /**
  * Represents a Proxy class that handles routing and server functionality.
  */

package/tests/API/Response.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { APIGatewayEvent, Context } from 'aws-lambda'
 import { expect as c_expect } from 'chai'
 

package/tests/BaseEvent/Transaction.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { expect as c_expect } from 'chai'
 
 import Response from '../../src/API/Response'

package/tests/Cache/Redis-client.test.ts

@@ -1,3 +1,5 @@
+import { jest } from '@jest/globals'
+
 import Redis from '../../src/Cache/Redis'
 
 let _connectionId = 1

package/tests/Cache/Redis-cluster.test.ts

@@ -1,3 +1,5 @@
+import { jest } from '@jest/globals'
+
 import Redis from '../../src/Cache/Redis'
 
 let _connectionId = 1

package/tests/Database/DatabaseManager.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { expect } from 'chai'
 
 import { DatabaseManager } from '../../src/Database'
@@ -17,13 +18,13 @@ describe('Database Manager', () => {
     const underTest = new DatabaseManager()
 
     underTest['databases'] = {
-      knex: jest.fn(config => {
+      knex: jest.fn((config: any) => {
         return { host: config.host, type: 'knex' } as any
       }) as any,
-      pg: jest.fn(config => {
+      pg: jest.fn((config: any) => {
         return { host: config.host, type: 'pg' } as any
       }) as any,
-      kysely: jest.fn(config => {
+      kysely: jest.fn((config: any) => {
         return { host: config.host, type: 'kysely' } as any
       }) as any,
     }

package/tests/Database/integrations/knex/KnexDatabase.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { Knex } from 'knex'
 
 import type { DbConfig } from '../../../../src/Database'

package/tests/Database/integrations/knex/KnexTransaction.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { Knex } from 'knex'
 
 import { DbConfig } from '../../../../src/Database'

package/tests/Database/integrations/kysely/KyselyDatabase.test.ts

@@ -1,5 +1,6 @@
+import { jest } from '@jest/globals'
 import { PostgresDialect } from 'kysely'
-import { PoolClient } from 'pg'
+import * as pg from 'pg'
 
 import type { DbConfig } from '../../../../src/Database'
 import { KyselyDatabase } from '../../../../src/Database/integrations/kysely/KyselyDatabase'
@@ -38,7 +39,7 @@ describe('KyselyDatabase', () => {
   let mockPgClient
   beforeEach(() => {
     mockTrans = {
-      execute: jest.fn(async cb => {
+      execute: jest.fn(async (cb: any) => {
         cb(mockTrans)
       }),
     } as any
@@ -68,7 +69,7 @@ describe('KyselyDatabase', () => {
       () =>
         ({
           connect: async () => mockPgTrans,
-        }) as PoolClient
+        }) as pg.PoolClient
     )
     KyselyDatabase['pgProvider'] = mockPgClient as any
   })

package/tests/Database/integrations/kysely/KyselyTransaction.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { Kysely, Transaction } from 'kysely'
 
 import type { DbConfig } from '../../../../src/Database'
@@ -23,7 +24,7 @@ const testResources = async (config: Partial<DbConfig<'kysely'>>) => {
 
   const transaction = jest.fn().mockImplementation(() => {
     return {
-      execute: jest.fn(async cb => {
+      execute: jest.fn(async (cb: any) => {
         try {
           await cb(transaction)
         } catch (e) {

package/tests/Database/integrations/pg/PostgresDatabase.test.ts

@@ -1,4 +1,5 @@
-import { PoolClient } from 'pg'
+import { jest } from '@jest/globals'
+import * as pg from 'pg'
 
 import type { DbConfig } from '../../../../src/Database'
 import { PostgresDatabase } from '../../../../src/Database/integrations/pgsql/PostgresDatabase'
@@ -39,7 +40,7 @@ describe('PostgresDatabase', () => {
       () =>
         ({
           connect: async () => mockTrans,
-        }) as PoolClient
+        }) as pg.PoolClient
     )
     PostgresDatabase['pgProvider'] = mockClient as any
   })