@naturalcycles/nodejs-lib 15.11.0 → 15.13.0

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

@@ -1,5 +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 type { Ajv } from 'ajv';
 import { AjvValidationError } from './ajvValidationError.js';
 export interface AjvValidationOptions {
@@ -38,8 +39,6 @@ export interface AjvSchemaCfg {
 /**
  * On creation - compiles ajv validation function.
  * Provides convenient methods, error reporting, etc.
- *
- * @experimental
  */
 export declare class AjvSchema<T = unknown> {
     schema: JsonSchema<T>;
@@ -58,6 +57,7 @@ export declare class AjvSchema<T = unknown> {
      * correctly for some reason.
      */
     static create<T>(schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T>;
+    static createFromZod<T>(zodSchema: ZodType<T>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T>;
     readonly cfg: AjvSchemaCfg;
     /**
      * It returns the original object just for convenience.

package/dist/validation/ajv/ajvSchema.js

@@ -1,15 +1,14 @@
 import { _isObject, _lazyValue, } from '@naturalcycles/js-lib';
 import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema';
-import { _filterNullishValues } from '@naturalcycles/js-lib/object';
+import { _deepCopy, _filterNullishValues } from '@naturalcycles/js-lib/object';
 import { _substringBefore } from '@naturalcycles/js-lib/string';
+import { z } from '@naturalcycles/js-lib/zod';
 import { _inspect } from '../../string/inspect.js';
 import { AjvValidationError } from './ajvValidationError.js';
 import { getAjv } from './getAjv.js';
 /**
  * On creation - compiles ajv validation function.
  * Provides convenient methods, error reporting, etc.
- *
- * @experimental
  */
 export class AjvSchema {
     schema;
@@ -29,7 +28,7 @@ export class AjvSchema {
     /**
      * Shortcut for AjvSchema.create(schema, { lazy: true })
      */
-    static createLazy(schema, cfg = {}) {
+    static createLazy(schema, cfg) {
         return AjvSchema.create(schema, {
             lazy: true,
             ...cfg,
@@ -44,7 +43,7 @@ export class AjvSchema {
      * Implementation note: JsonSchemaBuilder goes first in the union type, otherwise TypeScript fails to infer <T> type
      * correctly for some reason.
      */
-    static create(schema, cfg = {}) {
+    static create(schema, cfg) {
         if (schema instanceof AjvSchema)
             return schema;
         if (schema instanceof JsonSchemaAnyBuilder) {
@@ -52,6 +51,10 @@ export class AjvSchema {
         }
         return new AjvSchema(schema, cfg);
     }
+    static createFromZod(zodSchema, cfg) {
+        const jsonSchema = z.toJSONSchema(zodSchema, { target: 'draft-7' });
+        return new AjvSchema(jsonSchema, cfg);
+    }
     cfg;
     /**
      * It returns the original object just for convenience.
@@ -73,7 +76,7 @@ export class AjvSchema {
     }
     getValidationResult(input, opt = {}) {
         const fn = this.getAJVValidateFunction();
-        const item = opt.mutateInput || typeof input !== 'object' ? input : structuredClone(input);
+        const item = opt.mutateInput || typeof input !== 'object' ? input : _deepCopy(input);
         const valid = fn(item); // mutates item
         if (valid)
             return [null, item];

package/package.json

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

package/src/validation/ajv/ajvSchema.ts

@@ -6,8 +6,9 @@ import {
 } from '@naturalcycles/js-lib'
 import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib/json-schema'
 import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema'
-import { _filterNullishValues } from '@naturalcycles/js-lib/object'
+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 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
 
   /**
@@ -136,7 +140,7 @@ export class AjvSchema<T = unknown> {
   ): ValidationFunctionResult<T, AjvValidationError> {
     const fn = this.getAJVValidateFunction()
 
-    const item = opt.mutateInput || typeof input !== 'object' ? input : structuredClone(input)
+    const item = opt.mutateInput || typeof input !== 'object' ? input : _deepCopy(input)
 
     const valid = fn(item) // mutates item
     if (valid) return [null, item]