z-schema 12.2.0 → 12.4.0

package/src/z-schema.ts

@@ -15,11 +15,6 @@ import { defaultOptions } from './z-schema-options.js';
 import { getSchemaReader, setSchemaReader } from './z-schema-reader.js';
 
 export class ZSchema extends ZSchemaBase {
-  /** @internal Use ZSchema.create() instead. */
-  constructor(options: ZSchemaOptions | undefined, token: symbol) {
-    super(options, token);
-  }
-
   // ----- static methods start -----
 
   // class scoped format functions
@@ -30,7 +25,7 @@ export class ZSchema extends ZSchemaBase {
    * @param validatorFunction - A sync or async function `(value: unknown) => boolean | Promise<boolean>`.
    */
   public static registerFormat(name: string, validatorFunction: FormatValidatorFn): void {
-    return registerFormat(name, validatorFunction);
+    registerFormat(name, validatorFunction);
   }
 
   /**
@@ -38,7 +33,7 @@ export class ZSchema extends ZSchemaBase {
    * @param name - The format name to unregister.
    */
   public static unregisterFormat(name: string): void {
-    return unregisterFormat(name);
+    unregisterFormat(name);
   }
 
   /** Returns the names of all globally registered format validators. */
@@ -72,7 +67,7 @@ export class ZSchema extends ZSchemaBase {
    * @param schemaReader - A function `(uri: string) => JsonSchema | undefined`, or `undefined` to clear.
    */
   public static setSchemaReader(schemaReader: SchemaReader | undefined) {
-    return setSchemaReader(schemaReader);
+    setSchemaReader(schemaReader);
   }
 
   public static schemaSymbol = schemaSymbol;
@@ -148,8 +143,8 @@ export class ZSchema extends ZSchemaBase {
     try {
       this._validate(json, schema, options ?? {});
       return { valid: true };
-    } catch (err) {
-      return { valid: false, err: err as ValidateError };
+    } catch (error) {
+      return { valid: false, err: error as ValidateError };
     }
   }
 
@@ -164,11 +159,15 @@ export class ZSchema extends ZSchemaBase {
   validateAsync(json: unknown, schema: JsonSchema | string, options?: ValidateOptions): Promise<true> {
     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 ?? new Error('Validation failed'));
+          } else {
+            resolve(valid);
+          }
+        });
+      } catch (error) {
+        reject(error instanceof Error ? error : new Error(String(error), { cause: error }));
       }
     });
   }
@@ -187,8 +186,8 @@ export class ZSchema extends ZSchemaBase {
         this._validate(json, schema, options || {}, (err, valid) => {
           resolve({ valid, err });
         });
-      } catch (err) {
-        resolve({ valid: false, err: err as ValidateError });
+      } catch (error) {
+        resolve({ valid: false, err: error as ValidateError });
       }
     });
   }
@@ -212,8 +211,8 @@ export class ZSchema extends ZSchemaBase {
     try {
       this._validateSchema(schemaOrArr);
       return { valid: true };
-    } catch (err) {
-      return { valid: false, err: err as ValidateError };
+    } catch (error) {
+      return { valid: false, err: error as ValidateError };
     }
   }
 }
@@ -223,11 +222,6 @@ export class ZSchema extends ZSchemaBase {
  * Created via `ZSchema.create({ safe: true })`.
  */
 export class ZSchemaSafe extends ZSchemaBase {
-  /** @internal Use ZSchema.create() instead. */
-  constructor(options: ZSchemaOptions | undefined, token: symbol) {
-    super(options, token);
-  }
-
   /**
    * Validate JSON data against a schema.
    * @param json - The data to validate.
@@ -239,8 +233,8 @@ export class ZSchemaSafe extends ZSchemaBase {
     try {
       this._validate(json, schema, options);
       return { valid: true };
-    } catch (err) {
-      return { valid: false, err: err as ValidateError };
+    } catch (error) {
+      return { valid: false, err: error as ValidateError };
     }
   }
 
@@ -253,8 +247,8 @@ export class ZSchemaSafe extends ZSchemaBase {
     try {
       this._validateSchema(schemaOrArr);
       return { valid: true };
-    } catch (err) {
-      return { valid: false, err: err as ValidateError };
+    } catch (error) {
+      return { valid: false, err: error as ValidateError };
     }
   }
 }
@@ -264,11 +258,6 @@ export class ZSchemaSafe extends ZSchemaBase {
  * Created via `ZSchema.create({ async: true })`.
  */
 export class ZSchemaAsync extends ZSchemaBase {
-  /** @internal Use ZSchema.create() instead. */
-  constructor(options: ZSchemaOptions | undefined, token: symbol) {
-    super(options, token);
-  }
-
   /**
    * Validate JSON data against a schema asynchronously.
    * @param json - The data to validate.
@@ -280,9 +269,15 @@ export class ZSchemaAsync extends ZSchemaBase {
   validate(json: unknown, schema: JsonSchema | string, options: ValidateOptions = {}): Promise<true> {
     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 ?? new Error('Validation failed'));
+          } else {
+            resolve(valid);
+          }
+        });
+      } catch (error) {
+        reject(error instanceof Error ? error : new Error(String(error), { cause: error }));
       }
     });
   }
@@ -303,11 +298,6 @@ export class ZSchemaAsync extends ZSchemaBase {
  * Created via `ZSchema.create({ async: true, safe: true })`.
  */
 export class ZSchemaAsyncSafe extends ZSchemaBase {
-  /** @internal Use ZSchema.create() instead. */
-  constructor(options: ZSchemaOptions | undefined, token: symbol) {
-    super(options, token);
-  }
-
   /**
    * Validate JSON data against a schema asynchronously.
    * The promise always resolves (never rejects).
@@ -322,8 +312,8 @@ export class ZSchemaAsyncSafe extends ZSchemaBase {
         this._validate(json, schema, options, (err, valid) => {
           resolve({ valid, err });
         });
-      } catch (err) {
-        resolve({ valid: false, err: err as ValidateError });
+      } catch (error) {
+        resolve({ valid: false, err: error as ValidateError });
       }
     });
   }
@@ -337,8 +327,8 @@ export class ZSchemaAsyncSafe extends ZSchemaBase {
     try {
       this._validateSchema(schemaOrArr);
       return { valid: true };
-    } catch (err) {
-      return { valid: false, err: err as ValidateError };
+    } catch (error) {
+      return { valid: false, err: error as ValidateError };
     }
   }
 }