@decaf-ts/decorator-validation 1.1.8 → 1.2.0

package/lib/validation/Validators/TypeValidator.cjs

@@ -13,9 +13,9 @@ exports.TypeValidator = void 0;
 const Validator_1 = require("./Validator.cjs");
 const constants_1 = require("./constants.cjs");
 const decorators_1 = require("./decorators.cjs");
-const utils_1 = require("../../utils/index.cjs");
 const Validation_1 = require("../Validation.cjs");
 const reflection_1 = require("@decaf-ts/reflection");
+const constants_2 = require("../../utils/constants.cjs");
 /**
  * @summary Required Validator
  *
@@ -58,8 +58,8 @@ exports.TypeValidator = TypeValidator = __decorate([
 ], TypeValidator);
 Validation_1.Validation.register({
     validator: TypeValidator,
-    validationKey: utils_1.ModelKeys.TYPE,
+    validationKey: constants_2.ModelKeys.TYPE,
     save: false,
 });
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy92YWxpZGF0aW9uL1ZhbGlkYXRvcnMvVHlwZVZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBd0M7QUFDeEMsMkNBQXFFO0FBQ3JFLDZDQUF5QztBQUN6Qyx1Q0FBd0M7QUFDeEMsOENBQTJDO0FBRTNDLHFEQUEyRDtBQUUzRDs7Ozs7OztHQU9HO0FBRUksSUFBTSxhQUFhLEdBQW5CLE1BQU0sYUFBYyxTQUFRLHFCQUFTO0lBQzFDLFlBQVksVUFBa0Isa0NBQXNCLENBQUMsSUFBSTtRQUN2RCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakIsQ0FBQztJQUVEOzs7Ozs7Ozs7OztPQVdHO0lBQ0ksU0FBUyxDQUNkLEtBQVUsRUFDVixLQUEyQyxFQUMzQyxPQUFnQjtRQUVoQixJQUFJLEtBQUssS0FBSyxTQUFTO1lBQUUsT0FBTyxDQUFDLHlDQUF5QztRQUMxRSxJQUFJLENBQUMsSUFBQSxnQ0FBbUIsRUFBQyxLQUFLLEVBQUUsS0FBSyxDQUFDO1lBQ3BDLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FDcEIsT0FBTyxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQ3ZCLE9BQU8sS0FBSyxLQUFLLFFBQVE7Z0JBQ3ZCLENBQUMsQ0FBQyxLQUFLO2dCQUNQLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztvQkFDcEIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO29CQUNsQixDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksRUFDaEIsT0FBTyxLQUFLLENBQ2IsQ0FBQztJQUNOLENBQUM7Q0FDRixDQUFBO0FBbENZLHNDQUFhO3dCQUFiLGFBQWE7SUFEekIsSUFBQSxzQkFBUyxFQUFDLDBCQUFjLENBQUMsSUFBSSxDQUFDOztHQUNsQixhQUFhLENBa0N6QjtBQUVELHVCQUFVLENBQUMsUUFBUSxDQUFDO0lBQ2xCLFNBQVMsRUFBRSxhQUFhO0lBQ3hCLGFBQWEsRUFBRSxpQkFBUyxDQUFDLElBQUk7SUFDN0IsSUFBSSxFQUFFLEtBQUs7Q0FDVyxDQUFDLENBQUMiLCJmaWxlIjoidmFsaWRhdGlvbi9WYWxpZGF0b3JzL1R5cGVWYWxpZGF0b3IuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBWYWxpZGF0b3IgfSBmcm9tIFwiLi9WYWxpZGF0b3JcIjtcbmltcG9ydCB7IERFRkFVTFRfRVJST1JfTUVTU0FHRVMsIFZhbGlkYXRpb25LZXlzIH0gZnJvbSBcIi4vY29uc3RhbnRzXCI7XG5pbXBvcnQgeyB2YWxpZGF0b3IgfSBmcm9tIFwiLi9kZWNvcmF0b3JzXCI7XG5pbXBvcnQgeyBNb2RlbEtleXMgfSBmcm9tIFwiLi4vLi4vdXRpbHNcIjtcbmltcG9ydCB7IFZhbGlkYXRpb24gfSBmcm9tIFwiLi4vVmFsaWRhdGlvblwiO1xuaW1wb3J0IHsgVmFsaWRhdG9yRGVmaW5pdGlvbiB9IGZyb20gXCIuL3R5cGVzXCI7XG5pbXBvcnQgeyBldmFsdWF0ZURlc2lnblR5cGVzIH0gZnJvbSBcIkBkZWNhZi10cy9yZWZsZWN0aW9uXCI7XG5cbi8qKlxuICogQHN1bW1hcnkgUmVxdWlyZWQgVmFsaWRhdG9yXG4gKlxuICogQGNsYXNzIFJlcXVpcmVkVmFsaWRhdG9yXG4gKiBAZXh0ZW5kcyBWYWxpZGF0b3JcbiAqXG4gKiBAY2F0ZWdvcnkgVmFsaWRhdG9yc1xuICovXG5AdmFsaWRhdG9yKFZhbGlkYXRpb25LZXlzLlRZUEUpXG5leHBvcnQgY2xhc3MgVHlwZVZhbGlkYXRvciBleHRlbmRzIFZhbGlkYXRvciB7XG4gIGNvbnN0cnVjdG9yKG1lc3NhZ2U6IHN0cmluZyA9IERFRkFVTFRfRVJST1JfTUVTU0FHRVMuVFlQRSkge1xuICAgIHN1cGVyKG1lc3NhZ2UpO1xuICB9XG5cbiAgLyoqXG4gICAqIEBzdW1tYXJ5IFZhbGlkYXRlcyBhIG1vZGVsXG4gICAqIEBwYXJhbSB7c3RyaW5nfSB2YWx1ZVxuICAgKiBAcGFyYW0ge3N0cmluZyB8IHN0cmluZ1tdIHwge25hbWU6IHN0cmluZ319IHR5cGVzXG4gICAqIEBwYXJhbSB7c3RyaW5nfSBbbWVzc2FnZV1cbiAgICpcbiAgICogQHJldHVybiB7c3RyaW5nIHwgdW5kZWZpbmVkfVxuICAgKlxuICAgKiBAb3ZlcnJpZGVcbiAgICpcbiAgICogQHNlZSBWYWxpZGF0b3IjaGFzRXJyb3JzXG4gICAqL1xuICBwdWJsaWMgaGFzRXJyb3JzKFxuICAgIHZhbHVlOiBhbnksXG4gICAgdHlwZXM6IHN0cmluZyB8IHN0cmluZ1tdIHwgeyBuYW1lOiBzdHJpbmcgfSxcbiAgICBtZXNzYWdlPzogc3RyaW5nLFxuICApOiBzdHJpbmcgfCB1bmRlZmluZWQge1xuICAgIGlmICh2YWx1ZSA9PT0gdW5kZWZpbmVkKSByZXR1cm47IC8vIERvbnQgdHJ5IGFuZCBlbmZvcmNlIHR5cGUgaWYgdW5kZWZpbmVkXG4gICAgaWYgKCFldmFsdWF0ZURlc2lnblR5cGVzKHZhbHVlLCB0eXBlcykpXG4gICAgICByZXR1cm4gdGhpcy5nZXRNZXNzYWdlKFxuICAgICAgICBtZXNzYWdlIHx8IHRoaXMubWVzc2FnZSxcbiAgICAgICAgdHlwZW9mIHR5cGVzID09PSBcInN0cmluZ1wiXG4gICAgICAgICAgPyB0eXBlc1xuICAgICAgICAgIDogQXJyYXkuaXNBcnJheSh0eXBlcylcbiAgICAgICAgICAgID8gdHlwZXMuam9pbihcIiwgXCIpXG4gICAgICAgICAgICA6IHR5cGVzLm5hbWUsXG4gICAgICAgIHR5cGVvZiB2YWx1ZSxcbiAgICAgICk7XG4gIH1cbn1cblxuVmFsaWRhdGlvbi5yZWdpc3Rlcih7XG4gIHZhbGlkYXRvcjogVHlwZVZhbGlkYXRvcixcbiAgdmFsaWRhdGlvbktleTogTW9kZWxLZXlzLlRZUEUsXG4gIHNhdmU6IGZhbHNlLFxufSBhcyBWYWxpZGF0b3JEZWZpbml0aW9uKTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy92YWxpZGF0aW9uL1ZhbGlkYXRvcnMvVHlwZVZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBd0M7QUFDeEMsMkNBQXFFO0FBQ3JFLDZDQUF5QztBQUN6Qyw4Q0FBMkM7QUFFM0MscURBQTJEO0FBQzNELHFEQUFrRDtBQUVsRDs7Ozs7OztHQU9HO0FBRUksSUFBTSxhQUFhLEdBQW5CLE1BQU0sYUFBYyxTQUFRLHFCQUFTO0lBQzFDLFlBQVksVUFBa0Isa0NBQXNCLENBQUMsSUFBSTtRQUN2RCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakIsQ0FBQztJQUVEOzs7Ozs7Ozs7OztPQVdHO0lBQ0ksU0FBUyxDQUNkLEtBQVUsRUFDVixLQUEyQyxFQUMzQyxPQUFnQjtRQUVoQixJQUFJLEtBQUssS0FBSyxTQUFTO1lBQUUsT0FBTyxDQUFDLHlDQUF5QztRQUMxRSxJQUFJLENBQUMsSUFBQSxnQ0FBbUIsRUFBQyxLQUFLLEVBQUUsS0FBSyxDQUFDO1lBQ3BDLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FDcEIsT0FBTyxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQ3ZCLE9BQU8sS0FBSyxLQUFLLFFBQVE7Z0JBQ3ZCLENBQUMsQ0FBQyxLQUFLO2dCQUNQLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztvQkFDcEIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO29CQUNsQixDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksRUFDaEIsT0FBTyxLQUFLLENBQ2IsQ0FBQztJQUNOLENBQUM7Q0FDRixDQUFBO0FBbENZLHNDQUFhO3dCQUFiLGFBQWE7SUFEekIsSUFBQSxzQkFBUyxFQUFDLDBCQUFjLENBQUMsSUFBSSxDQUFDOztHQUNsQixhQUFhLENBa0N6QjtBQUVELHVCQUFVLENBQUMsUUFBUSxDQUFDO0lBQ2xCLFNBQVMsRUFBRSxhQUFhO0lBQ3hCLGFBQWEsRUFBRSxxQkFBUyxDQUFDLElBQUk7SUFDN0IsSUFBSSxFQUFFLEtBQUs7Q0FDVyxDQUFDLENBQUMiLCJmaWxlIjoidmFsaWRhdGlvbi9WYWxpZGF0b3JzL1R5cGVWYWxpZGF0b3IuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBWYWxpZGF0b3IgfSBmcm9tIFwiLi9WYWxpZGF0b3JcIjtcbmltcG9ydCB7IERFRkFVTFRfRVJST1JfTUVTU0FHRVMsIFZhbGlkYXRpb25LZXlzIH0gZnJvbSBcIi4vY29uc3RhbnRzXCI7XG5pbXBvcnQgeyB2YWxpZGF0b3IgfSBmcm9tIFwiLi9kZWNvcmF0b3JzXCI7XG5pbXBvcnQgeyBWYWxpZGF0aW9uIH0gZnJvbSBcIi4uL1ZhbGlkYXRpb25cIjtcbmltcG9ydCB7IFZhbGlkYXRvckRlZmluaXRpb24gfSBmcm9tIFwiLi90eXBlc1wiO1xuaW1wb3J0IHsgZXZhbHVhdGVEZXNpZ25UeXBlcyB9IGZyb20gXCJAZGVjYWYtdHMvcmVmbGVjdGlvblwiO1xuaW1wb3J0IHsgTW9kZWxLZXlzIH0gZnJvbSBcIi4uLy4uL3V0aWxzL2NvbnN0YW50c1wiO1xuXG4vKipcbiAqIEBzdW1tYXJ5IFJlcXVpcmVkIFZhbGlkYXRvclxuICpcbiAqIEBjbGFzcyBSZXF1aXJlZFZhbGlkYXRvclxuICogQGV4dGVuZHMgVmFsaWRhdG9yXG4gKlxuICogQGNhdGVnb3J5IFZhbGlkYXRvcnNcbiAqL1xuQHZhbGlkYXRvcihWYWxpZGF0aW9uS2V5cy5UWVBFKVxuZXhwb3J0IGNsYXNzIFR5cGVWYWxpZGF0b3IgZXh0ZW5kcyBWYWxpZGF0b3Ige1xuICBjb25zdHJ1Y3RvcihtZXNzYWdlOiBzdHJpbmcgPSBERUZBVUxUX0VSUk9SX01FU1NBR0VTLlRZUEUpIHtcbiAgICBzdXBlcihtZXNzYWdlKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBAc3VtbWFyeSBWYWxpZGF0ZXMgYSBtb2RlbFxuICAgKiBAcGFyYW0ge3N0cmluZ30gdmFsdWVcbiAgICogQHBhcmFtIHtzdHJpbmcgfCBzdHJpbmdbXSB8IHtuYW1lOiBzdHJpbmd9fSB0eXBlc1xuICAgKiBAcGFyYW0ge3N0cmluZ30gW21lc3NhZ2VdXG4gICAqXG4gICAqIEByZXR1cm4ge3N0cmluZyB8IHVuZGVmaW5lZH1cbiAgICpcbiAgICogQG92ZXJyaWRlXG4gICAqXG4gICAqIEBzZWUgVmFsaWRhdG9yI2hhc0Vycm9yc1xuICAgKi9cbiAgcHVibGljIGhhc0Vycm9ycyhcbiAgICB2YWx1ZTogYW55LFxuICAgIHR5cGVzOiBzdHJpbmcgfCBzdHJpbmdbXSB8IHsgbmFtZTogc3RyaW5nIH0sXG4gICAgbWVzc2FnZT86IHN0cmluZyxcbiAgKTogc3RyaW5nIHwgdW5kZWZpbmVkIHtcbiAgICBpZiAodmFsdWUgPT09IHVuZGVmaW5lZCkgcmV0dXJuOyAvLyBEb250IHRyeSBhbmQgZW5mb3JjZSB0eXBlIGlmIHVuZGVmaW5lZFxuICAgIGlmICghZXZhbHVhdGVEZXNpZ25UeXBlcyh2YWx1ZSwgdHlwZXMpKVxuICAgICAgcmV0dXJuIHRoaXMuZ2V0TWVzc2FnZShcbiAgICAgICAgbWVzc2FnZSB8fCB0aGlzLm1lc3NhZ2UsXG4gICAgICAgIHR5cGVvZiB0eXBlcyA9PT0gXCJzdHJpbmdcIlxuICAgICAgICAgID8gdHlwZXNcbiAgICAgICAgICA6IEFycmF5LmlzQXJyYXkodHlwZXMpXG4gICAgICAgICAgICA/IHR5cGVzLmpvaW4oXCIsIFwiKVxuICAgICAgICAgICAgOiB0eXBlcy5uYW1lLFxuICAgICAgICB0eXBlb2YgdmFsdWUsXG4gICAgICApO1xuICB9XG59XG5cblZhbGlkYXRpb24ucmVnaXN0ZXIoe1xuICB2YWxpZGF0b3I6IFR5cGVWYWxpZGF0b3IsXG4gIHZhbGlkYXRpb25LZXk6IE1vZGVsS2V5cy5UWVBFLFxuICBzYXZlOiBmYWxzZSxcbn0gYXMgVmFsaWRhdG9yRGVmaW5pdGlvbik7XG4iXX0=

package/lib/validation/Validators/URLValidator.cjs

@@ -38,8 +38,8 @@ let URLValidator = class URLValidator extends PatternValidator_1.PatternValidato
      *
      * @see Validator#hasErrors
      */
