ejv 2.0.4 → 2.1.0

package/src/index.ts

@@ -1,5 +1,5 @@
 export { ejv } from './ejv';
-export { DataType, NumberFormat, StringFormat, ErrorMsg, ErrorType } from './constants';
+export { DATA_TYPE, NUMBER_FORMAT, STRING_FORMAT, ERROR_MESSAGE, ERROR_TYPE } from './constants';
 export {
 	BooleanScheme,
 	NumberScheme,

package/src/interfaces.ts

@@ -1,6 +1,6 @@
-import { DataType, ErrorType, NumberFormat, StringFormat } from './constants';
+import { DATA_TYPE, ERROR_TYPE, NUMBER_FORMAT, STRING_FORMAT } from './constants';
 
-export type AllDataType = string | string[] | DataType | DataType[];
+export type AllDataType = string | string[] | DATA_TYPE | DATA_TYPE[];
 
 
 interface CommonScheme {
@@ -29,14 +29,16 @@ export interface MinMaxScheme<T> extends CommonScheme, MinMax<T> {
 
 export interface NumberScheme extends MinMaxScheme<number> {
 	enum?: number[];
+	notEnum?: number[];
 
-	format?: string | string[] | NumberFormat | NumberFormat[];
+	format?: string | string[] | NUMBER_FORMAT | NUMBER_FORMAT[];
 }
 
 export interface StringScheme extends CommonScheme {
 	enum?: string[];
+	notEnum?: string[];
 
-	format?: string | string[] | StringFormat | StringFormat[];
+	format?: string | string[] | STRING_FORMAT | STRING_FORMAT[];
 	pattern?: string | string[] | RegExp | RegExp[];
 
 	length?: number;
@@ -49,11 +51,8 @@ export interface ObjectScheme extends CommonScheme {
 	allowNoProperty?: boolean; // true
 }
 
-
-/* eslint-disable @typescript-eslint/no-empty-interface */
-export interface DateScheme extends MinMaxScheme<string | Date> {
-	// min, max string for date string
-}
+// min, max string for date string
+export type DateScheme = MinMaxScheme<string | Date>
 
 // no additional rule
 export type RegExpScheme = CommonScheme;
@@ -79,7 +78,7 @@ export type Scheme =
 
 export interface Options {
 	customErrorMsg?: {
-		[key in ErrorType]?: string;
+		[key in ERROR_TYPE]?: string;
 	};
 }
 
@@ -88,7 +87,7 @@ export interface InternalOptions extends Options {
 }
 
 export class EjvError {
-	public type: ErrorType;
+	public type: ERROR_TYPE;
 	public message: string;
 
 	public data: unknown;
@@ -101,7 +100,7 @@ export class EjvError {
 	public isDataError: boolean;
 
 	constructor (param: {
-		type: ErrorType,
+		type: ERROR_TYPE,
 		message: string,
 
 		data: unknown,

package/src/tester.ts

@@ -1,35 +1,35 @@
-import { DataType } from './constants';
+import { DATA_TYPE } from './constants';
 import { AnyObject } from './interfaces';
 
-export const typeTester = (value: unknown, type: DataType): boolean => {
+export const typeTester = (value: unknown, type: DATA_TYPE): boolean => {
 	let valid: boolean;
 
 	switch (type) {
-		case DataType.BOOLEAN:
+		case DATA_TYPE.BOOLEAN:
 			valid = booleanTester(value);
 			break;
 
-		case DataType.NUMBER:
+		case DATA_TYPE.NUMBER:
 			valid = numberTester(value);
 			break;
 
-		case DataType.STRING:
+		case DATA_TYPE.STRING:
 			valid = stringTester(value);
 			break;
 
-		case DataType.OBJECT:
+		case DATA_TYPE.OBJECT:
 			valid = objectTester(value);
 			break;
 
-		case DataType.DATE:
+		case DATA_TYPE.DATE:
 			valid = dateTester(value);
 			break;
 
-		case DataType.REGEXP:
+		case DATA_TYPE.REGEXP:
 			valid = regExpTester(value);
 			break;
 
-		case DataType.ARRAY:
+		case DATA_TYPE.ARRAY:
 			valid = arrayTester(value);
 			break;
 	}
@@ -45,6 +45,10 @@ export const enumTester = <T> (value: T, arr: T[]): boolean => {
 	return arr.includes(value);
 };
 
+export const notEnumTester = <T> (value: T, arr: T[]): boolean => {
+	return !enumTester(value, arr);
+};
+
 export const lengthTester = (value: string | unknown[], length: number): boolean => {
 	return value.length === length;
 };
@@ -291,7 +295,7 @@ export const arrayTester = (value: unknown): value is unknown[] => {
 	return Array.isArray(value);
 };
 
-export const arrayTypeOfTester = (array: unknown[], type: DataType): boolean => {
+export const arrayTypeOfTester = (array: unknown[], type: DATA_TYPE): boolean => {
 	return array.every((item: unknown): boolean => {
 		return typeTester(item, type);
 	});

package/src/util.ts

@@ -1,5 +1,5 @@
 import { AnyObject } from './interfaces';
-import { ErrorMsg } from './constants';
+import { ERROR_MESSAGE } from './constants';
 
 
 enum CloneDataType {
@@ -104,7 +104,7 @@ export const sift = <T> (arr: T[]): T[] => {
 };
 
 
-export const createErrorMsg = (errorMsg: ErrorMsg, param?: {
+export const createErrorMsg = (errorMsg: ERROR_MESSAGE, param?: {
 	placeholders?: (string | number)[]
 }): string => {
 	let result: string = errorMsg;

package/.eslintrc.json

@@ -1,88 +0,0 @@
-{
-	"env": {
-		"browser": true,
-		"es2021": true,
-		"node": true
-	},
-	"extends": [
-		"eslint:recommended",
-		"plugin:@typescript-eslint/recommended"
-	],
-	"parser": "@typescript-eslint/parser",
-	"parserOptions": {
-		"ecmaVersion": 2020,
-		"sourceType": "module"
-	},
-	"plugins": [
-		"@typescript-eslint"
-	],
-	"rules": {
-		"indent": "off",
-		"@typescript-eslint/indent": [
-			"warn",
-			"tab",
-			{
-				"ignoreComments": true,
-				"SwitchCase": 1,
-				"ignoredNodes": [
-					"CallExpression *",
-					"ExpressionStatement *"
-				]
-			}
-		],
-		"linebreak-style": [
-			"warn",
-			"windows"
-		],
-		"arrow-parens": "warn",
-		"quotes": [
-			"warn",
-			"single"
-		],
-		"semi": [
-			"warn",
-			"always"
-		],
-		"no-shadow": "off",
-		"@typescript-eslint/no-shadow": "warn",
-		"no-trailing-spaces": "warn",
-		"no-var": "warn",
-		"prefer-const": "warn",
-		"space-before-function-paren": "warn",
-		"brace-style": [
-			"warn",
-			"stroustrup"
-		],
-		"key-spacing": [
-			"warn",
-			{
-				"beforeColon": false,
-				"afterColon": true
-			}
-		],
-		"@typescript-eslint/type-annotation-spacing": [
-			"warn",
-			{
-				"before": false,
-				"after": true,
-				"overrides": {
-					"arrow": {
-						"before": true,
-						"after": true
-					}
-				}
-			}
-		],
-		"@typescript-eslint/explicit-function-return-type": "warn",
-		"@typescript-eslint/no-inferrable-types": "off",
-		"@typescript-eslint/no-non-null-assertion": "warn",
-		"@typescript-eslint/no-empty-function": "warn",
-		"@typescript-eslint/no-unused-vars": "warn",
-		"@typescript-eslint/explicit-module-boundary-types": "warn",
-		"operator-linebreak": [
-			"warn",
-			"before"
-		],
-		"no-param-reassign": "warn"
-	}
-}

package/build/cjs/constants.js

@@ -1,118 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorMsg = exports.ErrorType = exports.StringFormat = exports.NumberFormat = exports.DataType = void 0;
-var DataType;
-(function (DataType) {
-    DataType["BOOLEAN"] = "boolean";
-    DataType["NUMBER"] = "number";
-    DataType["STRING"] = "string";
-    DataType["OBJECT"] = "object";
-    DataType["DATE"] = "date";
-    DataType["REGEXP"] = "regexp";
-    DataType["ARRAY"] = "array";
-})(DataType || (exports.DataType = DataType = {}));
-var NumberFormat;
-(function (NumberFormat) {
-    NumberFormat["INTEGER"] = "integer";
-    NumberFormat["INDEX"] = "index";
-})(NumberFormat || (exports.NumberFormat = NumberFormat = {}));
-var StringFormat;
-(function (StringFormat) {
-    StringFormat["EMAIL"] = "email";
-    StringFormat["DATE"] = "date";
-    StringFormat["DATE_TIME"] = "date-time";
-    StringFormat["TIME"] = "time";
-    // URL = 'url',
-    // IP = 'ip', // ipv4 || ipv6
-    // IPV4 = 'ipv4',
-    // IPV6 = 'ipv6'
-})(StringFormat || (exports.StringFormat = StringFormat = {}));
-var ErrorType;
-(function (ErrorType) {
-    // about ejv() running
-    ErrorType["NO_DATA"] = "NO_DATA";
-    ErrorType["NO_SCHEME"] = "NO_SCHEME";
-    ErrorType["INVALID_SCHEMES"] = "INVALID_SCHEMES";
-    // not match with scheme
-    ErrorType["REQUIRED"] = "REQUIRED";
-    ErrorType["TYPE_MISMATCH"] = "TYPE_MISMATCH";
-    ErrorType["TYPE_MISMATCH_ONE_OF"] = "TYPE_MISMATCH_ONE_OF";
-    ErrorType["ONE_VALUE_OF"] = "ONE_VALUE_OF";
-    ErrorType["FORMAT"] = "FORMAT";
-    ErrorType["FORMAT_ONE_OF"] = "FORMAT_ONE_OF";
-    ErrorType["BIGGER_THAN_OR_EQUAL"] = "BIGGER_THAN_OR_EQUAL";
-    ErrorType["BIGGER_THAN"] = "BIGGER_THAN";
-    ErrorType["SMALLER_THAN_OR_EQUAL"] = "SMALLER_THAN_OR_EQUAL";
-    ErrorType["SMALLER_THAN"] = "SMALLER_THAN";
-    ErrorType["LENGTH"] = "LENGTH";
-    ErrorType["MIN_LENGTH"] = "MIN_LENGTH";
-    ErrorType["MAX_LENGTH"] = "MAX_LENGTH";
-    ErrorType["PATTERN"] = "PATTERN";
-    ErrorType["PATTERN_ONE_OF"] = "PATTERN_ONE_OF";
-    ErrorType["PROPERTY"] = "PROPERTY";
-    ErrorType["AFTER_OR_SAME_DATE"] = "AFTER_OR_SAME_DATE";
-    ErrorType["AFTER_DATE"] = "AFTER_DATE";
-    ErrorType["BEFORE_OR_SAME_DATE"] = "BEFORE_OR_SAME_DATE";
-    ErrorType["BEFORE_DATE"] = "BEFORE_DATE";
-    ErrorType["UNIQUE_ITEMS"] = "UNIQUE_ITEMS";
-    ErrorType["ITEMS_TYPE"] = "ITEMS_TYPE";
-    ErrorType["ITEMS_SCHEMES"] = "ITEMS_SCHEMES";
-})(ErrorType || (exports.ErrorType = ErrorType = {}));
-var ErrorMsg;
-(function (ErrorMsg) {
-    // about Error
-    ErrorMsg["NO_DATA"] = "no data to validate";
-    ErrorMsg["NO_SCHEME"] = "no scheme";
-    ErrorMsg["NO_ARRAY_SCHEME"] = "schemes should be array";
-    ErrorMsg["NO_OBJECT_ARRAY_SCHEME"] = "schemes should be array of object";
-    ErrorMsg["EMPTY_SCHEME"] = "schemes should not be empty";
-    ErrorMsg["SCHEMES_SHOULD_HAVE_TYPE"] = "schemes should have type";
-    ErrorMsg["SCHEMES_HAS_INVALID_TYPE"] = "schemes has invalid type: <<1>>";
-    ErrorMsg["SCHEMES_HAS_DUPLICATED_TYPE"] = "schemes has duplicated type: <<1>>";
-    ErrorMsg["ENUM_SHOULD_BE_ARRAY"] = "enum should be array";
-    ErrorMsg["ENUM_SHOULD_BE_NUMBERS"] = "enum values should be numbers";
-    ErrorMsg["ENUM_SHOULD_BE_STRINGS"] = "enum values should be strings";
-    ErrorMsg["MIN_SHOULD_BE_NUMBER"] = "min should be number";
-    ErrorMsg["EXCLUSIVE_MIN_SHOULD_BE_BOOLEAN"] = "exclusiveMin should be a boolean";
-    ErrorMsg["MAX_SHOULD_BE_NUMBER"] = "max should be number";
-    ErrorMsg["EXCLUSIVE_MAX_SHOULD_BE_BOOLEAN"] = "exclusiveMax should be a boolean";
-    ErrorMsg["INVALID_NUMBER_FORMAT"] = "invalid number format: <<1>>";
-    ErrorMsg["INVALID_STRING_FORMAT"] = "invalid string format: <<1>>";
-    ErrorMsg["INVALID_STRING_PATTERN"] = "invalid string pattern: <<1>>";
-    ErrorMsg["LENGTH_SHOULD_BE_INTEGER"] = "length should be a integer";
-    ErrorMsg["MIN_LENGTH_SHOULD_BE_INTEGER"] = "minLength should be a integer";
-    ErrorMsg["MAX_LENGTH_SHOULD_BE_INTEGER"] = "maxLength should be a integer";
-    ErrorMsg["PROPERTIES_SHOULD_BE_ARRAY"] = "properties should be array";
-    ErrorMsg["PROPERTIES_SHOULD_HAVE_ITEMS"] = "properties should have items";
-    ErrorMsg["PROPERTIES_SHOULD_BE_ARRAY_OF_OBJECT"] = "properties should be array of object";
-    ErrorMsg["ALLOW_NO_PROPERTY_SHOULD_BE_BOOLEAN"] = "allowNoProperty should be a boolean";
-    ErrorMsg["MIN_DATE_SHOULD_BE_DATE_OR_STRING"] = "min should be Date or string representing date";
-    ErrorMsg["MAX_DATE_SHOULD_BE_DATE_OR_STRING"] = "max should be Date or string representing date";
-    ErrorMsg["UNIQUE_SHOULD_BE_BOOLEAN"] = "unique should be a boolean";
-    ErrorMsg["INVALID_ITEMS_SCHEME"] = "invalid schemes of array items: <<1>>";
-    // about EjvError
-    ErrorMsg["REQUIRED"] = "value is required";
-    ErrorMsg["TYPE_MISMATCH"] = "the value should be a <<1>>";
-    ErrorMsg["TYPE_MISMATCH_ONE_OF"] = "the value should be type of <<1>>";
-    ErrorMsg["ONE_VALUE_OF"] = "the value should be one of <<1>>";
-    ErrorMsg["FORMAT"] = "the value should be a form of <<1>>";
-    ErrorMsg["FORMAT_ONE_OF"] = "the value should be form of one of <<1>>";
-    ErrorMsg["BIGGER_THAN_OR_EQUAL"] = "the value should be bigger or equal than <<1>>";
-    ErrorMsg["BIGGER_THAN"] = "the value should be bigger than <<1>>";
-    ErrorMsg["SMALLER_THAN_OR_EQUAL"] = "the value should be smaller or equal than <<1>>";
-    ErrorMsg["SMALLER_THAN"] = "the value should be smaller than <<1>>";
-    ErrorMsg["LENGTH"] = "the value should be length of <<1>>";
-    ErrorMsg["MIN_LENGTH"] = "the value should be longer than <<1>>";
-    ErrorMsg["MAX_LENGTH"] = "the value should be shorter than <<1>>";
-    ErrorMsg["PATTERN"] = "the value should be pattern of <<1>>";
-    ErrorMsg["PATTERN_ONE_OF"] = "the value should be one of pattern of <<1>>";
-    ErrorMsg["PROPERTY"] = "the value should have property";
-    ErrorMsg["AFTER_OR_SAME_DATE"] = "the value should be after or same date than <<1>>";
-    ErrorMsg["AFTER_DATE"] = "the value should be after date than <<1>>";
-    ErrorMsg["BEFORE_OR_SAME_DATE"] = "the value should be before or same date than <<1>>";
-    ErrorMsg["BEFORE_DATE"] = "the value should be before date than <<1>>";
-    ErrorMsg["UNIQUE_ITEMS"] = "the array should be unique items";
-    ErrorMsg["ITEMS_TYPE"] = "the array should have items in type of <<1>>";
-    ErrorMsg["ITEMS_SCHEMES"] = "the array should have items matched with schemes of <<1>>";
-})(ErrorMsg || (exports.ErrorMsg = ErrorMsg = {}));
-//# sourceMappingURL=constants.js.map

package/build/cjs/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"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"}