joi-to-json 2.3.3 → 2.3.6

package/lib/parsers/json.js

@@ -115,9 +115,16 @@ class JoiJsonSchemaParser {
     return _.get(fieldDefn, 'flags.default')
   }
 
+  _getConst(fieldDefn) {
+    const enumList = fieldDefn[this.enumFieldName]
+    if (fieldDefn.flags && fieldDefn.flags.only && _.size(enumList) === 1) {
+      return enumList[0]
+    }
+  }
+
   _getEnum(fieldDefn) {
     const enumList = fieldDefn[this.enumFieldName]
-    if (fieldDefn.flags && fieldDefn.flags.only && !_.isEmpty(enumList)) {
+    if (fieldDefn.flags && fieldDefn.flags.only && _.size(enumList) > 1) {
       return _.uniq(enumList)
     }
   }
@@ -141,6 +148,7 @@ class JoiJsonSchemaParser {
     this._setIfNotEmpty(fieldSchema, 'examples', this._getFieldExample(fieldDefn))
     this._setIfNotEmpty(fieldSchema, 'description', this._getFieldDescription(fieldDefn))
     this._setIfNotEmpty(fieldSchema, 'default', this._getDefaultValue(fieldDefn))
+    this._setIfNotEmpty(fieldSchema, 'const', this._getConst(fieldDefn))
     this._setIfNotEmpty(fieldSchema, 'enum', this._getEnum(fieldDefn))
   }
 
@@ -412,14 +420,30 @@ class JoiJsonSchemaParser {
     }
 
     if (joiSpec.whens) {
-      const condition = joiSpec.whens[0]
       schema.oneOf = []
+
+      const condition = joiSpec.whens[0]
+
+      if (condition.switch) {
+        for (const switchCondition of condition.switch) {
+          if (switchCondition.then) {
+            schema.oneOf.push(this.parse(switchCondition.then, definitions, level + 1))
+          }
+
+          if (switchCondition.otherwise) {
+            schema.oneOf.push(this.parse(switchCondition.otherwise, definitions, level + 1))
+          }
+        }
+      }
+
       if (condition.then) {
         schema.oneOf.push(this.parse(condition.then, definitions, level + 1))
       }
+
       if (condition.otherwise) {
         schema.oneOf.push(this.parse(condition.otherwise, definitions, level + 1))
       }
+
       delete schema.type
       return
     }

package/lib/parsers/open-api.js

@@ -53,6 +53,10 @@ class JoiOpenApiSchemaParser extends JoiJsonSchemaParser {
       schema.schemas = definitions
     }
 
+    if (fullSchema.const) {
+      schema.enum = [fullSchema.const]
+    }
+
     return schema
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joi-to-json",
-  "version": "2.3.3",
+  "version": "2.3.6",
   "description": "joi to JSON / OpenAPI Schema Converter",
   "main": "index.js",
   "repository": {