-    hasErrors(value, message) {
-        return super.hasErrors(value, constants_1.DEFAULT_PATTERNS.URL, message);
+    hasErrors(value, pattern, message) {
+        return super.hasErrors(value, pattern || constants_1.DEFAULT_PATTERNS.URL, message);
     }
 };
 exports.URLValidator = URLValidator;
@@ -48,4 +48,4 @@ exports.URLValidator = URLValidator = __decorate([
     __metadata("design:paramtypes", [String])
 ], URLValidator);
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy92YWxpZGF0aW9uL1ZhbGlkYXRvcnMvVVJMVmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLDJDQUlxQjtBQUNyQix5REFBc0Q7QUFDdEQsNkNBQXlDO0FBRXpDOzs7Ozs7OztHQVFHO0FBRUksSUFBTSxZQUFZLEdBQWxCLE1BQU0sWUFBYSxTQUFRLG1DQUFnQjtJQUNoRCxZQUFZLFVBQWtCLGtDQUFzQixDQUFDLEdBQUc7UUFDdEQsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2pCLENBQUM7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNJLFNBQVMsQ0FBQyxLQUFhLEVBQUUsT0FBZ0I7UUFDOUMsT0FBTyxLQUFLLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSw0QkFBZ0IsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDL0QsQ0FBQztDQUNGLENBQUE7QUFwQlksb0NBQVk7dUJBQVosWUFBWTtJQUR4QixJQUFBLHNCQUFTLEVBQUMsMEJBQWMsQ0FBQyxHQUFHLENBQUM7O0dBQ2pCLFlBQVksQ0FvQnhCIiwiZmlsZSI6InZhbGlkYXRpb24vVmFsaWRhdG9ycy9VUkxWYWxpZGF0b3IuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBWYWxpZGF0aW9uS2V5cyxcbiAgREVGQVVMVF9FUlJPUl9NRVNTQUdFUyxcbiAgREVGQVVMVF9QQVRURVJOUyxcbn0gZnJvbSBcIi4vY29uc3RhbnRzXCI7XG5pbXBvcnQgeyBQYXR0ZXJuVmFsaWRhdG9yIH0gZnJvbSBcIi4vUGF0dGVyblZhbGlkYXRvclwiO1xuaW1wb3J0IHsgdmFsaWRhdG9yIH0gZnJvbSBcIi4vZGVjb3JhdG9yc1wiO1xuXG4vKipcbiAqIEBzdW1tYXJ5IFVSTCBWYWxpZGF0b3JcbiAqIEBkZXNjcmlwdGlvbiBQYXR0ZXJuIGZyb20ge0BsaW5rIGh0dHBzOi8vZ2lzdC5naXRodWIuY29tL2RwZXJpbmkvNzI5Mjk0fVxuICpcbiAqIEBjbGFzcyBVUkxWYWxpZGF0b3JcbiAqIEBleHRlbmRzIFBhdHRlcm5WYWxpZGF0b3JcbiAqXG4gKiBAY2F0ZWdvcnkgVmFsaWRhdG9yc1xuICovXG5AdmFsaWRhdG9yKFZhbGlkYXRpb25LZXlzLlVSTClcbmV4cG9ydCBjbGFzcyBVUkxWYWxpZGF0b3IgZXh0ZW5kcyBQYXR0ZXJuVmFsaWRhdG9yIHtcbiAgY29uc3RydWN0b3IobWVzc2FnZTogc3RyaW5nID0gREVGQVVMVF9FUlJPUl9NRVNTQUdFUy5VUkwpIHtcbiAgICBzdXBlcihtZXNzYWdlKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBAc3VtbWFyeSBWYWxpZGF0ZXMgYSBtb2RlbFxuICAgKlxuICAgKiBAcGFyYW0ge3N0cmluZ30gdmFsdWVcbiAgICogQHBhcmFtIHtzdHJpbmd9IFttZXNzYWdlXVxuICAgKlxuICAgKiBAcmV0dXJuIHtzdHJpbmcgfCB1bmRlZmluZWR9XG4gICAqXG4gICAqIEBvdmVycmlkZVxuICAgKlxuICAgKiBAc2VlIFZhbGlkYXRvciNoYXNFcnJvcnNcbiAgICovXG4gIHB1YmxpYyBoYXNFcnJvcnModmFsdWU6IHN0cmluZywgbWVzc2FnZT86IHN0cmluZyk6IHN0cmluZyB8IHVuZGVmaW5lZCB7XG4gICAgcmV0dXJuIHN1cGVyLmhhc0Vycm9ycyh2YWx1ZSwgREVGQVVMVF9QQVRURVJOUy5VUkwsIG1lc3NhZ2UpO1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy92YWxpZGF0aW9uL1ZhbGlkYXRvcnMvVVJMVmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLDJDQUlxQjtBQUNyQix5REFBc0Q7QUFDdEQsNkNBQXlDO0FBRXpDOzs7Ozs7OztHQVFHO0FBRUksSUFBTSxZQUFZLEdBQWxCLE1BQU0sWUFBYSxTQUFRLG1DQUFnQjtJQUNoRCxZQUFZLFVBQWtCLGtDQUFzQixDQUFDLEdBQUc7UUFDdEQsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2pCLENBQUM7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNJLFNBQVMsQ0FDZCxLQUFhLEVBQ2IsT0FBZ0IsRUFDaEIsT0FBZ0I7UUFFaEIsT0FBTyxLQUFLLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLElBQUksNEJBQWdCLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzFFLENBQUM7Q0FDRixDQUFBO0FBeEJZLG9DQUFZO3VCQUFaLFlBQVk7SUFEeEIsSUFBQSxzQkFBUyxFQUFDLDBCQUFjLENBQUMsR0FBRyxDQUFDOztHQUNqQixZQUFZLENBd0J4QiIsImZpbGUiOiJ2YWxpZGF0aW9uL1ZhbGlkYXRvcnMvVVJMVmFsaWRhdG9yLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgVmFsaWRhdGlvbktleXMsXG4gIERFRkFVTFRfRVJST1JfTUVTU0FHRVMsXG4gIERFRkFVTFRfUEFUVEVSTlMsXG59IGZyb20gXCIuL2NvbnN0YW50c1wiO1xuaW1wb3J0IHsgUGF0dGVyblZhbGlkYXRvciB9IGZyb20gXCIuL1BhdHRlcm5WYWxpZGF0b3JcIjtcbmltcG9ydCB7IHZhbGlkYXRvciB9IGZyb20gXCIuL2RlY29yYXRvcnNcIjtcblxuLyoqXG4gKiBAc3VtbWFyeSBVUkwgVmFsaWRhdG9yXG4gKiBAZGVzY3JpcHRpb24gUGF0dGVybiBmcm9tIHtAbGluayBodHRwczovL2dpc3QuZ2l0aHViLmNvbS9kcGVyaW5pLzcyOTI5NH1cbiAqXG4gKiBAY2xhc3MgVVJMVmFsaWRhdG9yXG4gKiBAZXh0ZW5kcyBQYXR0ZXJuVmFsaWRhdG9yXG4gKlxuICogQGNhdGVnb3J5IFZhbGlkYXRvcnNcbiAqL1xuQHZhbGlkYXRvcihWYWxpZGF0aW9uS2V5cy5VUkwpXG5leHBvcnQgY2xhc3MgVVJMVmFsaWRhdG9yIGV4dGVuZHMgUGF0dGVyblZhbGlkYXRvciB7XG4gIGNvbnN0cnVjdG9yKG1lc3NhZ2U6IHN0cmluZyA9IERFRkFVTFRfRVJST1JfTUVTU0FHRVMuVVJMKSB7XG4gICAgc3VwZXIobWVzc2FnZSk7XG4gIH1cblxuICAvKipcbiAgICogQHN1bW1hcnkgVmFsaWRhdGVzIGEgbW9kZWxcbiAgICpcbiAgICogQHBhcmFtIHtzdHJpbmd9IHZhbHVlXG4gICAqIEBwYXJhbSB7c3RyaW5nfSBbbWVzc2FnZV1cbiAgICpcbiAgICogQHJldHVybiB7c3RyaW5nIHwgdW5kZWZpbmVkfVxuICAgKlxuICAgKiBAb3ZlcnJpZGVcbiAgICpcbiAgICogQHNlZSBWYWxpZGF0b3IjaGFzRXJyb3JzXG4gICAqL1xuICBwdWJsaWMgaGFzRXJyb3JzKFxuICAgIHZhbHVlOiBzdHJpbmcsXG4gICAgcGF0dGVybj86IFJlZ0V4cCxcbiAgICBtZXNzYWdlPzogc3RyaW5nLFxuICApOiBzdHJpbmcgfCB1bmRlZmluZWQge1xuICAgIHJldHVybiBzdXBlci5oYXNFcnJvcnModmFsdWUsIHBhdHRlcm4gfHwgREVGQVVMVF9QQVRURVJOUy5VUkwsIG1lc3NhZ2UpO1xuICB9XG59XG4iXX0=

