feat: add support for maxDecimalPlaces on IsNumber (#381)

typestack · Nov 1, 2019 · a4dc10e · a4dc10e
1 parent 45b7df7
commit a4dc10e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/validation/ValidationTypeOptions.ts b/src/validation/ValidationTypeOptions.ts
@@ -1,7 +1,8 @@
 /**
- * Options to be passed to IsURL decorator.
+ * Options to be passed to IsNumber decorator.
  */
 export interface IsNumberOptions {
     allowNaN?: boolean;
     allowInfinity?: boolean;
-}
+    maxDecimalPlaces?: number;
+}
diff --git a/src/validation/ValidationTypes.ts b/src/validation/ValidationTypes.ts
@@ -150,7 +150,7 @@ export class ValidationTypes {
             case this.IS_DATE:
                 return eachPrefix + "$property must be a Date instance";
             case this.IS_NUMBER:
-                return eachPrefix + "$property must be a number";
+                return eachPrefix + "$property must be a number conforming to the specified constraints";
             case this.IS_INT:
                 return eachPrefix + "$property must be an integer number";
             case this.IS_STRING:

diff --git a/src/validation/Validator.ts b/src/validation/Validator.ts
@@ -435,6 +435,16 @@ export class Validator {
             return options.allowNaN;
         }
 
+        if (options.maxDecimalPlaces) {
+            let decimalPlaces = 0;
+            if ((value % 1) !== 0) {
+                decimalPlaces = value.toString().split(".")[1].length;
+            }
+            if (decimalPlaces > options.maxDecimalPlaces) {
+                return false;
+            }
+        }
+
         return Number.isFinite(value);
     }
 

diff --git a/test/functional/validation-functions-and-decorators.spec.ts b/test/functional/validation-functions-and-decorators.spec.ts
@@ -568,6 +568,11 @@ describe("IsNumber", function() {
         someProperty: number;
     }
 
+    class MaxDecimalPlacesTest {
+        @IsNumber({ maxDecimalPlaces: 3 })
+        someProperty: number;
+    }
+
     it("should fail if NaN passed without allowing NaN values", function (done) {
         checkInvalidValues(new MyClass(), [NaN], done);
     });
@@ -602,10 +607,18 @@ describe("IsNumber", function() {
 
     it("should return error object with proper data", function(done) {
         const validationType = "isNumber";
-        const message = "someProperty must be a number";
+        const message = "someProperty must be a number conforming to the specified constraints";
         checkReturnedError(new MyClass(), invalidValues, validationType, message, done);
     });
 
+    it("should pass if number of decimal places within maxDecimalPlaces", function(done) {
+        checkValidValues(new MaxDecimalPlacesTest(), [1.123], done);
+    });
+
+    it("should fail if number of decimal places exceeds maxDecimalPlaces", function(done) {
+        checkInvalidValues(new MaxDecimalPlacesTest(), [1.1234], done);
+    });
+
 });
 
 describe("IsInt", function() {