z-schema 12.1.1 → 12.3.1

package/dist/{z-schema.mjs → z-schema.js}

@@ -1,31 +1,27 @@
-import { deepClone } from "./utils/clone.mjs";
-import { jsonSymbol, schemaSymbol } from "./utils/symbols.mjs";
-import { defaultOptions } from "./z-schema-options.mjs";
-import { SchemaCache, prepareRemoteSchema } from "./schema-cache.mjs";
-import "./z-schema-versions.mjs";
-import { getRegisteredFormats, registerFormat, unregisterFormat } from "./format-validators.mjs";
-import { getSchemaReader, setSchemaReader } from "./z-schema-reader.mjs";
-import { FACTORY_TOKEN, ZSchemaBase } from "./z-schema-base.mjs";
+import { deepClone } from "./utils/clone.js";
+import { jsonSymbol, schemaSymbol } from "./utils/symbols.js";
+import { defaultOptions } from "./z-schema-options.js";
+import { SchemaCache, prepareRemoteSchema } from "./schema-cache.js";
+import "./z-schema-versions.js";
+import { getRegisteredFormats, registerFormat, unregisterFormat } from "./format-validators.js";
+import { getSchemaReader, setSchemaReader } from "./z-schema-reader.js";
+import { FACTORY_TOKEN, ZSchemaBase } from "./z-schema-base.js";
 //#region src/z-schema.ts
 var ZSchema = class ZSchema extends ZSchemaBase {
-	/** @internal Use ZSchema.create() instead. */
-	constructor(options, token) {
-		super(options, token);
-	}
 	/**
 	* Register a global format validator available to all instances.
 	* @param name - The format name (e.g. `'email'`, `'date'`).
 	* @param validatorFunction - A sync or async function `(value: unknown) => boolean | Promise<boolean>`.
 	*/
 	static registerFormat(name, validatorFunction) {
-		return registerFormat(name, validatorFunction);
+		registerFormat(name, validatorFunction);
 	}
 	/**
 	* Remove a globally registered format validator.
 	* @param name - The format name to unregister.
 	*/
 	static unregisterFormat(name) {
-		return unregisterFormat(name);
+		unregisterFormat(name);
 	}
 	/** Returns the names of all globally registered format validators. */
 	static getRegisteredFormats() {
@@ -54,7 +50,7 @@ var ZSchema = class ZSchema extends ZSchemaBase {
 	* @param schemaReader - A function `(uri: string) => JsonSchema | undefined`, or `undefined` to clear.
 	*/
 	static setSchemaReader(schemaReader) {
-		return setSchemaReader(schemaReader);
+		setSchemaReader(schemaReader);
 	}
 	static schemaSymbol = schemaSymbol;
 	static jsonSymbol = jsonSymbol;
@@ -90,10 +86,10 @@ var ZSchema = class ZSchema extends ZSchemaBase {
 		try {
 			this._validate(json, schema, options ?? {});
 			return { valid: true };
-		} catch (err) {
+		} catch (error) {
 			return {
 				valid: false,
-				err
+				err: error
 			};
 		}
 	}
@@ -108,9 +104,12 @@ var ZSchema = class ZSchema extends ZSchemaBase {
 	validateAsync(json, schema, options) {
 		return new Promise((resolve, reject) => {
 			try {
-				this._validate(json, schema, options || {}, (err, valid) => err || valid !== true ? reject(err) : resolve(valid));
-			} catch (err) {
-				reject(err);
+				this._validate(json, schema, options || {}, (err, valid) => {
+					if (err || !valid) reject(err ?? /* @__PURE__ */ new Error("Validation failed"));
+					else resolve(valid);
+				});
+			} catch (error) {
+				reject(error instanceof Error ? error : new Error(String(error), { cause: error }));
 			}
 		});
 	}
@@ -131,10 +130,10 @@ var ZSchema = class ZSchema extends ZSchemaBase {
 						err
 					});
 				});
-			} catch (err) {
+			} catch (error) {
 				resolve({
 					valid: false,
-					err
+					err: error
 				});
 			}
 		});
