json-2-joi 2.0.1 → 2.0.2

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 2.0.2
+
+- Remove `min` setting from JOI schema if `minLength` is not defined in JSON schema.
+- Allow `null` value as Array's item if `allowNull` option is set to true.
+
 ### 2.0.1
 
 - Set correct examples data for Array type field.

package/README.md

@@ -4,7 +4,7 @@
 
 Converts a JSON schema to a Joi schema for object validation.
 
-## Change based on the forked version (Enjoi):
+## Change based on the forked version (enjoi):
 
 - Provided `refineDescription(schema)`, `allowNull` options
 - Change cycle reference resovling without self-generating id and rely on $id if defined in JSON schema

package/lib/resolver.js

@@ -35,6 +35,13 @@ function isNotEmptyObject(value) {
     return isObject(value) && Object.keys(value).length > 0;
 }
 
+function allowNullIfNeeded(schema, allowNull = false) {
+    if (allowNull) {
+        return schema.allow(null);
+    }
+    return schema;
+}
+
 function normalizedId(id) {
     return id.replace(/[^a-zA-Z0-9]/g, '_');
 }
@@ -426,8 +433,8 @@ class SchemaResolver {
 
                 if (Array.isArray(schema.required) && !!~schema.required.indexOf(key)) {
                     joischema = joischema.required();
-                } else if (this.allowNull) {
-                    joischema = joischema.allow(null);
+                } else {
+                    joischema = allowNullIfNeeded(joischema, this.allowNull);
                 }
 
                 schemas[key] = joischema;
@@ -450,25 +457,25 @@ class SchemaResolver {
         return joischema;
     }
 
+    resolveAsArray(value, baseUri) {
+        if (Array.isArray(value)) {
+            // found an array, thus its _per type_
+            return value.map((v) => allowNullIfNeeded(this.resolve(v, baseUri), this.allowNull));
+        }
+        // it's a single entity, so just resolve it normally
+        return [allowNullIfNeeded(this.resolve(value, baseUri), this.allowNull)];
+    }
+
     array(schema, baseUri) {
         let joischema = this.joi.array();
         let items;
 
-        const resolveAsArray = (value) => {
-            if (Array.isArray(value)) {
-                // found an array, thus its _per type_
-                return value.map((v) => this.resolve(v, baseUri));
-            }
-            // it's a single entity, so just resolve it normally
-            return [this.resolve(value, baseUri)];
-        }
-
         if (schema.items) {
-            items = resolveAsArray(schema.items);
+            items = this.resolveAsArray(schema.items, baseUri);
 
             joischema = joischema.items(...items);
         } else if (schema.ordered) {
-            items = resolveAsArray(schema.ordered);
+            items = this.resolveAsArray(schema.ordered, baseUri);
             joischema = joischema.ordered(...items);
         }
 
@@ -554,11 +561,7 @@ class SchemaResolver {
     regularString(schema, joischema) {
         schema.pattern && (joischema = joischema.regex(new RegExp(schema.pattern)));
 
-        if (typeof schema.minLength === 'undefined') {
-            schema.minLength = 0;
-        }
-
-        if (schema.minLength === 0 && !schema.pattern && !schema.format) {
+        if ((typeof schema.minLength === 'undefined' || schema.minLength === 0) && !schema.pattern && !schema.format) {
             joischema = joischema.allow('');
         }
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "json-2-joi",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "Apache 2.0",
-  "description": "Converts json-schema to Joi schema.",
+  "description": "Converts json-schema to Joi schema. (Enhanced enjoi)",
   "main": "./index.js",
   "scripts": {
     "test": "tape test/*.js",