@naturalcycles/nodejs-lib 15.56.0 → 15.57.0

package/dist/validation/ajv/ajvSchema.js

@@ -53,6 +53,7 @@ export class AjvSchema {
         }
         let jsonSchema;
         if (AjvSchema.isJsonSchemaBuilder(schema)) {
+            // oxlint-disable typescript-eslint(no-unnecessary-type-assertion)
             jsonSchema = schema.build();
             AjvSchema.requireValidJsonSchema(jsonSchema);
         }

package/dist/validation/ajv/getAjv.js

@@ -1,7 +1,7 @@
 import { _lazyValue } from '@naturalcycles/js-lib';
 import { Set2 } from '@naturalcycles/js-lib/object';
 import { _substringAfterLast } from '@naturalcycles/js-lib/string';
-import { _, Ajv } from 'ajv';
+import { Ajv } from 'ajv';
 import { validTLDs } from '../tlds.js';
 /* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
 // oxlint-disable unicorn/prefer-code-point
@@ -66,27 +66,30 @@ export function createAjv(opt) {
         modifying: true,
         schemaType: 'object',
         errors: true,
-        code(ctx) {
-            const { gen, data, schema, it } = ctx;
-            const { parentData, parentDataProperty } = it;
-            if (schema.trim) {
-                gen.assign(_ `${data}`, _ `${data}.trim()`);
+        validate: function validate(transform, data, _schema, ctx) {
+            if (!data)
+                return true;
+            let transformedData = data;
+            if (transform.trim) {
+                transformedData = transformedData.trim();
             }
-            if (schema.toLowerCase) {
-                gen.assign(_ `${data}`, _ `${data}.toLowerCase()`);
+            if (transform.toLowerCase) {
+                transformedData = transformedData.toLocaleLowerCase();
             }
-            if (schema.toUpperCase) {
-                gen.assign(_ `${data}`, _ `${data}.toUpperCase()`);
+            if (transform.toUpperCase) {
+                transformedData = transformedData.toLocaleUpperCase();
             }
-            if (typeof schema.truncate === 'number' && schema.truncate >= 0) {
-                gen.assign(_ `${data}`, _ `${data}.slice(0, ${schema.truncate})`);
-                if (schema.trim) {
-                    gen.assign(_ `${data}`, _ `${data}.trim()`);
+            if (typeof transform.truncate === 'number' && transform.truncate >= 0) {
+                transformedData = transformedData.slice(0, transform.truncate);
+                if (transform.trim) {
+                    transformedData = transformedData.trim();
                 }
             }
-            gen.if(_ `${parentData} !== undefined`, () => {
-                gen.assign(_ `${parentData}[${parentDataProperty}]`, data);
-            });
+            // Explicit check for `undefined` because parentDataProperty can be `0` when it comes to arrays.
+            if (ctx?.parentData && typeof ctx.parentDataProperty !== 'undefined') {
+                ctx.parentData[ctx.parentDataProperty] = transformedData;
+            }
+            return true;
         },
     });
     ajv.addKeyword({
@@ -366,7 +369,7 @@ export function createAjv(opt) {
             if (!optionalValues.includes(data))
                 return true;
             if (ctx?.parentData && ctx.parentDataProperty) {
-                ctx.parentData[ctx.parentDataProperty] = undefined;
+                delete ctx.parentData[ctx.parentDataProperty];
             }
             return true;
         },

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

@@ -86,6 +86,7 @@ export declare class JsonSchemaStringBuilder<IN extends string | undefined = str
     pattern(pattern: string, opt?: JsonBuilderRuleOpt): this;
     minLength(minLength: number): this;
     maxLength(maxLength: number): this;
+    length(exactLength: number): this;
     length(minLength: number, maxLength: number): this;
     email(opt?: Partial<JsonSchemaStringEmailOptions>): this;
     trim(): this;
@@ -234,6 +235,7 @@ export declare class JsonSchemaArrayBuilder<IN, OUT, Opt> extends JsonSchemaAnyB
     constructor(itemsSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>);
     minLength(minItems: number): this;
     maxLength(maxItems: number): this;
+    length(exactLength: number): this;
     length(minItems: number, maxItems: number): this;
     exactLength(length: number): this;
     unique(): this;

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -218,8 +218,16 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
      * due to how mutability works in Ajv.
      */
     optional(optionalValues) {
-        _objectAssign(this.schema, { optionalValues });
-        return super.optional();
+        if (!optionalValues) {
+            return super.optional();
+        }
+        const newBuilder = new JsonSchemaStringBuilder().optional();
+        const alternativesSchema = j.enum(optionalValues);
+        Object.assign(newBuilder.getSchema(), {
+            anyOf: [this.build(), alternativesSchema.build()],
+            optionalValues,
+        });
+        return newBuilder;
     }
     regex(pattern, opt) {
         return this.pattern(pattern.source, opt);
@@ -240,9 +248,9 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
         _objectAssign(this.schema, { maxLength });
         return this;
     }
