@forklaunch/validator 0.4.12 → 0.5.0

package/lib/src/zod/index.js

@@ -28,22 +28,28 @@ __export(zod_exports, {
   date: () => date,
   email: () => email,
   enum_: () => enum_,
+  function_: () => function_,
   isSchema: () => isSchema,
   literal: () => literal,
   never: () => never,
+  null_: () => null_,
   nullish: () => nullish,
   number: () => number,
   openapi: () => openapi,
   optional: () => optional,
   parse: () => parse,
+  promise: () => promise,
+  record: () => record,
   schemify: () => schemify,
   string: () => string,
   symbol: () => symbol,
+  undefined_: () => undefined_,
   union: () => union,
   unknown: () => unknown,
   uri: () => uri,
   uuid: () => uuid,
-  validate: () => validate
+  validate: () => validate,
+  void_: () => void_
 });
 module.exports = __toCommonJS(zod_exports);
 
@@ -88,6 +94,9 @@ var ZodSchemaValidator = class {
   }).pipe(import_zod.z.date());
   symbol = import_zod.z.symbol();
   nullish = import_zod.z.union([import_zod.z.void(), import_zod.z.null(), import_zod.z.undefined()]);
+  void = import_zod.z.void();
+  null = import_zod.z.null();
+  undefined = import_zod.z.undefined();
   any = import_zod.z.any();
   unknown = import_zod.z.unknown();
   never = import_zod.z.never();
