Merge pull request #309 from Jasery/master

fix: catch the custom validate function
yiminghe · Apr 24, 2022 · d664fb8 · d664fb8
2 parents 68e13b0 + abe3d8d
commit d664fb8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/__tests__/validator.spec.ts b/__tests__/validator.spec.ts
@@ -470,4 +470,22 @@ describe('validator', () => {
       });
     });
   });
+
+  it('custom validate function throw error', done => {
+    new Schema({
+      v: [
+        {
+          validator(rule, value, callback) {
+            throw new Error('something wrong');
+          },
+        },
+      ],
+    })
+      .validate({ v: '' })
+      .catch(({ errors }) => {
+        expect(errors.length).toBe(1);
+        expect(errors[0].message).toBe('something wrong');
+        done();
+      });
+  });
 });
diff --git a/src/index.ts b/src/index.ts
@@ -283,7 +283,11 @@ class Schema {
         if (rule.asyncValidator) {
           res = rule.asyncValidator(rule, data.value, cb, data.source, options);
         } else if (rule.validator) {
-          res = rule.validator(rule, data.value, cb, data.source, options);
+          try {
+            res = rule.validator(rule, data.value, cb, data.source, options);
+          } catch (error) {
+            cb(error.message);
+          }
           if (res === true) {
             cb();
           } else if (res === false) {