json-2-joi 2.5.0 → 2.5.1

package/README.md

@@ -90,7 +90,7 @@ const schema = Json2Joi.schema({
 
 const { error, value } = schema.validate({firstName: 'John', lastName: 'Doe', age: 45});
 ```
-schema.additionalProperties !== false
+
 ### joiOptions
 
 When this option is provided, a Joi instance will be created as `joiInstance = Joi.defaults((schema) => schema.options(joiOptions));` for building Joi Schema.

package/lib/resolver.js

@@ -222,7 +222,7 @@ class SchemaResolver {
         return joiSchema;
     }
 
-    resolve(schema, resolveOptions = {}, baseUri = (schema.$id || '')) {
+    resolve(schema, resolveOptions = {}, baseUri = (schema.$id || ''), isPropertyRequired = false) {
         if (this.joi.isSchema(schema)) {
             return schema;
         }
@@ -242,17 +242,17 @@ class SchemaResolver {
 
         if (typeof schema === 'string') {
             // If schema is itself a string, interpret it as a type
-            resolvedSchema = this.resolveType({ type: schema }, resolveOptions, baseUri);
+            resolvedSchema = this.resolveType({ type: schema }, resolveOptions, baseUri, isPropertyRequired);
         } else if (schema.$ref) {
             if (schema.$ref.trim() === '#') {
                 return baseUri ? this.joi.link(`#${normalizedId(baseUri)}`) : this.joi.link('/');
             }
 
-            resolvedSchema = this.resolve(this.resolveReference(schema.$ref, baseUri), resolveOptions, baseUri);
+            resolvedSchema = this.resolve(this.resolveReference(schema.$ref, baseUri), resolveOptions, baseUri, isPropertyRequired);
         } else {
             const partialSchemas = [];
             if (schema.type) {
-                partialSchemas.push(this.resolveType(schema, resolveOptions, baseUri));
+                partialSchemas.push(this.resolveType(schema, resolveOptions, baseUri, isPropertyRequired));
             } else if (schema.properties) {
                 // if no type is specified, just properties
                 partialSchemas.push(this.object(schema, resolveOptions, baseUri))
@@ -307,6 +307,15 @@ class SchemaResolver {
             this.joiSharedSchemas.set(`${baseUri}#${schema.$anchor}`, resolvedSchema);
         }
 
+        if (isPropertyRequired) {
+            resolvedSchema = resolvedSchema.required();
+            if (resolveOptions.strictRequired) {
+                resolvedSchema = resolvedSchema.invalid(null, '');
+            }
+        } else {
+            resolvedSchema = allowNullIfNeeded(resolvedSchema, resolveOptions);
+        }
+
         return resolvedSchema;
     }
 
@@ -358,7 +367,7 @@ class SchemaResolver {
         return refSchema;
     }
 
-    resolveType(schema, resolveOptions, baseUri) {
+    resolveType(schema, resolveOptions, baseUri, isPropertyRequired = false) {
         let joischema;
 
         const joitype = (type, options, format) => {
@@ -370,7 +379,7 @@ class SchemaResolver {
 
             switch (type) {
                 case 'array':
-                    joischema = this.array(schema, options, baseUri);
+                    joischema = this.array(schema, options, baseUri, isPropertyRequired);
                     break;
                 case 'boolean':
                     joischema = this.joi.boolean();
@@ -500,17 +509,9 @@ class SchemaResolver {
 
         Object.keys(jsonSchema.properties).forEach((key) => {
             const property = jsonSchema.properties[key];
+            const isPropertyRequired = Array.isArray(jsonSchema.required) && !!~jsonSchema.required.indexOf(key);
 
-            let joischema = this.resolve(property, resolveOptions, baseUri);
-
-            if (Array.isArray(jsonSchema.required) && !!~jsonSchema.required.indexOf(key)) {
-                joischema = joischema.required();
-                if (resolveOptions.strictRequired) {
-                    joischema = joischema.invalid(null, '');
-                }
-            } else {
-                joischema = allowNullIfNeeded(joischema, resolveOptions);
-            }
+            const joischema = this.resolve(property, resolveOptions, baseUri, isPropertyRequired);
 
             schemas[key] = joischema;
         });
@@ -533,26 +534,26 @@ class SchemaResolver {
         return joischema;
     }
 
-    resolveAsArray(value, resolveOptions, baseUri) {
+    resolveAsArray(value, resolveOptions, baseUri, isPropertyRequired = false) {
         return [].concat(value).map((v) => {
             const vSchema = this.resolve(v, resolveOptions, baseUri);
-            if (resolveOptions.strictArrayRequired) {
+            if (resolveOptions.strictArrayRequired && isPropertyRequired) {
                 return vSchema.invalid(...resolveOptions.customizedNullValues);
             }
             return allowNullIfNeeded(vSchema, resolveOptions)
         });
     }
 
-    array(schema, resolveOptions, baseUri) {
+    array(schema, resolveOptions, baseUri, isPropertyRequired = false) {
         let joischema = this.joi.array();
         let items;
 
         if (schema.items) {
-            items = this.resolveAsArray(schema.items, resolveOptions, baseUri);
+            items = this.resolveAsArray(schema.items, resolveOptions, baseUri, isPropertyRequired);
 
             joischema = joischema.items(...items);
         } else if (schema.ordered) {
-            items = this.resolveAsArray(schema.ordered, resolveOptions, baseUri);
+            items = this.resolveAsArray(schema.ordered, resolveOptions, baseUri, isPropertyRequired);
             joischema = joischema.ordered(...items);
         }
 
@@ -560,7 +561,7 @@ class SchemaResolver {
             joischema = joischema.max(items.length);
         }
 
-        if (resolveOptions.strictArrayRequired && !schema.minItems) {
+        if (isPropertyRequired && resolveOptions.strictArrayRequired && !schema.minItems) {
             schema.minItems = 1;
         }
         isNumber(schema.minItems) && (joischema = joischema.min(schema.minItems));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-2-joi",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "license": "Apache 2.0",
   "description": "Converts json-schema to Joi schema. (Enhanced enjoi)",
   "main": "./index.js",