@naturalcycles/nodejs-lib 15.63.1 → 15.65.0

package/dist/validation/ajv/ajvSchema.js

@@ -75,7 +75,7 @@ export class AjvSchema {
      */
     static createFromZod(schema) {
         const jsonSchema = z.toJSONSchema(schema, {
-            target: 'draft-7',
+            target: 'draft-2020-12',
         });
         return AjvSchema.create(jsonSchema);
     }

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

@@ -1,4 +1,4 @@
-import { Ajv, type Options } from 'ajv';
+import { Ajv2020, type Options } from 'ajv/dist/2020.js';
 /**
  * Return cached instance of Ajv with default (recommended) options.
  *
@@ -27,4 +27,4 @@ export declare const getCoercingAjv: any;
  *
  * https://ajv.js.org/options.html
  */
-export declare function createAjv(opt?: Options): Ajv;
+export declare function createAjv(opt?: Options): Ajv2020;

package/dist/validation/ajv/getAjv.js

@@ -1,7 +1,7 @@
 import { _isBetween, _lazyValue } from '@naturalcycles/js-lib';
 import { Set2 } from '@naturalcycles/js-lib/object';
 import { _substringAfterLast } from '@naturalcycles/js-lib/string';
-import { Ajv } from 'ajv';
+import { Ajv2020 } from 'ajv/dist/2020.js';
 import { validTLDs } from '../tlds.js';
 /* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
 // oxlint-disable unicorn/prefer-code-point
@@ -52,7 +52,7 @@ export const getCoercingAjv = _lazyValue(() => createAjv(AJV_MUTATING_COERCING_O
  * https://ajv.js.org/options.html
  */
 export function createAjv(opt) {
-    const ajv = new Ajv({
+    const ajv = new Ajv2020({
         ...AJV_OPTIONS,
         ...opt,
     });

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

@@ -45,6 +45,7 @@ export declare const j: {
         withRegexKeys: typeof withRegexKeys;
     };
     array<IN, OUT, Opt>(itemSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>): JsonSchemaArrayBuilder<IN, OUT, Opt>;
+    tuple<const S extends JsonSchemaAnyBuilder<any, any, any>[]>(items: S): JsonSchemaTupleBuilder<S>;
     set<IN, OUT, Opt>(itemSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>): JsonSchemaSet2Builder<IN, OUT, Opt>;
     buffer(): JsonSchemaBufferBuilder;
     enum<const T extends readonly (string | number | boolean | null)[] | StringEnum | NumberEnum>(input: T, opt?: JsonBuilderRuleOpt): JsonSchemaEnumBuilder<T extends readonly (infer U)[] ? U : T extends StringEnum ? T[keyof T] : T extends NumberEnum ? T[keyof T] : never>;
@@ -235,10 +236,15 @@ export declare class JsonSchemaObjectBuilder<IN extends AnyObject, OUT extends A
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */
     allowAdditionalProperties(): this;
-    extend(props: AnyObject): never;
-    extend<IN2 extends AnyObject>(props: {
-        [K in keyof Required<IN2>]-?: JsonSchemaAnyBuilder<any, IN2[K], any>;
-    }): JsonSchemaObjectBuilder<IN & IN2, OUT & IN2, false>;
+    extend<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<IN & {
+        [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt> ? IsOpt extends true ? never : K : never]: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never;
+    } & {
+        [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never;
+    }, OUT & {
+        [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt> ? IsOpt extends true ? never : K : never]: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never;
+    } & {
+        [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never;
+    }, false>;
     /**
      * Concatenates another schema to the current schema.
      *
@@ -261,7 +267,15 @@ export declare class JsonSchemaObjectBuilder<IN extends AnyObject, OUT extends A
     /**
      * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
      */
-    dbEntity(): never;
+    dbEntity(): JsonSchemaObjectBuilder<IN & {
+        id: string;
+        created: any;
+        updated: any;
+    } & {}, OUT & {
+        id: string;
+        created: any;
+        updated: any;
+    } & {}, false>;
     minProperties(minProperties: number): this;
     maxProperties(maxProperties: number): this;
 }
@@ -291,7 +305,7 @@ export declare class JsonSchemaObjectInferringBuilder<PROPS extends Record<strin
     /**
      * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
      */
-    dbEntity(): JsonSchemaObjectInferringBuilder<{ [K in "id" | keyof PROPS | "created" | "updated"]: K extends "id" | "created" | "updated" ? {
+    dbEntity(): JsonSchemaObjectInferringBuilder<{ [K in "id" | "created" | "updated" | keyof PROPS]: K extends "id" | "created" | "updated" ? {
         id: JsonSchemaStringBuilder<string, string, false>;
         created: JsonSchemaNumberBuilder<UnixTimestamp, UnixTimestamp, false>;
         updated: JsonSchemaNumberBuilder<UnixTimestamp, UnixTimestamp, false>;
@@ -318,6 +332,10 @@ export declare class JsonSchemaEnumBuilder<IN extends string | number | boolean
     constructor(enumValues: readonly IN[], baseType: EnumBaseType, opt?: JsonBuilderRuleOpt);
     branded<B extends IN>(): JsonSchemaEnumBuilder<B | IN, B, Opt>;
 }
+export declare class JsonSchemaTupleBuilder<ITEMS extends JsonSchemaAnyBuilder<any, any, any>[]> extends JsonSchemaAnyBuilder<TupleIn<ITEMS>, TupleOut<ITEMS>, false> {
+    private readonly _items;
+    constructor(items: ITEMS);
+}
 type EnumBaseType = 'string' | 'number' | 'other';
 export interface JsonSchema<IN = unknown, OUT = IN> {
     readonly in?: IN;
@@ -331,6 +349,7 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
     writeOnly?: boolean;
     type?: string | string[];
     items?: JsonSchema;
+    prefixItems?: JsonSchema[];
     properties?: {
         [K in keyof IN & keyof OUT]: JsonSchema<IN[K], OUT[K]>;
     };
@@ -447,4 +466,10 @@ type EnumKeyUnion<T> = T extends readonly (infer U)[] ? U : T extends StringEnum
 type SchemaIn<S> = S extends JsonSchemaAnyBuilder<infer IN, any, any> ? IN : never;
 type SchemaOut<S> = S extends JsonSchemaAnyBuilder<any, infer OUT, any> ? OUT : never;
 type SchemaOpt<S> = S extends JsonSchemaAnyBuilder<any, any, infer Opt> ? (Opt extends true ? true : false) : false;
+type TupleIn<T extends readonly JsonSchemaAnyBuilder<any, any, any>[]> = {
+    [K in keyof T]: T[K] extends JsonSchemaAnyBuilder<infer I, any, any> ? I : never;
+};
+type TupleOut<T extends readonly JsonSchemaAnyBuilder<any, any, any>[]> = {
+    [K in keyof T]: T[K] extends JsonSchemaAnyBuilder<any, infer O, any> ? O : never;
+};
 export {};

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -71,6 +71,9 @@ export const j = {
     array(itemSchema) {
         return new JsonSchemaArrayBuilder(itemSchema);
     },
+    tuple(items) {
+        return new JsonSchemaTupleBuilder(items);
+    },
     set(itemSchema) {
         return new JsonSchemaSet2Builder(itemSchema);
     },
@@ -586,14 +589,12 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
         return this.cloneAndUpdateSchema({ additionalProperties: true });
     }
     extend(props) {
-        const clone = this.clone();
+        const newBuilder = new JsonSchemaObjectBuilder();
+        _objectAssign(newBuilder.schema, _deepCopy(this.schema));
         const incomingSchemaBuilder = new JsonSchemaObjectBuilder(props);
-        mergeJsonSchemaObjects(clone.schema, incomingSchemaBuilder.schema);
-        // The incoming object is type-safe because `extend<Foo>()` expects a passed in type that matches the passed in props,
-        // but maybe the current schema was created differently, so that's what decides the typecheckedness.
-        const hasIsOfTypeCheck = this.schema.hasIsOfTypeCheck;
-        _objectAssign(clone.schema, { hasIsOfTypeCheck });
-        return clone;
+        mergeJsonSchemaObjects(newBuilder.schema, incomingSchemaBuilder.schema);
+        _objectAssign(newBuilder.schema, { hasIsOfTypeCheck: false });
+        return newBuilder;
     }
     /**
      * Concatenates another schema to the current schema.
@@ -756,6 +757,18 @@ export class JsonSchemaEnumBuilder extends JsonSchemaAnyBuilder {
         return this;
     }
 }
+export class JsonSchemaTupleBuilder extends JsonSchemaAnyBuilder {
+    _items;
+    constructor(items) {
+        super({
+            type: 'array',
+            prefixItems: items.map(i => i.build()),
+            minItems: items.length,
+            maxItems: items.length,
+        });
+        this._items = items;
+    }
+}
 function object(props) {
     return new JsonSchemaObjectBuilder(props);
 }

package/package.json

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

package/src/validation/ajv/ajvSchema.ts

@@ -100,7 +100,7 @@ export class AjvSchema<IN = unknown, OUT = IN> {
     schema: T,
   ): AjvSchema<T['_input'], T['_output']> {
     const jsonSchema = z.toJSONSchema(schema, {
-      target: 'draft-7',
+      target: 'draft-2020-12',
     }) as unknown as JsonSchema<T['_input'], T['_output']>
 
     return AjvSchema.create(jsonSchema)

package/src/validation/ajv/getAjv.ts

@@ -2,7 +2,7 @@ import { _isBetween, _lazyValue } from '@naturalcycles/js-lib'
 import { Set2 } from '@naturalcycles/js-lib/object'
 import { _substringAfterLast } from '@naturalcycles/js-lib/string'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
-import { Ajv, type Options, type ValidateFunction } from 'ajv'
+import { Ajv2020, type Options, type ValidateFunction } from 'ajv/dist/2020.js'
 import { validTLDs } from '../tlds.js'
 import type {
   JsonSchemaIsoDateOptions,
@@ -65,8 +65,8 @@ export const getCoercingAjv = _lazyValue(() => createAjv(AJV_MUTATING_COERCING_O
  *
  * https://ajv.js.org/options.html
  */
-export function createAjv(opt?: Options): Ajv {
-  const ajv = new Ajv({
+export function createAjv(opt?: Options): Ajv2020 {
+  const ajv = new Ajv2020({
     ...AJV_OPTIONS,
     ...opt,
   })

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -126,6 +126,12 @@ export const j = {
     return new JsonSchemaArrayBuilder(itemSchema)
   },
 
+  tuple<const S extends JsonSchemaAnyBuilder<any, any, any>[]>(
+    items: S,
+  ): JsonSchemaTupleBuilder<S> {
+    return new JsonSchemaTupleBuilder<S>(items)
+  },
+
   set<IN, OUT, Opt>(
     itemSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>,
   ): JsonSchemaSet2Builder<IN, OUT, Opt> {
@@ -828,24 +834,50 @@ export class JsonSchemaObjectBuilder<
     return this.cloneAndUpdateSchema({ additionalProperties: true })
   }
 
-  extend(props: AnyObject): never
-  extend<IN2 extends AnyObject>(props: {
-    [K in keyof Required<IN2>]-?: JsonSchemaAnyBuilder<any, IN2[K], any>
-  }): JsonSchemaObjectBuilder<IN & IN2, OUT & IN2, false>
-  extend<IN2 extends AnyObject>(props: {
-    [key in keyof IN2]: JsonSchemaAnyBuilder<any, IN2[key], any>
-  }): JsonSchemaObjectBuilder<IN & IN2, OUT & IN2, false> {
-    const clone = this.clone()
+  extend<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
+    props: P,
+  ): JsonSchemaObjectBuilder<
+    IN & {
+      // required keys
+      [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt>
+        ? IsOpt extends true
+          ? never
+          : K
+        : never]: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never
+    } & {
+      // optional keys
+      [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt>
+        ? IsOpt extends true
+          ? K
+          : never
+        : never]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never
+    },
+    OUT & {
+      // required keys
+      [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt>
+        ? IsOpt extends true
+          ? never
+          : K
+        : never]: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never
+    } & {
+      // optional keys
+      [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt>
+        ? IsOpt extends true
+          ? K
+          : never
+        : never]?: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never
+    },
+    false
+  > {
+    const newBuilder = new JsonSchemaObjectBuilder()
+    _objectAssign(newBuilder.schema, _deepCopy(this.schema))
 
-    const incomingSchemaBuilder = new JsonSchemaObjectBuilder<IN2, IN2, false>(props)
-    mergeJsonSchemaObjects(clone.schema as any, incomingSchemaBuilder.schema as any)
+    const incomingSchemaBuilder = new JsonSchemaObjectBuilder(props)
+    mergeJsonSchemaObjects(newBuilder.schema as any, incomingSchemaBuilder.schema as any)
 
-    // The incoming object is type-safe because `extend<Foo>()` expects a passed in type that matches the passed in props,
-    // but maybe the current schema was created differently, so that's what decides the typecheckedness.
-    const hasIsOfTypeCheck = this.schema.hasIsOfTypeCheck
-    _objectAssign(clone.schema, { hasIsOfTypeCheck })
+    _objectAssign(newBuilder.schema, { hasIsOfTypeCheck: false })
 
-    return clone as unknown as JsonSchemaObjectBuilder<IN & IN2, OUT & IN2, false>
+    return newBuilder as any
   }
 
   /**
@@ -1113,6 +1145,23 @@ export class JsonSchemaEnumBuilder<
   }
 }
 
+export class JsonSchemaTupleBuilder<
+  ITEMS extends JsonSchemaAnyBuilder<any, any, any>[],
+> extends JsonSchemaAnyBuilder<TupleIn<ITEMS>, TupleOut<ITEMS>, false> {
+  private readonly _items: ITEMS
+
+  constructor(items: ITEMS) {
+    super({
+      type: 'array',
+      prefixItems: items.map(i => i.build()),
+      minItems: items.length,
+      maxItems: items.length,
+    })
+
+    this._items = items
+  }
+}
+
 type EnumBaseType = 'string' | 'number' | 'other'
 
 export interface JsonSchema<IN = unknown, OUT = IN> {
@@ -1130,6 +1179,7 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
 
   type?: string | string[]
   items?: JsonSchema
+  prefixItems?: JsonSchema[]
   properties?: {
     [K in keyof IN & keyof OUT]: JsonSchema<IN[K], OUT[K]>
   }
@@ -1395,3 +1445,11 @@ type SchemaIn<S> = S extends JsonSchemaAnyBuilder<infer IN, any, any> ? IN : nev
 type SchemaOut<S> = S extends JsonSchemaAnyBuilder<any, infer OUT, any> ? OUT : never
 type SchemaOpt<S> =
   S extends JsonSchemaAnyBuilder<any, any, infer Opt> ? (Opt extends true ? true : false) : false
+
+type TupleIn<T extends readonly JsonSchemaAnyBuilder<any, any, any>[]> = {
+  [K in keyof T]: T[K] extends JsonSchemaAnyBuilder<infer I, any, any> ? I : never
+}
+
+type TupleOut<T extends readonly JsonSchemaAnyBuilder<any, any, any>[]> = {
+  [K in keyof T]: T[K] extends JsonSchemaAnyBuilder<any, infer O, any> ? O : never
+}