Smaller bundle size

package.json

@@ -1,7 +1,7 @@
 {
   "name": "class-validator",
   "private": true,
-  "version": "0.9.1",
+  "version": "1.0.0-rc1",
   "description": "Class-based validation with Typescript / ES6 / ES5 using decorators or validation schemas. Supports both node.js and browser",
   "license": "MIT",
   "readmeFilename": "README.md",
@@ -23,7 +23,6 @@
     "typescript-validator"
   ],
   "dependencies": {
-    "@types/validator": "9.4.2",
     "google-libphonenumber": "^3.1.6",
     "validator": "10.4.0"
   },
@@ -34,6 +33,7 @@
     "@types/mocha": "^5.2.5",
     "@types/node": "^10.5.2",
     "@types/sinon": "^5.0.1",
+    "@types/validator": "^9.4.2",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "codecov": "^3.0.4",

sample/sample1-simple-validation/Post.ts

@@ -1,4 +1,14 @@
-import {Contains, IsInt, MinLength, MaxLength, IsEmail, IsFQDN, IsDate, ArrayNotEmpty, ArrayMinSize, ArrayMaxSize, IsEnum} from "../../src/decorator/decorators";
+import {IsDate} from "../../src/decorator/typechecker/IsDate";
+import {IsInt} from "../../src/decorator/typechecker/IsInt";
+import {IsEnum} from "../../src/decorator/typechecker/IsEnum";
+import {Contains} from "../../src/decorator/string/Contains";
+import {IsEmail} from "../../src/decorator/string/IsEmail";
+import {IsFQDN} from "../../src/decorator/string/IsFQDN";
+import {MinLength} from "../../src/decorator/string/MinLength";
+import {MaxLength} from "../../src/decorator/string/MaxLength";
+import {ArrayNotEmpty} from "../../src/decorator/array/ArrayNotEmpty";
+import {ArrayMinSize} from "../../src/decorator/array/ArrayMinSize";
+import {ArrayMaxSize} from "../../src/decorator/array/ArrayMaxSize";
 
 export enum PostType {
     Public,

sample/sample2-using-groups/Post.ts

@@ -1,4 +1,9 @@
-import {Contains, IsInt, Length, IsEmail, IsFQDN, IsDate} from "../../src/decorator/decorators";
+import {IsDate} from "../../src/decorator/typechecker/IsDate";
+import {IsInt} from "../../src/decorator/typechecker/IsInt";
+import {Contains} from "../../src/decorator/string/Contains";
+import {IsEmail} from "../../src/decorator/string/IsEmail";
+import {IsFQDN} from "../../src/decorator/string/IsFQDN";
+import {Length} from "../../src/decorator/string/Length";
 
 export class Post {
 
@@ -35,4 +40,4 @@ export class Post {
     @IsDate()
     createDate: Date;
 
-}
+}

sample/sample3-nested-objects/Post.ts

@@ -1,5 +1,6 @@
-import {Contains, IsInt, Length, IsEmail, IsFQDN, IsDate, ValidateNested} from "../../src/decorator/decorators";
 import {Tag} from "./Tag";
+import {Length} from "../../src/decorator/string/Length";
+import {ValidateNested} from "../../src/decorator/system/ValidateNested";
 
 export class Post {
 
@@ -11,4 +12,4 @@ export class Post {
     @ValidateNested()
     tags: Tag[];
 
-}
+}

sample/sample3-nested-objects/Tag.ts

@@ -1,4 +1,4 @@
-import {Contains, IsInt, Length, IsEmail, IsFQDN, IsDate} from "../../src/decorator/decorators";
+import {Length} from "../../src/decorator/string/Length";
 
 export class Tag {
 
@@ -7,4 +7,4 @@ export class Tag {
     })
     name: string;
 
-}
+}

sample/sample4-custom-validator/CustomTextLength.ts

@@ -1,5 +1,5 @@
+import {ValidatorConstraint} from "../../src/decorator/ValidatorConstraint";
 import {ValidatorConstraintInterface} from "../../src/validation/ValidatorConstraintInterface";
-import {ValidatorConstraint} from "../../src/decorator/decorators";
 
 @ValidatorConstraint()
 export class CustomTextLength implements ValidatorConstraintInterface {
@@ -8,4 +8,4 @@ export class CustomTextLength implements ValidatorConstraintInterface {
         return text.length > 1 && text.length < 10;
     }
 
-}
+}

sample/sample4-custom-validator/Post.ts

@@ -1,6 +1,5 @@
-import {Contains, IsInt, MinLength, MaxLength, IsEmail, IsFQDN, IsDate, IsNotEmpty, ArrayNotEmpty, ArrayMinSize, ArrayMaxSize} from "../../src/decorator/decorators";
-import {Validate} from "../../src/decorator/decorators";
 import {CustomTextLength} from "./CustomTextLength";
+import {Validate} from "../../src/decorator/Validate";
 
 export class Post {
 
@@ -9,4 +8,4 @@ export class Post {
     })
     title: string;
 
-}
+}

sample/sample6-custom-decorator/IsLongerThan.ts

