isvalid 4.1.29 → 4.1.31

package/lib/formalize.js

@@ -124,7 +124,8 @@ const formalizeAny = (schema, options = {}) => {
 		'errors': ['object'],
 		'pre': ['function', 'array', 'asyncfunction'],
 		'post': ['function', 'array', 'asyncfunction'],
-		'priority': 'number'
+		'priority': 'number',
+		'_plugins': 'any'
 	};
 
 	// Validators specific to type.
@@ -164,7 +165,6 @@ const formalizeAny = (schema, options = {}) => {
 		key = convenienceNames[key] || key;
 
 		let validator = validators[key];
-		let test = formalizedSchema[key];
 
 		if (typeof validator === 'undefined') {
 
@@ -184,8 +184,13 @@ const formalizeAny = (schema, options = {}) => {
 
 			if (typeof plugin === 'undefined') throw new SchemaError(schema, `Validator \`${key}\` is unknown in this context.`);
 
-			formalizedSchema.plugins = formalizedSchema.plugins || {};
-			formalizedSchema.plugins[key] = {
+			Object.defineProperty(formalizedSchema, '_plugins', {
+				value: formalizedSchema._plugins || {},
+				enumerable: false,
+				writable: true
+			});
+
+			formalizedSchema._plugins[key] = {
 				phase: plugin.phase || 'post',
 				validator: plugin.validate,
 				formalize: plugin.formalize
@@ -193,6 +198,8 @@ const formalizeAny = (schema, options = {}) => {
 
 		}
 
+		let test = formalizedSchema[key];
+
 		// Test for - and transform - errors in validator.
 		if (Array.isArray(test) &&
 
@@ -218,9 +225,9 @@ const formalizeAny = (schema, options = {}) => {
 			);
 		}
 
-		if (typeof (formalizedSchema.plugins || {})[key] !== 'undefined') {
+		if (typeof (formalizedSchema._plugins || {})[key] !== 'undefined') {
 			try {
-				formalizedSchema[key] = formalizedSchema.plugins[key].formalize(formalizedSchema[key], key, type) || formalizedSchema[key];
+				formalizedSchema[key] = formalizedSchema._plugins[key].formalize(formalizedSchema[key], key, type) || formalizedSchema[key];
 			} catch (error) {
 				throw new SchemaError(schema, error.message);
 			}

package/lib/plugins.js

@@ -6,15 +6,31 @@
 // See license in LICENSE
 //
 
-
 import { isSameType, instanceTypeName, typeName } from './utils.js';
 
-const plugins = [];
+const plugins = {};
+
+export function use(identifier, plugin, { conflict = 'fail' } = {}) {
+
+	if (typeof identifier !== 'string') {
+		throw new Error('Identifier must be a string.');
+	}
+
+	if (plugins[identifier]) {
+		switch (conflict) {
+		case 'replace':
+			break;
+		case 'ignore':
+			return;
+		default:
+			throw new Error(`Plugin with identifier "${identifier}" already exists.`);
+		}
+	}
+
+	plugins[identifier] = plugin({ isSameType, instanceTypeName, typeName });
 
-export function use(plugin) {
-	plugins.push(plugin({ isSameType, instanceTypeName, typeName }));
 }
 
 export function all() {
-	return plugins;
+	return Object.values(plugins);
 }

package/lib/validate.js

@@ -380,9 +380,9 @@ const validateCustom = async (phase, data, schema, options, keyPath, validatedDa
 
 const validatePlugins = async (phase, data, schema, options, keyPath) => {
 
-	const plugins = Object.keys(schema.plugins || {})
-		.filter((key) => schema.plugins[key].phase === phase)
-		.map((key) => [key, schema.plugins[key].validator]);
+	const plugins = Object.keys(schema._plugins || {})
+		.filter((key) => schema._plugins[key].phase === phase)
+		.map((key) => [key, schema._plugins[key].validator]);
 
 	for (let idx = 0 ; idx < plugins.length ; idx++) {
 		const [key, validator] = plugins[idx];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "isvalid",
-	"version": "4.1.29",
+	"version": "4.1.31",
 	"description": "Async JSON validation library for node.js.",
 	"main": "./index.js",
 	"type": "module",

package/test/index.js

@@ -13,7 +13,7 @@ import { use } from '../lib/plugins.js';
 
 chaiUse(chaiAsPromised);
 
-use(function (utils) {
+use('utils', (utils) => {
 	return {
 		supportsType: (type) => utils.isSameType(type, String),
 		validatorsForType: () => { return { ensureCase: String }; },