Revert "feat(): change required logic \n\n BREAKING CHANGE: rules for…

… maxLength, maxNumber etc. will not raise an error if the field is empty and there is no required rule. To validate for required you should defined required rule directly." This reverts commit 62561a9.
horprogs · Dec 27, 2021 · a1bce7e · a1bce7e
1 parent aad6d4c
commit a1bce7e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 49 deletions.
diff --git a/site/examples/index.html b/site/examples/index.html
@@ -656,9 +656,6 @@ <h2>
 
               validation
                 .addField('#example4_name', [
-                  {
-                    rule: 'required',
-                  },
                   {
                     rule: 'minLength',
                     value: 3,
@@ -838,9 +835,6 @@ <h2>
 
               validation
                 .addField('#example5_name', [
-                  {
-                    rule: 'required',
-                  },
                   {
                     rule: 'minLength',
                     value: 3,

diff --git a/src/example.ts b/src/example.ts
@@ -180,9 +180,13 @@ const basicExample = () => {
   validation
     .addField('#basic_name', [
       {
-        rule: 'maxNumber' as Rules,
+        rule: 'minNumber' as Rules,
         value: 10,
       },
+      {
+        rule: 'maxNumber' as Rules,
+        value: 100,
+      },
     ])
     .onSuccess((ev) => {
       ev?.preventDefault();

diff --git a/src/main.ts b/src/main.ts
@@ -252,26 +252,22 @@ class JustValidate {
             `Value for ${fieldRule.rule} rule for [${field}] field is not defined. The field will be always invalid.`
           );
           this.setFieldInvalid(field, fieldRule);
-          break;
+          return;
         }
 
         if (typeof ruleValue !== 'number') {
           console.error(
             `Value for ${fieldRule.rule} rule for [${field}] should be a number. The field will be always invalid.`
           );
           this.setFieldInvalid(field, fieldRule);
-          break;
+          return;
         }
 
         if (typeof elemValue !== 'string') {
           this.setFieldInvalid(field, fieldRule);
           break;
         }
 
-        if (elemValue === '') {
-          break;
-        }
-
         if (isLengthMoreThanMax(elemValue, ruleValue)) {
           this.setFieldInvalid(field, fieldRule);
         }
@@ -284,26 +280,22 @@ class JustValidate {
             `Value for ${fieldRule.rule} rule for [${field}] field is not defined. The field will be always invalid.`
           );
           this.setFieldInvalid(field, fieldRule);
-          break;
+          return;
         }
 
         if (typeof ruleValue !== 'number') {
           console.error(
             `Value for ${fieldRule.rule} rule for [${field}] should be a number. The field will be always invalid.`
           );
           this.setFieldInvalid(field, fieldRule);
-          break;
+          return;
         }
 
         if (typeof elemValue !== 'string') {
           this.setFieldInvalid(field, fieldRule);
           break;
         }
 
-        if (elemValue === '') {
-          break;
-        }
-
         if (isLengthLessThanMin(elemValue, ruleValue)) {
           this.setFieldInvalid(field, fieldRule);
         }
@@ -316,10 +308,6 @@ class JustValidate {
           break;
         }
 
-        if (elemValue === '') {
-          break;
-        }
-
         if (!isPassword(elemValue)) {
           this.setFieldInvalid(field, fieldRule);
         }
@@ -332,10 +320,6 @@ class JustValidate {
           break;
         }
 
-        if (elemValue === '') {
-          break;
-        }
-
         if (!isStrongPassword(elemValue)) {
           this.setFieldInvalid(field, fieldRule);
         }
@@ -348,10 +332,6 @@ class JustValidate {
           break;
         }
 
-        if (elemValue === '') {
-          break;
-        }
-
         if (!isNumber(elemValue)) {
           this.setFieldInvalid(field, fieldRule);
         }
@@ -364,26 +344,22 @@ class JustValidate {
             `Value for ${fieldRule.rule} rule for [${field}] field is not defined. The field will be always invalid.`
           );
           this.setFieldInvalid(field, fieldRule);
-          break;
+          return;
         }
 
         if (typeof ruleValue !== 'number') {
           console.error(
             `Value for ${fieldRule.rule} rule for [${field}] field should be a number. The field will be always invalid.`
           );
           this.setFieldInvalid(field, fieldRule);
-          break;
+          return;
         }
 
         if (typeof elemValue !== 'string') {
           this.setFieldInvalid(field, fieldRule);
           break;
         }
 
-        if (elemValue === '') {
-          break;
-        }
-
         const num = +elemValue;
 
         if (Number.isNaN(num) || isNumberMoreThanMax(num, ruleValue)) {
@@ -398,26 +374,22 @@ class JustValidate {
             `Value for ${fieldRule.rule} rule for [${field}] field is not defined. The field will be always invalid.`
           );
           this.setFieldInvalid(field, fieldRule);
-          break;
+          return;
         }
 
         if (typeof ruleValue !== 'number') {
           console.error(
             `Value for ${fieldRule.rule} rule for [${field}] field should be a number. The field will be always invalid.`
           );
           this.setFieldInvalid(field, fieldRule);
-          break;
+          return;
         }
 
         if (typeof elemValue !== 'string') {
           this.setFieldInvalid(field, fieldRule);
           break;
         }
 
-        if (elemValue === '') {
-          break;
-        }
-
         const num = +elemValue;
 
         if (Number.isNaN(num) || isNumberLessThanMin(num, ruleValue)) {

diff --git a/src/tests/main.test.ts b/src/tests/main.test.ts
@@ -1085,10 +1085,11 @@ describe('Validation', () => {
       expect(getElem('button')).toBeEnabled();
     });
 
-    expect(onSubmit).toHaveBeenCalled();
-    onSubmit.mockReset();
+    expect(onSubmit).not.toHaveBeenCalled();
 
-    expect(getElemByTestId('error-label-#password')).not.toBeInTheDocument();
+    expect(getElemByTestId('error-label-#password')).toHaveTextContent(
+      'Password must contain minimum eight characters, at least one letter and one number'
+    );
 
     changeTextBySelector('#password', '12345678');
     clickBySelector('#submit-btn');
@@ -1140,10 +1141,11 @@ describe('Validation', () => {
       expect(getElem('button')).toBeEnabled();
     });
 
-    expect(onSubmit).toHaveBeenCalled();
-    onSubmit.mockReset();
+    expect(onSubmit).not.toHaveBeenCalled();
 
-    expect(getElemByTestId('error-label-#password')).not.toBeInTheDocument();
+    expect(getElemByTestId('error-label-#password')).toHaveTextContent(
+      'Password should contain minimum eight characters, at least one uppercase letter, one lowercase letter, one number and one special character'
+    );
 
     changeTextBySelector('#password', '12345678a');
     clickBySelector('#submit-btn');