From a0e117c5401d8a2b309586e056063c5ed21cd2e0 Mon Sep 17 00:00:00 2001 From: Jay Date: Sat, 4 Jul 2020 14:30:08 +0000 Subject: [PATCH 1/2] [feat] add array validate contains type --- types/array.js | 27 +++++++++++++++++++++++++++ types/array.test.js | 13 +++++++++++++ 2 files changed, 40 insertions(+) diff --git a/types/array.js b/types/array.js index 3ef2729..17c9a27 100644 --- a/types/array.js +++ b/types/array.js @@ -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 } } diff --git a/types/array.test.js b/types/array.test.js index 003a9f7..7778a15 100644 --- a/types/array.test.js +++ b/types/array.test.js @@ -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', {}])) + }) }) From d18c7cbad44437583f7dc374c75c327eeaa282bf Mon Sep 17 00:00:00 2001 From: Jay Date: Sat, 4 Jul 2020 14:34:49 +0000 Subject: [PATCH 2/2] [chore] bump version and changelog --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e12b69b..f21735a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/package.json b/package.json index 600636d..d038914 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mtfos-validator", - "version": "0.0.5", + "version": "0.0.6", "description": "", "main": "index.js", "scripts": {