@cryptexlabs/codex-nodejs-common 0.12.1 → 0.12.2

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptexlabs/codex-nodejs-common",
-    "version": "0.12.1",
+    "version": "0.12.2",
     "description": "Common code for Codex framework",
     "main": "lib/src/index.js",
     "type": "commonjs",

package/lib/src/decorator/is-valid-email-type.d.ts

@@ -1,7 +1,9 @@
 import { ValidatorConstraintInterface, ValidationArguments, ValidationOptions } from "class-validator";
 export declare class IsValidEmailTypeConstraint implements ValidatorConstraintInterface {
     private readonly EMAIL_TYPES;
-    validate(timezone: any, args: ValidationArguments): boolean;
+    validate(emailType: any, args: ValidationArguments): boolean;
     defaultMessage(args: ValidationArguments): string;
 }
-export declare function IsValidEmailType(validationOptions?: ValidationOptions): (object: any, propertyName: string) => void;
+export declare function IsValidEmailType(validationOptions?: ValidationOptions & {
+    optional?: boolean;
+}): (object: any, propertyName: string) => void;

package/lib/src/decorator/is-valid-email-type.js

@@ -14,16 +14,26 @@ let IsValidEmailTypeConstraint = class IsValidEmailTypeConstraint {
     constructor() {
         this.EMAIL_TYPES = Object.values(authf_data_model_1.EmailTypeEnum);
     }
-    validate(timezone, args) {
-        return this.EMAIL_TYPES.includes(timezone);
+    validate(emailType, args) {
+        var _a;
+        const optional = ((_a = args.constraints[0]) === null || _a === void 0 ? void 0 : _a.optional) || false;
+        if (optional && (emailType === undefined || emailType === null)) {
+            return true;
+        }
+        return this.EMAIL_TYPES.includes(emailType);
     }
     defaultMessage(args) {
-        return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+        var _a;
+        const optional = ((_a = args.constraints[0]) === null || _a === void 0 ? void 0 : _a.optional) || false;
+        if (optional && (args.value === undefined || args.value === null)) {
+            return `"${args.value}" is optional, but it must either be null/undefined or a valid email type.`;
+        }
+        return `"${args.value}" is not a valid email type. Allowed types: ${this.EMAIL_TYPES.join(", ")}.`;
     }
 };
 exports.IsValidEmailTypeConstraint = IsValidEmailTypeConstraint;
 exports.IsValidEmailTypeConstraint = IsValidEmailTypeConstraint = __decorate([
-    (0, class_validator_1.ValidatorConstraint)({ name: "IsValidEmailType", async: false })
+    (0, class_validator_1.ValidatorConstraint)({ async: false })
 ], IsValidEmailTypeConstraint);
 function IsValidEmailType(validationOptions) {
     return (object, propertyName) => {
@@ -31,7 +41,7 @@ function IsValidEmailType(validationOptions) {
             target: object.constructor,
             propertyName,
             options: validationOptions,
-            constraints: [],
+            constraints: [{ optional: (validationOptions === null || validationOptions === void 0 ? void 0 : validationOptions.optional) || false }],
             validator: IsValidEmailTypeConstraint,
         });
     };

package/lib/src/decorator/is-valid-email-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-valid-email-type.js","sourceRoot":"","sources":["../../../src/decorator/is-valid-email-type.ts"],"names":[],"mappings":";;;;;;;;;AAuBA,4CAUC;AAjCD,qDAMyB;AACzB,oEAA8D;AAGvD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAAhC;QAEY,gBAAW,GAAa,MAAM,CAAC,MAAM,CAAC,gCAAa,CAAC,CAAC;IASxE,CAAC;IAPC,QAAQ,CAAC,QAAa,EAAE,IAAyB;QAC/C,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,cAAc,CAAC,IAAyB;QACtC,OAAO,IAAI,IAAI,CAAC,KAAK,qEAAqE,CAAC;IAC7F,CAAC;CACF,CAAA;AAXY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,qCAAmB,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GACnD,0BAA0B,CAWtC;AAED,SAAgB,gBAAgB,CAAC,iBAAqC;IACpE,OAAO,CAAC,MAAW,EAAE,YAAoB,EAAE,EAAE;QAC3C,IAAA,mCAAiB,EAAC;YAChB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,0BAA0B;SACtC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"is-valid-email-type.js","sourceRoot":"","sources":["../../../src/decorator/is-valid-email-type.ts"],"names":[],"mappings":";;;;;;;;;AAqCA,4CAYC;AAjDD,qDAMyB;AACzB,oEAA8D;AAGvD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAAhC;QAEY,gBAAW,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAa,CAAC,CAAC;IAuB9D,CAAC;IArBC,QAAQ,CAAC,SAAc,EAAE,IAAyB;;QAChD,MAAM,QAAQ,GAAG,CAAA,MAAA,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,0CAAE,QAAQ,KAAI,KAAK,CAAC;QAExD,IAAI,QAAQ,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED,cAAc,CAAC,IAAyB;;QACtC,MAAM,QAAQ,GAAG,CAAA,MAAA,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,0CAAE,QAAQ,KAAI,KAAK,CAAC;QACxD,IAAI,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,EAAE,CAAC;YAClE,OAAO,IAAI,IAAI,CAAC,KAAK,4EAA4E,CAAC;QACpG,CAAC;QACD,OAAO,IACL,IAAI,CAAC,KACP,+CAA+C,IAAI,CAAC,WAAW,CAAC,IAAI,CAClE,IAAI,CACL,GAAG,CAAC;IACP,CAAC;CACF,CAAA;AAzBY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,qCAAmB,EAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GACzB,0BAA0B,CAyBtC;AAED,SAAgB,gBAAgB,CAC9B,iBAA8D;IAE9D,OAAO,CAAC,MAAW,EAAE,YAAoB,EAAE,EAAE;QAC3C,IAAA,mCAAiB,EAAC;YAChB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,KAAI,KAAK,EAAE,CAAC;YACjE,SAAS,EAAE,0BAA0B;SACtC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/lib/src/decorator/is-valid-email.d.ts

@@ -0,0 +1,9 @@
+import { ValidatorConstraintInterface, ValidationArguments, ValidationOptions } from "class-validator";
+export declare class IsValidEmailConstraint implements ValidatorConstraintInterface {
+    private readonly EMAIL_TYPES;
+    validate(value: any, args: ValidationArguments): boolean;
+    defaultMessage(args: ValidationArguments): string;
+}
+export declare function IsValidEmail(options?: {
+    optional: boolean;
+}, validationOptions?: ValidationOptions): (object: any, propertyName: string) => void;

package/lib/src/decorator/is-valid-email.js

@@ -0,0 +1,43 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IsValidEmailConstraint = void 0;
+exports.IsValidEmail = IsValidEmail;
+const class_validator_1 = require("class-validator");
+const authf_data_model_1 = require("@cryptexlabs/authf-data-model");
+let IsValidEmailConstraint = class IsValidEmailConstraint {
+    constructor() {
+        this.EMAIL_TYPES = Object.values(authf_data_model_1.EmailTypeEnum);
+    }
+    validate(value, args) {
+        const [optional] = args.constraints;
+        if (optional && value === null) {
+            return true;
+        }
+        return this.EMAIL_TYPES.includes(value);
+    }
+    defaultMessage(args) {
+        return `"${args.value}" is not a valid email. Choose one of the allowed email types or set it to null if optional.`;
+    }
+};
+exports.IsValidEmailConstraint = IsValidEmailConstraint;
+exports.IsValidEmailConstraint = IsValidEmailConstraint = __decorate([
+    (0, class_validator_1.ValidatorConstraint)({ name: "IsValidEmail", async: false })
+], IsValidEmailConstraint);
+function IsValidEmail(options, validationOptions) {
+    return (object, propertyName) => {
+        (0, class_validator_1.registerDecorator)({
+            target: object.constructor,
+            propertyName,
+            options: validationOptions,
+            constraints: [(options === null || options === void 0 ? void 0 : options.optional) || false],
+            validator: IsValidEmailConstraint,
+        });
+    };
+}
+//# sourceMappingURL=is-valid-email.js.map

package/lib/src/decorator/is-valid-email.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-valid-email.js","sourceRoot":"","sources":["../../../src/decorator/is-valid-email.ts"],"names":[],"mappings":";;;;;;;;;AA4BA,oCAaC;AAzCD,qDAMyB;AACzB,oEAA8D;AAGvD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QACY,gBAAW,GAAa,MAAM,CAAC,MAAM,CAAC,gCAAa,CAAC,CAAC;IAcxE,CAAC;IAXC,QAAQ,CAAC,KAAU,EAAE,IAAyB;QAC5C,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,cAAc,CAAC,IAAyB;QACtC,OAAO,IAAI,IAAI,CAAC,KAAK,8FAA8F,CAAC;IACtH,CAAC;CACF,CAAA;AAfY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,qCAAmB,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GAC/C,sBAAsB,CAelC;AAGD,SAAgB,YAAY,CAC1B,OAA+B,EAC/B,iBAAqC;IAErC,OAAO,CAAC,MAAW,EAAE,YAAoB,EAAE,EAAE;QAC3C,IAAA,mCAAiB,EAAC;YAChB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,KAAI,KAAK,CAAC;YACzC,SAAS,EAAE,sBAAsB;SAClC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/lib/src/decorator/is-valid-phone-type.d.ts

@@ -1,7 +1,9 @@
 import { ValidatorConstraintInterface, ValidationArguments, ValidationOptions } from "class-validator";
 export declare class IsValidPhoneTypeConstraint implements ValidatorConstraintInterface {
     private readonly PHONE_TYPES;
-    validate(timezone: any, args: ValidationArguments): boolean;
+    validate(phoneType: any, args: ValidationArguments): boolean;
     defaultMessage(args: ValidationArguments): string;
 }
-export declare function IsValidPhoneType(validationOptions?: ValidationOptions): (object: any, propertyName: string) => void;
+export declare function IsValidPhoneType(validationOptions?: ValidationOptions & {
+    optional?: boolean;
+}): (object: any, propertyName: string) => void;

package/lib/src/decorator/is-valid-phone-type.js

@@ -14,16 +14,26 @@ let IsValidPhoneTypeConstraint = class IsValidPhoneTypeConstraint {
     constructor() {
         this.PHONE_TYPES = Object.values(authf_data_model_1.PhoneTypeEnum);
     }
-    validate(timezone, args) {
-        return this.PHONE_TYPES.includes(timezone);
+    validate(phoneType, args) {
+        var _a;
+        const optional = ((_a = args.constraints[0]) === null || _a === void 0 ? void 0 : _a.optional) || false;
+        if (optional && (phoneType === undefined || phoneType === null)) {
+            return true;
+        }
+        return this.PHONE_TYPES.includes(phoneType);
     }
     defaultMessage(args) {
-        return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+        var _a;
+        const optional = ((_a = args.constraints[0]) === null || _a === void 0 ? void 0 : _a.optional) || false;
+        if (optional && (args.value === undefined || args.value === null)) {
+            return `"${args.property}" is optional but, if defined, must be one of: ${this.PHONE_TYPES.join(", ")}.`;
+        }
+        return `"${args.value}" is not a valid phone type. Allowed types: ${this.PHONE_TYPES.join(", ")}.`;
     }
 };
 exports.IsValidPhoneTypeConstraint = IsValidPhoneTypeConstraint;
 exports.IsValidPhoneTypeConstraint = IsValidPhoneTypeConstraint = __decorate([
-    (0, class_validator_1.ValidatorConstraint)({ name: "IsValidPhoneType", async: false })
+    (0, class_validator_1.ValidatorConstraint)({ async: false })
 ], IsValidPhoneTypeConstraint);
 function IsValidPhoneType(validationOptions) {
     return (object, propertyName) => {
@@ -31,7 +41,7 @@ function IsValidPhoneType(validationOptions) {
             target: object.constructor,
             propertyName,
             options: validationOptions,
-            constraints: [],
+            constraints: [{ optional: (validationOptions === null || validationOptions === void 0 ? void 0 : validationOptions.optional) || false }],
             validator: IsValidPhoneTypeConstraint,
         });
     };

package/lib/src/decorator/is-valid-phone-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-valid-phone-type.js","sourceRoot":"","sources":["../../../src/decorator/is-valid-phone-type.ts"],"names":[],"mappings":";;;;;;;;;AAuBA,4CAUC;AAjCD,qDAMyB;AACzB,oEAA6E;AAGtE,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAAhC;QAEY,gBAAW,GAAa,MAAM,CAAC,MAAM,CAAC,gCAAa,CAAC,CAAC;IASxE,CAAC;IAPC,QAAQ,CAAC,QAAa,EAAE,IAAyB;QAC/C,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,cAAc,CAAC,IAAyB;QACtC,OAAO,IAAI,IAAI,CAAC,KAAK,qEAAqE,CAAC;IAC7F,CAAC;CACF,CAAA;AAXY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,qCAAmB,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GACnD,0BAA0B,CAWtC;AAED,SAAgB,gBAAgB,CAAC,iBAAqC;IACpE,OAAO,CAAC,MAAW,EAAE,YAAoB,EAAE,EAAE;QAC3C,IAAA,mCAAiB,EAAC;YAChB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,0BAA0B;SACtC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"is-valid-phone-type.js","sourceRoot":"","sources":["../../../src/decorator/is-valid-phone-type.ts"],"names":[],"mappings":";;;;;;;;;AA8CA,4CAYC;AA1DD,qDAMyB;AACzB,oEAA8D;AAGvD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAAhC;QAEY,gBAAW,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAa,CAAC,CAAC;IAgC9D,CAAC;IA9BC,QAAQ,CAAC,SAAc,EAAE,IAAyB;;QAChD,MAAM,QAAQ,GAAG,CAAA,MAAA,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,0CAAE,QAAQ,KAAI,KAAK,CAAC;QAGxD,IAAI,QAAQ,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;QAGD,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED,cAAc,CAAC,IAAyB;;QACtC,MAAM,QAAQ,GAAG,CAAA,MAAA,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,0CAAE,QAAQ,KAAI,KAAK,CAAC;QAGxD,IAAI,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,EAAE,CAAC;YAClE,OAAO,IACL,IAAI,CAAC,QACP,kDAAkD,IAAI,CAAC,WAAW,CAAC,IAAI,CACrE,IAAI,CACL,GAAG,CAAC;QACP,CAAC;QAED,OAAO,IACL,IAAI,CAAC,KACP,+CAA+C,IAAI,CAAC,WAAW,CAAC,IAAI,CAClE,IAAI,CACL,GAAG,CAAC;IACP,CAAC;CACF,CAAA;AAlCY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,qCAAmB,EAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GACzB,0BAA0B,CAkCtC;AAED,SAAgB,gBAAgB,CAC9B,iBAA8D;IAE9D,OAAO,CAAC,MAAW,EAAE,YAAoB,EAAE,EAAE;QAC3C,IAAA,mCAAiB,EAAC;YAChB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,KAAI,KAAK,EAAE,CAAC;YACjE,SAAS,EAAE,0BAA0B;SACtC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/lib/src/decorator/is-valid-utc-timezone.d.ts

@@ -1,7 +1,7 @@
 import { ValidatorConstraintInterface, ValidationArguments, ValidationOptions } from "class-validator";
 export declare class IsValidUtcTimezoneConstraint implements ValidatorConstraintInterface {
     private readonly TIMEZONES;
-    validate(timezone: any, args: ValidationArguments): boolean;
+    validate(timezone: any): boolean;
     defaultMessage(args: ValidationArguments): string;
 }
 export declare function IsValidUtcTimezone(validationOptions?: ValidationOptions): (object: any, propertyName: string) => void;

package/lib/src/decorator/is-valid-utc-timezone.js

@@ -55,16 +55,16 @@ let IsValidUtcTimezoneConstraint = class IsValidUtcTimezoneConstraint {
             "+14:00",
         ];
     }
-    validate(timezone, args) {
+    validate(timezone) {
         return this.TIMEZONES.includes(timezone);
     }
     defaultMessage(args) {
-        return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+        return `"${args.value}" is not a valid UTC timezone. Allowed timezones: ${this.TIMEZONES.join(", ")}.`;
     }
 };
 exports.IsValidUtcTimezoneConstraint = IsValidUtcTimezoneConstraint;
 exports.IsValidUtcTimezoneConstraint = IsValidUtcTimezoneConstraint = __decorate([
-    (0, class_validator_1.ValidatorConstraint)({ name: "IsValidUtcTimezone", async: false })
+    (0, class_validator_1.ValidatorConstraint)({ async: false })
 ], IsValidUtcTimezoneConstraint);
 function IsValidUtcTimezone(validationOptions) {
     return (object, propertyName) => {
@@ -72,7 +72,6 @@ function IsValidUtcTimezone(validationOptions) {
             target: object.constructor,
             propertyName,
             options: validationOptions,
-            constraints: [],
             validator: IsValidUtcTimezoneConstraint,
         });
     };

package/lib/src/decorator/is-valid-utc-timezone.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-valid-utc-timezone.js","sourceRoot":"","sources":["../../../src/decorator/is-valid-utc-timezone.ts"],"names":[],"mappings":";;;;;;;;;AAiEA,gDAUC;AA3ED,qDAMyB;AAIlB,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QAEY,cAAS,GAAa;YACrC,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;SACT,CAAC;IASJ,CAAC;IAPC,QAAQ,CAAC,QAAa,EAAE,IAAyB;QAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,cAAc,CAAC,IAAyB;QACtC,OAAO,IAAI,IAAI,CAAC,KAAK,qEAAqE,CAAC;IAC7F,CAAC;CACF,CAAA;AArDY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,qCAAmB,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GACrD,4BAA4B,CAqDxC;AAED,SAAgB,kBAAkB,CAAC,iBAAqC;IACtE,OAAO,CAAC,MAAW,EAAE,YAAoB,EAAE,EAAE;QAC3C,IAAA,mCAAiB,EAAC;YAChB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,4BAA4B;SACxC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"is-valid-utc-timezone.js","sourceRoot":"","sources":["../../../src/decorator/is-valid-utc-timezone.ts"],"names":[],"mappings":";;;;;;;;;AAoEA,gDASC;AA7ED,qDAMyB;AAGlB,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QAEY,cAAS,GAAG;YAC3B,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;SACT,CAAC;IAaJ,CAAC;IAXC,QAAQ,CAAC,QAAa;QACpB,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,cAAc,CAAC,IAAyB;QACtC,OAAO,IACL,IAAI,CAAC,KACP,qDAAqD,IAAI,CAAC,SAAS,CAAC,IAAI,CACtE,IAAI,CACL,GAAG,CAAC;IACP,CAAC;CACF,CAAA;AAzDY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,qCAAmB,EAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GACzB,4BAA4B,CAyDxC;AAED,SAAgB,kBAAkB,CAAC,iBAAqC;IACtE,OAAO,CAAC,MAAW,EAAE,YAAoB,EAAE,EAAE;QAC3C,IAAA,mCAAiB,EAAC;YAChB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,SAAS,EAAE,4BAA4B;SACxC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/lib/src/dto/email.dto.js

@@ -11,19 +11,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailDto = void 0;
 const authf_data_model_1 = require("@cryptexlabs/authf-data-model");
-const class_validator_1 = require("class-validator");
 const decorator_1 = require("../decorator");
+const is_valid_email_1 = require("../decorator/is-valid-email");
 class EmailDto {
 }
 exports.EmailDto = EmailDto;
 __decorate([
-    (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.IsEmail)(),
+    (0, is_valid_email_1.IsValidEmail)({ optional: true }),
     __metadata("design:type", String)
 ], EmailDto.prototype, "value", void 0);
 __decorate([
-    (0, class_validator_1.IsOptional)(),
-    (0, decorator_1.IsValidEmailType)(),
+    (0, decorator_1.IsValidEmailType)({ optional: true }),
     __metadata("design:type", String)
 ], EmailDto.prototype, "type", void 0);
 //# sourceMappingURL=email.dto.js.map

package/lib/src/dto/email.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"email.dto.js","sourceRoot":"","sources":["../../../src/dto/email.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA8E;AAC9E,qDAAsD;AACtD,4CAAgD;AAEhD,MAAa,QAAQ;CAQpB;AARD,4BAQC;AALC;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,GAAE;;uCACW;AAIrB;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAgB,GAAE;;sCACC"}
+{"version":3,"file":"email.dto.js","sourceRoot":"","sources":["../../../src/dto/email.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA8E;AAE9E,4CAAgD;AAChD,gEAA2D;AAE3D,MAAa,QAAQ;CAMpB;AAND,4BAMC;AAJC;IADC,IAAA,6BAAY,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACZ;AAGrB;IADC,IAAA,4BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCACjB"}

package/lib/src/dto/phone.dto.js

@@ -17,13 +17,11 @@ class PhoneDto {
 }
 exports.PhoneDto = PhoneDto;
 __decorate([
-    (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], PhoneDto.prototype, "value", void 0);
 __decorate([
-    (0, class_validator_1.IsOptional)(),
-    (0, decorator_1.IsValidPhoneType)(),
+    (0, decorator_1.IsValidPhoneType)({ optional: true }),
     __metadata("design:type", String)
 ], PhoneDto.prototype, "type", void 0);
 //# sourceMappingURL=phone.dto.js.map

package/lib/src/dto/phone.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"phone.dto.js","sourceRoot":"","sources":["../../../src/dto/phone.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA8E;AAC9E,qDAAuD;AACvD,4CAAgD;AAEhD,MAAa,QAAQ;CAQpB;AARD,4BAQC;AALC;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;uCACG;AAId;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAgB,GAAE;;sCACC"}
+{"version":3,"file":"phone.dto.js","sourceRoot":"","sources":["../../../src/dto/phone.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA8E;AAC9E,qDAAuD;AACvD,4CAAgD;AAEhD,MAAa,QAAQ;CAMpB;AAND,4BAMC;AAJC;IADC,IAAA,0BAAQ,GAAE;;uCACG;AAGd;IADC,IAAA,4BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCACjB"}

package/lib/src/dto/photo.dto.js

@@ -15,7 +15,6 @@ class PhotoDto {
 }
 exports.PhotoDto = PhotoDto;
 __decorate([
-    (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsUrl)(),
     __metadata("design:type", String)
 ], PhotoDto.prototype, "url", void 0);

package/lib/src/dto/photo.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"photo.dto.js","sourceRoot":"","sources":["../../../src/dto/photo.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qDAAoD;AAEpD,MAAa,QAAQ;CAIpB;AAJD,4BAIC;AADC;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;;qCACI"}
+{"version":3,"file":"photo.dto.js","sourceRoot":"","sources":["../../../src/dto/photo.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qDAAoD;AAEpD,MAAa,QAAQ;CAGpB;AAHD,4BAGC;AADC;IADC,IAAA,uBAAK,GAAE;;qCACI"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cryptexlabs/codex-nodejs-common",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Common code for Codex framework",
   "main": "lib/src/index.js",
   "type": "commonjs",

package/src/decorator/is-valid-email-type.ts

@@ -7,27 +7,43 @@ import {
 } from "class-validator";
 import { EmailTypeEnum } from "@cryptexlabs/authf-data-model";
 
-@ValidatorConstraint({ name: "IsValidEmailType", async: false })
+@ValidatorConstraint({ async: false })
 export class IsValidEmailTypeConstraint
   implements ValidatorConstraintInterface {
-  private readonly EMAIL_TYPES: string[] = Object.values(EmailTypeEnum);
+  private readonly EMAIL_TYPES = Object.values(EmailTypeEnum);
 
-  validate(timezone: any, args: ValidationArguments): boolean {
-    return this.EMAIL_TYPES.includes(timezone);
+  validate(emailType: any, args: ValidationArguments): boolean {
+    const optional = args.constraints[0]?.optional || false;
+    // If optional, allow null or undefined values
+    if (optional && (emailType === undefined || emailType === null)) {
+      return true;
+    }
+    // Otherwise, validate against allowed EMAIL_TYPES
+    return this.EMAIL_TYPES.includes(emailType);
   }
 
   defaultMessage(args: ValidationArguments): string {
-    return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+    const optional = args.constraints[0]?.optional || false;
+    if (optional && (args.value === undefined || args.value === null)) {
+      return `"${args.value}" is optional, but it must either be null/undefined or a valid email type.`;
+    }
+    return `"${
+      args.value
+    }" is not a valid email type. Allowed types: ${this.EMAIL_TYPES.join(
+      ", "
+    )}.`;
   }
 }
 
-export function IsValidEmailType(validationOptions?: ValidationOptions) {
+export function IsValidEmailType(
+  validationOptions?: ValidationOptions & { optional?: boolean }
+) {
   return (object: any, propertyName: string) => {
     registerDecorator({
       target: object.constructor,
       propertyName,
       options: validationOptions,
-      constraints: [],
+      constraints: [{ optional: validationOptions?.optional || false }],
       validator: IsValidEmailTypeConstraint,
     });
   };

package/src/decorator/is-valid-email.ts

@@ -0,0 +1,42 @@
+import {
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
+  ValidationArguments,
+  registerDecorator,
+  ValidationOptions,
+} from "class-validator";
+import { EmailTypeEnum } from "@cryptexlabs/authf-data-model";
+
+@ValidatorConstraint({ name: "IsValidEmail", async: false })
+export class IsValidEmailConstraint implements ValidatorConstraintInterface {
+  private readonly EMAIL_TYPES: string[] = Object.values(EmailTypeEnum);
+
+  // Receive constraints in the validate method
+  validate(value: any, args: ValidationArguments): boolean {
+    const [optional] = args.constraints; // Get optional flag from constraints
+    if (optional && value === null) {
+      return true; // Allow null if optional is true
+    }
+    return this.EMAIL_TYPES.includes(value); // Otherwise, validate normally
+  }
+
+  defaultMessage(args: ValidationArguments): string {
+    return `"${args.value}" is not a valid email. Choose one of the allowed email types or set it to null if optional.`;
+  }
+}
+
+// Custom decorator allowing the use of an optional argument
+export function IsValidEmail(
+  options?: { optional: boolean }, // Add an optional parameter to control nullability
+  validationOptions?: ValidationOptions
+) {
+  return (object: any, propertyName: string) => {
+    registerDecorator({
+      target: object.constructor,
+      propertyName,
+      options: validationOptions,
+      constraints: [options?.optional || false], // Pass optional flag to the validator
+      validator: IsValidEmailConstraint,
+    });
+  };
+}

package/src/decorator/is-valid-phone-type.ts

@@ -5,29 +5,54 @@ import {
   registerDecorator,
   ValidationOptions,
 } from "class-validator";
-import { EmailTypeEnum, PhoneTypeEnum } from "@cryptexlabs/authf-data-model";
+import { PhoneTypeEnum } from "@cryptexlabs/authf-data-model";
 
-@ValidatorConstraint({ name: "IsValidPhoneType", async: false })
+@ValidatorConstraint({ async: false })
 export class IsValidPhoneTypeConstraint
   implements ValidatorConstraintInterface {
-  private readonly PHONE_TYPES: string[] = Object.values(PhoneTypeEnum);
+  private readonly PHONE_TYPES = Object.values(PhoneTypeEnum);
 
-  validate(timezone: any, args: ValidationArguments): boolean {
-    return this.PHONE_TYPES.includes(timezone);
+  validate(phoneType: any, args: ValidationArguments): boolean {
+    const optional = args.constraints[0]?.optional || false;
+
+    // If the property is optional, allow null or undefined values
+    if (optional && (phoneType === undefined || phoneType === null)) {
+      return true;
+    }
+
+    // Otherwise, validate against the allowed PHONE_TYPES
+    return this.PHONE_TYPES.includes(phoneType);
   }
 
   defaultMessage(args: ValidationArguments): string {
-    return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+    const optional = args.constraints[0]?.optional || false;
+
+    // Provide different messages based on `optional` status
+    if (optional && (args.value === undefined || args.value === null)) {
+      return `"${
+        args.property
+      }" is optional but, if defined, must be one of: ${this.PHONE_TYPES.join(
+        ", "
+      )}.`;
+    }
+
+    return `"${
+      args.value
+    }" is not a valid phone type. Allowed types: ${this.PHONE_TYPES.join(
+      ", "
+    )}.`;
   }
 }
 
-export function IsValidPhoneType(validationOptions?: ValidationOptions) {
+export function IsValidPhoneType(
+  validationOptions?: ValidationOptions & { optional?: boolean }
+) {
   return (object: any, propertyName: string) => {
     registerDecorator({
       target: object.constructor,
       propertyName,
       options: validationOptions,
-      constraints: [],
+      constraints: [{ optional: validationOptions?.optional || false }],
       validator: IsValidPhoneTypeConstraint,
     });
   };

package/src/decorator/is-valid-utc-timezone.ts

@@ -6,11 +6,10 @@ import {
   ValidationOptions,
 } from "class-validator";
 
-// Step 1: Define the custom validator
-@ValidatorConstraint({ name: "IsValidUtcTimezone", async: false })
+@ValidatorConstraint({ async: false })
 export class IsValidUtcTimezoneConstraint
   implements ValidatorConstraintInterface {
-  private readonly TIMEZONES: string[] = [
+  private readonly TIMEZONES = [
     "-12:00",
     "-11:00",
     "-10:30",
@@ -54,12 +53,16 @@ export class IsValidUtcTimezoneConstraint
     "+14:00",
   ];
 
-  validate(timezone: any, args: ValidationArguments): boolean {
+  validate(timezone: any): boolean {
     return this.TIMEZONES.includes(timezone);
   }
 
   defaultMessage(args: ValidationArguments): string {
-    return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+    return `"${
+      args.value
+    }" is not a valid UTC timezone. Allowed timezones: ${this.TIMEZONES.join(
+      ", "
+    )}.`;
   }
 }
 
@@ -69,7 +72,6 @@ export function IsValidUtcTimezone(validationOptions?: ValidationOptions) {
       target: object.constructor,
       propertyName,
       options: validationOptions,
-      constraints: [],
       validator: IsValidUtcTimezoneConstraint,
     });
   };

package/src/dto/email.dto.ts

@@ -1,13 +1,12 @@
 import { EmailInterface, EmailTypeEnum } from "@cryptexlabs/authf-data-model";
 import { IsEmail, IsOptional } from "class-validator";
 import { IsValidEmailType } from "../decorator";
+import { IsValidEmail } from "../decorator/is-valid-email";
 
 export class EmailDto implements EmailInterface {
-  @IsOptional()
-  @IsEmail()
+  @IsValidEmail({ optional: true })
   value: string | null;
 
-  @IsOptional()
-  @IsValidEmailType()
+  @IsValidEmailType({ optional: true })
   type: EmailTypeEnum;
 }

package/src/dto/phone.dto.ts

@@ -3,11 +3,9 @@ import { IsOptional, IsString } from "class-validator";
 import { IsValidPhoneType } from "../decorator";
 
 export class PhoneDto implements PhoneInterface {
-  @IsOptional()
   @IsString()
   value: string;
 
-  @IsOptional()
-  @IsValidPhoneType()
+  @IsValidPhoneType({ optional: true })
   type: PhoneTypeEnum;
 }

package/src/dto/photo.dto.ts

@@ -2,7 +2,6 @@ import { PhotoInterface } from "@cryptexlabs/authf-data-model";
 import { IsOptional, IsUrl } from "class-validator";
 
 export class PhotoDto implements PhotoInterface {
-  @IsOptional()
   @IsUrl()
   url: string;
 }