feat(validator): number 新增 nonPositive, nonNegative 规则

fjc0k · Nov 12, 2021 · a0d1f9c · a0d1f9c
1 parent ad3c31b
commit a0d1f9c
Show file tree

Hide file tree

Showing 8 changed files with 174 additions and 32 deletions.
diff --git a/src/validator/__snapshots__/yup.test.ts.snap b/src/validator/__snapshots__/yup.test.ts.snap
@@ -88,93 +88,183 @@ Object {
 }
 `;
 
-exports[`yup number 支持 nonnegativeInteger() 1`] = `
+exports[`yup number 支持 nonNegative() 1`] = `
 Object {
   "data": 1,
 }
 `;
 
-exports[`yup number 支持 nonnegativeInteger() 2`] = `
+exports[`yup number 支持 nonNegative() 2`] = `
+Object {
+  "data": -1,
+  "error": [ValidationError: 此项必须是一个非负数],
+}
+`;
+
+exports[`yup number 支持 nonNegative() 3`] = `
+Object {
+  "data": -0,
+}
+`;
+
+exports[`yup number 支持 nonNegative() 4`] = `
+Object {
+  "data": 0.5,
+}
+`;
+
+exports[`yup number 支持 nonNegative() 5`] = `
+Object {
+  "data": 1.5,
+}
+`;
+
+exports[`yup number 支持 nonNegative() 6`] = `
+Object {
+  "data": 100,
+}
+`;
+
+exports[`yup number 支持 nonNegative() 7`] = `
+Object {
+  "data": -100.3,
+  "error": [ValidationError: 此项必须是一个非负数],
+}
+`;
+
+exports[`yup number 支持 nonNegativeInteger() 1`] = `
+Object {
+  "data": 1,
+}
+`;
+
+exports[`yup number 支持 nonNegativeInteger() 2`] = `
 Object {
   "data": -1,
   "error": [ValidationError: 此项必须是一个非负整数],
 }
 `;
 
-exports[`yup number 支持 nonnegativeInteger() 3`] = `
+exports[`yup number 支持 nonNegativeInteger() 3`] = `
 Object {
   "data": -0,
 }
 `;
 
-exports[`yup number 支持 nonnegativeInteger() 4`] = `
+exports[`yup number 支持 nonNegativeInteger() 4`] = `
 Object {
   "data": 0.5,
   "error": [ValidationError: 此项必须是一个非负整数],
 }
 `;
 
-exports[`yup number 支持 nonnegativeInteger() 5`] = `
+exports[`yup number 支持 nonNegativeInteger() 5`] = `
 Object {
   "data": 1.5,
   "error": [ValidationError: 此项必须是一个非负整数],
 }
 `;
 
-exports[`yup number 支持 nonnegativeInteger() 6`] = `
+exports[`yup number 支持 nonNegativeInteger() 6`] = `
 Object {
   "data": 100,
 }
 `;
 
-exports[`yup number 支持 nonnegativeInteger() 7`] = `
+exports[`yup number 支持 nonNegativeInteger() 7`] = `
 Object {
   "data": -100.3,
   "error": [ValidationError: 此项必须是一个非负整数],
 }
 `;
 
-exports[`yup number 支持 nonpositiveInteger() 1`] = `
+exports[`yup number 支持 nonPositive() 1`] = `
+Object {
+  "data": 1,
+  "error": [ValidationError: 此项必须是一个非正数],
+}
+`;
+
+exports[`yup number 支持 nonPositive() 2`] = `
+Object {
+  "data": -1,
+}
+`;
+
+exports[`yup number 支持 nonPositive() 3`] = `
+Object {
+  "data": -0,
+}
+`;
+
+exports[`yup number 支持 nonPositive() 4`] = `
+Object {
+  "data": 0.5,
+  "error": [ValidationError: 此项必须是一个非正数],
+}
+`;
+
+exports[`yup number 支持 nonPositive() 5`] = `
+Object {
+  "data": 1.5,
+  "error": [ValidationError: 此项必须是一个非正数],
+}
+`;
+
+exports[`yup number 支持 nonPositive() 6`] = `
+Object {
+  "data": 100,
+  "error": [ValidationError: 此项必须是一个非正数],
+}
+`;
+
+exports[`yup number 支持 nonPositive() 7`] = `
+Object {
+  "data": -100.3,
+}
+`;
+
+exports[`yup number 支持 nonPositiveInteger() 1`] = `
 Object {
   "data": 1,
   "error": [ValidationError: 此项必须是一个非正整数],
 }
 `;
 
-exports[`yup number 支持 nonpositiveInteger() 2`] = `
+exports[`yup number 支持 nonPositiveInteger() 2`] = `
 Object {
   "data": -1,
 }
 `;
 