package/lib/validation/Validators/URLValidator.d.ts

@@ -22,5 +22,5 @@ export declare class URLValidator extends PatternValidator {
      *
      * @see Validator#hasErrors
      */
-    hasErrors(value: string, message?: string): string | undefined;
+    hasErrors(value: string, pattern?: RegExp, message?: string): string | undefined;
 }

package/lib/validation/Validators/index.cjs

@@ -53,19 +53,19 @@ __exportStar(require("./ValidatorRegistry.cjs"), exports);
  * @category Validation
  */
 exports.Validators = {
+    DateValidator: DateValidator_1.DateValidator,
     EmailValidator: EmailValidator_1.EmailValidator,
-    RequiredValidator: RequiredValidator_1.RequiredValidator,
+    ListValidator: ListValidator_1.ListValidator,
     MaxLengthValidator: MaxLengthValidator_1.MaxLengthValidator,
     MaxValidator: MaxValidator_1.MaxValidator,
     MinLengthValidator: MinLengthValidator_1.MinLengthValidator,
     MinValidator: MinValidator_1.MinValidator,
+    PasswordValidator: PasswordValidator_1.PasswordValidator,
     PatternValidator: PatternValidator_1.PatternValidator,
-    URLValidator: URLValidator_1.URLValidator,
+    RequiredValidator: RequiredValidator_1.RequiredValidator,
     StepValidator: StepValidator_1.StepValidator,
-    DateValidator: DateValidator_1.DateValidator,
     TypeValidator: TypeValidator_1.TypeValidator,
-    PasswordValidator: PasswordValidator_1.PasswordValidator,
-    ListValidator: ListValidator_1.ListValidator,
+    URLValidator: URLValidator_1.URLValidator,
 };
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy92YWxpZGF0aW9uL1ZhbGlkYXRvcnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtREFBZ0Q7QUFDaEQsbURBQWdEO0FBQ2hELDJEQUF3RDtBQUN4RCxtREFBZ0Q7QUFDaEQsaURBQThDO0FBQzlDLHlEQUFzRDtBQUN0RCxpREFBOEM7QUFDOUMsNkRBQTBEO0FBQzFELGlEQUE4QztBQUM5Qyw2REFBMEQ7QUFDMUQsMkRBQXdEO0FBQ3hELHFEQUFrRDtBQUNsRCxtREFBZ0Q7QUFFaEQsOENBQTRCO0FBQzVCLGtEQUFnQztBQUNoQywrQ0FBNkI7QUFDN0IsbURBQWlDO0FBQ2pDLGtEQUFnQztBQUNoQyx1REFBcUM7QUFDckMsaURBQStCO0FBQy9CLHVEQUFxQztBQUNyQyxpREFBK0I7QUFDL0Isc0RBQW9DO0FBQ3BDLHFEQUFtQztBQUNuQyxzREFBb0M7QUFDcEMsa0RBQWdDO0FBQ2hDLDBDQUF3QjtBQUN4QixrREFBZ0M7QUFDaEMsaURBQStCO0FBQy9CLDhDQUE0QjtBQUM1QixzREFBb0M7QUFDcEM7Ozs7O0dBS0c7QUFDVSxRQUFBLFVBQVUsR0FBRztJQUN4QixjQUFjLEVBQWQsK0JBQWM7SUFDZCxpQkFBaUIsRUFBakIscUNBQWlCO0lBQ2pCLGtCQUFrQixFQUFsQix1Q0FBa0I7SUFDbEIsWUFBWSxFQUFaLDJCQUFZO0lBQ1osa0JBQWtCLEVBQWxCLHVDQUFrQjtJQUNsQixZQUFZLEVBQVosMkJBQVk7SUFDWixnQkFBZ0IsRUFBaEIsbUNBQWdCO0lBQ2hCLFlBQVksRUFBWiwyQkFBWTtJQUNaLGFBQWEsRUFBYiw2QkFBYTtJQUNiLGFBQWEsRUFBYiw2QkFBYTtJQUNiLGFBQWEsRUFBYiw2QkFBYTtJQUNiLGlCQUFpQixFQUFqQixxQ0FBaUI7SUFDakIsYUFBYSxFQUFiLDZCQUFhO0NBQ2QsQ0FBQyIsImZpbGUiOiJ2YWxpZGF0aW9uL1ZhbGlkYXRvcnMvaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEYXRlVmFsaWRhdG9yIH0gZnJvbSBcIi4vRGF0ZVZhbGlkYXRvclwiO1xuaW1wb3J0IHsgVHlwZVZhbGlkYXRvciB9IGZyb20gXCIuL1R5cGVWYWxpZGF0b3JcIjtcbmltcG9ydCB7IFBhc3N3b3JkVmFsaWRhdG9yIH0gZnJvbSBcIi4vUGFzc3dvcmRWYWxpZGF0b3JcIjtcbmltcG9ydCB7IFN0ZXBWYWxpZGF0b3IgfSBmcm9tIFwiLi9TdGVwVmFsaWRhdG9yXCI7XG5pbXBvcnQgeyBVUkxWYWxpZGF0b3IgfSBmcm9tIFwiLi9VUkxWYWxpZGF0b3JcIjtcbmltcG9ydCB7IFBhdHRlcm5WYWxpZGF0b3IgfSBmcm9tIFwiLi9QYXR0ZXJuVmFsaWRhdG9yXCI7XG5pbXBvcnQgeyBNaW5WYWxpZGF0b3IgfSBmcm9tIFwiLi9NaW5WYWxpZGF0b3JcIjtcbmltcG9ydCB7IE1pbkxlbmd0aFZhbGlkYXRvciB9IGZyb20gXCIuL01pbkxlbmd0aFZhbGlkYXRvclwiO1xuaW1wb3J0IHsgTWF4VmFsaWRhdG9yIH0gZnJvbSBcIi4vTWF4VmFsaWRhdG9yXCI7XG5pbXBvcnQgeyBNYXhMZW5ndGhWYWxpZGF0b3IgfSBmcm9tIFwiLi9NYXhMZW5ndGhWYWxpZGF0b3JcIjtcbmltcG9ydCB7IFJlcXVpcmVkVmFsaWRhdG9yIH0gZnJvbSBcIi4vUmVxdWlyZWRWYWxpZGF0b3JcIjtcbmltcG9ydCB7IEVtYWlsVmFsaWRhdG9yIH0gZnJvbSBcIi4vRW1haWxWYWxpZGF0b3JcIjtcbmltcG9ydCB7IExpc3RWYWxpZGF0b3IgfSBmcm9tIFwiLi9MaXN0VmFsaWRhdG9yXCI7XG5cbmV4cG9ydCAqIGZyb20gXCIuL2NvbnN0YW50c1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vRGF0ZVZhbGlkYXRvclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vZGVjb3JhdG9yc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vRW1haWxWYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL0xpc3RWYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL01heExlbmd0aFZhbGlkYXRvclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vTWF4VmFsaWRhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9NaW5MZW5ndGhWYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL01pblZhbGlkYXRvclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vUGFzc3dvcmRWYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL1BhdHRlcm5WYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL1JlcXVpcmVkVmFsaWRhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9TdGVwVmFsaWRhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi90eXBlc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vVHlwZVZhbGlkYXRvclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vVVJMVmFsaWRhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9WYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL1ZhbGlkYXRvclJlZ2lzdHJ5XCI7XG4vKipcbiAqIEBzdW1tYXJ5IGNvbnN0YW50IGhvbGRpbmcgYWxsIHtAbGluayBWYWxpZGF0b3J9c1xuICogQGNvbnN0YW50IFZhbGlkYXRvcnNcbiAqIEBtZW1iZXJPZiBtb2R1bGU6ZGVjb3JhdG9yLXZhbGlkYXRpb24uVmFsaWRhdGlvbi5WYWxpZGF0b3JzXG4gKiBAY2F0ZWdvcnkgVmFsaWRhdGlvblxuICovXG5leHBvcnQgY29uc3QgVmFsaWRhdG9ycyA9IHtcbiAgRW1haWxWYWxpZGF0b3IsXG4gIFJlcXVpcmVkVmFsaWRhdG9yLFxuICBNYXhMZW5ndGhWYWxpZGF0b3IsXG4gIE1heFZhbGlkYXRvcixcbiAgTWluTGVuZ3RoVmFsaWRhdG9yLFxuICBNaW5WYWxpZGF0b3IsXG4gIFBhdHRlcm5WYWxpZGF0b3IsXG4gIFVSTFZhbGlkYXRvcixcbiAgU3RlcFZhbGlkYXRvcixcbiAgRGF0ZVZhbGlkYXRvcixcbiAgVHlwZVZhbGlkYXRvcixcbiAgUGFzc3dvcmRWYWxpZGF0b3IsXG4gIExpc3RWYWxpZGF0b3IsXG59O1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy92YWxpZGF0aW9uL1ZhbGlkYXRvcnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtREFBZ0Q7QUFDaEQsbURBQWdEO0FBQ2hELDJEQUF3RDtBQUN4RCxtREFBZ0Q7QUFDaEQsaURBQThDO0FBQzlDLHlEQUFzRDtBQUN0RCxpREFBOEM7QUFDOUMsNkRBQTBEO0FBQzFELGlEQUE4QztBQUM5Qyw2REFBMEQ7QUFDMUQsMkRBQXdEO0FBQ3hELHFEQUFrRDtBQUNsRCxtREFBZ0Q7QUFFaEQsOENBQTRCO0FBQzVCLGtEQUFnQztBQUNoQywrQ0FBNkI7QUFDN0IsbURBQWlDO0FBQ2pDLGtEQUFnQztBQUNoQyx1REFBcUM7QUFDckMsaURBQStCO0FBQy9CLHVEQUFxQztBQUNyQyxpREFBK0I7QUFDL0Isc0RBQW9DO0FBQ3BDLHFEQUFtQztBQUNuQyxzREFBb0M7QUFDcEMsa0RBQWdDO0FBQ2hDLDBDQUF3QjtBQUN4QixrREFBZ0M7QUFDaEMsaURBQStCO0FBQy9CLDhDQUE0QjtBQUM1QixzREFBb0M7QUFDcEM7Ozs7O0dBS0c7QUFDVSxRQUFBLFVBQVUsR0FBRztJQUN4QixhQUFhLEVBQWIsNkJBQWE7SUFDYixjQUFjLEVBQWQsK0JBQWM7SUFDZCxhQUFhLEVBQWIsNkJBQWE7SUFDYixrQkFBa0IsRUFBbEIsdUNBQWtCO0lBQ2xCLFlBQVksRUFBWiwyQkFBWTtJQUNaLGtCQUFrQixFQUFsQix1Q0FBa0I7SUFDbEIsWUFBWSxFQUFaLDJCQUFZO0lBQ1osaUJBQWlCLEVBQWpCLHFDQUFpQjtJQUNqQixnQkFBZ0IsRUFBaEIsbUNBQWdCO0lBQ2hCLGlCQUFpQixFQUFqQixxQ0FBaUI7SUFDakIsYUFBYSxFQUFiLDZCQUFhO0lBQ2IsYUFBYSxFQUFiLDZCQUFhO0lBQ2IsWUFBWSxFQUFaLDJCQUFZO0NBQ2IsQ0FBQyIsImZpbGUiOiJ2YWxpZGF0aW9uL1ZhbGlkYXRvcnMvaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEYXRlVmFsaWRhdG9yIH0gZnJvbSBcIi4vRGF0ZVZhbGlkYXRvclwiO1xuaW1wb3J0IHsgVHlwZVZhbGlkYXRvciB9IGZyb20gXCIuL1R5cGVWYWxpZGF0b3JcIjtcbmltcG9ydCB7IFBhc3N3b3JkVmFsaWRhdG9yIH0gZnJvbSBcIi4vUGFzc3dvcmRWYWxpZGF0b3JcIjtcbmltcG9ydCB7IFN0ZXBWYWxpZGF0b3IgfSBmcm9tIFwiLi9TdGVwVmFsaWRhdG9yXCI7XG5pbXBvcnQgeyBVUkxWYWxpZGF0b3IgfSBmcm9tIFwiLi9VUkxWYWxpZGF0b3JcIjtcbmltcG9ydCB7IFBhdHRlcm5WYWxpZGF0b3IgfSBmcm9tIFwiLi9QYXR0ZXJuVmFsaWRhdG9yXCI7XG5pbXBvcnQgeyBNaW5WYWxpZGF0b3IgfSBmcm9tIFwiLi9NaW5WYWxpZGF0b3JcIjtcbmltcG9ydCB7IE1pbkxlbmd0aFZhbGlkYXRvciB9IGZyb20gXCIuL01pbkxlbmd0aFZhbGlkYXRvclwiO1xuaW1wb3J0IHsgTWF4VmFsaWRhdG9yIH0gZnJvbSBcIi4vTWF4VmFsaWRhdG9yXCI7XG5pbXBvcnQgeyBNYXhMZW5ndGhWYWxpZGF0b3IgfSBmcm9tIFwiLi9NYXhMZW5ndGhWYWxpZGF0b3JcIjtcbmltcG9ydCB7IFJlcXVpcmVkVmFsaWRhdG9yIH0gZnJvbSBcIi4vUmVxdWlyZWRWYWxpZGF0b3JcIjtcbmltcG9ydCB7IEVtYWlsVmFsaWRhdG9yIH0gZnJvbSBcIi4vRW1haWxWYWxpZGF0b3JcIjtcbmltcG9ydCB7IExpc3RWYWxpZGF0b3IgfSBmcm9tIFwiLi9MaXN0VmFsaWRhdG9yXCI7XG5cbmV4cG9ydCAqIGZyb20gXCIuL2NvbnN0YW50c1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vRGF0ZVZhbGlkYXRvclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vZGVjb3JhdG9yc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vRW1haWxWYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL0xpc3RWYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL01heExlbmd0aFZhbGlkYXRvclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vTWF4VmFsaWRhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9NaW5MZW5ndGhWYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL01pblZhbGlkYXRvclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vUGFzc3dvcmRWYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL1BhdHRlcm5WYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL1JlcXVpcmVkVmFsaWRhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9TdGVwVmFsaWRhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi90eXBlc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vVHlwZVZhbGlkYXRvclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vVVJMVmFsaWRhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9WYWxpZGF0b3JcIjtcbmV4cG9ydCAqIGZyb20gXCIuL1ZhbGlkYXRvclJlZ2lzdHJ5XCI7XG4vKipcbiAqIEBzdW1tYXJ5IGNvbnN0YW50IGhvbGRpbmcgYWxsIHtAbGluayBWYWxpZGF0b3J9c1xuICogQGNvbnN0YW50IFZhbGlkYXRvcnNcbiAqIEBtZW1iZXJPZiBtb2R1bGU6ZGVjb3JhdG9yLXZhbGlkYXRpb24uVmFsaWRhdGlvbi5WYWxpZGF0b3JzXG4gKiBAY2F0ZWdvcnkgVmFsaWRhdGlvblxuICovXG5leHBvcnQgY29uc3QgVmFsaWRhdG9ycyA9IHtcbiAgRGF0ZVZhbGlkYXRvcixcbiAgRW1haWxWYWxpZGF0b3IsXG4gIExpc3RWYWxpZGF0b3IsXG4gIE1heExlbmd0aFZhbGlkYXRvcixcbiAgTWF4VmFsaWRhdG9yLFxuICBNaW5MZW5ndGhWYWxpZGF0b3IsXG4gIE1pblZhbGlkYXRvcixcbiAgUGFzc3dvcmRWYWxpZGF0b3IsXG4gIFBhdHRlcm5WYWxpZGF0b3IsXG4gIFJlcXVpcmVkVmFsaWRhdG9yLFxuICBTdGVwVmFsaWRhdG9yLFxuICBUeXBlVmFsaWRhdG9yLFxuICBVUkxWYWxpZGF0b3IsXG59O1xuIl19

