@naturalcycles/nodejs-lib 15.57.0 → 15.57.1

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

@@ -49,6 +49,8 @@ export declare class JsonSchemaAnyBuilder<IN, OUT, Opt> extends JsonSchemaTermin
      *
      * const schemaBad = j.string().isOfType<number>() // ❌
      * schemaBad.build() // TypeError: property "build" does not exist on type "never"
+     *
+     * const result = ajvValidateRequest.body(req, schemaBad) // result will have `unknown` type
      * ```
      */
     isOfType<ExpectedType>(): ExactMatch<ExpectedType, OUT> extends true ? this : never;

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -26,8 +26,6 @@ export const j = {
         },
         stringMap(schema) {
             const builtSchema = schema.build();
-            _assert(!builtSchema?.optionalField, 'In a StringMap schema the value cannot be `undefined`, because `undefined` is not a valid JSON Schema value.');
-            builtSchema.optionalField = undefined;
             return new JsonSchemaObjectBuilder({}, {
                 hasIsOfTypeCheck: false,
                 patternProperties: {
@@ -111,7 +109,9 @@ export class JsonSchemaTerminal {
      * Same as if it would be JSON.stringified.
      */
     build() {
-        return _sortObject(JSON.parse(JSON.stringify(this.schema)), JSON_SCHEMA_ORDER);
+        const jsonSchema = _sortObject(JSON.parse(JSON.stringify(this.schema)), JSON_SCHEMA_ORDER);
+        delete jsonSchema.optionalField;
+        return jsonSchema;
     }
     clone() {
         return new JsonSchemaAnyBuilder(_deepCopy(this.schema));
@@ -140,6 +140,8 @@ export class JsonSchemaAnyBuilder extends JsonSchemaTerminal {
      *
      * const schemaBad = j.string().isOfType<number>() // ❌
      * schemaBad.build() // TypeError: property "build" does not exist on type "never"
+     *
+     * const result = ajvValidateRequest.body(req, schemaBad) // result will have `unknown` type
      * ```
      */
     isOfType() {
@@ -533,13 +535,11 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
         const properties = {};
         const required = [];
         for (const [key, builder] of Object.entries(props)) {
-            const schema = builder.build();
-            if (!schema.optionalField) {
+            const isOptional = builder.getSchema().optionalField;
+            if (!isOptional) {
                 required.push(key);
             }
-            else {
-                schema.optionalField = undefined;
-            }
+            const schema = builder.build();
             properties[key] = schema;
         }
         this.schema.properties = properties;
@@ -595,13 +595,11 @@ export class JsonSchemaObjectInferringBuilder extends JsonSchemaAnyBuilder {
         const properties = {};
         const required = [];
         for (const [key, builder] of Object.entries(props)) {
-            const schema = builder.build();
-            if (!schema.optionalField) {
+            const isOptional = builder.getSchema().optionalField;
+            if (!isOptional) {
                 required.push(key);
             }
-            else {
-                schema.optionalField = undefined;
-            }
+            const schema = builder.build();
             properties[key] = schema;
         }
         this.schema.properties = properties;

package/package.json

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

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -70,11 +70,6 @@ export const j = {
       schema: S,
     ): JsonSchemaObjectBuilder<StringMap<SchemaIn<S>>, StringMap<SchemaOut<S>>> {
       const builtSchema = schema.build()
-      _assert(
-        !builtSchema?.optionalField,
-        'In a StringMap schema the value cannot be `undefined`, because `undefined` is not a valid JSON Schema value.',
-      )
-      builtSchema.optionalField = undefined
 
       return new JsonSchemaObjectBuilder<StringMap<SchemaIn<S>>, StringMap<SchemaOut<S>>>(
         {},
@@ -193,7 +188,14 @@ export class JsonSchemaTerminal<IN, OUT, Opt> {
    * Same as if it would be JSON.stringified.
    */
   build(): JsonSchema<IN, OUT> {
-    return _sortObject(JSON.parse(JSON.stringify(this.schema)), JSON_SCHEMA_ORDER)
+    const jsonSchema = _sortObject(
+      JSON.parse(JSON.stringify(this.schema)),
+      JSON_SCHEMA_ORDER,
+    ) as JsonSchema<IN, OUT>
+
+    delete jsonSchema.optionalField
+
+    return jsonSchema
   }
 
   clone(): JsonSchemaAnyBuilder<IN, OUT, Opt> {
@@ -226,6 +228,8 @@ export class JsonSchemaAnyBuilder<IN, OUT, Opt> extends JsonSchemaTerminal<IN, O
    *
    * const schemaBad = j.string().isOfType<number>() // ❌
    * schemaBad.build() // TypeError: property "build" does not exist on type "never"
+   *
+   * const result = ajvValidateRequest.body(req, schemaBad) // result will have `unknown` type
    * ```
    */
   isOfType<ExpectedType>(): ExactMatch<ExpectedType, OUT> extends true ? this : never {
@@ -755,12 +759,12 @@ export class JsonSchemaObjectBuilder<
     const required: string[] = []
 
     for (const [key, builder] of Object.entries(props)) {
-      const schema = builder.build()
-      if (!schema.optionalField) {
+      const isOptional = (builder as JsonSchemaTerminal<any, any, any>).getSchema().optionalField
+      if (!isOptional) {
         required.push(key)
-      } else {
-        schema.optionalField = undefined
       }
+
+      const schema = builder.build()
       properties[key] = schema
     }
 
@@ -870,12 +874,12 @@ export class JsonSchemaObjectInferringBuilder<
     const required: string[] = []
 
     for (const [key, builder] of Object.entries(props)) {
-      const schema = builder.build()
-      if (!schema.optionalField) {
+      const isOptional = (builder as JsonSchemaTerminal<any, any, any>).getSchema().optionalField
+      if (!isOptional) {
         required.push(key)
-      } else {
-        schema.optionalField = undefined
       }
+
+      const schema = builder.build()
       properties[key] = schema
     }