@@ -157,10 +156,10 @@ var ZSchema = class ZSchema extends ZSchemaBase {
 		try {
 			this._validateSchema(schemaOrArr);
 			return { valid: true };
-		} catch (err) {
+		} catch (error) {
 			return {
 				valid: false,
-				err
+				err: error
 			};
 		}
 	}
@@ -170,10 +169,6 @@ var ZSchema = class ZSchema extends ZSchemaBase {
 * Created via `ZSchema.create({ safe: true })`.
 */
 var ZSchemaSafe = class extends ZSchemaBase {
-	/** @internal Use ZSchema.create() instead. */
-	constructor(options, token) {
-		super(options, token);
-	}
 	/**
 	* Validate JSON data against a schema.
 	* @param json - The data to validate.
@@ -185,10 +180,10 @@ var ZSchemaSafe = class extends ZSchemaBase {
 		try {
 			this._validate(json, schema, options);
 			return { valid: true };
-		} catch (err) {
+		} catch (error) {
 			return {
 				valid: false,
-				err
+				err: error
 			};
 		}
 	}
@@ -201,10 +196,10 @@ var ZSchemaSafe = class extends ZSchemaBase {
 		try {
 			this._validateSchema(schemaOrArr);
 			return { valid: true };
-		} catch (err) {
+		} catch (error) {
 			return {
 				valid: false,
-				err
+				err: error
 			};
 		}
 	}
@@ -214,10 +209,6 @@ var ZSchemaSafe = class extends ZSchemaBase {
 * Created via `ZSchema.create({ async: true })`.
 */
 var ZSchemaAsync = class extends ZSchemaBase {
-	/** @internal Use ZSchema.create() instead. */
-	constructor(options, token) {
-		super(options, token);
-	}
 	/**
 	* Validate JSON data against a schema asynchronously.
 	* @param json - The data to validate.
@@ -229,9 +220,12 @@ var ZSchemaAsync = class extends ZSchemaBase {
 	validate(json, schema, options = {}) {
 		return new Promise((resolve, reject) => {
 			try {
-				this._validate(json, schema, options, (err, valid) => err || valid !== true ? reject(err) : resolve(valid));
-			} catch (err) {
-				reject(err);
+				this._validate(json, schema, options, (err, valid) => {
+					if (err || !valid) reject(err ?? /* @__PURE__ */ new Error("Validation failed"));
+					else resolve(valid);
+				});
+			} catch (error) {
+				reject(error instanceof Error ? error : new Error(String(error), { cause: error }));
 			}
 		});
 	}