package/lib/validation/Validators/index.d.ts

@@ -36,17 +36,17 @@ export * from "./ValidatorRegistry";
  * @category Validation
  */
 export declare const Validators: {
+    DateValidator: typeof DateValidator;
     EmailValidator: typeof EmailValidator;
-    RequiredValidator: typeof RequiredValidator;
+    ListValidator: typeof ListValidator;
     MaxLengthValidator: typeof MaxLengthValidator;
     MaxValidator: typeof MaxValidator;
     MinLengthValidator: typeof MinLengthValidator;
     MinValidator: typeof MinValidator;
+    PasswordValidator: typeof PasswordValidator;
     PatternValidator: typeof PatternValidator;
-    URLValidator: typeof URLValidator;
+    RequiredValidator: typeof RequiredValidator;
     StepValidator: typeof StepValidator;
-    DateValidator: typeof DateValidator;
     TypeValidator: typeof TypeValidator;
-    PasswordValidator: typeof PasswordValidator;
-    ListValidator: typeof ListValidator;
+    URLValidator: typeof URLValidator;
 };

package/lib/validation/decorators.cjs

@@ -15,14 +15,11 @@ exports.password = password;
 exports.list = list;
 exports.set = set;
 require("reflect-metadata");
-const ListValidator_1 = require("./Validators/ListValidator.cjs");
-const Validation_1 = require("./Validation.cjs");
 const constants_1 = require("./Validators/constants.cjs");
 const strings_1 = require("../utils/strings.cjs");
