@theshelf/validation-driver-zod 0.5.0 → 0.6.0

package/dist/Zod.d.ts

@@ -4,5 +4,5 @@ export default class Zod implements Driver {
     #private;
     constructor();
     get name(): string;
-    validate(data: unknown, schema: ValidationSchema): ValidationResult;
+    validate<T>(data: T, schema: ValidationSchema<T>): ValidationResult;
 }

package/dist/Zod.js

@@ -1,20 +1,23 @@
 import { z } from 'zod';
-import { ValidationResult, MAX_EMAIL_LENGTH, MAX_URL_LENGTH } from '@theshelf/validation';
+import { ValidationResult, FieldTypes, MAX_EMAIL_LENGTH, MAX_URL_LENGTH } from '@theshelf/validation';
 // Zod is so type heavy that we've chosen for inferred types to be used.
 // This is a trade-off between readability and verbosity.
 export default class Zod {
     #validators = new Map();
     constructor() {
-        this.#validators.set('string', (constraints, required) => this.#validateString(constraints, required));
-        this.#validators.set('number', (constraints, required) => this.#validateNumber(constraints, required));
-        this.#validators.set('boolean', (constraints, required) => this.#validateBoolean(constraints, required));
-        this.#validators.set('date', (constraints, required) => this.#validateDate(constraints, required));
-        this.#validators.set('datetime', (constraints, required) => this.#validateDateTime(constraints, required));
-        this.#validators.set('uuid', (constraints, required) => this.#validateUuid(constraints, required));
-        this.#validators.set('email', (constraints, required) => this.#validateEmail(constraints, required));
-        this.#validators.set('array', (constraints, required) => this.#validateArray(constraints, required));
-        this.#validators.set('url', (constraints, required) => this.#validateUrl(constraints, required));
-        this.#validators.set('enum', (constraints, required) => this.#validateEnum(constraints, required));
+        this.#validators.set(FieldTypes.STRING, (constraints, required) => this.#validateString(constraints, required));
+        this.#validators.set(FieldTypes.NUMBER, (constraints, required) => this.#validateNumber(constraints, required));
+        this.#validators.set(FieldTypes.BOOLEAN, (constraints, required) => this.#validateBoolean(constraints, required));
+        this.#validators.set(FieldTypes.DATE, (constraints, required) => this.#validateDate(constraints, required));
+        this.#validators.set(FieldTypes.DATE_STRING, (constraints, required) => this.#validateDateString(constraints, required));
+        this.#validators.set(FieldTypes.DATE_TIME_STRING, (constraints, required) => this.#validateDateTimeString(constraints, required));
+        this.#validators.set(FieldTypes.TIME_STRING, (constraints, required) => this.#validateTimeString(constraints, required));
+        this.#validators.set(FieldTypes.UUID, (constraints, required) => this.#validateUuid(constraints, required));
+        this.#validators.set(FieldTypes.EMAIL, (constraints, required) => this.#validateEmail(constraints, required));
+        this.#validators.set(FieldTypes.ARRAY, (constraints, required) => this.#validateArray(constraints, required));
+        this.#validators.set(FieldTypes.URL, (constraints, required) => this.#validateUrl(constraints, required));
+        this.#validators.set(FieldTypes.URL_STRING, (constraints, required) => this.#validateUrlString(constraints, required));
+        this.#validators.set(FieldTypes.ENUM, (constraints, required) => this.#validateEnum(constraints, required));
     }
     get name() { return Zod.name; }
     validate(data, schema) {
@@ -69,15 +72,23 @@ export default class Zod {
         return this.#checkRequired(validation, required);
     }
     #validateDate(constraints, required) {
+        const validation = z.date();
+        return this.#checkRequired(validation, required);
+    }
+    #validateDateString(constraints, required) {
         const validation = z.iso.date();
         return this.#checkRequired(validation, required);
     }
-    #validateDateTime(constraints, required) {
+    #validateDateTimeString(constraints, required) {
         const validation = z.iso.datetime();
         return this.#checkRequired(validation, required);
     }
+    #validateTimeString(constraints, required) {
+        const validation = z.iso.time();
+        return this.#checkRequired(validation, required);
+    }
     #validateUuid(constraints, required) {
-        const validation = z.uuid();
+        const validation = z.uuid(); // String or UUID object?
         return this.#checkRequired(validation, required);
     }
     #validateEmail(constraints, required) {
@@ -94,6 +105,10 @@ export default class Zod {
         return this.#checkRequired(validation, required);
     }
     #validateUrl(constraints, required) {
+        const validation = z.instanceof(URL);
+        return this.#checkRequired(validation, required);
+    }
+    #validateUrlString(constraints, required) {
         let validation = z.url().max(MAX_URL_LENGTH);
         if (constraints.protocols !== undefined) {
             const escapedProtocols = constraints.protocols.map((p) => p.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@theshelf/validation-driver-zod",
   "private": false,
-  "version": "0.5.0",
+  "version": "0.6.0",
   "type": "module",
   "repository": {
     "url": "git+https://github.com/MaskingTechnology/theshelf.git"
@@ -27,6 +27,6 @@
     "zod": "^4.5.4"
   },
   "peerDependencies": {
-    "@theshelf/validation": "^0.5.0"
+    "@theshelf/validation": "^0.6.0"
   }
 }