@@ -250,10 +244,6 @@ var ZSchemaAsync = class extends ZSchemaBase {
 * Created via `ZSchema.create({ async: true, safe: true })`.
 */
 var ZSchemaAsyncSafe = class extends ZSchemaBase {
-	/** @internal Use ZSchema.create() instead. */
-	constructor(options, token) {
-		super(options, token);
-	}
 	/**
 	* Validate JSON data against a schema asynchronously.
 	* The promise always resolves (never rejects).
@@ -271,10 +261,10 @@ var ZSchemaAsyncSafe = class extends ZSchemaBase {
 						err
 					});
 				});
-			} catch (err) {
+			} catch (error) {
 				resolve({
 					valid: false,
-					err
+					err: error
 				});
 			}
 		});
@@ -288,10 +278,10 @@ var ZSchemaAsyncSafe = class extends ZSchemaBase {
 		try {
 			this._validateSchema(schemaOrArr);
 			return { valid: true };
-		} catch (err) {
+		} catch (error) {
 			return {
 				valid: false,
-				err
+				err: error
 			};
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "z-schema",
-  "version": "12.1.1",
+  "version": "12.3.1",
   "description": "Fast, lightweight JSON Schema validator for Node.js and browsers — full support for draft-04, draft-06, draft-07, draft-2019-09, and draft-2020-12 (latest)",
   "keywords": [
     "draft-04",
@@ -39,32 +39,30 @@
     "LICENSE",
     "README.md"
   ],
+  "type": "module",
   "sideEffects": [
-    "./dist/z-schema-versions.mjs"
+    "./dist/z-schema-versions.js"
   ],
   "exports": {
     ".": {
       "import": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       },
       "require": {
-        "types": "./cjs/index.d.ts",
-        "default": "./cjs/index.js"
+        "types": "./cjs/index.d.cts",
+        "default": "./cjs/index.cjs"
       },
-      "default": "./dist/index.mjs"
+      "default": "./dist/index.js"
     }
   },
   "scripts": {
-    "prepare": "husky",
-    "pre-commit": "npx lint-staged",
+    "prepare": "lefthook install",
     "pre-push": "npm run build && npm run build:tests",
-    "format": "oxfmt",
-    "format:check": "oxfmt --check",
-    "lint": "oxlint --fix",
-    "lint:check": "oxlint",
+    "check": "ultracite check",
+    "fix": "ultracite fix",
     "clean": "rimraf ./cjs && rimraf ./dist && rimraf ./umd && rimraf --glob \"./src/schemas/*.json\"",
-    "build": "npm run copy:schemas && tsdown",
+    "build": "npm run copy:schemas && tsdown && node ./scripts/write-build-markers.mjs",
     "build:watch": "npm run copy:schemas && tsdown --watch",
     "build:tests": "tsc --noEmit --project test/tsconfig.json",
     "copy:schemas": "node ./scripts/copy-schemas.mts",
@@ -87,22 +85,26 @@
     "@types/node": "^25.2.0",
     "@types/punycode": "^2.1.4",
     "@types/validator": "^13.15.10",
-    "@vitest/browser-playwright": "^4.0.18",
-    "@vitest/coverage-istanbul": "^4.0.18",
-    "@vitest/coverage-v8": "^4.0.18",
-    "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
+    "@vitest/browser-playwright": "^4.1.0",
+    "@vitest/coverage-istanbul": "^4.1.0",
+    "@vitest/coverage-v8": "^4.1.0",
+    "lefthook": "^2.1.9",
     "lodash.isequal": "^4.5.0",
-    "oxfmt": "^0.41.0",
+    "oxfmt": "^0.51.0",
     "oxlint": "^1.56.0",
+    "oxlint-tsgolint": "^0.23.0",
     "rimraf": "^6.1.2",
-    "tsdown": "^0.21.4",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18"
+    "tsdown": "^0.22.0",
+    "typescript": "^6.0.3",
+    "ultracite": "^7.8.1",
+    "vitest": "^4.1.0"
   },
   "optionalDependencies": {
     "commander": "^14.0.3"
   },
+  "overrides": {
+    "vite": ">=7.3.2"
+  },
   "engines": {
     "node": ">=22.0.0"
   },

package/src/errors.ts

@@ -76,12 +76,11 @@ export const Errors = {
 };
 
 export class ValidateError extends Error {
-  name: string;
+  override readonly name: string = 'ValidateError';
   details?: SchemaErrorDetail[];
 
   constructor(message: string, details?: SchemaErrorDetail[]) {
     super(message);
-    this.name = 'z-schema validation error';
     this.details = details;
   }
 }

package/src/format-validators.ts

@@ -18,9 +18,9 @@ const dateValidator: FormatValidatorFn = (date: unknown) => {
   if (matches === null) {
     return false;
   }
-  const year = parseInt(matches[1], 10);
-  const month = parseInt(matches[2], 10);
-  const day = parseInt(matches[3], 10);
+  const year = Number.parseInt(matches[1], 10);
+  const month = Number.parseInt(matches[2], 10);
+  const day = Number.parseInt(matches[3], 10);
   return isValidRfc3339Date(year, month, day);
 };
 
@@ -29,20 +29,23 @@ const dateTimeValidator: FormatValidatorFn = (dateTime: unknown) => {
     return true;
   }
   // date-time from http://tools.ietf.org/html/rfc3339#section-5.6
-  const s = dateTime.toLowerCase().split('t');
-  if (s.length !== 2) {
+  let tIdx = dateTime.indexOf('T');
+  if (tIdx === -1) {
+    tIdx = dateTime.indexOf('t');
+  }
+  if (tIdx === -1) {
     return false;
   }
-  const datePart = s[0];
-  const timePart = s[1];
+  const datePart = dateTime.slice(0, tIdx);
+  const timePart = dateTime.slice(tIdx + 1);
   // Check date
   const dateMatches = /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/.exec(datePart);
   if (dateMatches === null) {
     return false;
   }
-  const year = parseInt(dateMatches[1], 10);
-  const month = parseInt(dateMatches[2], 10);
-  const day = parseInt(dateMatches[3], 10);
+  const year = Number.parseInt(dateMatches[1], 10);
+  const month = Number.parseInt(dateMatches[2], 10);
+  const day = Number.parseInt(dateMatches[3], 10);
   if (!isValidRfc3339Date(year, month, day)) {
     return false;
   }
@@ -96,12 +99,13 @@ const ipv6Validator: FormatValidatorFn = (ipv6: unknown) => {
   return isIPModule.default(ipv6, 6);
 };
 
+const INVALID_REGEX_ESCAPES = new Set(['a']);
+
 const regexValidator: FormatValidatorFn = (input: unknown) => {
   if (typeof input !== 'string') {
     return true;
   }
 
-  const invalidEscapes = new Set(['a']);
   for (let idx = 0; idx < input.length; idx++) {
     if (input[idx] !== '\\') {
       continue;
@@ -113,15 +117,19 @@ const regexValidator: FormatValidatorFn = (input: unknown) => {
     }
 
     const escaped = input[idx];
-    if (invalidEscapes.has(escaped)) {
+    if (INVALID_REGEX_ESCAPES.has(escaped)) {
       return false;
     }
   }
 
   try {
-    RegExp(input);
+    // Constructed purely to detect an invalid pattern (throws SyntaxError). The
+    // result is intentionally unused; `new` is required by new-for-builtins and
+    // `void`/call-form trip no-void/new-for-builtins, so no-new is disabled here.
+    // oxlint-disable-next-line no-new
+    new RegExp(input);
     return true;
-  } catch (_e) {
+  } catch {
     return false;
   }
 };
@@ -132,7 +140,7 @@ const durationValidator: FormatValidatorFn = (input: unknown) => {
   }
 
   // eslint-disable-next-line no-control-regex
-  if (!/^P[\x00-\x7F]*$/.test(input)) {
+  if (!/^P[\u0000-\u007F]*$/.test(input)) {
     return false;
   }
 
@@ -163,7 +171,7 @@ const durationValidator: FormatValidatorFn = (input: unknown) => {
     return false;
   }
 
-  const hasDateComponent = /\d+[YMD]/.test(datePart);
+  const hasDateComponent = datePart.length > 0;
   let hasTimeComponent = false;
 
   if (timePart !== undefined) {
@@ -193,43 +201,55 @@ const uuidValidator: FormatValidatorFn = (input: unknown) => {
 
 const strictUriValidator: FormatValidatorFn = (uri: unknown) => typeof uri !== 'string' || isURLModule.default(uri);
 
+const isHexChar = (c: number) => (c >= 48 && c <= 57) || (c >= 65 && c <= 70) || (c >= 97 && c <= 102);
+
 const hasValidPercentEncoding = (str: string): boolean => {
   for (let i = 0; i < str.length; i++) {
-    if (str[i] === '%') {
-      if (i + 2 >= str.length || !/[0-9a-fA-F]/.test(str[i + 1]) || !/[0-9a-fA-F]/.test(str[i + 2])) {
-        return false;
-      }
+    if (
+      str[i] === '%' &&
+      (i + 2 >= str.length || !isHexChar(str.charCodeAt(i + 1)) || !isHexChar(str.charCodeAt(i + 2)))
+    ) {
+      return false;
     }
   }
   return true;
 };
 
-const uriValidator: FormatValidatorFn = function (uri: unknown) {
-  if (typeof uri !== 'string') return true;
+const uriValidator: FormatValidatorFn = (uri: unknown) => {
+  if (typeof uri !== 'string') {
+    return true;
+  }
   // eslint-disable-next-line no-control-regex
-  if (/[^\x00-\x7F]/.test(uri)) return false;
-  if (!hasValidPercentEncoding(uri)) return false;
-  const match = uri.match(/^([a-zA-Z][a-zA-Z0-9+.-]*):\/\/([^/?#]*)/);
+  if (/[^\u0000-\u007F]/.test(uri)) {
+    return false;
+  }
+  if (!hasValidPercentEncoding(uri)) {
+    return false;
+  }
+  const match = /^([a-zA-Z][a-zA-Z0-9+.-]*):\/\/([^/?#]*)/.exec(uri);
   if (match) {
     const authority = match[2];
     const atIndex = authority.indexOf('@');
     if (atIndex > 0) {
-      const userinfo = authority.substring(0, atIndex);
+      // userinfo is a string; prefer-set-has misfires here — two String#includes
+      // calls are faster than building a Set or a regex for this membership check.
+      // oxlint-disable-next-line unicorn/prefer-set-has
+      const userinfo = authority.slice(0, atIndex);
       if (userinfo.includes('[') || userinfo.includes(']')) {
         return false;
       }
     }
     // Validate port: must be numeric
-    let hostPort = atIndex >= 0 ? authority.substring(atIndex + 1) : authority;
+    let hostPort = atIndex === -1 ? authority : authority.slice(atIndex + 1);
     if (hostPort.startsWith('[')) {
       const bracketEnd = hostPort.indexOf(']');
-      if (bracketEnd >= 0) {
-        hostPort = hostPort.substring(bracketEnd + 1);
+      if (bracketEnd !== -1) {
+        hostPort = hostPort.slice(bracketEnd + 1);
       }
     }
     const colonIndex = hostPort.lastIndexOf(':');
-    if (colonIndex >= 0) {
-      const port = hostPort.substring(colonIndex + 1);
+    if (colonIndex !== -1) {
+      const port = hostPort.slice(colonIndex + 1);
       if (port.length > 0 && !/^\d+$/.test(port)) {
         return false;
       }
@@ -239,15 +259,21 @@ const uriValidator: FormatValidatorFn = function (uri: unknown) {
 };
 
 const uriReferenceValidator: FormatValidatorFn = (uri: unknown) => {
-  if (typeof uri !== 'string') return true;
+  if (typeof uri !== 'string') {
+    return true;
+  }
   // eslint-disable-next-line no-control-regex
-  if (/[^\x00-\x7F]/.test(uri)) return false;
+  if (/[^\u0000-\u007F]/.test(uri)) {
+    return false;
+  }
   // URI-reference allows relative URIs
   return /^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/.test(uri);
 };
 
 const uriTemplateValidator: FormatValidatorFn = (uri: unknown) => {
-  if (typeof uri !== 'string') return true;
+  if (typeof uri !== 'string') {
+    return true;
+  }
   // URI template allows braces for expressions.
   if (!/^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^`| ]*$/.test(uri)) {
     return false;
@@ -286,66 +312,100 @@ const hasValidTildeEscapes = (segment: string): boolean => {
 };
 
 const jsonPointerValidator: FormatValidatorFn = (pointer: unknown) => {
-  if (typeof pointer !== 'string') return true;
+  if (typeof pointer !== 'string') {
+    return true;
+  }
   // JSON Pointer: empty, or a sequence of '/'-prefixed reference tokens.
   // In each token, '~' must be escaped as '~0' or '~1'.
-  if (pointer === '') return true;
-  if (!/^(?:\/[^/]*)+$/.test(pointer)) return false;
-  const tokens = pointer.split('/').slice(1); // first element is empty before leading '/'
-  for (const token of tokens) {
-    if (!hasValidTildeEscapes(token)) return false;
+  if (pointer === '') {
+    return true;
+  }
+  if (!/^(?:\/[^/]*)+$/.test(pointer)) {
+    return false;
+  }
+  const tokens = pointer.split('/');
+  for (let i = 1; i < tokens.length; i++) {
+    if (!hasValidTildeEscapes(tokens[i])) {
+      return false;
+    }
   }
   return true;
 };
 
 const relativeJsonPointerValidator: FormatValidatorFn = (pointer: unknown) => {
-  if (typeof pointer !== 'string') return true;
+  if (typeof pointer !== 'string') {
+    return true;
+  }
   // Relative JSON Pointer: non-negative integer prefix (no leading zeros unless zero),
   // followed by either '#', a JSON Pointer, or nothing.
-  const match = pointer.match(/^(0|[1-9]\d*)(.*)$/);
-  if (!match) return false;
+  const match = /^(0|[1-9]\d*)(.*)$/.exec(pointer);
+  if (!match) {
+    return false;
+  }
   const suffix = match[2];
-  if (suffix === '' || suffix === '#') return true;
-  if (!suffix.startsWith('/')) return false;
-  if (!/^(?:\/[^/]*)+$/.test(suffix)) return false;
-  const tokens = suffix.split('/').slice(1);
-  for (const token of tokens) {
-    if (!hasValidTildeEscapes(token)) return false;
+  if (suffix === '' || suffix === '#') {
+    return true;
+  }
+  if (!suffix.startsWith('/')) {
+    return false;
+  }
+  if (!/^(?:\/[^/]*)+$/.test(suffix)) {
+    return false;
+  }
+  const tokens = suffix.split('/');
+  for (let i = 1; i < tokens.length; i++) {
+    if (!hasValidTildeEscapes(tokens[i])) {
+      return false;
+    }
   }
   return true;
 };
 
 const timeValidator: FormatValidatorFn = (time: unknown) => {
-  if (typeof time !== 'string') return true;
+  if (typeof time !== 'string') {
+    return true;
+  }
   return parseRfc3339Time(time) !== null;
 };
 
 const idnEmailValidator: FormatValidatorFn = (email: unknown) => {
-  if (typeof email !== 'string') return true;
+  if (typeof email !== 'string') {
+    return true;
+  }
   // Simple email check, allowing international chars
   return /^[^\s@]+@[^\s@]+$/.test(email);
 };
 
 const idnHostnameValidator: FormatValidatorFn = (hostname: unknown) => {
-  if (typeof hostname !== 'string') return true;
+  if (typeof hostname !== 'string') {
+    return true;
+  }
   return isValidIdnHostname(hostname);
 };
 
 const iriValidator: FormatValidatorFn = (iri: unknown) => {
-  if (typeof iri !== 'string') return true;
+  if (typeof iri !== 'string') {
+    return true;
+  }
   if (!/^[a-zA-Z][a-zA-Z0-9+.-]*:[^"\\<>^{}^`| ]*$/u.test(iri)) {
     return false;
   }
   try {
+    // Constructed purely to detect an unparseable IRI (throws). Avoids URL.canParse,
+    // which is unavailable in older browsers the UMD build still targets; no-new is
+    // disabled here as the construction is intentional and the result is unused.
+    // oxlint-disable-next-line no-new
     new URL(iri);
     return true;
-  } catch (_e) {
+  } catch {
     return false;
   }
 };
 
 const iriReferenceValidator: FormatValidatorFn = (iriReference: unknown) => {
-  if (typeof iriReference !== 'string') return true;
+  if (typeof iriReference !== 'string') {
+    return true;
+  }
   return /^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/u.test(iriReference);
 };
 
@@ -385,10 +445,24 @@ export function getFormatValidators(options?: FormatValidatorsOptions): Record<s
     ...inbuiltValidators,
     ...(options?.strictUris ? { uri: strictUriValidator } : {}),
     ...customValidators,
-    ...(options?.customFormats || {}),
+    ...options?.customFormats,
   };
 }
 
+export function resolveFormatValidator(name: string, options?: FormatValidatorsOptions): FormatValidatorFn | undefined {
+  const custom = options?.customFormats;
+  if (custom && Object.hasOwn(custom, name)) {
+    return custom[name] as FormatValidatorFn | undefined;
+  }
+  if (Object.hasOwn(customValidators, name)) {
+    return customValidators[name];
+  }
+  if (options?.strictUris && name === 'uri') {
+    return strictUriValidator;
+  }
+  return inbuiltValidators[name];
+}
+
 export function registerFormat(name: string, validatorFunction: FormatValidatorFn) {
   customValidators[name] = validatorFunction;
 }
@@ -411,10 +485,16 @@ export function isFormatSupported(name: string, customFormats?: Record<string, F
   if (customFormats) {
     const custom = customFormats[name];
     // Explicitly null means unregistered at instance level
-    if (custom === null) return false;
-    if (custom != null) return true;
+    if (custom === null) {
+      return false;
+    }
+    if (custom != null) {
+      return true;
+    }
+  }
+  if (name in customValidators) {
+    return customValidators[name] != null;
   }
-  if (name in customValidators) return customValidators[name] != null;
   return name in inbuiltValidators;
 }