-const PasswordValidator_1 = require("./Validators/PasswordValidator.cjs");
-const utils_1 = require("../utils/index.cjs");
-const utils_2 = require("./utils.cjs");
+const utils_1 = require("./utils.cjs");
 const reflection_1 = require("@decaf-ts/reflection");
+const dates_1 = require("../utils/dates.cjs");
 /**
  * @summary Marks the property as required.
  * @description Validators to validate a decorated property must use key {@link ValidationKeys#REQUIRED}
@@ -34,7 +31,7 @@ const reflection_1 = require("@decaf-ts/reflection");
  * @category Decorators
  */
 function required(message = constants_1.DEFAULT_ERROR_MESSAGES.REQUIRED) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.REQUIRED), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.REQUIRED), {
         message: message,
     });
 }
@@ -50,7 +47,7 @@ function required(message = constants_1.DEFAULT_ERROR_MESSAGES.REQUIRED) {
  * @category Decorators
  */
 function min(value, message = constants_1.DEFAULT_ERROR_MESSAGES.MIN) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.MIN), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.MIN), {
         value: value,
         message: message,
         types: [Number.name, Date.name],
@@ -68,7 +65,7 @@ function min(value, message = constants_1.DEFAULT_ERROR_MESSAGES.MIN) {
  * @category Decorators
  */
 function max(value, message = constants_1.DEFAULT_ERROR_MESSAGES.MAX) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.MAX), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.MAX), {
         value: value,
         message: message,
         types: [Number.name, Date.name],
@@ -86,7 +83,7 @@ function max(value, message = constants_1.DEFAULT_ERROR_MESSAGES.MAX) {
  * @category Decorators
  */
 function step(value, message = constants_1.DEFAULT_ERROR_MESSAGES.STEP) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.STEP), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.STEP), {
         value: value,
         message: message,
         types: [Number.name],
@@ -104,7 +101,7 @@ function step(value, message = constants_1.DEFAULT_ERROR_MESSAGES.STEP) {
  * @category Decorators
  */
 function minlength(value, message = constants_1.DEFAULT_ERROR_MESSAGES.MIN_LENGTH) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.MIN_LENGTH), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.MIN_LENGTH), {
         value: value,
         message: message,
         types: [String.name, Array.name, Set.name],
@@ -122,7 +119,7 @@ function minlength(value, message = constants_1.DEFAULT_ERROR_MESSAGES.MIN_LENGT
  * @category Decorators
  */
 function maxlength(value, message = constants_1.DEFAULT_ERROR_MESSAGES.MAX_LENGTH) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.MAX_LENGTH), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.MAX_LENGTH), {
         value: value,
         message: message,
         types: [String.name, Array.name, Set.name],
@@ -140,7 +137,7 @@ function maxlength(value, message = constants_1.DEFAULT_ERROR_MESSAGES.MAX_LENGT
  * @category Decorators
  */
 function pattern(value, message = constants_1.DEFAULT_ERROR_MESSAGES.PATTERN) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.PATTERN), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.PATTERN), {
         value: typeof value === "string" ? value : value.toString(),
         message: message,
         types: [String.name],
@@ -157,7 +154,8 @@ function pattern(value, message = constants_1.DEFAULT_ERROR_MESSAGES.PATTERN) {
  * @category Decorators
  */
 function email(message = constants_1.DEFAULT_ERROR_MESSAGES.EMAIL) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.EMAIL), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.EMAIL), {
+        pattern: constants_1.DEFAULT_PATTERNS.EMAIL,
         message: message,
         types: [String.name],
     });
