json-2-joi 2.3.1 → 2.3.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.3.2
+
+- Enhance `null` value support when `type` is array and contains `null`.
+
 ### 2.3.1
 
 - Fix `noDefaults` options validation issue.

package/lib/resolver.js

@@ -357,10 +357,6 @@ class SchemaResolver {
     resolveType(schema, resolveOptions, baseUri) {
         let joischema;
 
-        const typeDefinitionMap = {
-            title: 'label'
-        };
-
         const joitype = (type, options, format) => {
             let joischema;
 
@@ -397,6 +393,19 @@ class SchemaResolver {
             return joischema;
         }
 
+        let nullIdx;
+        if (Array.isArray(schema.type)) {
+            nullIdx = schema.type.findIndex((type) => type === 'null');
+            if (nullIdx > -1) {
+                schema.type.splice(nullIdx, 1);
+            }
+            if (schema.type.length === 1) {
+                schema.type = schema.type[0];
+            } else if (schema.type.length === 0) {
+                schema.type = 'null';
+            }
+        }
+
         if (Array.isArray(schema.type)) {
             const schemas = [];
 
@@ -408,7 +417,13 @@ class SchemaResolver {
         } else {
             joischema = joitype(schema.type, resolveOptions, schema.format);
         }
+        if (nullIdx > -1) {
+            joischema = joischema.allow(null);
+        }
 
+        const typeDefinitionMap = {
+            title: 'label'
+        };
         Object.keys(typeDefinitionMap).forEach(function (key) {
             if (schema[key] !== undefined) {
                 joischema = joischema[typeDefinitionMap[key]](schema[key]);

package/package.json

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