ejv 2.1.5 → 2.1.6

package/spec/StringScheme.ts

@@ -6,13 +6,13 @@ import { ejv } from '../src/ejv';
 import { EjvError, Scheme } from '../src/interfaces';
 import { ERROR_MESSAGE, ERROR_TYPE } from '../src/constants';
 import { createErrorMsg } from '../src/util';
-import { checkSchemeError, TypeTester, TYPE_TESTER_ARR } from './common-test-util';
+import { checkSchemeError, TypeTester, typeTesterArr } from './common-test-util';
 
 
 describe('StringScheme', () => {
 	describe('type', () => {
 		describe('mismatch', () => {
-			TYPE_TESTER_ARR
+			typeTesterArr
 				.filter((obj: TypeTester): boolean => obj.type !== 'string')
 				.forEach((obj: TypeTester): void => {
 					const data = {
@@ -129,8 +129,7 @@ describe('StringScheme', () => {
 					const errorScheme: Scheme = {
 						key: 'a',
 						type: 'string',
-						// @ts-expect-error: null
-						enum: null
+						enum: null as unknown as string[]
 					};
 
 					checkSchemeError({
@@ -144,8 +143,7 @@ describe('StringScheme', () => {
 					const errorScheme: Scheme = {
 						key: 'a',
 						type: 'string',
-						// @ts-expect-error: type mismatch
-						enum: 'a'
+						enum: 'a' as unknown as string[]
 					};
 
 					checkSchemeError({
@@ -227,8 +225,7 @@ describe('StringScheme', () => {
 					const errorScheme: Scheme = {
 						key: 'a',
 						type: 'string',
-						// @ts-expect-error: null
-						notEnum: null
+						notEnum: null as unknown as string[]
 					};
 
 					checkSchemeError({
@@ -242,8 +239,7 @@ describe('StringScheme', () => {
 					const errorScheme: Scheme = {
 						key: 'a',
 						type: 'string',
-						// @ts-expect-error: type mismatch
-						notEnum: 'a'
+						notEnum: 'a' as unknown as string[]
 					};
 
 					checkSchemeError({
@@ -326,8 +322,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: null
-					length: null
+					length: null as unknown as number
 				};
 
 				checkSchemeError({
@@ -341,8 +336,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: type mismatch
-					length: '3'
+					length: '3' as unknown as number
 				};
 
 				checkSchemeError({
@@ -408,8 +402,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: type mismatch
-					minLength: null
+					minLength: null as unknown as number
 				};
 
 				checkSchemeError({
@@ -437,8 +430,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: type mismatch
-					minLength: '1'
+					minLength: '1' as unknown as number
 				};
 
 				checkSchemeError({
@@ -512,8 +504,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: null
-					maxLength: null
+					maxLength: null as unknown as number
 				};
 
 				checkSchemeError({
@@ -541,8 +532,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: type mismatch
-					maxLength: '1'
+					maxLength: '1' as unknown as number
 				};
 
 				checkSchemeError({
@@ -616,8 +606,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: null
-					format: null
+					format: null as unknown as string
 				};
 
 				checkSchemeError({
@@ -1075,8 +1064,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: null
-					pattern: null
+					pattern: null as unknown as string
 				};
 
 				checkSchemeError({
@@ -1092,8 +1080,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: type mismatch
-					pattern: 1
+					pattern: 1 as unknown as string
 				};
 
 				checkSchemeError({
@@ -1141,8 +1128,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: type mismatch
-					pattern: [null, /ab/]
+					pattern: [null as unknown as RegExp, /ab/]
 				};
 
 				checkSchemeError({
@@ -1158,8 +1144,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: type mismatch
-					pattern: [1, 3]
+					pattern: [1, 3] as unknown as string[]
 				};
 
 				checkSchemeError({
@@ -1207,8 +1192,7 @@ describe('StringScheme', () => {
 				const errorScheme: Scheme = {
 					key: 'a',
 					type: 'string',
-					// @ts-expect-error: type mismatch
-					pattern: new RegExp(null)
+					pattern: new RegExp(null as unknown as string)
 				};
 
 				checkSchemeError({

package/spec/common-test-util.ts

@@ -6,7 +6,7 @@ import { EjvError, Scheme } from '../src/interfaces';
 import { ejv } from '../src/ejv';
 import { ERROR_TYPE } from '../src/constants';
 
-export function commonTestRunner (
+export const commonTestRunner = (
 	testFnc: (args: unknown) => unknown,
 	nullResult: boolean,
 	undefinedResult: boolean,
@@ -14,41 +14,38 @@ export function commonTestRunner (
 	numberResult: boolean,
 	stringResult: boolean,
 	arrayResult: boolean,
-	objectResult: boolean,
-	bufferResult: boolean
-): boolean {
+	objectResult: boolean
+): boolean => {
 	return testFnc(null) === nullResult
 		&& testFnc(undefined) === undefinedResult
 		&& testFnc(true) === booleanResult
 		&& testFnc(8) === numberResult
 		&& testFnc('hello') === stringResult
 		&& testFnc([1, 2, 3]) === arrayResult
-		&& testFnc({ a: 1 }) === objectResult
-		&& testFnc(new Uint8Array(3)) === bufferResult;
-}
+		&& testFnc({ a: 1 }) === objectResult;
+};
 
 export interface TypeTester {
 	type: string;
 	value: unknown;
 }
 
-export const TYPE_TESTER_ARR: TypeTester[] = [
+export const typeTesterArr: TypeTester[] = [
 	{ type: 'boolean', value: true },
 	{ type: 'number', value: 123 },
 	{ type: 'string', value: 'ejv' },
 	{ type: 'object', value: {} },
 	{ type: 'date', value: new Date },
 	{ type: 'regexp', value: new RegExp('ejv') },
-	{ type: 'array', value: [1, 2, 3] },
-	{ type: 'buffer', value: new Uint8Array(5) }
+	{ type: 'array', value: [1, 2, 3] }
 ];
 
 
-export function checkSchemeError (param: {
+export const checkSchemeError = (param: {
 	data: object,
 	errorScheme: Scheme,
 	message: string,
-}): void {
+}): void => {
 	const ejvError: EjvError | null = ejv(param.data, [param.errorScheme]);
 
 	expect(ejvError).to.be.instanceOf(EjvError);
@@ -63,4 +60,4 @@ export function checkSchemeError (param: {
 
 	expect(ejvError).to.have.property('isSchemeError', true);
 	expect(ejvError).to.have.property('isDataError', false);
-}
+};

package/spec/testers.spec.ts

@@ -7,7 +7,6 @@ import {
 	arrayTester,
 	arrayTypeOfTester,
 	booleanTester,
-	bufferTester,
 	dateFormatTester,
 	dateTester,
 	dateTimeFormatTester,
@@ -50,7 +49,6 @@ describe('testers', function () {
 					true,
 					true,
 					true,
-					true,
 					true
 				)).to.be.true;
 			});
@@ -114,7 +112,6 @@ describe('testers', function () {
 					false,
 					false,
 					false,
-					false,
 					false
 				)).to.be.true;
 			});
@@ -143,7 +140,6 @@ describe('testers', function () {
 					true,
 					false,
 					false,
-					false,
 					false
 				)).to.be.true;
 			});
@@ -261,7 +257,6 @@ describe('testers', function () {
 					false,
 					true,
 					false,
-					false,
 					false
 				)).to.be.true;
 			});
@@ -608,8 +603,7 @@ describe('testers', function () {
 					false,
 					false,
 					true, // array is object
-					true,
-					true // buffer is object
+					true
 				)).to.be.true;
 			});
 
@@ -650,7 +644,6 @@ describe('testers', function () {
 					false,
 					false,
 					false,
-					false,
 					false
 				)).to.be.true;
 			});
@@ -785,7 +778,6 @@ describe('testers', function () {
 					false,
 					false,
 					true,
-					false,
 					false
 				)).to.be.true;
 			});
@@ -826,7 +818,6 @@ describe('testers', function () {
 					false,
 					false,
 					false,
-					false,
 					false
 				)).to.be.true;
 			});
@@ -839,29 +830,4 @@ describe('testers', function () {
 			});
 		});
 	});
-
-	describe('buffer', () => {
-		describe('bufferTester()', () => {
-			it('common test', () => {
-				expect(commonTestRunner(
-					bufferTester,
-					false,
-					false,
-					false,
-					false,
-					false,
-					false,
-					false,
-					true
-				)).to.be.true;
-			});
-
-			it('logic test', () => {
-				expect(bufferTester(new Uint8Array)).to.be.true;
-				expect(bufferTester(new Uint16Array)).to.be.true;
-				expect(bufferTester(new Uint32Array)).to.be.true;
-				expect(bufferTester(Buffer.from('hello'))).to.be.true;
-			});
-		});
-	});
 });

package/src/constants.ts

@@ -5,8 +5,7 @@ export enum DATA_TYPE {
 	OBJECT = 'object',
 	DATE = 'date',
 	REGEXP = 'regexp',
-	ARRAY = 'array',
-	BUFFER = 'buffer'
+	ARRAY = 'array'
 }
 
 export enum NUMBER_FORMAT {
@@ -59,10 +58,6 @@ export enum ERROR_TYPE {
 	MIN_LENGTH = 'MIN_LENGTH',
 	MAX_LENGTH = 'MAX_LENGTH',
 
-	BYTE_LENGTH = 'BYTE_LENGTH',
-	MIN_BYTE_LENGTH = 'MIN_BYTE_LENGTH',
-	MAX_BYTE_LENGTH = 'MAX_BYTE_LENGTH',
-
 	PATTERN = 'PATTERN',
 	PATTERN_ONE_OF = 'PATTERN_ONE_OF',
 
@@ -115,10 +110,6 @@ export enum ERROR_MESSAGE {
 	MIN_LENGTH_SHOULD_BE_INTEGER = 'minLength should be a integer',
 	MAX_LENGTH_SHOULD_BE_INTEGER = 'maxLength should be a integer',
 
-	BYTE_LENGTH_SHOULD_BE_INTEGER = 'byteLength should be a integer',
-	MIN_BYTE_LENGTH_SHOULD_BE_INTEGER = 'minByteLength should be a integer',
-	MAX_BYTE_LENGTH_SHOULD_BE_INTEGER = 'maxByteLength should be a integer',
-
 	PROPERTIES_SHOULD_BE_ARRAY = 'properties should be array',
 	PROPERTIES_SHOULD_HAVE_ITEMS = 'properties should have items',
 	PROPERTIES_SHOULD_BE_ARRAY_OF_OBJECT = 'properties should be array of object',
@@ -154,10 +145,6 @@ export enum ERROR_MESSAGE {
 	MIN_LENGTH = 'the value should be longer than <<1>>', // minLength
 	MAX_LENGTH = 'the value should be shorter than <<1>>', // maxLength
 
-	BYTE_LENGTH = 'the byte length of value should be <<1>>', // length
-	MIN_BYTE_LENGTH = 'the byte length of value should be longer than <<1>>', // minLength
-	MAX_BYTE_LENGTH = 'the byte length of value should be shorter than <<1>>', // maxLength
-
 	PATTERN = 'the value should be pattern of <<1>>', // pattern
 	PATTERN_ONE_OF = 'the value should be one of pattern of <<1>>', // pattern
 

package/src/ejv.ts

@@ -2,8 +2,6 @@ import {
 	AllDataType,
 	AnyObject,
 	ArrayScheme,
-	BufferLike,
-	BufferScheme,
 	DateScheme,
 	EjvError,
 	InternalOptions,
@@ -19,7 +17,6 @@ import {
 	arrayTester,
 	arrayTypeOfTester,
 	booleanTester,
-	bufferLengthTester,
 	dateFormatTester,
 	dateTester,
 	dateTimeFormatTester,
@@ -35,11 +32,9 @@ import {
 	integerTester,
 	jsonStrTester,
 	lengthTester,
-	maxByteLengthTester,
 	maxDateTester,
 	maxLengthTester,
 	maxNumberTester,
-	minByteLengthTester,
 	minDateTester,
 	minLengthTester,
 	minNumberTester,
@@ -1700,108 +1695,6 @@ const _ejv = <T> (data: T, schemes: Scheme[], options: InternalOptions): null |
 				}
 				break;
 			}
-
-			case DATA_TYPE.BUFFER: {
-				const valueAsBuffer: BufferLike = value as unknown as BufferLike;
-				const bufferScheme: BufferScheme = scheme as BufferScheme;
-
-				if (definedTester(bufferScheme.byteLength)) {
-					const length: number = bufferScheme.byteLength;
-
-					if (!(numberTester(length) && integerTester(length))) {
-						return new EjvError({
-							type: ERROR_TYPE.INVALID_SCHEMES,
-							message: createErrorMsg(ERROR_MESSAGE.BYTE_LENGTH_SHOULD_BE_INTEGER),
-
-							data: data,
-
-							errorScheme: bufferScheme,
-							isSchemeError: true
-						});
-					}
-
-					if (!bufferLengthTester(valueAsBuffer, length)) {
-						result = new EjvError({
-							type: ERROR_TYPE.BYTE_LENGTH,
-							message: createErrorMsg(ERROR_MESSAGE.BYTE_LENGTH, {
-								placeholders: ['' + length]
-							}),
-
-							data,
-							path: _options.path,
-
-							errorScheme: bufferScheme,
-							errorData: value
-						});
-						break;
-					}
-				}
-
-				if (definedTester(bufferScheme.minByteLength)) {
-					const minLength: number = bufferScheme.minByteLength;
-
-					if (!(numberTester(bufferScheme.minByteLength) && integerTester(minLength))) {
-						return new EjvError({
-							type: ERROR_TYPE.INVALID_SCHEMES,
-							message: createErrorMsg(ERROR_MESSAGE.MIN_BYTE_LENGTH_SHOULD_BE_INTEGER),
-
-							data: data,
-
-							errorScheme: bufferScheme,
-							isSchemeError: true
-						});
-					}
-
-					if (!minByteLengthTester(valueAsBuffer, minLength)) {
-						result = new EjvError({
-							type: ERROR_TYPE.MIN_BYTE_LENGTH,
-							message: createErrorMsg(ERROR_MESSAGE.MIN_BYTE_LENGTH, {
-								placeholders: ['' + minLength]
-							}),
-
-							data,
-							path: _options.path,
-
-							errorScheme: bufferScheme,
-							errorData: value
-						});
-						break;
-					}
-				}
-
-				if (definedTester(bufferScheme.maxByteLength)) {
-					const maxLength: number = bufferScheme.maxByteLength;
-
-					if (!(numberTester(bufferScheme.maxByteLength) && integerTester(maxLength))) {
-						return new EjvError({
-							type: ERROR_TYPE.INVALID_SCHEMES,
-							message: createErrorMsg(ERROR_MESSAGE.MAX_BYTE_LENGTH_SHOULD_BE_INTEGER),
-
-							data: data,
-
-							errorScheme: bufferScheme,
-							isSchemeError: true
-						});
-					}
-
-					if (!maxByteLengthTester(valueAsBuffer, maxLength)) {
-						result = new EjvError({
-							type: ERROR_TYPE.MAX_BYTE_LENGTH,
-							message: createErrorMsg(ERROR_MESSAGE.MAX_BYTE_LENGTH, {
-								placeholders: ['' + maxLength]
-							}),
-
-							data,
-							path: _options.path,
-
-							errorScheme: bufferScheme,
-							errorData: value
-						});
-						break;
-					}
-				}
-				break;
-			}
 		}
 
 		if (result) {
@@ -1827,7 +1720,7 @@ const _ejv = <T> (data: T, schemes: Scheme[], options: InternalOptions): null |
 	return result;
 };
 
-export function ejv (data: object, schemes: Scheme[], options?: Options): null | EjvError {
+export const ejv = (data: object, schemes: Scheme[], options?: Options): null | EjvError => {
 	// check data itself
 	if (!definedTester(data) || !objectTester(data) || data === null) {
 		return new EjvError({
@@ -1855,4 +1748,4 @@ export function ejv (data: object, schemes: Scheme[], options?: Options): null |
 	}
 
 	return _ejv(data, schemes, internalOption);
-}
+};

package/src/interfaces.ts

@@ -66,17 +66,6 @@ export interface ArrayScheme extends CommonScheme {
 	maxLength?: number;
 }
 
-
-export type BufferLike = ArrayBuffer
-	| SharedArrayBuffer
-	| Exclude<ArrayBufferView, DataView>;
-
-export interface BufferScheme extends CommonScheme {
-	byteLength?: number;
-	minByteLength?: number;
-	maxByteLength?: number;
-}
-
 export type Scheme =
 	BooleanScheme
 	| NumberScheme
@@ -84,8 +73,7 @@ export type Scheme =
 	| ObjectScheme
 	| DateScheme
 	| RegExpScheme
-	| ArrayScheme
-	| BufferScheme;
+	| ArrayScheme;
 
 
 export interface Options {