-    length(minLength, maxLength) {
-        _objectAssign(this.schema, { minLength, maxLength });
-        return this;
+    length(minLengthOrExactLength, maxLength) {
+        const maxLengthActual = maxLength ?? minLengthOrExactLength;
+        return this.minLength(minLengthOrExactLength).maxLength(maxLengthActual);
     }
     email(opt) {
         const defaultOptions = { checkTLD: true };
@@ -380,8 +388,16 @@ export class JsonSchemaNumberBuilder extends JsonSchemaAnyBuilder {
      * due to how mutability works in Ajv.
      */
     optional(optionalValues) {
-        _objectAssign(this.schema, { optionalValues });
-        return super.optional();
+        if (!optionalValues) {
+            return super.optional();
+        }
+        const newBuilder = new JsonSchemaNumberBuilder().optional();
+        const alternativesSchema = j.enum(optionalValues);
+        Object.assign(newBuilder.getSchema(), {
+            anyOf: [this.build(), alternativesSchema.build()],
+            optionalValues,
+        });
+        return newBuilder;
     }
     integer() {
         _objectAssign(this.schema, { type: 'integer' });
@@ -488,10 +504,16 @@ export class JsonSchemaBooleanBuilder extends JsonSchemaAnyBuilder {
      * due to how mutability works in Ajv.
      */
     optional(optionalValue) {
-        if (typeof optionalValue !== 'undefined') {
-            _objectAssign(this.schema, { optionalValues: [optionalValue] });
+        if (typeof optionalValue === 'undefined') {
+            return super.optional();
         }
-        return super.optional();
+        const newBuilder = new JsonSchemaBooleanBuilder().optional();
+        const alternativesSchema = j.enum([optionalValue]);
+        Object.assign(newBuilder.getSchema(), {
+            anyOf: [this.build(), alternativesSchema.build()],
+            optionalValues: [optionalValue],
+        });
+        return newBuilder;
     }
 }
 export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
@@ -627,8 +649,9 @@ export class JsonSchemaArrayBuilder extends JsonSchemaAnyBuilder {
         _objectAssign(this.schema, { maxItems });
         return this;
     }
-    length(minItems, maxItems) {
-        return this.minLength(minItems).maxLength(maxItems);
+    length(minItemsOrExact, maxItems) {
+        const maxItemsActual = maxItems ?? minItemsOrExact;
+        return this.minLength(minItemsOrExact).maxLength(maxItemsActual);
     }
     exactLength(length) {
         return this.minLength(length).maxLength(length);

package/package.json

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

package/src/validation/ajv/ajvSchema.ts

@@ -73,6 +73,7 @@ export class AjvSchema<IN = unknown, OUT = IN> {
     let jsonSchema: JsonSchema<IN, OUT>
 
     if (AjvSchema.isJsonSchemaBuilder(schema)) {
+      // oxlint-disable typescript-eslint(no-unnecessary-type-assertion)
       jsonSchema = (schema as JsonSchemaTerminal<IN, OUT, any>).build()
       AjvSchema.requireValidJsonSchema(jsonSchema)
     } else {

package/src/validation/ajv/getAjv.ts

@@ -1,7 +1,7 @@
 import { _lazyValue } from '@naturalcycles/js-lib'
 import { Set2 } from '@naturalcycles/js-lib/object'
 import { _substringAfterLast } from '@naturalcycles/js-lib/string'
-import { _, Ajv, type Options, type ValidateFunction } from 'ajv'
+import { Ajv, type Options, type ValidateFunction } from 'ajv'
 import { validTLDs } from '../tlds.js'
 import type { JsonSchemaIsoDateOptions, JsonSchemaStringEmailOptions } from './jsonSchemaBuilder.js'
 
@@ -77,33 +77,42 @@ export function createAjv(opt?: Options): Ajv {
     modifying: true,
     schemaType: 'object',
     errors: true,
-    code(ctx) {
-      const { gen, data, schema, it } = ctx
-      const { parentData, parentDataProperty } = it
+    validate: function validate(
+      transform: { trim?: true; toLowerCase?: true; toUpperCase?: true; truncate?: number },
+      data: string,
+      _schema,
+      ctx,
+    ) {
+      if (!data) return true
 
-      if (schema.trim) {
-        gen.assign(_`${data}`, _`${data}.trim()`)
+      let transformedData = data
+
+      if (transform.trim) {
+        transformedData = transformedData.trim()
       }
 
-      if (schema.toLowerCase) {
-        gen.assign(_`${data}`, _`${data}.toLowerCase()`)
+      if (transform.toLowerCase) {
+        transformedData = transformedData.toLocaleLowerCase()
       }
 
-      if (schema.toUpperCase) {
-        gen.assign(_`${data}`, _`${data}.toUpperCase()`)
+      if (transform.toUpperCase) {
+        transformedData = transformedData.toLocaleUpperCase()
       }
 
-      if (typeof schema.truncate === 'number' && schema.truncate >= 0) {
-        gen.assign(_`${data}`, _`${data}.slice(0, ${schema.truncate})`)
+      if (typeof transform.truncate === 'number' && transform.truncate >= 0) {
+        transformedData = transformedData.slice(0, transform.truncate)
 
-        if (schema.trim) {
-          gen.assign(_`${data}`, _`${data}.trim()`)
+        if (transform.trim) {
+          transformedData = transformedData.trim()
         }
       }
 
-      gen.if(_`${parentData} !== undefined`, () => {
-        gen.assign(_`${parentData}[${parentDataProperty}]`, data)
-      })
+      // Explicit check for `undefined` because parentDataProperty can be `0` when it comes to arrays.
+      if (ctx?.parentData && typeof ctx.parentDataProperty !== 'undefined') {
+        ctx.parentData[ctx.parentDataProperty] = transformedData
+      }
+
+      return true
     },
   })
 
@@ -413,7 +422,7 @@ export function createAjv(opt?: Options): Ajv {
       if (!optionalValues.includes(data)) return true
 
       if (ctx?.parentData && ctx.parentDataProperty) {
-        ctx.parentData[ctx.parentDataProperty] = undefined
+        delete ctx.parentData[ctx.parentDataProperty]
       }
 
       return true

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -325,12 +325,22 @@ export class JsonSchemaStringBuilder<
   override optional(
     optionalValues?: string[],
   ): JsonSchemaStringBuilder<IN | undefined, OUT | undefined, true> {
-    _objectAssign(this.schema, { optionalValues })
-    return super.optional() as unknown as JsonSchemaStringBuilder<
-      IN | undefined,
-      OUT | undefined,
-      true
-    >
+    if (!optionalValues) {
+      return super.optional() as unknown as JsonSchemaStringBuilder<
+        IN | undefined,
+        OUT | undefined,
+        true
+      >
+    }
+
+    const newBuilder = new JsonSchemaStringBuilder<IN, OUT, Opt>().optional()
+    const alternativesSchema = j.enum(optionalValues)
+    Object.assign(newBuilder.getSchema(), {
+      anyOf: [this.build(), alternativesSchema.build()],
+      optionalValues,
+    })
+
+    return newBuilder
   }
 
   regex(pattern: RegExp, opt?: JsonBuilderRuleOpt): this {
@@ -354,9 +364,11 @@ export class JsonSchemaStringBuilder<
     return this
   }
 
-  length(minLength: number, maxLength: number): this {
-    _objectAssign(this.schema, { minLength, maxLength })
-    return this
+  length(exactLength: number): this
+  length(minLength: number, maxLength: number): this
+  length(minLengthOrExactLength: number, maxLength?: number): this {
+    const maxLengthActual = maxLength ?? minLengthOrExactLength
+    return this.minLength(minLengthOrExactLength).maxLength(maxLengthActual)
   }
 
   email(opt?: Partial<JsonSchemaStringEmailOptions>): this {
@@ -544,12 +556,22 @@ export class JsonSchemaNumberBuilder<
   override optional(
     optionalValues?: number[],
   ): JsonSchemaNumberBuilder<IN | undefined, OUT | undefined, true> {
-    _objectAssign(this.schema, { optionalValues })
-    return super.optional() as unknown as JsonSchemaNumberBuilder<
-      IN | undefined,
-      OUT | undefined,
-      true
-    >
+    if (!optionalValues) {
+      return super.optional() as unknown as JsonSchemaNumberBuilder<
+        IN | undefined,
+        OUT | undefined,
+        true
+      >
+    }
+
+    const newBuilder = new JsonSchemaNumberBuilder<IN, OUT, Opt>().optional()
+    const alternativesSchema = j.enum(optionalValues)
+    Object.assign(newBuilder.getSchema(), {
+      anyOf: [this.build(), alternativesSchema.build()],
+      optionalValues,
+    })
+
+    return newBuilder
   }
 
   integer(): this {
@@ -691,15 +713,22 @@ export class JsonSchemaBooleanBuilder<
   override optional(
     optionalValue?: boolean,
   ): JsonSchemaBooleanBuilder<IN | undefined, OUT | undefined, true> {
-    if (typeof optionalValue !== 'undefined') {
-      _objectAssign(this.schema, { optionalValues: [optionalValue] })
+    if (typeof optionalValue === 'undefined') {
+      return super.optional() as unknown as JsonSchemaBooleanBuilder<
+        IN | undefined,
+        OUT | undefined,
+        true
+      >
     }
 
-    return super.optional() as unknown as JsonSchemaBooleanBuilder<
-      IN | undefined,
-      OUT | undefined,
-      true
-    >
+    const newBuilder = new JsonSchemaBooleanBuilder<IN, OUT, Opt>().optional()
+    const alternativesSchema = j.enum([optionalValue])
+    Object.assign(newBuilder.getSchema(), {
+      anyOf: [this.build(), alternativesSchema.build()],
+      optionalValues: [optionalValue],
+    })
+
+    return newBuilder
   }
 }
 
@@ -925,8 +954,11 @@ export class JsonSchemaArrayBuilder<IN, OUT, Opt> extends JsonSchemaAnyBuilder<I
     return this
   }
 
-  length(minItems: number, maxItems: number): this {
-    return this.minLength(minItems).maxLength(maxItems)
+  length(exactLength: number): this
+  length(minItems: number, maxItems: number): this
+  length(minItemsOrExact: number, maxItems?: number): this {
+    const maxItemsActual = maxItems ?? minItemsOrExact
+    return this.minLength(minItemsOrExact).maxLength(maxItemsActual)
   }
 
   exactLength(length: number): this {