Merge pull request #18 from josh-wer/develop

Develop
joshuauyi · Dec 5, 2020 · 397b1e1 · 397b1e1
2 parents b4c8184 + 7543db4
commit 397b1e1
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 66 deletions.
diff --git a/dist/formidate.min.js b/dist/formidate.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formidate",
-  "version": "0.2.5",
+  "version": "1.0.0",
   "description": "Form validation library",
   "author": "Joshua Uyi <joshuaouyi@gmail.com>",
   "main": "lib/index.js",

diff --git a/src/ControlRules.ts b/src/ControlRules.ts
@@ -19,9 +19,7 @@ class ControlRules {
   private rules: IFormRuleItem = {};
 
   public date(dateOnly?: boolean, invalidDate?: ErroMessageType, overrideMessage?: ErroMessageType) {
-    if (!this.rules.datetime) {
-      this.rules.datetime = {};
-    }
+    this.rules.datetime = this.rules.datetime || {};
     if (dateOnly !== undefined) {
       this.rules.datetime.dateOnly = dateOnly;
     }
@@ -35,9 +33,7 @@ class ControlRules {
   }
 
   public beforeDate(date: any, message?: ErroMessageType) {
-    if (!this.rules.datetime) {
-      this.rules.datetime = {};
-    }
+    this.rules.datetime = this.rules.datetime || {};
     this.rules.datetime.latest = date;
     if (message) {
       this.rules.datetime.tooLate = message;
@@ -46,9 +42,7 @@ class ControlRules {
   }
 
   public afterDate(date: any, message?: ErroMessageType) {
-    if (!this.rules.datetime) {
-      this.rules.datetime = {};
-    }
+    this.rules.datetime = this.rules.datetime || {};
     this.rules.datetime.earliet = date;
     if (message) {
       this.rules.datetime.tooEarly = message;
@@ -102,9 +96,7 @@ class ControlRules {
   // length
 
   public lengthConfig(tokenizer?: LengthTokenizer, notValid?: ErroMessageType, overrideMessage?: ErroMessageType) {
-    if (!this.rules.length) {
-      this.rules.length = {};
-    }
+    this.rules.length = this.rules.length || {};
     if (overrideMessage) {
       this.rules.length.message = overrideMessage;
     }
@@ -119,9 +111,7 @@ class ControlRules {
   }
 
   public length(length: number, message?: ErroMessageType) {
-    if (!this.rules.length) {
-      this.rules.length = {};
-    }
+    this.rules.length = this.rules.length || {};
 
     this.rules.length.is = length;
     if (message) {
@@ -131,9 +121,7 @@ class ControlRules {
   }
 
   public minLength(length: number, message?: ErroMessageType) {
-    if (!this.rules.length) {
-      this.rules.length = {};
-    }
+    this.rules.length = this.rules.length || {};
 
     this.rules.length.minimum = length;
     if (message) {
@@ -143,9 +131,7 @@ class ControlRules {
   }
 
   public maxLength(length: number, message?: ErroMessageType) {
-    if (!this.rules.length) {
-      this.rules.length = {};
-    }
+    this.rules.length = this.rules.length || {};
 
     this.rules.length.maximum = length;
     if (message) {
@@ -156,39 +142,38 @@ class ControlRules {
 
   // numericality
 
-  public numeric(useStrict?: boolean, notValid?: ErroMessageType, overrideMessage?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+  public number(notValid?: ErroMessageType, useStrict?: boolean, overrideMessage?: ErroMessageType) {
+    this.rules.numericality = this.rules.numericality || {};
     if (useStrict !== undefined) {
       this.rules.numericality.strict = useStrict;
     }
-    if (overrideMessage) {
-      this.rules.numericality.message = overrideMessage;
-    }
     if (notValid) {
       this.rules.numericality.notValid = notValid;
     }
+    if (overrideMessage) {
+      this.rules.numericality.message = overrideMessage;
+    }
 
     return this;
   }
 
-  public isInteger(message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
-
+  public integer(message?: ErroMessageType) {
+    this.rules.numericality = this.rules.numericality || {};
     this.rules.numericality.onlyInteger = true;
     if (message) {
       this.rules.numericality.notInteger = message;
     }
     return this;
   }
 
+  public double() {
+    this.rules.numericality = this.rules.numericality || {};
+    this.rules.numericality.onlyInteger = false;
+    return this;
+  }
+
   public greaterThan(value: number, message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+    this.rules.numericality = this.rules.numericality || {};
 
     this.rules.numericality.greaterThan = value;
     if (message) {
@@ -198,9 +183,7 @@ class ControlRules {
   }
 
   public greaterThanOrEquals(value: number, message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+    this.rules.numericality = this.rules.numericality || {};
 
     this.rules.numericality.greaterThanOrEqualTo = value;
     if (message) {
@@ -210,9 +193,7 @@ class ControlRules {
   }
 
   public equals(value: number, message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+    this.rules.numericality = this.rules.numericality || {};
 
     this.rules.numericality.equalTo = value;
     if (message) {
@@ -222,9 +203,7 @@ class ControlRules {
   }
 
   public lessThanOrEquals(value: number, message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+    this.rules.numericality = this.rules.numericality || {};
 
     this.rules.numericality.lessThanOrEqualTo = value;
     if (message) {
@@ -234,9 +213,7 @@ class ControlRules {
   }
 
   public lessThan(value: number, message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+    this.rules.numericality = this.rules.numericality || {};
 
     this.rules.numericality.lessThan = value;
     if (message) {
@@ -246,9 +223,7 @@ class ControlRules {
   }
 
   public divisibleBy(value: number, message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+    this.rules.numericality = this.rules.numericality || {};
 
     this.rules.numericality.divisibleBy = value;
     if (message) {
@@ -258,9 +233,7 @@ class ControlRules {
   }
 
   public odd(message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+    this.rules.numericality = this.rules.numericality || {};
 
     this.rules.numericality.odd = true;
     if (message) {
@@ -270,9 +243,7 @@ class ControlRules {
   }
 
   public even(message?: ErroMessageType) {
-    if (!this.rules.numericality) {
-      this.rules.numericality = {};
-    }
+    this.rules.numericality = this.rules.numericality || {};
 
     this.rules.numericality.even = true;
     if (message) {
@@ -283,15 +254,15 @@ class ControlRules {
 
   //
 
-  public required(message?: string | null, allowEmpty?: boolean) {
+  public required(message?: ErroMessageType, allowEmpty?: boolean) {
     this.rules.presence = {
       allowEmpty: allowEmpty === undefined ? false : allowEmpty,
       message: message ? message : undefined,
     };
     return this;
   }
 
-  public isType(type: string, message?: string) {
+  public isType(type: string, message?: ErroMessageType) {
     this.rules.type = {
       type,
       message: message ? message : undefined,

diff --git a/src/__tests__/rules.test.ts b/src/__tests__/rules.test.ts
@@ -163,10 +163,10 @@ describe('Control Rules', () => {
     });
   });
 
-  describe('numeric', () => {
+  describe('number', () => {
     it('should set passed properties', () => {
       const rules = FD.rules()
-        .numeric(true, 'wrong', 'default msg')
+        .number('wrong', true, 'default msg')
         .serialize();
 
       expect(rules.numericality?.strict).toBe(true);
@@ -175,17 +175,27 @@ describe('Control Rules', () => {
     });
   });
 
-  describe('isInteger', () => {
+  describe('integer', () => {
     it('should set passed properties', () => {
       const rules = FD.rules()
-        .isInteger('wrong')
+        .integer('wrong')
         .serialize();
 
       expect(rules.numericality?.onlyInteger).toBe(true);
       expect(rules.numericality?.notInteger).toBe('wrong');
     });
   });
 
+  describe('double', () => {
+    it('should set passed properties', () => {
+      const rules = FD.rules()
+        .double()
+        .serialize();
+
+      expect(rules.numericality?.onlyInteger).toBe(false);
+    });
+  });
+
   describe('greaterThan', () => {
     it('should set passed properties', () => {
       const rules = FD.rules()