fix(validator): fix unexpect validate with empty format (#2926)

alibaba · Mar 12, 2022 · 7da2628 · 7da2628
1 parent 6e9a8ae
commit 7da2628
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/packages/validator/src/__tests__/validator.spec.ts b/packages/validator/src/__tests__/validator.spec.ts
@@ -392,6 +392,19 @@ test('validate custom formats', async () => {
   noError(await validate('中文', 'custom'))
 })
 
+test('validate undefined format', async () => {
+  expect(
+    (
+      await validate('a', {
+        required: false,
+        pattern: '(\\d{3,4}-\\d{7,8}-\\d{4})|(4\\d{4,9})|(\\d{3,4}-\\d{7,8})',
+        format: undefined,
+        message: 'error',
+      })
+    ).error
+  ).toEqual(['error'])
+})
+
 test('validator return boolean', async () => {
   hasError(
     await validate('123', {

diff --git a/packages/validator/src/rules.ts b/packages/validator/src/rules.ts
@@ -46,9 +46,13 @@ const extendSameRules = (
 const RULES: IRegistryRules = {
   format(value, rule) {
     if (isValidateEmpty(value)) return ''
-    return !new RegExp(getValidateFormats(rule.format) || '').test(value)
-      ? rule.message
-      : ''
+    if (rule.format) {
+      const format = getValidateFormats(rule.format)
+      if (format) {
+        return !new RegExp(format).test(value) ? rule.message : ''
+      }
+    }
+    return ''
   },
   required(value, rule) {
     if (rule.required === false) return ''