@@ -1,8 +1,8 @@
-import {registerDecorator} from "../../src/index";
 import {ValidationOptions} from "../../src/decorator/ValidationOptions";
 import {ValidatorConstraintInterface} from "../../src/validation/ValidatorConstraintInterface";
-import {ValidatorConstraint} from "../../src/decorator/decorators";
+import {ValidatorConstraint} from "../../src/decorator/ValidatorConstraint";
 import {ValidationArguments} from "../../src/validation/ValidationArguments";
+import {registerDecorator} from "../../src/register-decorator";
 
 export function IsLongerThan(property: string, validationOptions?: ValidationOptions) {
     return function (object: Object, propertyName: string) {
@@ -27,4 +27,4 @@ export class IsLongerThanConstraint implements ValidatorConstraintInterface {
                 value.length > relatedValue.length;
     }
 
-}
+}

sample/sample6-custom-decorator/IsUserAlreadyExist.ts

@@ -1,6 +1,6 @@
-import {registerDecorator} from "../../src/index";
 import {ValidationOptions} from "../../src/decorator/ValidationOptions";
 import {ValidationArguments} from "../../src/validation/ValidationArguments";
+import {registerDecorator} from "../../src/register-decorator";
 
 export function IsUserAlreadyExist(validationOptions?: ValidationOptions) {
     return function (object: Object, propertyName: string) {
@@ -23,4 +23,4 @@ export function IsUserAlreadyExist(validationOptions?: ValidationOptions) {
             }
         });
     };
-}
+}

sample/sample7-inheritance-support/BaseContent.ts

@@ -1,8 +1,8 @@
-import {IsEmail} from "../../src/decorator/decorators";
+import {IsEmail} from "../../src/decorator/string/IsEmail";
 
 export class BaseContent {
 
     @IsEmail()
     email: string;
 
-}
+}

sample/sample7-inheritance-support/Post.ts

@@ -1,5 +1,8 @@
-import {Contains, IsInt, MinLength, MaxLength} from "../../src/decorator/decorators";
 import {BaseContent} from "./BaseContent";
+import {IsInt} from "../../src/decorator/typechecker/IsInt";
+import {Contains} from "../../src/decorator/string/Contains";
+import {MinLength} from "../../src/decorator/string/MinLength";
+import {MaxLength} from "../../src/decorator/string/MaxLength";
 
 export class Post extends BaseContent {
 
@@ -13,4 +16,4 @@ export class Post extends BaseContent {
     @IsInt()
     rating: number;
 
-}
+}

src/decorator/Validate.ts

@@ -0,0 +1,26 @@
+import {ValidationOptions} from "./ValidationOptions";
+import {ValidationMetadataArgs} from "../metadata/ValidationMetadataArgs";
+import {ValidationMetadata} from "../metadata/ValidationMetadata";
+import {MetadataStorage} from "../metadata/MetadataStorage";
+import {ValidationTypes} from "../validation/ValidationTypes";
+import {getFromContainer} from "../container";
+
+/**
+ * Performs validation based on the given custom validation class.
+ * Validation class must be decorated with ValidatorConstraint decorator.
+ */
+export function Validate(constraintClass: Function, validationOptions?: ValidationOptions): Function;
+export function Validate(constraintClass: Function, constraints?: any[], validationOptions?: ValidationOptions): Function;
+export function Validate(constraintClass: Function, constraintsOrValidationOptions?: any[] | ValidationOptions, maybeValidationOptions?: ValidationOptions): Function {
+    return function (object: Object, propertyName: string) {
+        const args: ValidationMetadataArgs = {
+            type: ValidationTypes.CUSTOM_VALIDATION,
+            target: object.constructor,
+            propertyName: propertyName,
+            constraintCls: constraintClass,
+            constraints: constraintsOrValidationOptions instanceof Array ? constraintsOrValidationOptions as any[] : undefined,
+            validationOptions: !(constraintsOrValidationOptions instanceof Array) ? constraintsOrValidationOptions as ValidationOptions : maybeValidationOptions
+        };
+        getFromContainer(MetadataStorage).addValidationMetadata(new ValidationMetadata(args));
+    };
+}

src/decorator/ValidateBy.ts

@@ -0,0 +1,33 @@
+import {ValidationFunction} from "./ValidationFunction";
+import {ValidationOptions} from "./ValidationOptions";
+import {registerDecorator} from "../register-decorator";
+import {ValidationArguments} from "../validation/ValidationArguments";
+import {ValidatorConstraintInterface} from "../validation/ValidatorConstraintInterface";
+
+export function buildMessage(
+    impl: (eachPrefix: string, args?: ValidationArguments) => string,
+    validationOptions?: ValidationOptions)
+    : (validationArguments?: ValidationArguments) => string {
+    return (validationArguments?: ValidationArguments) => {
+        const eachPrefix = validationOptions && validationOptions.each
+            ? "each value in "
+            : "";
+        return impl(eachPrefix, validationArguments);
+    };
+}
+
+export function ValidateBy(validator: ValidationFunction, validationOptions?: ValidationOptions) {
+    return function (object: Object, propertyName: string) {
+        registerDecorator({
+            name: validator.name,
+            target: object.constructor,
+            propertyName: propertyName,
+            options: validationOptions,
+            constraints: validator.constraints,
+            validator: <ValidatorConstraintInterface> {
+                validate: validator.validate,
+                defaultMessage: validator.defaultMessage
+            }
+        });
+    };
+}