@@ -173,7 +171,8 @@ function email(message = constants_1.DEFAULT_ERROR_MESSAGES.EMAIL) {
  * @category Decorators
  */
 function url(message = constants_1.DEFAULT_ERROR_MESSAGES.URL) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.URL), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.URL), {
+        pattern: constants_1.DEFAULT_PATTERNS.URL,
         message: message,
         types: [String.name],
     });
@@ -190,7 +189,7 @@ function url(message = constants_1.DEFAULT_ERROR_MESSAGES.URL) {
  * @category Decorators
  */
 function type(types, message = constants_1.DEFAULT_ERROR_MESSAGES.TYPE) {
-    return (0, reflection_1.metadata)((0, utils_2.getValidationKey)(constants_1.ValidationKeys.TYPE), {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.TYPE), {
         customTypes: types,
         message: message,
     });
@@ -212,11 +211,11 @@ function type(types, message = constants_1.DEFAULT_ERROR_MESSAGES.TYPE) {
  */
 function date(format = "dd/MM/yyyy", message = constants_1.DEFAULT_ERROR_MESSAGES.DATE) {
     return (target, propertyKey) => {
-        Reflect.defineMetadata((0, utils_2.getValidationKey)(constants_1.ValidationKeys.DATE), {
+        (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.DATE), {
             format: format,
             message: message,
             types: [Date.name],
-        }, target, propertyKey);
+        })(target, propertyKey);
         const values = new WeakMap();
         Object.defineProperty(target, propertyKey, {
             configurable: false,
@@ -230,7 +229,7 @@ function date(format = "dd/MM/yyyy", message = constants_1.DEFAULT_ERROR_MESSAGE
                         set: (newValue) => {
                             let val;
                             try {
-                                val = (0, utils_1.parseDate)(format, newValue);
+                                val = (0, dates_1.parseDate)(format, newValue);
                                 values.set(this, val);
                             }
                             catch (e) {
@@ -259,19 +258,12 @@ function date(format = "dd/MM/yyyy", message = constants_1.DEFAULT_ERROR_MESSAGE
  * @memberOf module:decorator-validation.Decorators.Validation
  * @category Decorators
  */
-function password(pattern = constants_1.DEFAULT_PATTERNS.PASSWORD.CHAR8_ONE_OF_EACH, message = constants_1.DEFAULT_ERROR_MESSAGES.PASSWORD, validator = PasswordValidator_1.PasswordValidator) {
-    return (target, propertyKey) => {
-        Reflect.defineMetadata((0, utils_2.getValidationKey)(constants_1.ValidationKeys.PASSWORD), {
-            pattern: pattern,
-            message: message,
-            types: [String.name],
-        }, target, propertyKey);
-        Validation_1.Validation.register({
-            validator: validator,
-            validationKey: constants_1.ValidationKeys.PASSWORD,
-            save: true,
-        });
-    };
+function password(pattern = constants_1.DEFAULT_PATTERNS.PASSWORD.CHAR8_ONE_OF_EACH, message = constants_1.DEFAULT_ERROR_MESSAGES.PASSWORD) {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.PASSWORD), {
+        pattern: pattern,
+        message: message,
+        types: [String.name],
+    });
 }
 /**
  * @summary List Decorator
@@ -287,20 +279,12 @@ function password(pattern = constants_1.DEFAULT_PATTERNS.PASSWORD.CHAR8_ONE_OF_E
  * @memberOf module:decorator-validation.Decorators.Validation
  * @category Decorators
  */
-function list(clazz, collection = "Array", message = constants_1.DEFAULT_ERROR_MESSAGES.LIST, validator = ListValidator_1.ListValidator) {
-    return (target, propertyKey) => {
-        type(collection)(target, propertyKey);
-        Reflect.defineMetadata((0, utils_2.getValidationKey)(constants_1.ValidationKeys.LIST), {
-            class: clazz.name,
-            type: collection,
-            message: message,
-        }, target, propertyKey);
-        Validation_1.Validation.register({
-            validator: validator,
-            validationKey: constants_1.ValidationKeys.LIST,
-            save: true,
-        });
-    };
+function list(clazz, collection = "Array", message = constants_1.DEFAULT_ERROR_MESSAGES.LIST) {
+    return (0, reflection_1.metadata)((0, utils_1.getValidationKey)(constants_1.ValidationKeys.LIST), {
+        class: Array.isArray(clazz) ? clazz.map((c) => c.name) : [clazz.name],
+        type: collection,
+        message: message,
+    });
 }
 /**
  * @summary Set Decorator
@@ -315,10 +299,8 @@ function list(clazz, collection = "Array", message = constants_1.DEFAULT_ERROR_M
  * @memberOf module:decorator-validation.Decorators.Validation
  * @category Decorators
  */
-function set(clazz, message = constants_1.DEFAULT_ERROR_MESSAGES.LIST, validator) {
-    return (target, propertyKey) => {
-        list(clazz, "Set", message, validator)(target, propertyKey);
-    };
+function set(clazz, message = constants_1.DEFAULT_ERROR_MESSAGES.LIST) {
+    return list(clazz, "Set", message);
 }
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["src/validation/decorators.ts"],"names":[],"mappings":"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","file":"validation/decorators.js","sourcesContent":["import \"reflect-metadata\";\nimport { ListValidator } from \"./Validators/ListValidator\";\nimport { Validation } from \"./Validation\";\nimport { ValidationMetadata } from \"./types\";\nimport {\n  DEFAULT_ERROR_MESSAGES,\n  DEFAULT_PATTERNS,\n  ValidationKeys,\n} from \"./Validators/constants\";\nimport { sf } from \"../utils/strings\";\nimport { Constructor, ModelConstructor } from \"../model/types\";\nimport { PasswordValidator } from \"./Validators/PasswordValidator\";\nimport { ValidatorDefinition } from \"./Validators/types\";\nimport { Validator } from \"./Validators/Validator\";\nimport { parseDate } from \"../utils\";\nimport { getValidationKey } from \"./utils\";\nimport { metadata } from \"@decaf-ts/reflection\";\n\n/**\n * @summary Marks the property as required.\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#REQUIRED}\n *\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#REQUIRED}\n *\n * @function required\n *\n * @category Decorators\n */\nexport function required(message: string = DEFAULT_ERROR_MESSAGES.REQUIRED) {\n  return metadata<ValidationMetadata>(\n    getValidationKey(ValidationKeys.REQUIRED),\n    {\n      message: message,\n    },\n  );\n}\n\n/**\n * @summary Defines a minimum value for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#MIN}\n *\n * @param {number | Date} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#MIN}\n *\n * @function min\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function min(\n  value: number | Date | string,\n  message: string = DEFAULT_ERROR_MESSAGES.MIN,\n) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.MIN), {\n    value: value,\n    message: message,\n    types: [Number.name, Date.name],\n  });\n}\n\n/**\n * @summary Defines a maximum value for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#MAX}\n *\n * @param {number | Date} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#MAX}\n *\n * @function max\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function max(\n  value: number | Date | string,\n  message: string = DEFAULT_ERROR_MESSAGES.MAX,\n) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.MAX), {\n    value: value,\n    message: message,\n    types: [Number.name, Date.name],\n  });\n}\n\n/**\n * @summary Defines a step value for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#STEP}\n *\n * @param {number} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#STEP}\n *\n * @function step\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function step(\n  value: number,\n  message: string = DEFAULT_ERROR_MESSAGES.STEP,\n) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.STEP), {\n    value: value,\n    message: message,\n    types: [Number.name],\n  });\n}\n\n/**\n * @summary Defines a minimum length for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#MIN_LENGTH}\n *\n * @param {string} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#MIN_LENGTH}\n *\n * @function minlength\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function minlength(\n  value: number,\n  message: string = DEFAULT_ERROR_MESSAGES.MIN_LENGTH,\n) {\n  return metadata<ValidationMetadata>(\n    getValidationKey(ValidationKeys.MIN_LENGTH),\n    {\n      value: value,\n      message: message,\n      types: [String.name, Array.name, Set.name],\n    },\n  );\n}\n\n/**\n * @summary Defines a maximum length for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#MAX_LENGTH}\n *\n * @param {string} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#MAX_LENGTH}\n *\n * @function maxlength\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function maxlength(\n  value: number,\n  message: string = DEFAULT_ERROR_MESSAGES.MAX_LENGTH,\n) {\n  return metadata<ValidationMetadata>(\n    getValidationKey(ValidationKeys.MAX_LENGTH),\n    {\n      value: value,\n      message: message,\n      types: [String.name, Array.name, Set.name],\n    },\n  );\n}\n\n/**\n * @summary Defines a RegExp pattern the property must respect\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#PATTERN}\n *\n * @param {string} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#PATTERN}\n *\n * @function pattern\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function pattern(\n  value: RegExp | string,\n  message: string = DEFAULT_ERROR_MESSAGES.PATTERN,\n) {\n  return metadata<ValidationMetadata>(\n    getValidationKey(ValidationKeys.PATTERN),\n    {\n      value: typeof value === \"string\" ? value : value.toString(),\n      message: message,\n      types: [String.name],\n    },\n  );\n}\n\n/**\n * @summary Defines the property as an email\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#EMAIL}\n *\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#EMAIL}\n *\n * @function email\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function email(message: string = DEFAULT_ERROR_MESSAGES.EMAIL) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.EMAIL), {\n    message: message,\n    types: [String.name],\n  });\n}\n\n/**\n * @summary Defines the property as an URL\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#URL}\n *\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#URL}\n *\n * @function url\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function url(message: string = DEFAULT_ERROR_MESSAGES.URL) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.URL), {\n    message: message,\n    types: [String.name],\n  });\n}\n\n/**\n * @summary Enforces type verification\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#TYPE}\n *\n * @param {string[] | string} types accepted types\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#TYPE}\n *\n * @function type\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function type(\n  types: string[] | string,\n  message: string = DEFAULT_ERROR_MESSAGES.TYPE,\n) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.TYPE), {\n    customTypes: types,\n    message: message,\n  });\n}\n\n/**\n * @summary Date Handler Decorator\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#DATE}\n *\n * Will enforce serialization according to the selected format\n *\n * @param {string} format accepted format according to {@link formatDate}\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#DATE}\n * @param {Constructor<Validator>} [validator] the Validator to be used. Defaults to {@link DateValidator}\n *\n * @function date\n *\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function date(\n  format: string = \"dd/MM/yyyy\",\n  message: string = DEFAULT_ERROR_MESSAGES.DATE,\n) {\n  return (target: Record<string, any>, propertyKey: string): any => {\n    Reflect.defineMetadata(\n      getValidationKey(ValidationKeys.DATE),\n      {\n        format: format,\n        message: message,\n        types: [Date.name],\n      },\n      target,\n      propertyKey,\n    );\n\n    const values = new WeakMap();\n\n    Object.defineProperty(target, propertyKey, {\n      configurable: false,\n      set(this: any, newValue: string | Date) {\n        const descriptor = Object.getOwnPropertyDescriptor(this, propertyKey);\n        if (!descriptor || descriptor.configurable)\n          Object.defineProperty(this, propertyKey, {\n            enumerable: true,\n            configurable: false,\n            get: () => values.get(this),\n            set: (newValue: string | Date | number) => {\n              let val: Date | undefined;\n              try {\n                val = parseDate(format, newValue);\n                values.set(this, val);\n              } catch (e: any) {\n                console.error(sf(\"Failed to parse date: {0}\", e.message || e));\n              }\n            },\n          });\n        this[propertyKey] = newValue;\n      },\n      get() {\n        console.log(\"here\");\n      },\n    });\n  };\n}\n\n/**\n * @summary Password Handler Decorator\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#PASSWORD}\n *\n * @param {RegExp} [pattern] defaults to {@link PasswordPatterns#CHAR8_ONE_OF_EACH}\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#PASSWORD}\n * @param {Constructor<Validator>} [validator] Defaults to {@link PasswordValidator}\n *\n * @function password\n *\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function password(\n  pattern: RegExp = DEFAULT_PATTERNS.PASSWORD.CHAR8_ONE_OF_EACH,\n  message: string = DEFAULT_ERROR_MESSAGES.PASSWORD,\n  validator: Constructor<Validator> = PasswordValidator,\n) {\n  return (target: any, propertyKey: string) => {\n    Reflect.defineMetadata(\n      getValidationKey(ValidationKeys.PASSWORD),\n      {\n        pattern: pattern,\n        message: message,\n        types: [String.name],\n      },\n      target,\n      propertyKey,\n    );\n    Validation.register({\n      validator: validator,\n      validationKey: ValidationKeys.PASSWORD,\n      save: true,\n    } as ValidatorDefinition);\n  };\n}\n\n/**\n * @summary List Decorator\n * @description Also sets the {@link type} to the provided collection\n *\n * @param {ModelConstructor} clazz\n * @param {string} [collection] The collection being used. defaults to Array\n * @param {string} [message] defaults to {@link DEFAULT_ERROR_MESSAGES#LIST}\n * @param {Constructor<Validator>} [validator] defaults to {@link ListValidator}\n *\n * @function list\n *\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function list(\n  clazz: ModelConstructor<any>,\n  collection: \"Array\" | \"Set\" = \"Array\",\n  message: string = DEFAULT_ERROR_MESSAGES.LIST,\n  validator: Constructor<Validator> = ListValidator,\n) {\n  return (target: any, propertyKey: string): any => {\n    type(collection)(target, propertyKey);\n    Reflect.defineMetadata(\n      getValidationKey(ValidationKeys.LIST),\n      {\n        class: clazz.name,\n        type: collection,\n        message: message,\n      },\n      target,\n      propertyKey,\n    );\n    Validation.register({\n      validator: validator,\n      validationKey: ValidationKeys.LIST,\n      save: true,\n    } as ValidatorDefinition);\n  };\n}\n\n/**\n * @summary Set Decorator\n * @description Wrapper for {@link list} with the 'Set' Collection\n *\n * @param {ModelConstructor} clazz\n * @param {string} [message] defaults to {@link DEFAULT_ERROR_MESSAGES#LIST}\n * @param {Constructor<Validator>} [validator]\n *\n * @function set\n *\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function set(\n  clazz: ModelConstructor<any>,\n  message: string = DEFAULT_ERROR_MESSAGES.LIST,\n  validator?: Constructor<Validator>,\n) {\n  return (target: any, propertyKey: string): any => {\n    list(clazz, \"Set\", message, validator)(target, propertyKey);\n  };\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["src/validation/decorators.ts"],"names":[],"mappings":"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","file":"validation/decorators.js","sourcesContent":["import \"reflect-metadata\";\nimport { ValidationMetadata } from \"./types\";\nimport {\n  DEFAULT_ERROR_MESSAGES,\n  DEFAULT_PATTERNS,\n  ValidationKeys,\n} from \"./Validators/constants\";\nimport { sf } from \"../utils/strings\";\nimport { ModelConstructor } from \"../model/types\";\nimport { getValidationKey } from \"./utils\";\nimport { metadata } from \"@decaf-ts/reflection\";\nimport { parseDate } from \"../utils/dates\";\n\n/**\n * @summary Marks the property as required.\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#REQUIRED}\n *\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#REQUIRED}\n *\n * @function required\n *\n * @category Decorators\n */\nexport function required(message: string = DEFAULT_ERROR_MESSAGES.REQUIRED) {\n  return metadata<ValidationMetadata>(\n    getValidationKey(ValidationKeys.REQUIRED),\n    {\n      message: message,\n    },\n  );\n}\n\n/**\n * @summary Defines a minimum value for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#MIN}\n *\n * @param {number | Date} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#MIN}\n *\n * @function min\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function min(\n  value: number | Date | string,\n  message: string = DEFAULT_ERROR_MESSAGES.MIN,\n) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.MIN), {\n    value: value,\n    message: message,\n    types: [Number.name, Date.name],\n  });\n}\n\n/**\n * @summary Defines a maximum value for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#MAX}\n *\n * @param {number | Date} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#MAX}\n *\n * @function max\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function max(\n  value: number | Date | string,\n  message: string = DEFAULT_ERROR_MESSAGES.MAX,\n) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.MAX), {\n    value: value,\n    message: message,\n    types: [Number.name, Date.name],\n  });\n}\n\n/**\n * @summary Defines a step value for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#STEP}\n *\n * @param {number} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#STEP}\n *\n * @function step\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function step(\n  value: number,\n  message: string = DEFAULT_ERROR_MESSAGES.STEP,\n) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.STEP), {\n    value: value,\n    message: message,\n    types: [Number.name],\n  });\n}\n\n/**\n * @summary Defines a minimum length for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#MIN_LENGTH}\n *\n * @param {string} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#MIN_LENGTH}\n *\n * @function minlength\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function minlength(\n  value: number,\n  message: string = DEFAULT_ERROR_MESSAGES.MIN_LENGTH,\n) {\n  return metadata<ValidationMetadata>(\n    getValidationKey(ValidationKeys.MIN_LENGTH),\n    {\n      value: value,\n      message: message,\n      types: [String.name, Array.name, Set.name],\n    },\n  );\n}\n\n/**\n * @summary Defines a maximum length for the property\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#MAX_LENGTH}\n *\n * @param {string} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#MAX_LENGTH}\n *\n * @function maxlength\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function maxlength(\n  value: number,\n  message: string = DEFAULT_ERROR_MESSAGES.MAX_LENGTH,\n) {\n  return metadata<ValidationMetadata>(\n    getValidationKey(ValidationKeys.MAX_LENGTH),\n    {\n      value: value,\n      message: message,\n      types: [String.name, Array.name, Set.name],\n    },\n  );\n}\n\n/**\n * @summary Defines a RegExp pattern the property must respect\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#PATTERN}\n *\n * @param {string} value\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#PATTERN}\n *\n * @function pattern\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function pattern(\n  value: RegExp | string,\n  message: string = DEFAULT_ERROR_MESSAGES.PATTERN,\n) {\n  return metadata<ValidationMetadata>(\n    getValidationKey(ValidationKeys.PATTERN),\n    {\n      value: typeof value === \"string\" ? value : value.toString(),\n      message: message,\n      types: [String.name],\n    },\n  );\n}\n\n/**\n * @summary Defines the property as an email\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#EMAIL}\n *\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#EMAIL}\n *\n * @function email\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function email(message: string = DEFAULT_ERROR_MESSAGES.EMAIL) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.EMAIL), {\n    pattern: DEFAULT_PATTERNS.EMAIL,\n    message: message,\n    types: [String.name],\n  });\n}\n\n/**\n * @summary Defines the property as an URL\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#URL}\n *\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#URL}\n *\n * @function url\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function url(message: string = DEFAULT_ERROR_MESSAGES.URL) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.URL), {\n    pattern: DEFAULT_PATTERNS.URL,\n    message: message,\n    types: [String.name],\n  });\n}\n\n/**\n * @summary Enforces type verification\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#TYPE}\n *\n * @param {string[] | string} types accepted types\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#TYPE}\n *\n * @function type\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function type(\n  types: string[] | string,\n  message: string = DEFAULT_ERROR_MESSAGES.TYPE,\n) {\n  return metadata<ValidationMetadata>(getValidationKey(ValidationKeys.TYPE), {\n    customTypes: types,\n    message: message,\n  });\n}\n\n/**\n * @summary Date Handler Decorator\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#DATE}\n *\n * Will enforce serialization according to the selected format\n *\n * @param {string} format accepted format according to {@link formatDate}\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#DATE}\n * @param {Constructor<Validator>} [validator] the Validator to be used. Defaults to {@link DateValidator}\n *\n * @function date\n *\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function date(\n  format: string = \"dd/MM/yyyy\",\n  message: string = DEFAULT_ERROR_MESSAGES.DATE,\n) {\n  return (target: Record<string, any>, propertyKey: string): any => {\n    metadata(getValidationKey(ValidationKeys.DATE), {\n      format: format,\n      message: message,\n      types: [Date.name],\n    })(target, propertyKey);\n\n    const values = new WeakMap();\n\n    Object.defineProperty(target, propertyKey, {\n      configurable: false,\n      set(this: any, newValue: string | Date) {\n        const descriptor = Object.getOwnPropertyDescriptor(this, propertyKey);\n        if (!descriptor || descriptor.configurable)\n          Object.defineProperty(this, propertyKey, {\n            enumerable: true,\n            configurable: false,\n            get: () => values.get(this),\n            set: (newValue: string | Date | number) => {\n              let val: Date | undefined;\n              try {\n                val = parseDate(format, newValue);\n                values.set(this, val);\n              } catch (e: any) {\n                console.error(sf(\"Failed to parse date: {0}\", e.message || e));\n              }\n            },\n          });\n        this[propertyKey] = newValue;\n      },\n      get() {\n        console.log(\"here\");\n      },\n    });\n  };\n}\n\n/**\n * @summary Password Handler Decorator\n * @description Validators to validate a decorated property must use key {@link ValidationKeys#PASSWORD}\n *\n * @param {RegExp} [pattern] defaults to {@link PasswordPatterns#CHAR8_ONE_OF_EACH}\n * @param {string} [message] the error message. Defaults to {@link DEFAULT_ERROR_MESSAGES#PASSWORD}\n * @param {Constructor<Validator>} [validator] Defaults to {@link PasswordValidator}\n *\n * @function password\n *\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function password(\n  pattern: RegExp = DEFAULT_PATTERNS.PASSWORD.CHAR8_ONE_OF_EACH,\n  message: string = DEFAULT_ERROR_MESSAGES.PASSWORD,\n) {\n  return metadata(getValidationKey(ValidationKeys.PASSWORD), {\n    pattern: pattern,\n    message: message,\n    types: [String.name],\n  });\n}\n\n/**\n * @summary List Decorator\n * @description Also sets the {@link type} to the provided collection\n *\n * @param {ModelConstructor} clazz\n * @param {string} [collection] The collection being used. defaults to Array\n * @param {string} [message] defaults to {@link DEFAULT_ERROR_MESSAGES#LIST}\n * @param {Constructor<Validator>} [validator] defaults to {@link ListValidator}\n *\n * @function list\n *\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function list(\n  clazz: ModelConstructor<any> | ModelConstructor<any>[],\n  collection: \"Array\" | \"Set\" = \"Array\",\n  message: string = DEFAULT_ERROR_MESSAGES.LIST,\n) {\n  return metadata(getValidationKey(ValidationKeys.LIST), {\n    class: Array.isArray(clazz) ? clazz.map((c) => c.name) : [clazz.name],\n    type: collection,\n    message: message,\n  });\n}\n\n/**\n * @summary Set Decorator\n * @description Wrapper for {@link list} with the 'Set' Collection\n *\n * @param {ModelConstructor} clazz\n * @param {string} [message] defaults to {@link DEFAULT_ERROR_MESSAGES#LIST}\n * @param {Constructor<Validator>} [validator]\n *\n * @function set\n *\n * @memberOf module:decorator-validation.Decorators.Validation\n * @category Decorators\n */\nexport function set(\n  clazz: ModelConstructor<any>,\n  message: string = DEFAULT_ERROR_MESSAGES.LIST,\n) {\n  return list(clazz, \"Set\", message);\n}\n"]}

package/lib/validation/decorators.d.ts

@@ -1,6 +1,5 @@
 import "reflect-metadata";
-import { Constructor, ModelConstructor } from "../model/types";
-import { Validator } from "./Validators/Validator";
+import { ModelConstructor } from "../model/types";
 /**
  * @summary Marks the property as required.
  * @description Validators to validate a decorated property must use key {@link ValidationKeys#REQUIRED}
@@ -147,7 +146,7 @@ export declare function date(format?: string, message?: string): (target: Record
  * @memberOf module:decorator-validation.Decorators.Validation
  * @category Decorators
  */
-export declare function password(pattern?: RegExp, message?: string, validator?: Constructor<Validator>): (target: any, propertyKey: string) => void;
+export declare function password(pattern?: RegExp, message?: string): import("@decaf-ts/reflection").CustomDecorator<V>;
 /**
  * @summary List Decorator
  * @description Also sets the {@link type} to the provided collection
@@ -162,7 +161,7 @@ export declare function password(pattern?: RegExp, message?: string, validator?:
  * @memberOf module:decorator-validation.Decorators.Validation
  * @category Decorators
  */
-export declare function list(clazz: ModelConstructor<any>, collection?: "Array" | "Set", message?: string, validator?: Constructor<Validator>): (target: any, propertyKey: string) => any;
+export declare function list(clazz: ModelConstructor<any> | ModelConstructor<any>[], collection?: "Array" | "Set", message?: string): import("@decaf-ts/reflection").CustomDecorator<V>;
 /**
  * @summary Set Decorator
  * @description Wrapper for {@link list} with the 'Set' Collection
@@ -176,4 +175,4 @@ export declare function list(clazz: ModelConstructor<any>, collection?: "Array"
  * @memberOf module:decorator-validation.Decorators.Validation
  * @category Decorators
  */
-export declare function set(clazz: ModelConstructor<any>, message?: string, validator?: Constructor<Validator>): (target: any, propertyKey: string) => any;
+export declare function set(clazz: ModelConstructor<any>, message?: string): import("@decaf-ts/reflection").CustomDecorator<V>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decaf-ts/decorator-validation",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "simple decorator based validation engine",
   "type": "module",
   "exports": {