@@ -128,11 +137,8 @@ var ZodSchemaValidator = class {
    * @returns {ZodOptional<ZodResolve<T>>} The optional schema.
    */
   optional(schema) {
-    if (schema instanceof import_zod.ZodType) {
-      return schema.optional();
-    } else {
-      return this.schemify(schema).optional();
-    }
+    const resolvedSchema = this.schemify(schema);
+    return resolvedSchema.optional();
   }
   /**
    * Create an array schema.
@@ -140,11 +146,8 @@ var ZodSchemaValidator = class {
    * @returns {ZodArray<ZodResolve<T>>} The array schema.
    */
   array(schema) {
-    if (schema instanceof import_zod.ZodType) {
-      return schema.array();
-    } else {
-      return this.schemify(schema).array();
-    }
+    const resolvedSchema = this.schemify(schema);
+    return resolvedSchema.array();
   }
   /**
    * Create a union schema.
@@ -152,12 +155,7 @@ var ZodSchemaValidator = class {
    * @returns {ZodUnion<UnionZodResolve<T>>} The union schema.
    */
   union(schemas) {
-    const resolvedSchemas = schemas.map((schema) => {
-      if (schema instanceof import_zod.ZodType) {
-        return schema;
-      }
-      return this.schemify(schema);
-    });
+    const resolvedSchemas = schemas.map((schema) => this.schemify(schema));
     return import_zod.z.union(
       resolvedSchemas
     );
@@ -180,6 +178,36 @@ var ZodSchemaValidator = class {
       Object.values(schemaEnum)
     );
   }
+  /**
+   * Create a function schema.
+   * @param {ZodTuple} args - The arguments of the function.
+   * @param {ZodAny} returnType - The return type of the function.
+   * @returns {ZodFunction<Args, ReturnType>} The function schema.
+   */
+  function_(args, returnType) {
+    const schemaArgs = args.map((schema) => this.schemify(schema));
+    const schemaReturnType = this.schemify(returnType);
+    return import_zod.z.function(import_zod.z.tuple(schemaArgs), schemaReturnType);
+  }
+  /**
+   * Create a record schema.
+   * @param {ZodIdiomaticSchema} key - The key schema.
+   * @param {ZodIdiomaticSchema} value - The value schema.
+   * @returns {ZodRecord<ZodResolve<Key>, ZodResolve<Value>>} The record schema.
+   */
+  record(key, value) {
+    const keySchema = this.schemify(key);
+    const valueSchema = this.schemify(value);
+    return import_zod.z.record(keySchema, valueSchema);
+  }
+  /**
+   * Create a promise schema.
+   * @param {ZodIdiomaticSchema} schema - The schema to use for the promise.
+   * @returns {ZodPromise<ZodResolve<T>>} The promise schema.
+   */
+  promise(schema) {
+    return import_zod.z.promise(this.schemify(schema));
+  }
   /**
    * Checks if a value is a Zod schema.
    * @param {unknown} value - The value to check.
@@ -195,7 +223,7 @@ var ZodSchemaValidator = class {
    * @returns {boolean} True if valid, otherwise false.
    */
   validate(schema, value) {
-    const resolvedSchema = schema instanceof import_zod.ZodType ? schema : this.schemify(schema);
+    const resolvedSchema = this.schemify(schema);
     return resolvedSchema.safeParse(value).success;
   }
   /**
@@ -206,7 +234,7 @@ var ZodSchemaValidator = class {
    * @returns {ParseResult} - The discrimintated parsed value if successful, the error if unsuccessful.
    */
   parse(schema, value) {
-    const resolvedSchema = schema instanceof import_zod.ZodType ? schema : this.schemify(schema);
+    const resolvedSchema = this.schemify(schema);
     const result = resolvedSchema.safeParse(value);
     return result.success ? { ok: true, value: result.data } : {
       ok: false,
@@ -240,9 +268,7 @@ var ZodSchemaValidator = class {
    * @returns {SchemaObject} The OpenAPI schema object.
    */
   openapi(schema) {
-    return (0, import_zod_openapi.generateSchema)(
-      schema instanceof import_zod.ZodType ? schema : this.schemify(schema)
-    );
+    return (0, import_zod_openapi.generateSchema)(this.schemify(schema));
   }
 };
 
@@ -259,6 +285,9 @@ var boolean = StaticSchemaValidator.boolean;
 var date = StaticSchemaValidator.date;
 var symbol = StaticSchemaValidator.symbol;
 var nullish = StaticSchemaValidator.nullish;
+var void_ = StaticSchemaValidator.void;
+var null_ = StaticSchemaValidator.null;
+var undefined_ = StaticSchemaValidator.undefined;
 var any = StaticSchemaValidator.any;
 var unknown = StaticSchemaValidator.unknown;
 var never = StaticSchemaValidator.never;
@@ -274,6 +303,13 @@ var literal = StaticSchemaValidator.literal.bind(
   StaticSchemaValidator
 );
 var enum_ = StaticSchemaValidator.enum_.bind(StaticSchemaValidator);
+var function_ = StaticSchemaValidator.function_.bind(
+  StaticSchemaValidator
+);
+var record = StaticSchemaValidator.record.bind(StaticSchemaValidator);
+var promise = StaticSchemaValidator.promise.bind(
+  StaticSchemaValidator
+);
 var isSchema = StaticSchemaValidator.isSchema.bind(
   StaticSchemaValidator
 );
@@ -294,20 +330,26 @@ var openapi = StaticSchemaValidator.openapi.bind(
   date,
   email,
   enum_,
+  function_,
   isSchema,
   literal,
   never,
+  null_,
   nullish,
   number,
   openapi,
   optional,
   parse,
+  promise,
+  record,
   schemify,
   string,
   symbol,
+  undefined_,
   union,
   unknown,
   uri,
   uuid,
-  validate
+  validate,
+  void_
 });

package/lib/src/zod/index.mjs

@@ -1,8 +1,8 @@
 // src/zod/zodSchemaValidator.ts
 import { generateSchema } from "@anatine/zod-openapi";
 import {
-  ZodType,
-  z
+  z,
+  ZodType
 } from "zod";
 var ZodSchemaValidator = class {
   _Type = "Zod";
@@ -42,6 +42,9 @@ var ZodSchemaValidator = class {
   }).pipe(z.date());
   symbol = z.symbol();
   nullish = z.union([z.void(), z.null(), z.undefined()]);
+  void = z.void();
+  null = z.null();
+  undefined = z.undefined();
   any = z.any();
   unknown = z.unknown();
   never = z.never();
@@ -82,11 +85,8 @@ var ZodSchemaValidator = class {
    * @returns {ZodOptional<ZodResolve<T>>} The optional schema.
    */
   optional(schema) {
-    if (schema instanceof ZodType) {
-      return schema.optional();
-    } else {
-      return this.schemify(schema).optional();
-    }
+    const resolvedSchema = this.schemify(schema);
+    return resolvedSchema.optional();
   }
   /**
    * Create an array schema.
@@ -94,11 +94,8 @@ var ZodSchemaValidator = class {
    * @returns {ZodArray<ZodResolve<T>>} The array schema.
    */
   array(schema) {
-    if (schema instanceof ZodType) {
-      return schema.array();
-    } else {
-      return this.schemify(schema).array();
-    }
+    const resolvedSchema = this.schemify(schema);
+    return resolvedSchema.array();
   }
   /**
    * Create a union schema.
@@ -106,12 +103,7 @@ var ZodSchemaValidator = class {
    * @returns {ZodUnion<UnionZodResolve<T>>} The union schema.
    */
   union(schemas) {
-    const resolvedSchemas = schemas.map((schema) => {
-      if (schema instanceof ZodType) {
-        return schema;
-      }
-      return this.schemify(schema);
-    });
+    const resolvedSchemas = schemas.map((schema) => this.schemify(schema));
     return z.union(
       resolvedSchemas
     );
@@ -134,6 +126,36 @@ var ZodSchemaValidator = class {
       Object.values(schemaEnum)
     );
   }
+  /**
+   * Create a function schema.
+   * @param {ZodTuple} args - The arguments of the function.
+   * @param {ZodAny} returnType - The return type of the function.
+   * @returns {ZodFunction<Args, ReturnType>} The function schema.
+   */
+  function_(args, returnType) {
+    const schemaArgs = args.map((schema) => this.schemify(schema));
+    const schemaReturnType = this.schemify(returnType);
+    return z.function(z.tuple(schemaArgs), schemaReturnType);
+  }
+  /**
+   * Create a record schema.
+   * @param {ZodIdiomaticSchema} key - The key schema.
+   * @param {ZodIdiomaticSchema} value - The value schema.
+   * @returns {ZodRecord<ZodResolve<Key>, ZodResolve<Value>>} The record schema.
+   */
+  record(key, value) {
+    const keySchema = this.schemify(key);
+    const valueSchema = this.schemify(value);
+    return z.record(keySchema, valueSchema);
+  }
+  /**
+   * Create a promise schema.
+   * @param {ZodIdiomaticSchema} schema - The schema to use for the promise.
+   * @returns {ZodPromise<ZodResolve<T>>} The promise schema.
+   */
+  promise(schema) {
+    return z.promise(this.schemify(schema));
+  }
   /**
    * Checks if a value is a Zod schema.
    * @param {unknown} value - The value to check.
@@ -149,7 +171,7 @@ var ZodSchemaValidator = class {
    * @returns {boolean} True if valid, otherwise false.
    */
   validate(schema, value) {
-    const resolvedSchema = schema instanceof ZodType ? schema : this.schemify(schema);
+    const resolvedSchema = this.schemify(schema);
     return resolvedSchema.safeParse(value).success;
   }
   /**
@@ -160,7 +182,7 @@ var ZodSchemaValidator = class {
    * @returns {ParseResult} - The discrimintated parsed value if successful, the error if unsuccessful.
    */
   parse(schema, value) {
-    const resolvedSchema = schema instanceof ZodType ? schema : this.schemify(schema);
+    const resolvedSchema = this.schemify(schema);
     const result = resolvedSchema.safeParse(value);
     return result.success ? { ok: true, value: result.data } : {
       ok: false,
@@ -194,9 +216,7 @@ var ZodSchemaValidator = class {
    * @returns {SchemaObject} The OpenAPI schema object.
    */
   openapi(schema) {
-    return generateSchema(
-      schema instanceof ZodType ? schema : this.schemify(schema)
-    );
+    return generateSchema(this.schemify(schema));
   }
 };
 
@@ -213,6 +233,9 @@ var boolean = StaticSchemaValidator.boolean;
 var date = StaticSchemaValidator.date;
 var symbol = StaticSchemaValidator.symbol;
 var nullish = StaticSchemaValidator.nullish;
+var void_ = StaticSchemaValidator.void;
+var null_ = StaticSchemaValidator.null;
+var undefined_ = StaticSchemaValidator.undefined;
 var any = StaticSchemaValidator.any;
 var unknown = StaticSchemaValidator.unknown;
 var never = StaticSchemaValidator.never;
@@ -228,6 +251,13 @@ var literal = StaticSchemaValidator.literal.bind(
   StaticSchemaValidator
 );
 var enum_ = StaticSchemaValidator.enum_.bind(StaticSchemaValidator);
+var function_ = StaticSchemaValidator.function_.bind(
+  StaticSchemaValidator
+);
+var record = StaticSchemaValidator.record.bind(StaticSchemaValidator);
+var promise = StaticSchemaValidator.promise.bind(
+  StaticSchemaValidator
+);
 var isSchema = StaticSchemaValidator.isSchema.bind(
   StaticSchemaValidator
 );
@@ -247,20 +277,26 @@ export {
   date,
   email,
   enum_,
+  function_,
   isSchema,
   literal,
   never,
+  null_,
   nullish,
   number,
   openapi,
   optional,
   parse,
+  promise,
+  record,
   schemify,
   string,
   symbol,
+  undefined_,
   union,
   unknown,
   uri,
   uuid,
-  validate
+  validate,
+  void_
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/validator",
-  "version": "0.4.12",
+  "version": "0.5.0",
   "description": "Schema validator for ForkLaunch components.",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -61,7 +61,7 @@
     "@anatine/zod-openapi": "^2.2.8",
     "@sinclair/typebox": "^0.34.33",
     "zod": "^3.24.2",
-    "@forklaunch/common": "0.2.6"
+    "@forklaunch/common": "0.2.7"
   },
   "devDependencies": {
     "@eslint/js": "^9.24.0",