@creator.co/wapi 1.6.0 → 2.0.0-alpha.1

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/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@creator.co/wapi",
-  "version": "1.6.0",
+  "version": "2.0.0-alpha.1",
   "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",
+    "test": "jest --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,12 +39,12 @@
     "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.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
@@ -62,7 +62,7 @@
     "@typescript-eslint/parser": "^6.21.0",
     "aws-lambda": "^1.0.7",
     "aws-sdk-client-mock": "^3.0.0",
-    "chai": "^4.3.10",
+    "chai": "^4.4.1",
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",

package/src/Logger/Logger.ts

@@ -331,7 +331,7 @@ export default class Logger {
       push({ value: modifiedValue, parent, key })
     } catch {
       const lower = value.toLowerCase()
-      if (this.filterBlacklist.some(f => lower.includes(f)))
+      if (this.filterBlacklist.some(f => lower == f))
         modifiedValue = `**SUPPRESSED_SENSITIVE_DATA** (${String(modifiedValue)?.length || 0} len)`
     }
     parent[key] = modifiedValue
@@ -340,7 +340,7 @@ export default class Logger {
   private suppressSensitiveObject(value: object, push: (e: SupressableItem) => void) {
     Object.entries(value).forEach(([k, v]) => {
       const lower = k.toLowerCase()
-      const match = v && this.filterBlacklist.some(f => lower.includes(f))
+      const match = v && this.filterBlacklist.some(f => lower == f)
       if (match) {
         value[k] = `**SUPPRESSED_SENSITIVE_DATA** (${String(v)?.length || 0} len)`
       } else {

package/tests/Logger/Logger.test.ts

@@ -47,7 +47,7 @@ function testLogs(isContainer: boolean, provider?: Logger) {
     )
     expect(consoleProxy.log).toHaveBeenNthCalledWith(
       1,
-      expect.stringContaining('] **SUPPRESSED_SENSITIVE_DATA** (18 len)')
+      expect.stringContaining('] my password is 123')
     )
   })
 
@@ -166,9 +166,11 @@ function testLogs(isContainer: boolean, provider?: Logger) {
     )
     expect(consoleProxy.log).toHaveBeenNthCalledWith(
       1,
-      expect.stringContaining(
-        '[INFO] [Logger.test.ts:199] {\n' + '  "self": "[Circular ~]"\n' + '}'
-      )
+      expect.stringContaining('[INFO] [Logger.test.ts:')
+    )
+    expect(consoleProxy.log).toHaveBeenNthCalledWith(
+      1,
+      expect.stringContaining('] {\n' + '  "self": "[Circular ~]"\n' + '}')
     )
   })
 

package/tsconfig.json

@@ -6,13 +6,15 @@
       "es6",
       "dom"
     ],
+    "module": "esnext",
+    "target": "es6",
+    "moduleResolution": "node",
     "noImplicitAny": false,
     "noEmitOnError": true,
     "removeComments": false,
     "downlevelIteration": true,
     "resolveJsonModule": true,
     "sourceMap": true,
-    "target": "es5",
     "outDir": "dist",
     "declaration": true,
     "skipLibCheck": true,