Smaller bundle - next bunch of migrations...

typestack · Nov 13, 2018 · 3907863 · 3907863
1 parent 1320d29
commit 3907863
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 151 deletions.
diff --git a/sample/sample1-simple-validation/Post.ts b/sample/sample1-simple-validation/Post.ts
@@ -1,7 +1,8 @@
-import {Contains, MinLength, MaxLength, IsEmail, IsFQDN, ArrayNotEmpty, ArrayMinSize, ArrayMaxSize} from "../../src/decorator/decorators";
+import {MinLength, MaxLength, IsEmail, IsFQDN, ArrayNotEmpty, ArrayMinSize, ArrayMaxSize} from "../../src/decorator/decorators";
 import {IsDate} from "../../src/decorator/IsDate";
 import {IsInt} from "../../src/decorator/IsInt";
 import {IsEnum} from "../../src/decorator/IsEnum";
+import {Contains} from "../../src/decorator/Contains";
 
 export enum PostType {
     Public,

diff --git a/sample/sample2-using-groups/Post.ts b/sample/sample2-using-groups/Post.ts
@@ -1,6 +1,7 @@
-import {Contains, Length, IsEmail, IsFQDN} from "../../src/decorator/decorators";
+import {Length, IsEmail, IsFQDN} from "../../src/decorator/decorators";
 import {IsDate} from "../../src/decorator/IsDate";
 import {IsInt} from "../../src/decorator/IsInt";
+import {Contains} from "../../src/decorator/Contains";
 
 export class Post {
 

diff --git a/sample/sample7-inheritance-support/Post.ts b/sample/sample7-inheritance-support/Post.ts
@@ -1,6 +1,7 @@
-import {Contains, MinLength, MaxLength} from "../../src/decorator/decorators";
+import {MinLength, MaxLength} from "../../src/decorator/decorators";
 import {BaseContent} from "./BaseContent";
 import {IsInt} from "../../src/decorator/IsInt";
+import {Contains} from "../../src/decorator/Contains";
 
 export class Post extends BaseContent {
 

diff --git a/src/decorator/Contains.ts b/src/decorator/Contains.ts
@@ -0,0 +1,25 @@
+import {buildMessage, ValidateBy} from "./ValidateBy";
+import {ValidationOptions} from "./ValidationOptions";
+import validatorJsContains = require("validator/lib/contains");
+
+/**
+ * Checks if the string contains the seed.
+ * If given value is not a string, then it returns false.
+ */
+export function contains(value: string, seed: string): boolean {
+    return typeof value === "string" && validatorJsContains(value, seed);
+}
+
+/**
+ * Checks if the string contains the seed.
+ */
+export function Contains(seed: string, validationOptions?: ValidationOptions) {
+    return ValidateBy({
+            name: "contains",
+            validate: (value, args) => contains(value, args.constraints[0]),
+            constraints: [seed],
+            defaultMessage: buildMessage((eachPrefix) => eachPrefix + "$property must contain a $constraint1 string", validationOptions),
+        },
+        validationOptions
+    );
+}
diff --git a/src/decorator/IsBooleanString.ts b/src/decorator/IsBooleanString.ts
@@ -0,0 +1,24 @@
+import {buildMessage, ValidateBy} from "./ValidateBy";
+import {ValidationOptions} from "./ValidationOptions";
+import validatorJsIsBoolean = require("validator/lib/isBoolean");
+
+/**
+ * Checks if a string is a boolean.
+ * If given value is not a string, then it returns false.
+ */
+export function isBooleanString(value: string): boolean {
+    return typeof value === "string" && validatorJsIsBoolean(value);
+}
+
+/**
+ * Checks if a string is a boolean.
+ */
+export function IsBooleanString(validationOptions?: ValidationOptions) {
+    return ValidateBy({
+            name: "isBooleanString",
+            validate: (value) => isBooleanString(value),
+            defaultMessage: buildMessage((eachPrefix) => eachPrefix + eachPrefix + "$property must be a boolean string", validationOptions)
+        },
+        validationOptions
+    );
+}
diff --git a/src/decorator/IsNumberString.ts b/src/decorator/IsNumberString.ts
@@ -0,0 +1,24 @@
+import {ValidationOptions} from "./ValidationOptions";
+import {buildMessage, ValidateBy} from "./ValidateBy";
+import validatorJsIsNumeric = require("validator/lib/isNumeric");
+
+/**
+ * Checks if the string is numeric.
+ * If given value is not a string, then it returns false.
+ */
+export function isNumberString(value: string, options?: ValidatorJS.IsNumericOptions): boolean {
+    return typeof value === "string" && validatorJsIsNumeric(value, options);
+}
+
+/**
+ * Checks if the string is a number.
+ */
+export function IsNumberString(validationOptions?: ValidationOptions) {
+    return ValidateBy({
+            name: "isNumberString",
+            validate: (value) => isNumberString(value),
+            defaultMessage: buildMessage((eachPrefix) => eachPrefix + "$property must be a number string", validationOptions)
+        },
+        validationOptions
+    );
+}
diff --git a/src/decorator/decorators.ts b/src/decorator/decorators.ts
@@ -86,59 +86,10 @@ export function IsOptional(validationOptions?: ValidationOptions) {
     };
 }
 
-// -------------------------------------------------------------------------
-// String-as-types checkers
-// -------------------------------------------------------------------------
-
-/**
- * Checks if a string is a boolean.
- */
-export function IsBooleanString(validationOptions?: ValidationOptions) {
-    return function (object: Object, propertyName: string) {
-        const args: ValidationMetadataArgs = {
-            type: ValidationTypes.IS_BOOLEAN_STRING,
-            target: object.constructor,
-            propertyName: propertyName,
-            validationOptions: validationOptions
-        };
-        getFromContainer(MetadataStorage).addValidationMetadata(new ValidationMetadata(args));
-    };
-}
-
-/**
- * Checks if the string is a number.
- */
-export function IsNumberString(validationOptions?: ValidationOptions) {
-    return function (object: Object, propertyName: string) {
-        const args: ValidationMetadataArgs = {
-            type: ValidationTypes.IS_NUMBER_STRING,
-            target: object.constructor,
-            propertyName: propertyName,
-            validationOptions: validationOptions
-        };
-        getFromContainer(MetadataStorage).addValidationMetadata(new ValidationMetadata(args));
-    };
-}
-
 // -------------------------------------------------------------------------
 // String checkers
 // -------------------------------------------------------------------------
 
-/**
- * Checks if the string contains the seed.
- */
-export function Contains(seed: string, validationOptions?: ValidationOptions) {
-    return function (object: Object, propertyName: string) {
-        const args: ValidationMetadataArgs = {
-            type: ValidationTypes.CONTAINS,
-            target: object.constructor,
-            propertyName: propertyName,
-            constraints: [seed],
-            validationOptions: validationOptions
-        };
-        getFromContainer(MetadataStorage).addValidationMetadata(new ValidationMetadata(args));
-    };
-}
 
 /**
  * Checks if the string does not contain the seed.

diff --git a/src/validation/ValidationTypes.ts b/src/validation/ValidationTypes.ts
@@ -10,15 +10,10 @@ export class ValidationTypes {
     static NESTED_VALIDATION = "nestedValidation";
     static CONDITIONAL_VALIDATION = "conditionalValidation";
     static WHITELIST = "whitelistValidation";
-    // FIXME: delete
+    // FIXME: delete?
     static IS_DEFINED = "isDefined";
 
-    /* string-as-type checkers */
-    static IS_BOOLEAN_STRING = "isBooleanString";
-    static IS_NUMBER_STRING = "isNumberString";
-
     /* string checkers */
-    static CONTAINS = "contains";
     static NOT_CONTAINS = "notContains";
     static IS_ALPHA = "isAlpha";
     static IS_ALPHANUMERIC = "isAlphanumeric";
@@ -86,15 +81,7 @@ export class ValidationTypes {
             case this.IS_DEFINED:
                 return eachPrefix + "$property should not be null or undefined";
 
-            /* string-as-type checkers */
-            case this.IS_BOOLEAN_STRING:
-                return eachPrefix + "$property must be a boolean string";
-            case this.IS_NUMBER_STRING:
-                return eachPrefix + "$property must be a number string";
-
             /* string checkers */
-            case this.CONTAINS:
-                return eachPrefix + "$property must contain a $constraint1 string";
             case this.NOT_CONTAINS:
                 return eachPrefix + "$property should not contain a $constraint1 string";
             case this.IS_ALPHA:

diff --git a/src/validation/Validator.ts b/src/validation/Validator.ts
@@ -111,15 +111,7 @@ export class Validator {
             case ValidationTypes.IS_DEFINED:
                 return this.isDefined(value);
 
-            /* string-as-type checkers */
-            case ValidationTypes.IS_BOOLEAN_STRING:
-                return this.isBooleanString(value);
-            case ValidationTypes.IS_NUMBER_STRING:
-                return this.isNumberString(value);
-
             /* string checkers */
-            case ValidationTypes.CONTAINS:
-                return this.contains(value, metadata.constraints[0]);
             case ValidationTypes.NOT_CONTAINS:
                 return this.notContains(value, metadata.constraints[0]);
             case ValidationTypes.IS_ALPHA:
@@ -218,37 +210,10 @@ export class Validator {
         return value !== undefined && value !== null;
     }
 
-    // -------------------------------------------------------------------------
-    // Validation Methods: string-as-type checkers
-    // -------------------------------------------------------------------------
-
-    /**
-     * Checks if a string is a boolean.
-     * If given value is not a string, then it returns false.
-     */
-    isBooleanString(value: string): boolean {
-        return typeof value === "string" && this.validatorJs.isBoolean(value);
-    }
-
-    /**
-     * Checks if the string is numeric.
-     * If given value is not a string, then it returns false.
-     */
-    isNumberString(value: string, options?: ValidatorJS.IsNumericOptions): boolean {
-        return typeof value === "string" && this.validatorJs.isNumeric(value, options);
-    }
-
     // -------------------------------------------------------------------------
     // Validation Methods: string checkers
     // -------------------------------------------------------------------------
 
-    /**
-     * Checks if the string contains the seed.
-     * If given value is not a string, then it returns false.
-     */
-    contains(value: string, seed: string): boolean {
-        return typeof value === "string" && this.validatorJs.contains(value, seed);
-    }
 
     /**
      * Checks if the string does not contain the seed.