feat: add disabling of validators

src/index.ts

@@ -1,7 +1,8 @@
-import { getGlobalValidationEnabled, setGlobalValidationEnabled } from './lib/configs';
 import { Shapes } from './lib/Shapes';
 
 export const s = new Shapes();
+
+export * from './lib/configs';
 export * from './lib/errors/BaseError';
 export * from './lib/errors/CombinedError';
 export * from './lib/errors/CombinedPropertyError';
@@ -15,4 +16,3 @@ export * from './lib/errors/ValidationError';
 export * from './lib/Result';
 export * from './type-exports';
 export * from './utility-types';
-export { getGlobalValidationEnabled, setGlobalValidationEnabled };

src/validators/ArrayValidator.ts

@@ -10,7 +10,6 @@ import {
 	arrayLengthRangeInclusive
 } from '../constraints/ArrayLengthConstraints';
 import type { IConstraint } from '../constraints/base/IConstraint';
-import { getGlobalValidationEnabled } from '../lib/configs';
 import type { BaseError } from '../lib/errors/BaseError';
 import { CombinedPropertyError } from '../lib/errors/CombinedPropertyError';
 import { ValidationError } from '../lib/errors/ValidationError';
@@ -79,11 +78,7 @@ export class ArrayValidator<T> extends BaseValidator<T[]> {
 			return Result.err(new ValidationError('s.array(T)', 'Expected an array', values));
 		}
 
-		if (this.isValidationEnabled === false) {
-			return Result.ok(values);
-		}
-
-		if (this.isValidationEnabled === null && !getGlobalValidationEnabled()) {
+		if (!this.shouldValidatorRunConstraints) {
 			return Result.ok(values);
 		}
 

src/validators/BaseValidator.ts

@@ -65,11 +65,7 @@ export abstract class BaseValidator<T> {
 	public parse(value: unknown): T {
 		// If validation is disabled (at the validator or global level), we only run the `handle` method, which will do some basic checks
 		// (like that the input is a string for a string validator)
-		if (this.isValidationEnabled === false) {
-			return this.handle(value).unwrap();
-		}
-
-		if (this.isValidationEnabled === null && !getGlobalValidationEnabled()) {
+		if (!this.shouldValidatorRunConstraints) {
 			return this.handle(value).unwrap();
 		}
 
@@ -90,6 +86,14 @@ export abstract class BaseValidator<T> {
 		return this.isValidationEnabled;
 	}
 
+	protected get shouldValidatorRunConstraints() {
+		if (this.isValidationEnabled === null) {
+			return getGlobalValidationEnabled();
+		}
+
+		return this.isValidationEnabled;
+	}
+
 	protected clone(): this {
 		const clone: this = Reflect.construct(this.constructor, [this.constraints]);
 		clone.isValidationEnabled = this.isValidationEnabled;

src/validators/MapValidator.ts

@@ -1,5 +1,4 @@
 import type { IConstraint } from '../constraints/base/IConstraint';
-import { getGlobalValidationEnabled } from '../lib/configs';
 import type { BaseError } from '../lib/errors/BaseError';
 import { CombinedPropertyError } from '../lib/errors/CombinedPropertyError';
 import { ValidationError } from '../lib/errors/ValidationError';
@@ -25,11 +24,7 @@ export class MapValidator<K, V> extends BaseValidator<Map<K, V>> {
 			return Result.err(new ValidationError('s.map(K, V)', 'Expected a map', value));
 		}
 
-		if (this.isValidationEnabled === false) {
-			return Result.ok(value);
-		}
-
-		if (this.isValidationEnabled === null && !getGlobalValidationEnabled()) {
+		if (!this.shouldValidatorRunConstraints) {
 			return Result.ok(value);
 		}
 

src/validators/ObjectValidator.ts

@@ -1,5 +1,4 @@
 import type { IConstraint } from '../constraints/base/IConstraint';
-import { getGlobalValidationEnabled } from '../lib/configs';
 import type { BaseError } from '../lib/errors/BaseError';
 import { CombinedPropertyError } from '../lib/errors/CombinedPropertyError';
 import { MissingPropertyError } from '../lib/errors/MissingPropertyError';
@@ -127,11 +126,7 @@ export class ObjectValidator<T extends NonNullObject> extends BaseValidator<T> {
 			return Result.err(new ValidationError('s.object(T)', 'Expected the value to not be an array', value));
 		}
 
-		if (this.isValidationEnabled === false) {
-			return Result.ok(value as T);
-		}
-
-		if (this.isValidationEnabled === null && !getGlobalValidationEnabled()) {
+		if (!this.shouldValidatorRunConstraints) {
 			return Result.ok(value as T);
 		}
 

src/validators/RecordValidator.ts

@@ -1,5 +1,4 @@
 import type { IConstraint } from '../constraints/base/IConstraint';
-import { getGlobalValidationEnabled } from '../lib/configs';
 import type { BaseError } from '../lib/errors/BaseError';
 import { CombinedPropertyError } from '../lib/errors/CombinedPropertyError';
 import { ValidationError } from '../lib/errors/ValidationError';
@@ -31,11 +30,7 @@ export class RecordValidator<T> extends BaseValidator<Record<string, T>> {
 			return Result.err(new ValidationError('s.record(T)', 'Expected the value to not be an array', value));
 		}
 
-		if (this.isValidationEnabled === false) {
-			return Result.ok(value as Record<string, T>);
-		}
-
-		if (this.isValidationEnabled === null && !getGlobalValidationEnabled()) {
+		if (!this.shouldValidatorRunConstraints) {
 			return Result.ok(value as Record<string, T>);
 		}
 

src/validators/SetValidator.ts

@@ -1,5 +1,4 @@
 import type { IConstraint } from '../constraints/base/IConstraint';
-import { getGlobalValidationEnabled } from '../lib/configs';
 import type { BaseError } from '../lib/errors/BaseError';
 import { CombinedError } from '../lib/errors/CombinedError';
 import { ValidationError } from '../lib/errors/ValidationError';
@@ -23,11 +22,7 @@ export class SetValidator<T> extends BaseValidator<Set<T>> {
 			return Result.err(new ValidationError('s.set(T)', 'Expected a set', values));
 		}
 
-		if (this.isValidationEnabled === false) {
-			return Result.ok(values);
-		}
-
-		if (this.isValidationEnabled === null && !getGlobalValidationEnabled()) {
+		if (!this.shouldValidatorRunConstraints) {
 			return Result.ok(values);
 		}
 

src/validators/TupleValidator.ts

@@ -1,5 +1,4 @@
 import type { IConstraint } from '../constraints/base/IConstraint';
-import { getGlobalValidationEnabled } from '../lib/configs';
 import type { BaseError } from '../lib/errors/BaseError';
 import { CombinedPropertyError } from '../lib/errors/CombinedPropertyError';
 import { ValidationError } from '../lib/errors/ValidationError';
@@ -27,11 +26,7 @@ export class TupleValidator<T extends any[]> extends BaseValidator<[...T]> {
 			return Result.err(new ValidationError('s.tuple(T)', `Expected an array of length ${this.validators.length}`, values));
 		}
 
-		if (this.isValidationEnabled === false) {
-			return Result.ok(values as [...T]);
-		}
-
-		if (this.isValidationEnabled === null && !getGlobalValidationEnabled()) {
+		if (!this.shouldValidatorRunConstraints) {
 			return Result.ok(values as [...T]);
 		}