feat: AjvSchema.createFromZod

Author: kirillgroshkov

packages/nodejs-lib/src/jwt/jwt.service.test.ts

@@ -17,13 +17,11 @@ interface Data {
   num: number
 }
 
-const dataZodSchema = z.object({
-  accountId: z.string(),
-  num: z.number(),
-})
-
-const dataSchema = AjvSchema.create<Data>(
-  z.toJSONSchema(dataZodSchema, { target: 'draft-7' }) as any,
+const dataSchema = AjvSchema.createFromZod<Data>(
+  z.object({
+    accountId: z.string(),
+    num: z.number(),
+  }),
 )
 
 const data1: Data = {

packages/nodejs-lib/src/validation/ajv/ajvSchema.ts

@@ -8,6 +8,7 @@ import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib/json-s
 import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema'
 import { _filterNullishValues } from '@naturalcycles/js-lib/object'
 import { _substringBefore } from '@naturalcycles/js-lib/string'
+import { z, type ZodType } from '@naturalcycles/js-lib/zod'
 import type { Ajv } from 'ajv'
 import { _inspect } from '../../string/inspect.js'
 import { AjvValidationError } from './ajvValidationError.js'
@@ -55,8 +56,6 @@ export interface AjvSchemaCfg {
 /**
  * On creation - compiles ajv validation function.
  * Provides convenient methods, error reporting, etc.
- *
- * @experimental
  */
 export class AjvSchema<T = unknown> {
   private constructor(
@@ -81,7 +80,7 @@ export class AjvSchema<T = unknown> {
    */
   static createLazy<T>(
     schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>,
-    cfg: Partial<AjvSchemaCfg> = {},
+    cfg?: Partial<AjvSchemaCfg>,
   ): AjvSchema<T> {
     return AjvSchema.create(schema, {
       lazy: true,
@@ -100,7 +99,7 @@ export class AjvSchema<T = unknown> {
    */
   static create<T>(
     schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>,
-    cfg: Partial<AjvSchemaCfg> = {},
+    cfg?: Partial<AjvSchemaCfg>,
   ): AjvSchema<T> {
     if (schema instanceof AjvSchema) return schema
     if (schema instanceof JsonSchemaAnyBuilder) {
@@ -109,6 +108,11 @@ export class AjvSchema<T = unknown> {
     return new AjvSchema<T>(schema as JsonSchema<T>, cfg)
   }
 
+  static createFromZod<T>(zodSchema: ZodType<T>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T> {
+    const jsonSchema = z.toJSONSchema(zodSchema, { target: 'draft-7' })
+    return new AjvSchema<T>(jsonSchema as JsonSchema<T>, cfg)
+  }
+
   readonly cfg: AjvSchemaCfg
 
   /**