feat(validator): number 新增 positiveInteger, negativeInteger, nonposit…

…iveInteger, nonnegativeInteger

src/validator/__snapshots__/yup.test.ts.snap

@@ -40,6 +40,187 @@ Object {
 }
 `;
 
+exports[`yup number 支持 negativeInteger() 1`] = `
+Object {
+  "data": 1,
+  "error": [ValidationError: 此项必须是一个负整数],
+}
+`;
+
+exports[`yup number 支持 negativeInteger() 2`] = `
+Object {
+  "data": -1,
+}
+`;
+
+exports[`yup number 支持 negativeInteger() 3`] = `
+Object {
+  "data": -0,
+  "error": [ValidationError: 此项必须是一个负整数],
+}
+`;
+
+exports[`yup number 支持 negativeInteger() 4`] = `
+Object {
+  "data": 0.5,
+  "error": [ValidationError: 此项必须是一个负整数],
+}
+`;
+
+exports[`yup number 支持 negativeInteger() 5`] = `
+Object {
+  "data": 1.5,
+  "error": [ValidationError: 此项必须是一个负整数],
+}
+`;
+
+exports[`yup number 支持 negativeInteger() 6`] = `
+Object {
+  "data": 100,
+  "error": [ValidationError: 此项必须是一个负整数],
+}
+`;
+
+exports[`yup number 支持 negativeInteger() 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`] = `
+Object {
+  "data": -0,
+}
+`;
+
+exports[`yup number 支持 nonnegativeInteger() 4`] = `
+Object {
+  "data": 0.5,
+  "error": [ValidationError: 此项必须是一个非负整数],
+}
+`;
+
+exports[`yup number 支持 nonnegativeInteger() 5`] = `
+Object {
+  "data": 1.5,
+  "error": [ValidationError: 此项必须是一个非负整数],
+}
+`;
+
+exports[`yup number 支持 nonnegativeInteger() 6`] = `
+Object {
+  "data": 100,
+}
+`;
+
+exports[`yup number 支持 nonnegativeInteger() 7`] = `
+Object {
+  "data": -100.3,
+  "error": [ValidationError: 此项必须是一个非负整数],
+}
+`;
+
+exports[`yup number 支持 nonpositiveInteger() 1`] = `
+Object {
+  "data": 1,
+  "error": [ValidationError: 此项必须是一个非正整数],
+}
+`;
+
+exports[`yup number 支持 nonpositiveInteger() 2`] = `
+Object {
+  "data": -1,
+}
+`;
+
+exports[`yup number 支持 nonpositiveInteger() 3`] = `
+Object {
+  "data": -0,
+}
+`;
+
+exports[`yup number 支持 nonpositiveInteger() 4`] = `
+Object {
+  "data": 0.5,
+  "error": [ValidationError: 此项必须是一个非正整数],
+}
+`;
+
+exports[`yup number 支持 nonpositiveInteger() 5`] = `
+Object {
+  "data": 1.5,
+  "error": [ValidationError: 此项必须是一个非正整数],
+}
+`;
+
+exports[`yup number 支持 nonpositiveInteger() 6`] = `
+Object {
+  "data": 100,
+  "error": [ValidationError: 此项必须是一个非正整数],
+}
+`;
+
+exports[`yup number 支持 nonpositiveInteger() 7`] = `
+Object {
+  "data": -100.3,
+  "error": [ValidationError: 此项必须是一个非正整数],
+}
+`;
+
+exports[`yup number 支持 positiveInteger() 1`] = `
+Object {
+  "data": 1,
+}
+`;
+
+exports[`yup number 支持 positiveInteger() 2`] = `
+Object {
+  "data": -1,
+  "error": [ValidationError: 此项必须是一个正整数],
+}
+`;
+
+exports[`yup number 支持 positiveInteger() 3`] = `
+Object {
+  "data": 0,
+  "error": [ValidationError: 此项必须是一个正整数],
+}
+`;
+
+exports[`yup number 支持 positiveInteger() 4`] = `
+Object {
+  "data": 0.5,
+  "error": [ValidationError: 此项必须是一个正整数],
+}
+`;
+
+exports[`yup number 支持 positiveInteger() 5`] = `
+Object {
+  "data": 1.5,
+  "error": [ValidationError: 此项必须是一个正整数],
+}
+`;
+
+exports[`yup number 支持 positiveInteger() 6`] = `
+Object {
+  "data": 100,
+}
+`;
+
 exports[`yup test 第一个参数可传函数或正则 1`] = `
 Object {
   "data": Object {

src/validator/locale/enUS.ts

@@ -52,6 +52,10 @@ export const enUS: yup.Locale = {
     negative: '${path} must be a negative number',
     integer: '${path} must be an integer',
     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',
   },
   date: {
     min: '${path} field must be later than ${min}',

src/validator/locale/zhCN.ts

@@ -54,6 +54,10 @@ export const zhCN: yup.Locale = {
     negative: ({ label }) => `${label || '此项'}必须是一个负数`,
     integer: ({ label }) => `${label || '此项'}必须是一个整数`,
     id: ({ label }) => `${label || '此项'}必须是一个正整数`,
+    positiveInteger: ({ label }) => `${label || '此项'}必须是一个正整数`,
+    negativeInteger: ({ label }) => `${label || '此项'}必须是一个负整数`,
+    nonpositiveInteger: ({ label }) => `${label || '此项'}必须是一个非正整数`,
+    nonnegativeInteger: ({ label }) => `${label || '此项'}必须是一个非负整数`,
   },
   date: {
     min: ({ label, min }) => `${label || '此项'}必须晚于${min}`,

src/validator/yup.test.ts

@@ -217,4 +217,47 @@ describe('yup', () => {
     expect(rule.validatePlusSync(1.5)).toMatchSnapshot()
     expect(rule.validatePlusSync(100)).toMatchSnapshot()
   })
+
+  test('number 支持 positiveInteger()', () => {
+    const rule = yup.number().positiveInteger()
+    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()
+  })
+
+  test('number 支持 negativeInteger()', () => {
+    const rule = yup.number().negativeInteger()
+    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()
+    expect(rule.validatePlusSync(0.5)).toMatchSnapshot()
+    expect(rule.validatePlusSync(1.5)).toMatchSnapshot()
+    expect(rule.validatePlusSync(100)).toMatchSnapshot()
+    expect(rule.validatePlusSync(-100.3)).toMatchSnapshot()
+  })
 })

src/validator/yupSource/locale.js

@@ -46,6 +46,10 @@ export let number = {
   negative: '${path} must be a negative number',
   integer: '${path} must be an integer',
   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',
 }
 
 export let date = {

src/validator/yupSource/number.js

@@ -103,6 +103,32 @@ inherits(NumberSchema, MixedSchema, {
     return this.positive(msg).integer(msg)
   },
 
+  positiveInteger(msg = locale.positiveInteger) {
+    return this.positive(msg).integer(msg)
+  },
+
+  negativeInteger(msg = locale.negativeInteger) {
+    return this.negative(msg).integer(msg)
+  },
+
+  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) {
+    return this.test({
+      name: 'nonnegativeInteger',
+      message: msg,
+      exclusive: true,
+      test: val => isAbsent(val) || (Number.isInteger(val) && val >= 0),
+    })
+  },
+
   truncate() {
     return this.transform(value => (!isAbsent(value) ? value | 0 : value))
   },

src/validator/yupTypes/Locale.ts

@@ -44,6 +44,10 @@ export interface NumberLocale {
   negative: LocaleValue<{ less: number }>
   integer: LocaleValue
   id: LocaleValue
+  positiveInteger: LocaleValue
+  negativeInteger: LocaleValue
+  nonpositiveInteger: LocaleValue
+  nonnegativeInteger: LocaleValue
 }
 
 export interface DateLocale {

src/validator/yupTypes/number.ts

@@ -20,6 +20,14 @@ export interface NumberSchema<T extends number = number>
 
   id(message?: NumberLocale['id']): this
 
+  positiveInteger(message?: NumberLocale['positiveInteger']): this
+
+  negativeInteger(message?: NumberLocale['negativeInteger']): this
+
+  nonpositiveInteger(message?: NumberLocale['nonpositiveInteger']): this
+
+  nonnegativeInteger(message?: NumberLocale['nonnegativeInteger']): this
+
   truncate(): this
 
   round(type?: 'floor' | 'ceil' | 'trunc' | 'round'): this