@naturalcycles/nodejs-lib 15.65.0 → 15.65.2

package/dist/validation/ajv/getAjv.js

@@ -414,6 +414,26 @@ export function createAjv(opt) {
             return validate;
         },
     });
+    // This and `maxProperties2` are added because Ajv validates the `min/maxProperties` before validating the properties.
+    // So, in case of `minProperties(1)` and `{ foo: 'bar' }` Ajv will let it pass, even
+    // if the property validation would strip `foo` from the data.
+    // And Ajv would return `{}` as a successful validation.
+    // Since the keyword validation runs after JSON Schema validation,
+    // here we can make sure the number of properties are right ex-post property validation.
+    // It's named with the `2` suffix, because `minProperties` is reserved.
+    // And `maxProperties` does not suffer from this error due to the nature of how maximum works.
+    ajv.addKeyword({
+        keyword: 'minProperties2',
+        type: 'object',
+        modifying: false,
+        errors: true,
+        schemaType: 'number',
+        validate: function validate(minProperties, data, _schema, _ctx) {
+            if (typeof data !== 'object')
+                return true;
+            return Object.getOwnPropertyNames(data).length >= minProperties;
+        },
+    });
     return ajv;
 }
 const monthLengths = [0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];

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

@@ -401,6 +401,7 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
     errorMessages?: StringMap<string>;
     optionalValues?: (string | number | boolean)[];
     keySchema?: JsonSchema;
+    minProperties2?: number;
 }
 declare function object(props: AnyObject): never;
 declare function object<IN extends AnyObject>(props: {

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -632,7 +632,7 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
         });
     }
     minProperties(minProperties) {
-        return this.cloneAndUpdateSchema({ minProperties });
+        return this.cloneAndUpdateSchema({ minProperties, minProperties2: minProperties });
     }
     maxProperties(maxProperties) {
         return this.cloneAndUpdateSchema({ maxProperties });

package/package.json

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

package/src/stream/ndjson/ndjsonMap.ts

@@ -4,8 +4,7 @@ import type { TransformLogProgressOptions, TransformMapOptions } from '../index.
 import { Pipeline } from '../pipeline.js'
 
 export interface NDJSONMapOptions<IN = any, OUT = IN>
-  extends TransformMapOptions<IN, OUT>,
-    TransformLogProgressOptions<IN> {
+  extends TransformMapOptions<IN, OUT>, TransformLogProgressOptions<IN> {
   inputFilePath: string
   outputFilePath: string
 

package/src/stream/transform/transformLogProgress.ts

@@ -4,8 +4,7 @@ import { progressLogger } from '../progressLogger.js'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'
 
 export interface TransformLogProgressOptions<IN = any>
-  extends ProgressLoggerCfg<IN>,
-    TransformOptions {}
+  extends ProgressLoggerCfg<IN>, TransformOptions {}
 
 /**
  * Pass-through transform that optionally logs progress.

package/src/validation/ajv/getAjv.ts

@@ -478,6 +478,26 @@ export function createAjv(opt?: Options): Ajv2020 {
     },
   })
 
+  // This and `maxProperties2` are added because Ajv validates the `min/maxProperties` before validating the properties.
+  // So, in case of `minProperties(1)` and `{ foo: 'bar' }` Ajv will let it pass, even
+  // if the property validation would strip `foo` from the data.
+  // And Ajv would return `{}` as a successful validation.
+  // Since the keyword validation runs after JSON Schema validation,
+  // here we can make sure the number of properties are right ex-post property validation.
+  // It's named with the `2` suffix, because `minProperties` is reserved.
+  // And `maxProperties` does not suffer from this error due to the nature of how maximum works.
+  ajv.addKeyword({
+    keyword: 'minProperties2',
+    type: 'object',
+    modifying: false,
+    errors: true,
+    schemaType: 'number',
+    validate: function validate(minProperties: number, data: AnyObject, _schema, _ctx) {
+      if (typeof data !== 'object') return true
+      return Object.getOwnPropertyNames(data).length >= minProperties
+    },
+  })
+
   return ajv
 }
 

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -920,7 +920,7 @@ export class JsonSchemaObjectBuilder<
   }
 
   minProperties(minProperties: number): this {
-    return this.cloneAndUpdateSchema({ minProperties })
+    return this.cloneAndUpdateSchema({ minProperties, minProperties2: minProperties })
   }
 
   maxProperties(maxProperties: number): this {
@@ -1239,6 +1239,7 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
   errorMessages?: StringMap<string>
   optionalValues?: (string | number | boolean)[]
   keySchema?: JsonSchema
+  minProperties2?: number
 }
 
 function object(props: AnyObject): never