@naturalcycles/nodejs-lib 15.56.0 → 15.56.1

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);
@@ -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 {

package/package.json

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

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 {
@@ -544,12 +554,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 +711,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
   }
 }