src/decorator/ValidationFunction.ts

@@ -0,0 +1,9 @@
+import {ValidationArguments} from "../validation/ValidationArguments";
+
+export interface ValidationFunction {
+    name: string;
+    constraints?: any[];
+    validate: (value: any, validationArguments?: ValidationArguments) => Promise<boolean>|boolean;
+    defaultMessage: (validationArguments?: ValidationArguments) => string;
+    async?: boolean;
+}

src/decorator/ValidatorConstraint.ts

@@ -0,0 +1,20 @@
+import {ConstraintMetadata} from "../metadata/ConstraintMetadata";
+import {getFromContainer} from "../container";
+import {MetadataStorage} from "../metadata/MetadataStorage";
+
+/**
+ * Registers custom validator class.
+ */
+export function ValidatorConstraint(options?: { name?: string, async?: boolean }) {
+    return function (target: Function) {
+        const isAsync = options && options.async ? true : false;
+        let name = options && options.name ? options.name : "";
+        if (!name) {
+            name = (target as any).name;
+            if (!name) // generate name if it was not given
+                name = name.replace(/\.?([A-Z]+)/g, (x, y) => "_" + y.toLowerCase()).replace(/^_/, "");
+        }
+        const metadata = new ConstraintMetadata(target, name, isAsync);
+        getFromContainer(MetadataStorage).addConstraintMetadata(metadata);
+    };
+}

src/decorator/array/ArrayContains.ts

@@ -0,0 +1,30 @@
+import {ValidationOptions} from "../ValidationOptions";
+import {buildMessage, ValidateBy} from "../ValidateBy";
+
+export const ARRAY_CONTAINS = "arrayContains";
+
+/**
+ * Checks if array contains all values from the given array of values.
+ * If null or undefined is given then this function returns false.
+ */
+export function arrayContains(array: any[], values: any[]) {
+    if (!(array instanceof Array)) {
+        return false;
+    }
+
+    return !array || values.every(value => array.indexOf(value) !== -1);
+}
+
+/**
+ * Checks if array contains all values from the given array of values.
+ */
+export function ArrayContains(values: any[], validationOptions?: ValidationOptions) {
+    return ValidateBy({
+            name: ARRAY_CONTAINS,
+            validate: (value, args) => arrayContains(value, args.constraints[0]),
+            constraints: [values],
+            defaultMessage: buildMessage((eachPrefix) => eachPrefix + "$property must contain $constraint1 values", validationOptions)
+        },
+        validationOptions
+    );
+}

src/decorator/array/ArrayMaxSize.ts

@@ -0,0 +1,30 @@
+import {ValidationOptions} from "../ValidationOptions";
+import {buildMessage, ValidateBy} from "../ValidateBy";
+
+export const ARRAY_MAX_SIZE = "arrayMaxSize";
+
+/**
+ * Checks if array's length is as maximal this number.
+ * If null or undefined is given then this function returns false.
+ */
+export function arrayMaxSize(array: any[], max: number) {
+    if (!(array instanceof Array)) {
+        return false;
+    }
+
+    return array instanceof Array && array.length <= max;
+}
+
+/**
+ * Checks if array's length is as maximal this number.
+ */
+export function ArrayMaxSize(max: number, validationOptions?: ValidationOptions) {
+    return ValidateBy({
+            name: ARRAY_MAX_SIZE,
+            validate: (value, args) => arrayMaxSize(value, args.constraints[0]),
+            constraints: [max],
+            defaultMessage: buildMessage((eachPrefix) => eachPrefix + "$property must contain not more than $constraint1 elements", validationOptions)
+        },
+        validationOptions
+    );
+}

src/decorator/array/ArrayMinSize.ts

@@ -0,0 +1,30 @@
+import {ValidationOptions} from "../ValidationOptions";
+import {buildMessage, ValidateBy} from "../ValidateBy";
+
+export const ARRAY_MIN_SIZE = "arrayMinSize";
+
+/**
+ * Checks if array's length is as minimal this number.
+ * If null or undefined is given then this function returns false.
+ */
+export function arrayMinSize(array: any[], min: number) {
+    if (!(array instanceof Array)) {
+        return false;
+    }
+
+    return array instanceof Array && array.length >= min;
+}
+
+/**
+ * Checks if array's length is as minimal this number.
+ */
+export function ArrayMinSize(min: number, validationOptions?: ValidationOptions) {
+    return ValidateBy({
+            name: ARRAY_MIN_SIZE,
+            validate: (value, args) => arrayMinSize(value, args.constraints[0]),
+            constraints: [min],
+            defaultMessage: buildMessage((eachPrefix) => eachPrefix + "$property must contain at least $constraint1 elements", validationOptions)
+        },
+        validationOptions
+    );
+}