ejv 2.0.4 → 2.1.0

package/spec/ejv.spec.ts

@@ -2,7 +2,7 @@ import { describe, it } from 'mocha';
 import { expect } from 'chai';
 
 import { ejv } from '../src/ejv';
-import { ErrorMsg, ErrorType } from '../src/constants';
+import { ERROR_MESSAGE, ERROR_TYPE } from '../src/constants';
 import { AnyObject, EjvError, Scheme } from '../src/interfaces';
 import { createErrorMsg } from '../src/util';
 import { checkSchemeError } from './common-test-util';
@@ -18,8 +18,8 @@ describe('ejv()', () => {
 				);
 
 				expect(error).to.be.instanceof(EjvError);
-				expect(error).to.have.property('type', ErrorType.NO_DATA);
-				expect(error).to.have.property('message', ErrorMsg.NO_DATA);
+				expect(error).to.have.property('type', ERROR_TYPE.NO_DATA);
+				expect(error).to.have.property('message', ERROR_MESSAGE.NO_DATA);
 
 				expect(error).to.have.property('data', undefined);
 				expect(error).to.have.property('path', undefined);
@@ -38,8 +38,8 @@ describe('ejv()', () => {
 				);
 
 				expect(error).to.be.instanceof(EjvError);
-				expect(error).to.have.property('type', ErrorType.NO_DATA);
-				expect(error).to.have.property('message', ErrorMsg.NO_DATA);
+				expect(error).to.have.property('type', ERROR_TYPE.NO_DATA);
+				expect(error).to.have.property('message', ERROR_MESSAGE.NO_DATA);
 
 				expect(error).to.have.property('data', null);
 				expect(error).to.have.property('path', undefined);
@@ -63,8 +63,8 @@ describe('ejv()', () => {
 
 				expect(error).to.be.instanceof(EjvError);
 
-				expect(error).to.have.property('type', ErrorType.NO_SCHEME);
-				expect(error).to.have.property('message', ErrorMsg.NO_SCHEME);
+				expect(error).to.have.property('type', ERROR_TYPE.NO_SCHEME);
+				expect(error).to.have.property('message', ERROR_MESSAGE.NO_SCHEME);
 
 				expect(error).to.have.property('data', data);
 				expect(error).to.have.property('path', undefined);
@@ -82,8 +82,8 @@ describe('ejv()', () => {
 
 				expect(error).to.be.instanceof(EjvError);
 
-				expect(error).to.have.property('type', ErrorType.NO_SCHEME);
-				expect(error).to.have.property('message', ErrorMsg.NO_SCHEME);
+				expect(error).to.have.property('type', ERROR_TYPE.NO_SCHEME);
+				expect(error).to.have.property('message', ERROR_MESSAGE.NO_SCHEME);
 
 				expect(error).to.have.property('data', data);
 				expect(error).to.have.property('path', undefined);
@@ -103,8 +103,8 @@ describe('ejv()', () => {
 
 				expect(error).to.be.instanceof(EjvError);
 
-				expect(error).to.have.property('type', ErrorType.INVALID_SCHEMES);
-				expect(error).to.have.property('message', ErrorMsg.EMPTY_SCHEME);
+				expect(error).to.have.property('type', ERROR_TYPE.INVALID_SCHEMES);
+				expect(error).to.have.property('message', ERROR_MESSAGE.EMPTY_SCHEME);
 
 				expect(error).to.have.property('data', data);
 				expect(error).to.have.property('path', undefined);
@@ -124,8 +124,8 @@ describe('ejv()', () => {
 
 				expect(error).to.be.instanceof(EjvError);
 
-				expect(error).to.have.property('type', ErrorType.INVALID_SCHEMES);
-				expect(error).to.have.property('message', ErrorMsg.NO_OBJECT_ARRAY_SCHEME);
+				expect(error).to.have.property('type', ERROR_TYPE.INVALID_SCHEMES);
+				expect(error).to.have.property('message', ERROR_MESSAGE.NO_OBJECT_ARRAY_SCHEME);
 
 				expect(error).to.have.property('data', data);
 				expect(error).to.have.property('path', undefined);
@@ -145,7 +145,7 @@ describe('ejv()', () => {
 				checkSchemeError({
 					data,
 					errorScheme,
-					message: ErrorMsg.SCHEMES_SHOULD_HAVE_TYPE
+					message: ERROR_MESSAGE.SCHEMES_SHOULD_HAVE_TYPE
 				});
 			});
 
@@ -158,7 +158,7 @@ describe('ejv()', () => {
 				checkSchemeError({
 					data,
 					errorScheme,
-					message: createErrorMsg(ErrorMsg.SCHEMES_HAS_INVALID_TYPE, {
+					message: createErrorMsg(ERROR_MESSAGE.SCHEMES_HAS_INVALID_TYPE, {
 						placeholders: ['invalidType']
 					})
 				});
@@ -173,7 +173,7 @@ describe('ejv()', () => {
 				checkSchemeError({
 					data,
 					errorScheme,
-					message: createErrorMsg(ErrorMsg.SCHEMES_HAS_DUPLICATED_TYPE, {
+					message: createErrorMsg(ERROR_MESSAGE.SCHEMES_HAS_DUPLICATED_TYPE, {
 						placeholders: ['string']
 					})
 				});
@@ -192,7 +192,7 @@ describe('ejv()', () => {
 						type: 'number'
 					}], {
 						customErrorMsg: {
-							[ErrorType.REQUIRED]: customErrorMsg
+							[ERROR_TYPE.REQUIRED]: customErrorMsg
 						}
 					});
 
@@ -202,7 +202,7 @@ describe('ejv()', () => {
 						throw new Error('spec failed');
 					}
 
-					expect(error.type).to.be.eql(ErrorType.REQUIRED);
+					expect(error.type).to.be.eql(ERROR_TYPE.REQUIRED);
 					expect(error.message).to.be.eql(customErrorMsg);
 				});
 
@@ -216,7 +216,7 @@ describe('ejv()', () => {
 						type: 'number'
 					}], {
 						customErrorMsg: {
-							[ErrorType.TYPE_MISMATCH]: customErrorMsg
+							[ERROR_TYPE.TYPE_MISMATCH]: customErrorMsg
 						}
 					});
 
@@ -226,7 +226,7 @@ describe('ejv()', () => {
 						throw new Error('spec failed');
 					}
 
-					expect(error.type).to.be.eql(ErrorType.TYPE_MISMATCH);
+					expect(error.type).to.be.eql(ERROR_TYPE.TYPE_MISMATCH);
 					expect(error.message).to.be.eql(customErrorMsg);
 				});
 			});

package/spec/testers.spec.ts

@@ -35,7 +35,7 @@ import {
 	timeFormatTester,
 	uniqueItemsTester
 } from '../src/tester';
-import { DataType } from '../src/constants';
+import { DATA_TYPE } from '../src/constants';
 
 describe('testers', function () {
 	describe('common', () => {
@@ -790,11 +790,11 @@ describe('testers', function () {
 
 		describe('arrayTypeOfTester()', () => {
 			it('logic test', () => {
-				expect(arrayTypeOfTester([], DataType.NUMBER)).to.be.true;
-				expect(arrayTypeOfTester([1, 2], DataType.NUMBER)).to.be.true;
-				expect(arrayTypeOfTester([1, 2, '3'], DataType.NUMBER)).to.be.false;
+				expect(arrayTypeOfTester([], DATA_TYPE.NUMBER)).to.be.true;
+				expect(arrayTypeOfTester([1, 2], DATA_TYPE.NUMBER)).to.be.true;
+				expect(arrayTypeOfTester([1, 2, '3'], DATA_TYPE.NUMBER)).to.be.false;
 
-				expect(arrayTypeOfTester([new Date(), new Date(), new Date()], DataType.DATE)).to.be.true;
+				expect(arrayTypeOfTester([new Date(), new Date(), new Date()], DATA_TYPE.DATE)).to.be.true;
 			});
 		});
 

package/src/constants.ts

@@ -1,4 +1,4 @@
-export enum DataType {
+export enum DATA_TYPE {
 	BOOLEAN = 'boolean',
 	NUMBER = 'number',
 	STRING = 'string',
@@ -8,12 +8,12 @@ export enum DataType {
 	ARRAY = 'array'
 }
 
-export enum NumberFormat {
+export enum NUMBER_FORMAT {
 	INTEGER = 'integer',
 	INDEX = 'index'
 }
 
-export enum StringFormat {
+export enum STRING_FORMAT {
 	EMAIL = 'email',
 
 	DATE = 'date',
@@ -27,7 +27,7 @@ export enum StringFormat {
 	// IPV6 = 'ipv6'
 }
 
-export enum ErrorType {
+export enum ERROR_TYPE {
 	// about ejv() running
 	NO_DATA = 'NO_DATA',
 
@@ -41,6 +41,7 @@ export enum ErrorType {
 	TYPE_MISMATCH_ONE_OF = 'TYPE_MISMATCH_ONE_OF',
 
 	ONE_VALUE_OF = 'ONE_VALUE_OF',
+	NOT_ONE_VALUE_OF = 'NOT_ONE_VALUE_OF',
 
 	FORMAT = 'FORMAT',
 	FORMAT_ONE_OF = 'FORMAT_ONE_OF',
@@ -72,7 +73,7 @@ export enum ErrorType {
 	ITEMS_SCHEMES = 'ITEMS_SCHEMES'
 }
 
-export enum ErrorMsg {
+export enum ERROR_MESSAGE {
 	// about Error
 	NO_DATA = 'no data to validate',
 
@@ -89,6 +90,10 @@ export enum ErrorMsg {
 	ENUM_SHOULD_BE_NUMBERS = 'enum values should be numbers',
 	ENUM_SHOULD_BE_STRINGS = 'enum values should be strings',
 
+	NOT_ENUM_SHOULD_BE_ARRAY = 'notEnum should be array',
+	NOT_ENUM_SHOULD_BE_NUMBERS = 'notEnum values should be numbers',
+	NOT_ENUM_SHOULD_BE_STRINGS = 'notEnum values should be strings',
+
 	MIN_SHOULD_BE_NUMBER = 'min should be number',
 	EXCLUSIVE_MIN_SHOULD_BE_BOOLEAN = 'exclusiveMin should be a boolean',
 
@@ -123,6 +128,7 @@ export enum ErrorMsg {
 	TYPE_MISMATCH_ONE_OF = 'the value should be type of <<1>>',
 
 	ONE_VALUE_OF = 'the value should be one of <<1>>', // enum
+	NOT_ONE_VALUE_OF = 'the value should not be one of <<1>>', // enum
 
 	FORMAT = 'the value should be a form of <<1>>', // format
 	FORMAT_ONE_OF = 'the value should be form of one of <<1>>',
@@ -153,3 +159,4 @@ export enum ErrorMsg {
 	ITEMS_TYPE = 'the array should have items in type of <<1>>',
 	ITEMS_SCHEMES = 'the array should have items matched with schemes of <<1>>'
 }
+