-exports[`yup number 支持 nonpositiveInteger() 3`] = `
+exports[`yup number 支持 nonPositiveInteger() 3`] = `
 Object {
   "data": -0,
 }
 `;
 
-exports[`yup number 支持 nonpositiveInteger() 4`] = `
+exports[`yup number 支持 nonPositiveInteger() 4`] = `
 Object {
   "data": 0.5,
   "error": [ValidationError: 此项必须是一个非正整数],
 }
 `;
 
-exports[`yup number 支持 nonpositiveInteger() 5`] = `
+exports[`yup number 支持 nonPositiveInteger() 5`] = `
 Object {
   "data": 1.5,
   "error": [ValidationError: 此项必须是一个非正整数],
 }
 `;
 
-exports[`yup number 支持 nonpositiveInteger() 6`] = `
+exports[`yup number 支持 nonPositiveInteger() 6`] = `
 Object {
   "data": 100,
   "error": [ValidationError: 此项必须是一个非正整数],
 }
 `;
 
-exports[`yup number 支持 nonpositiveInteger() 7`] = `
+exports[`yup number 支持 nonPositiveInteger() 7`] = `
 Object {
   "data": -100.3,
   "error": [ValidationError: 此项必须是一个非正整数],

diff --git a/src/validator/locale/enUS.ts b/src/validator/locale/enUS.ts
@@ -54,8 +54,10 @@ export const enUS: yup.Locale = {
     id: '${path} must be a positive integer',
     positiveInteger: '${path} must be a positive integer',
     negativeInteger: '${path} must be a negative integer',
-    nonpositiveInteger: '${path} must be a nonpositive integer',
-    nonnegativeInteger: '${path} must be a nonnegative integer',
+    nonPositive: '${path} must be a non-positive number',
+    nonNegative: '${path} must be a non-negative number',
+    nonPositiveInteger: '${path} must be a non-positive integer',
+    nonNegativeInteger: '${path} must be a non-negative integer',
   },
   date: {
     min: '${path} field must be later than ${min}',

diff --git a/src/validator/locale/zhCN.ts b/src/validator/locale/zhCN.ts
@@ -56,8 +56,10 @@ export const zhCN: yup.Locale = {
     id: ({ label }) => `${label || '此项'}必须是一个正整数`,
     positiveInteger: ({ label }) => `${label || '此项'}必须是一个正整数`,
     negativeInteger: ({ label }) => `${label || '此项'}必须是一个负整数`,
-    nonpositiveInteger: ({ label }) => `${label || '此项'}必须是一个非正整数`,
-    nonnegativeInteger: ({ label }) => `${label || '此项'}必须是一个非负整数`,
+    nonPositive: ({ label }) => `${label || '此项'}必须是一个非正数`,
+    nonNegative: ({ label }) => `${label || '此项'}必须是一个非负数`,
+    nonPositiveInteger: ({ label }) => `${label || '此项'}必须是一个非正整数`,
+    nonNegativeInteger: ({ label }) => `${label || '此项'}必须是一个非负整数`,
   },
   date: {
     min: ({ label, min }) => `${label || '此项'}必须晚于${min}`,

diff --git a/src/validator/yup.test.ts b/src/validator/yup.test.ts
@@ -239,8 +239,8 @@ describe('yup', () => {
     expect(rule.validatePlusSync(-100.3)).toMatchSnapshot()
   })
 
-  test('number 支持 nonpositiveInteger()', () => {
-    const rule = yup.number().nonpositiveInteger()
+  test('number 支持 nonPositive()', () => {
+    const rule = yup.number().nonPositive()
     expect(rule.validatePlusSync(1)).toMatchSnapshot()
     expect(rule.validatePlusSync(-1)).toMatchSnapshot()
     expect(rule.validatePlusSync(-0)).toMatchSnapshot()
@@ -250,8 +250,30 @@ describe('yup', () => {
     expect(rule.validatePlusSync(-100.3)).toMatchSnapshot()
   })
 
-  test('number 支持 nonnegativeInteger()', () => {
-    const rule = yup.number().nonnegativeInteger()
+  test('number 支持 nonNegative()', () => {
+    const rule = yup.number().nonNegative()
+    expect(rule.validatePlusSync(1)).toMatchSnapshot()
+    expect(rule.validatePlusSync(-1)).toMatchSnapshot()
+    expect(rule.validatePlusSync(-0)).toMatchSnapshot()
+    expect(rule.validatePlusSync(0.5)).toMatchSnapshot()
+    expect(rule.validatePlusSync(1.5)).toMatchSnapshot()
+    expect(rule.validatePlusSync(100)).toMatchSnapshot()
+    expect(rule.validatePlusSync(-100.3)).toMatchSnapshot()
+  })
+
+  test('number 支持 nonPositiveInteger()', () => {
+    const rule = yup.number().nonPositiveInteger()
+    expect(rule.validatePlusSync(1)).toMatchSnapshot()
+    expect(rule.validatePlusSync(-1)).toMatchSnapshot()
+    expect(rule.validatePlusSync(-0)).toMatchSnapshot()
+    expect(rule.validatePlusSync(0.5)).toMatchSnapshot()
+    expect(rule.validatePlusSync(1.5)).toMatchSnapshot()
+    expect(rule.validatePlusSync(100)).toMatchSnapshot()
+    expect(rule.validatePlusSync(-100.3)).toMatchSnapshot()
+  })
+
+  test('number 支持 nonNegativeInteger()', () => {
+    const rule = yup.number().nonNegativeInteger()
     expect(rule.validatePlusSync(1)).toMatchSnapshot()
     expect(rule.validatePlusSync(-1)).toMatchSnapshot()
     expect(rule.validatePlusSync(-0)).toMatchSnapshot()

diff --git a/src/validator/yupSource/locale.js b/src/validator/yupSource/locale.js
@@ -48,8 +48,10 @@ export let number = {
   id: '${path} must be a positive integer',
   positiveInteger: '${path} must be a positive integer',
   negativeInteger: '${path} must be a negative integer',
-  nonpositiveInteger: '${path} must be a nonpositive integer',
-  nonnegativeInteger: '${path} must be a nonnegative integer',
+  nonPositive: '${path} must be a non-positive number',
+  nonNegative: '${path} must be a non-negative number',
+  nonPositiveInteger: '${path} must be a non-positive integer',
+  nonNegativeInteger: '${path} must be a non-negative integer',
 }
 
 export let date = {

diff --git a/src/validator/yupSource/number.js b/src/validator/yupSource/number.js
@@ -111,18 +111,36 @@ inherits(NumberSchema, MixedSchema, {
     return this.negative(msg).integer(msg)
   },
 
-  nonpositiveInteger(msg = locale.nonpositiveInteger) {
+  nonPositive(msg = locale.nonPositive) {
     return this.test({
-      name: 'nonpositiveInteger',
+      name: 'nonPositive',
+      message: msg,
+      exclusive: true,
+      test: val => isAbsent(val) || val <= 0,
+    })
+  },
+
+  nonNegative(msg = locale.nonNegative) {
+    return this.test({
+      name: 'nonNegative',
+      message: msg,
+      exclusive: true,
+      test: val => isAbsent(val) || val >= 0,
+    })
+  },
+
+  nonPositiveInteger(msg = locale.nonPositiveInteger) {
+    return this.test({
+      name: 'nonPositiveInteger',
       message: msg,
       exclusive: true,
       test: val => isAbsent(val) || (Number.isInteger(val) && val <= 0),
     })
   },
 
-  nonnegativeInteger(msg = locale.nonnegativeInteger) {
+  nonNegativeInteger(msg = locale.nonNegativeInteger) {
     return this.test({
-      name: 'nonnegativeInteger',
+      name: 'nonNegativeInteger',
       message: msg,
       exclusive: true,
       test: val => isAbsent(val) || (Number.isInteger(val) && val >= 0),

diff --git a/src/validator/yupTypes/Locale.ts b/src/validator/yupTypes/Locale.ts
@@ -46,8 +46,10 @@ export interface NumberLocale {
   id: LocaleValue
   positiveInteger: LocaleValue
   negativeInteger: LocaleValue
-  nonpositiveInteger: LocaleValue
-  nonnegativeInteger: LocaleValue
+  nonPositive: LocaleValue
+  nonNegative: LocaleValue
+  nonPositiveInteger: LocaleValue
+  nonNegativeInteger: LocaleValue
 }
 
 export interface DateLocale {

diff --git a/src/validator/yupTypes/number.ts b/src/validator/yupTypes/number.ts
@@ -24,9 +24,13 @@ export interface NumberSchema<T extends number = number>
 
   negativeInteger(message?: NumberLocale['negativeInteger']): this
 
-  nonpositiveInteger(message?: NumberLocale['nonpositiveInteger']): this
+  nonPositive(message?: NumberLocale['nonPositive']): this
 
-  nonnegativeInteger(message?: NumberLocale['nonnegativeInteger']): this
+  nonNegative(message?: NumberLocale['nonNegative']): this
+
+  nonPositiveInteger(message?: NumberLocale['nonPositiveInteger']): this
+
+  nonNegativeInteger(message?: NumberLocale['nonNegativeInteger']): this
 
   truncate(): this