@naturalcycles/nodejs-lib 15.80.1 → 15.80.2

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -126,7 +126,7 @@ export const j = {
      */
     oneOf(items) {
         const schemas = items.map(b => b.build());
-        _assert(schemas.every(hasOnlySchemasForPrimitives), 'Do not use `oneOf` validation with non-primitive types!');
+        _assert(schemas.every(hasNoObjectSchemas), 'Do not use `oneOf` validation with non-primitive types!');
         return new JsonSchemaAnyBuilder({
             oneOf: schemas,
         });
@@ -144,7 +144,7 @@ export const j = {
      */
     anyOf(items) {
         const schemas = items.map(b => b.build());
-        _assert(schemas.every(hasOnlySchemasForPrimitives), 'Do not use `anyOf` validation with non-primitive types!');
+        _assert(schemas.every(hasNoObjectSchemas), 'Do not use `anyOf` validation with non-primitive types!');
         return new JsonSchemaAnyBuilder({
             anyOf: schemas,
         });
@@ -899,15 +899,21 @@ function withEnumKeys(keys, schema) {
     const props = Object.fromEntries(typedValues.map(key => [key, schema]));
     return new JsonSchemaObjectBuilder(props, { hasIsOfTypeCheck: false });
 }
-function hasOnlySchemasForPrimitives(schema) {
+function hasNoObjectSchemas(schema) {
     if (Array.isArray(schema.type)) {
         schema.type.every(type => ['string', 'number', 'integer', 'boolean', 'null'].includes(type));
     }
     else if (schema.anyOf) {
-        return schema.anyOf.every(hasOnlySchemasForPrimitives);
+        return schema.anyOf.every(hasNoObjectSchemas);
     }
     else if (schema.oneOf) {
-        return schema.oneOf.every(hasOnlySchemasForPrimitives);
+        return schema.oneOf.every(hasNoObjectSchemas);
+    }
+    else if (schema.enum) {
+        return true;
+    }
+    else if (schema.type === 'array') {
+        return !schema.items || hasNoObjectSchemas(schema.items);
     }
     else {
         return !!schema.type && ['string', 'number', 'integer', 'boolean', 'null'].includes(schema.type);

package/package.json

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

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -206,7 +206,7 @@ export const j = {
   >(items: [...B]): JsonSchemaAnyBuilder<IN, OUT, false> {
     const schemas = items.map(b => b.build())
     _assert(
-      schemas.every(hasOnlySchemasForPrimitives),
+      schemas.every(hasNoObjectSchemas),
       'Do not use `oneOf` validation with non-primitive types!',
     )
 
@@ -233,7 +233,7 @@ export const j = {
   >(items: [...B]): JsonSchemaAnyBuilder<IN, OUT, false> {
     const schemas = items.map(b => b.build())
     _assert(
-      schemas.every(hasOnlySchemasForPrimitives),
+      schemas.every(hasNoObjectSchemas),
       'Do not use `anyOf` validation with non-primitive types!',
     )
 
@@ -1515,13 +1515,17 @@ function withEnumKeys<
   >(props, { hasIsOfTypeCheck: false })
 }
 
-function hasOnlySchemasForPrimitives(schema: JsonSchema): boolean {
+function hasNoObjectSchemas(schema: JsonSchema): boolean {
   if (Array.isArray(schema.type)) {
     schema.type.every(type => ['string', 'number', 'integer', 'boolean', 'null'].includes(type))
   } else if (schema.anyOf) {
-    return schema.anyOf.every(hasOnlySchemasForPrimitives)
+    return schema.anyOf.every(hasNoObjectSchemas)
   } else if (schema.oneOf) {
-    return schema.oneOf.every(hasOnlySchemasForPrimitives)
+    return schema.oneOf.every(hasNoObjectSchemas)
+  } else if (schema.enum) {
+    return true
+  } else if (schema.type === 'array') {
+    return !schema.items || hasNoObjectSchemas(schema.items)
   } else {
     return !!schema.type && ['string', 'number', 'integer', 'boolean', 'null'].includes(schema.type)
   }