@naturalcycles/nodejs-lib 15.65.1 → 15.65.3

package/dist/validation/ajv/getAjv.js

@@ -414,6 +414,37 @@ 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;
+            const numberOfProperties = Object.getOwnPropertyNames(data).length;
+            const isValid = numberOfProperties >= minProperties;
+            if (!isValid) {
+                ;
+                validate.errors = [
+                    {
+                        instancePath: ctx?.instancePath ?? '',
+                        message: `must NOT have fewer than ${minProperties} properties`,
+                    },
+                ];
+            }
+            return isValid;
+        },
+    });
     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.1",
+  "version": "15.65.3",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/through2-concurrent": "^2",
-    "@naturalcycles/dev-lib": "20.12.10"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/validation/ajv/getAjv.ts

@@ -478,6 +478,38 @@ 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
+
+      const numberOfProperties = Object.getOwnPropertyNames(data).length
+      const isValid = numberOfProperties >= minProperties
+      if (!isValid) {
+        ;(validate as any).errors = [
+          {
+            instancePath: ctx?.instancePath ?? '',
+            message: `must NOT have fewer than ${minProperties} properties`,
+          },
+        ]
+      }
+
+      return isValid
+    },
+  })
+
   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