hotfix/array-check-contains-type #20

Merged
root merged 8 commits from hotfix/array-check-contains-type into develop 2020-07-05 05:31:08 +00:00
4 changed files with 45 additions and 1 deletions
Showing only changes of commit b684a0e35e - Show all commits

View File

@ -1,5 +1,9 @@
# ChangeLog
## 2020-07-04 (0.0.6)
- add array validate contains type
## 2020-06-11 (0.0.5)
- modify types require method

View File

@ -1,6 +1,6 @@
{
"name": "mtfos-validator",
"version": "0.0.5",
"version": "0.0.6",
"description": "",
"main": "index.js",
"scripts": {

View File

@ -1,5 +1,6 @@
const Base = require('./base.js')
const util = require('util')
const validate = require('../validate.js')
class TypeArray extends Base {
constructor () {
@ -8,6 +9,10 @@ class TypeArray extends Base {
this._empty = false
this._min = null
this._max = null
/**
* @type {Base[]}
*/
this._itemTypes = []
}
/**
@ -30,6 +35,11 @@ class TypeArray extends Base {
return this
}
items (...args) {
this._itemTypes.push(...args)
return this
}
/**
* set max length
* @param {number} num
@ -50,6 +60,23 @@ class TypeArray extends Base {
if (!this._empty && value.length === 0) return `not allow empty`
if (this._min !== null && value.length < this._min) return `value length < ${this._min}`
if (this._max !== null && value.length > this._max) return `value length > ${this._max}`
for (const item of value) {
let verified = false
let fail = ''
for (const type of this._itemTypes) {
const result = type.validate(item)
if (result) {
fail = result
} else {
verified = true
fail = ''
break
}
}
if (!verified || fail) return fail || `item type not match`
}
return null
}
}

View File

@ -1,5 +1,7 @@
/* eslint-disable no-undef */
const TypeArray = require('./array.js')
const TypeString = require('./string.js')
const TypeObject = require('./object.js')
describe('test validate schema type array', () => {
function throwFunc (val) {
@ -59,4 +61,15 @@ describe('test validate schema type array', () => {
expect(throwFunc(arr.validate([1, 2, 3]))).toThrow()
})
it('test array contains value', async () => {
const arr = new TypeArray().items(new TypeString())
expect(throwFunc(arr.validate([1, 2, 3]))).toThrow()
throwFunc(arr.validate(['asd']))
const arr2 = new TypeArray().items(new TypeString(), new TypeObject())
expect(throwFunc(arr2.validate([123, true]))).toThrow()
throwFunc(arr2.validate(['asd', '33', {}]))
})
})