@naturalcycles/nodejs-lib 15.29.0 → 15.31.0

package/dist/stream/pipeline.js

@@ -101,6 +101,11 @@ export class Pipeline {
      * less clean than `.take()` on the source.
      */
     limit(limit) {
+        if (!this.transforms.length) {
+            console.warn(`Pipeline.limit was used as a very first Transfrom - please use Pipeline.limitSource instead`);
+            this.limitSource(limit);
+            return this;
+        }
         this.transforms.push(transformLimit({
             limit,
             signal: this.abortableSignal,

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/package.json

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

package/src/stream/pipeline.ts

@@ -140,6 +140,14 @@ export class Pipeline<T = unknown> {
    * less clean than `.take()` on the source.
    */
   limit(limit: NonNegativeInteger | undefined): this {
+    if (!this.transforms.length) {
+      console.warn(
+        `Pipeline.limit was used as a very first Transfrom - please use Pipeline.limitSource instead`,
+      )
+      this.limitSource(limit)
+      return this
+    }
+
     this.transforms.push(
       transformLimit({
         limit,

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>
+}