@naturalcycles/nodejs-lib 15.30.0 → 15.32.0

package/dist/validation/ajv/ajvSchema.d.ts

@@ -1,6 +1,6 @@
 import { type ValidationFunction, type ValidationFunctionResult } from '@naturalcycles/js-lib';
 import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib/json-schema';
-import { type ZodType } from '@naturalcycles/js-lib/zod';
+import { ZodType } from '@naturalcycles/js-lib/zod';
 import type { Ajv } from 'ajv';
 import { AjvValidationError } from './ajvValidationError.js';
 export interface AjvValidationOptions {
@@ -63,7 +63,7 @@ export declare class AjvSchema<T = unknown> {
      * Implementation note: JsonSchemaBuilder goes first in the union type, otherwise TypeScript fails to infer <T> type
      * correctly for some reason.
      */
-    static create<T>(schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T>;
+    static create<T>(schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T> | ZodType<T>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T>;
     /**
      * @experimental
      */
@@ -81,5 +81,12 @@ export declare class AjvSchema<T = unknown> {
     isValid(input: T, opt?: AjvValidationOptions): boolean;
     getValidationResult(input: T, opt?: AjvValidationOptions): ValidationFunctionResult<T, AjvValidationError>;
     getValidationFunction(): ValidationFunction<T, AjvValidationError>;
+    static isZodSchemaWithAjvSchema<T>(schema: ZodType<T>): schema is ZodTypeWithAjvSchema<T>;
+    static cacheAjvSchemaInZodSchema<T>(zodSchema: ZodType<T>, ajvSchema: AjvSchema<T>): ZodTypeWithAjvSchema<T>;
+    static requireCachedAjvSchemaFromZodSchema<T>(zodSchema: ZodTypeWithAjvSchema<T>): AjvSchema<T>;
     private getAJVValidateFunction;
 }
+export declare const HIDDEN_AJV_SCHEMA: unique symbol;
+export interface ZodTypeWithAjvSchema<T> extends ZodType<T> {
+    [HIDDEN_AJV_SCHEMA]: AjvSchema<T>;
+}

package/dist/validation/ajv/ajvSchema.js

@@ -2,7 +2,7 @@ import { _isObject, _lazyValue, } from '@naturalcycles/js-lib';
 import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema';
 import { _deepCopy, _filterNullishValues } from '@naturalcycles/js-lib/object';
 import { _substringBefore } from '@naturalcycles/js-lib/string';
-import { z } from '@naturalcycles/js-lib/zod';
+import { z, ZodType } from '@naturalcycles/js-lib/zod';
 import { _inspect } from '../../string/inspect.js';
 import { AjvValidationError } from './ajvValidationError.js';
 import { getAjv } from './getAjv.js';
@@ -49,14 +49,21 @@ export class AjvSchema {
         if (schema instanceof JsonSchemaAnyBuilder) {
             return new AjvSchema(schema.build(), cfg);
         }
+        if (schema instanceof ZodType)
+            return AjvSchema.createFromZod(schema);
         return new AjvSchema(schema, cfg);
     }
     /**
      * @experimental
      */
     static createFromZod(zodSchema, cfg) {
+        if (AjvSchema.isZodSchemaWithAjvSchema(zodSchema)) {
+            return AjvSchema.requireCachedAjvSchemaFromZodSchema(zodSchema);
+        }
         const jsonSchema = z.toJSONSchema(zodSchema, { target: 'draft-7' });
-        return new AjvSchema(jsonSchema, cfg);
+        const ajvSchema = new AjvSchema(jsonSchema, cfg);
+        AjvSchema.cacheAjvSchemaInZodSchema(zodSchema, ajvSchema);
+        return ajvSchema;
     }
     cfg;
     /**
@@ -114,6 +121,16 @@ export class AjvSchema {
             });
         };
     }
+    static isZodSchemaWithAjvSchema(schema) {
+        return !!schema[HIDDEN_AJV_SCHEMA];
+    }
+    static cacheAjvSchemaInZodSchema(zodSchema, ajvSchema) {
+        return Object.assign(zodSchema, { [HIDDEN_AJV_SCHEMA]: ajvSchema });
+    }
+    static requireCachedAjvSchemaFromZodSchema(zodSchema) {
+        return zodSchema[HIDDEN_AJV_SCHEMA];
+    }
     getAJVValidateFunction = _lazyValue(() => this.cfg.ajv.compile(this.schema));
 }
 const separator = '\n';
+export const HIDDEN_AJV_SCHEMA = Symbol('HIDDEN_AJV_SCHEMA');

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -1,4 +1,4 @@
-import type { BaseDBEntity, IANATimezone, IsoDate, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
+import type { AnyObject, BaseDBEntity, IANATimezone, IsoDate, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 import type { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi';
 import type { NumberSchema } from './number.extensions.js';
 import type { StringSchema } from './string.extensions.js';
@@ -33,8 +33,8 @@ export declare const numberEnumValueSchema: <ENUM extends NumberEnum>(en: ENUM)
  */
 export declare const numberEnumKeySchema: <ENUM extends NumberEnum>(en: ENUM) => StringSchema;
 export declare const urlSchema: (scheme?: string | string[]) => StringSchema;
-export declare function arraySchema<T>(items?: AnySchema<T>): ArraySchema<T[]>;
-export declare function objectSchema<T>(schema?: {
+export declare function arraySchema<T>(items: AnySchema<T>): ArraySchema<T[]>;
+export declare function objectSchema<T extends AnyObject>(schema: {
     [key in keyof Partial<T>]: AnySchema<T[key]>;
 }): ObjectSchema<T>;
 export declare function oneOfSchema<T = any>(...schemas: AnySchema[]): AlternativesSchema<T>;

package/dist/validation/joi/joi.shared.schemas.js

@@ -37,7 +37,7 @@ export const numberEnumValueSchema = (en) => Joi.number().valid(..._numberEnumVa
 export const numberEnumKeySchema = (en) => Joi.string().valid(..._numberEnumKeys(en));
 export const urlSchema = (scheme = 'https') => Joi.string().uri({ scheme });
 export function arraySchema(items) {
-    return items ? Joi.array().items(items) : Joi.array();
+    return Joi.array().items(items);
 }
 export function objectSchema(schema) {
     return Joi.object(schema);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.30.0",
+  "version": "15.32.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",

package/src/validation/ajv/ajvSchema.ts

@@ -8,7 +8,7 @@ import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib/json-s
 import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema'
 import { _deepCopy, _filterNullishValues } from '@naturalcycles/js-lib/object'
 import { _substringBefore } from '@naturalcycles/js-lib/string'
-import { z, type ZodType } from '@naturalcycles/js-lib/zod'
+import { z, ZodType } from '@naturalcycles/js-lib/zod'
 import type { Ajv } from 'ajv'
 import { _inspect } from '../../string/inspect.js'
 import { AjvValidationError } from './ajvValidationError.js'
@@ -105,13 +105,14 @@ export class AjvSchema<T = unknown> {
    * correctly for some reason.
    */
   static create<T>(
-    schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>,
+    schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T> | ZodType<T>,
     cfg?: Partial<AjvSchemaCfg>,
   ): AjvSchema<T> {
     if (schema instanceof AjvSchema) return schema
     if (schema instanceof JsonSchemaAnyBuilder) {
       return new AjvSchema<T>(schema.build(), cfg)
     }
+    if (schema instanceof ZodType) return AjvSchema.createFromZod(schema)
     return new AjvSchema<T>(schema as JsonSchema<T>, cfg)
   }
 
@@ -119,8 +120,16 @@ export class AjvSchema<T = unknown> {
    * @experimental
    */
   static createFromZod<T>(zodSchema: ZodType<T>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T> {
+    if (AjvSchema.isZodSchemaWithAjvSchema(zodSchema)) {
+      return AjvSchema.requireCachedAjvSchemaFromZodSchema(zodSchema)
+    }
+
     const jsonSchema = z.toJSONSchema(zodSchema, { target: 'draft-7' })
-    return new AjvSchema<T>(jsonSchema as JsonSchema<T>, cfg)
+    const ajvSchema = new AjvSchema<T>(jsonSchema as JsonSchema<T>, cfg)
+
+    AjvSchema.cacheAjvSchemaInZodSchema(zodSchema, ajvSchema)
+
+    return ajvSchema
   }
 
   readonly cfg: AjvSchemaCfg
@@ -199,7 +208,28 @@ export class AjvSchema<T = unknown> {
     }
   }
 
+  static isZodSchemaWithAjvSchema<T>(schema: ZodType<T>): schema is ZodTypeWithAjvSchema<T> {
+    return !!(schema as any)[HIDDEN_AJV_SCHEMA]
+  }
+
+  static cacheAjvSchemaInZodSchema<T>(
+    zodSchema: ZodType<T>,
+    ajvSchema: AjvSchema<T>,
+  ): ZodTypeWithAjvSchema<T> {
+    return Object.assign(zodSchema, { [HIDDEN_AJV_SCHEMA]: ajvSchema })
+  }
+
+  static requireCachedAjvSchemaFromZodSchema<T>(zodSchema: ZodTypeWithAjvSchema<T>): AjvSchema<T> {
+    return zodSchema[HIDDEN_AJV_SCHEMA]
+  }
+
   private getAJVValidateFunction = _lazyValue(() => this.cfg.ajv.compile<T>(this.schema))
 }
 
 const separator = '\n'
+
+export const HIDDEN_AJV_SCHEMA = Symbol('HIDDEN_AJV_SCHEMA')
+
+export interface ZodTypeWithAjvSchema<T> extends ZodType<T> {
+  [HIDDEN_AJV_SCHEMA]: AjvSchema<T>
+}

package/src/validation/joi/joi.shared.schemas.ts

@@ -5,6 +5,7 @@ import {
   _stringEnumValues,
 } from '@naturalcycles/js-lib'
 import type {
+  AnyObject,
   BaseDBEntity,
   IANATimezone,
   IsoDate,
@@ -72,11 +73,11 @@ export const numberEnumKeySchema = <ENUM extends NumberEnum>(en: ENUM): StringSc
 export const urlSchema = (scheme: string | string[] = 'https'): StringSchema =>
   Joi.string().uri({ scheme })
 
-export function arraySchema<T>(items?: AnySchema<T>): ArraySchema<T[]> {
-  return items ? Joi.array().items(items) : Joi.array()
+export function arraySchema<T>(items: AnySchema<T>): ArraySchema<T[]> {
+  return Joi.array().items(items)
 }
 
-export function objectSchema<T>(schema?: {
+export function objectSchema<T extends AnyObject>(schema: {
   [key in keyof Partial<T>]: AnySchema<T[key]>
 }): ObjectSchema<T> {
   return Joi.object(schema)