ejv 1.1.10 → 2.0.0

package/spec/testers.spec.ts

@@ -1,6 +1,7 @@
+import { describe, it } from 'mocha';
 import { expect } from 'chai';
 
-import { commonTestRunner } from './common-test-runner';
+import { commonTestRunner } from './common-test-util';
 
 import {
 	arrayTester,
@@ -313,8 +314,8 @@ describe('testers', function () {
 
 				expect(emailTester('a"b(c)d,e:f;g<h>i[j\\k]l@example.com')).to.be.false;
 				expect(emailTester('just"not"right@example.com')).to.be.false;
-				expect(emailTester('this is"not\allowed@example.com')).to.be.false;
-				expect(emailTester('this\ still\"not\\allowed@example.com')).to.be.false;
+				expect(emailTester('this is"notallowed@example.com')).to.be.false;
+				expect(emailTester('this still"not\\allowed@example.com')).to.be.false;
 				expect(emailTester('1234567890123456789012345678901234567890123456789012345678901234+x@example.com')).to.be.false;
 				expect(emailTester('john..doe@example.com')).to.be.false;
 				expect(emailTester('john.doe@example..com')).to.be.false;
@@ -609,29 +610,29 @@ describe('testers', function () {
 			it('logic test', () => {
 				expect(objectTester(null)).to.be.true;
 				expect(objectTester({})).to.be.true;
-				expect(objectTester({ a : 1 })).to.be.true;
+				expect(objectTester({ a: 1 })).to.be.true;
 			});
 		});
 
 		describe('hasPropertyTester()', () => {
 			it('logic test', () => {
 				expect(hasPropertyTester({})).to.be.false;
-				expect(hasPropertyTester({ a : 1 })).to.be.true;
+				expect(hasPropertyTester({ a: 1 })).to.be.true;
 			});
 		});
 	});
 
 	describe('date', () => {
-		const now : Date = new Date();
+		const now: Date = new Date();
 
-		const year : number = now.getFullYear();
-		const month : number = now.getMonth();
-		const date : number = now.getDate();
+		const year: number = now.getFullYear();
+		const month: number = now.getMonth();
+		const date: number = now.getDate();
 
-		const hours : number = now.getHours();
-		const minutes : number = now.getMinutes();
-		const seconds : number = now.getSeconds();
-		const ms : number = now.getMilliseconds();
+		const hours: number = now.getHours();
+		const minutes: number = now.getMinutes();
+		const seconds: number = now.getSeconds();
+		const ms: number = now.getMilliseconds();
 
 		describe('dateTester()', () => {
 			it('common test', () => {
@@ -793,7 +794,7 @@ describe('testers', function () {
 				expect(arrayTypeOfTester([1, 2], DataType.NUMBER)).to.be.true;
 				expect(arrayTypeOfTester([1, 2, '3'], DataType.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()], DataType.DATE)).to.be.true;
 			});
 		});
 
@@ -823,9 +824,9 @@ describe('testers', function () {
 
 			it('logic test', () => {
 				expect(regExpTester(/\d/)).to.be.true;
-				expect(regExpTester(new RegExp('\d'))).to.be.true;
+				expect(regExpTester(new RegExp('d'))).to.be.true;
 
-				expect(regExpTester('\d')).to.be.false;
+				expect(regExpTester('d')).to.be.false;
 			});
 		});
 	});

package/src/constants.ts

@@ -27,22 +27,26 @@ export enum StringFormat {
 	// IPV6 = 'ipv6'
 }
 
-export const ErrorMsgCursorA : string = '<<A>>';
-
 export enum ErrorType {
+	// about ejv() running
+	NO_DATA = 'NO_DATA',
+
+	NO_SCHEME = 'NO_SCHEME',
+	INVALID_SCHEMES = 'INVALID_SCHEMES',
+
+	// not match with scheme
 	REQUIRED = 'REQUIRED',
 
 	TYPE_MISMATCH = 'TYPE_MISMATCH',
 	TYPE_MISMATCH_ONE_OF = 'TYPE_MISMATCH_ONE_OF',
 
 	ONE_OF = 'ONE_OF',
-	NOT_ONE_OF = 'NOT_ONE_OF',
 
 	FORMAT = 'FORMAT',
 	FORMAT_ONE_OF = 'FORMAT_ONE_OF',
 
-	GREATER_THAN_OR_EQUAL = 'GREATER_THAN_OR_EQUAL',
-	GREATER_THAN = 'GREATER_THAN',
+	BIGGER_THAN_OR_EQUAL = 'BIGGER_THAN_OR_EQUAL',
+	BIGGER_THAN = 'BIGGER_THAN',
 
 	SMALLER_THAN_OR_EQUAL = 'SMALLER_THAN_OR_EQUAL',
 	SMALLER_THAN = 'SMALLER_THAN',
@@ -54,7 +58,7 @@ export enum ErrorType {
 	PATTERN = 'PATTERN',
 	PATTERN_ONE_OF = 'PATTERN_ONE_OF',
 
-	NO_PROPERTY = 'NO_PROPERTY',
+	PROPERTY = 'PROPERTY',
 
 	AFTER_OR_SAME_DATE = 'AFTER_OR_SAME_DATE',
 	AFTER_DATE = 'AFTER_DATE',
@@ -76,28 +80,24 @@ export enum ErrorMsg {
 	NO_ARRAY_SCHEME = 'schemes should be array',
 	NO_OBJECT_ARRAY_SCHEME = 'schemes should be array of object',
 
-	EMPTY_SCHEME = 'scheme should not be empty',
-	SCHEMES_SHOULD_HAVE_TYPE = 'scheme should have type',
-	SCHEMES_HAS_INVALID_TYPE = 'schemes has invalid type : <<A>>',
-	SCHEMES_HAS_DUPLICATED_TYPE = 'schemes has duplicated type : <<A>>',
+	EMPTY_SCHEME = 'schemes should not be empty',
+	SCHEMES_SHOULD_HAVE_TYPE = 'schemes should have type',
+	SCHEMES_HAS_INVALID_TYPE = 'schemes has invalid type: <<1>>',
+	SCHEMES_HAS_DUPLICATED_TYPE = 'schemes has duplicated type: <<1>>',
 
 	ENUM_SHOULD_BE_ARRAY = 'enum should be array',
 	ENUM_SHOULD_BE_NUMBERS = 'enum values should be numbers',
 	ENUM_SHOULD_BE_STRINGS = 'enum values should be strings',
 
-	ENUM_REVERSE_SHOULD_BE_ARRAY = 'enumReverse should be array',
-	ENUM_REVERSE_SHOULD_BE_NUMBERS = 'enumReverse values should be numbers',
-	ENUM_REVERSE_SHOULD_BE_STRINGS = 'enumReverse values should be strings',
-
 	MIN_SHOULD_BE_NUMBER = 'min should be number',
 	EXCLUSIVE_MIN_SHOULD_BE_BOOLEAN = 'exclusiveMin should be a boolean',
 
 	MAX_SHOULD_BE_NUMBER = 'max should be number',
 	EXCLUSIVE_MAX_SHOULD_BE_BOOLEAN = 'exclusiveMax should be a boolean',
 
-	INVALID_NUMBER_FORMAT = 'invalid number format : <<A>>',
-	INVALID_STRING_FORMAT = 'invalid string format : <<A>>',
-	INVALID_STRING_PATTERN = 'invalid string pattern : <<A>>',
+	INVALID_NUMBER_FORMAT = 'invalid number format: <<1>>',
+	INVALID_STRING_FORMAT = 'invalid string format: <<1>>',
+	INVALID_STRING_PATTERN = 'invalid string pattern: <<1>>',
 
 	LENGTH_SHOULD_BE_INTEGER = 'length should be a integer',
 	MIN_LENGTH_SHOULD_BE_INTEGER = 'minLength should be a integer',
@@ -114,43 +114,42 @@ export enum ErrorMsg {
 
 	UNIQUE_SHOULD_BE_BOOLEAN = 'unique should be a boolean',
 
-	INVALID_ITEMS_SCHEME = 'invalid schemes of array items : <<A>>',
+	INVALID_ITEMS_SCHEME = 'invalid schemes of array items: <<1>>',
 
 	// about EjvError
-	REQUIRED = 'required',
+	REQUIRED = 'value is required',
 
-	TYPE_MISMATCH = 'the value should be a <<A>>',
-	TYPE_MISMATCH_ONE_OF = 'the value should be one of <<A>>',
+	TYPE_MISMATCH = 'the value should be a <<1>>',
+	TYPE_MISMATCH_ONE_OF = 'the value should be type of <<1>>',
 
-	ONE_OF = 'the value should be one of <<A>>', // enum
-	NOT_ONE_OF = 'the value should be not one of <<A>>', // enumReverse
+	ONE_VALUE_OF = 'the value should be one of <<1>>', // enum
 
-	FORMAT = 'the value should be a form of <<A>>', // format
-	FORMAT_ONE_OF = 'the value should be form of one of <<A>>',
+	FORMAT = 'the value should be a form of <<1>>', // format
+	FORMAT_ONE_OF = 'the value should be form of one of <<1>>',
 
-	GREATER_THAN_OR_EQUAL = 'the value should be greater or equal than <<A>>', // min
-	GREATER_THAN = 'the value should be greater than <<A>>', // min
+	BIGGER_THAN_OR_EQUAL = 'the value should be bigger or equal than <<1>>', // min
+	BIGGER_THAN = 'the value should be bigger than <<1>>', // min
 
-	SMALLER_THAN_OR_EQUAL = 'the value should be smaller or equal than <<A>>', // max
-	SMALLER_THAN = 'the value should be smaller than <<A>>', // max
+	SMALLER_THAN_OR_EQUAL = 'the value should be smaller or equal than <<1>>', // max
+	SMALLER_THAN = 'the value should be smaller than <<1>>', // max
 
-	LENGTH = 'the value should be length of <<A>>', // length
-	MIN_LENGTH = 'the value should be longer than <<A>>', // minLength
-	MAX_LENGTH = 'the value should be shorter than <<A>>', // maxLength
+	LENGTH = 'the value should be length of <<1>>', // length
+	MIN_LENGTH = 'the value should be longer than <<1>>', // minLength
+	MAX_LENGTH = 'the value should be shorter than <<1>>', // maxLength
 
-	PATTERN = 'the value should be pattern of <<A>>', // pattern
-	PATTERN_ONE_OF = 'the value should be one of pattern of <<A>>', // pattern
+	PATTERN = 'the value should be pattern of <<1>>', // pattern
+	PATTERN_ONE_OF = 'the value should be one of pattern of <<1>>', // pattern
 
-	NO_PROPERTY = 'the value should have property',
+	PROPERTY = 'the value should have property',
 
-	AFTER_OR_SAME_DATE = 'the value should be after or same date than <<A>>', // date
-	AFTER_DATE = 'the value should be after date than <<A>>', // date
+	AFTER_OR_SAME_DATE = 'the value should be after or same date than <<1>>', // date
+	AFTER_DATE = 'the value should be after date than <<1>>', // date
 
-	BEFORE_OR_SAME_DATE = 'the value should be before or same date than <<A>>', // date
-	BEFORE_DATE = 'the value should be before date than <<A>>', // date
+	BEFORE_OR_SAME_DATE = 'the value should be before or same date than <<1>>', // date
+	BEFORE_DATE = 'the value should be before date than <<1>>', // date
 
 	UNIQUE_ITEMS = 'the array should be unique items',
 
-	ITEMS_TYPE = 'the array should have items in type of <<A>>',
-	ITEMS_SCHEMES = 'the array should have items matched with schemes of <<A>>'
-}
+	ITEMS_TYPE = 'the array should have items in type of <<1>>',
+	ITEMS_SCHEMES = 'the array should have items matched with schemes of <<1>>'
+}