joi-to-json 2.2.0 → 2.2.1

package/index.js

@@ -51,6 +51,7 @@ function parse(joiObj, type = 'json') {
   }
 
   const joiBaseSpec = new convertor().toBaseSpec(joiObj.describe())
+  // fs.writeFileSync(`./internal_${convertor.getSupportVersion()}_${type}.json`, JSON.stringify(joiBaseSpec, null, 2))
   const parser = parsers[type]
   if (!parser) {
     throw new Error(`No parser is registered for ${type}`)

package/lib/convertors/v12.js

@@ -37,7 +37,13 @@ class JoiSpecConvertor {
   }
 
   _convertAlternatives(joiObj) {
-    if (joiObj.base && joiObj.base.type === 'any') {
+    let isWhenCase = false
+    if (joiObj.alternatives.length === 1) {
+      const condition = joiObj.alternatives[0]
+      isWhenCase = !!condition.then || !!condition.otherwise
+    }
+
+    if (isWhenCase) {
       // when case
       joiObj.type = 'any'
       joiObj.whens = joiObj.alternatives

package/lib/parsers/json.js

@@ -354,10 +354,17 @@ class JoiJsonSchemaParser {
       return
     }
 
-    if (joiSpec.matches.length === 1 && joiSpec.matches[0].switch) {
-      schema.oneOf = _.map(joiSpec.matches[0].switch, (condition) => {
-        return this.parse(condition.then || condition.otherwise)
-      })
+    if (joiSpec.matches.length === 1) {
+      const match = joiSpec.matches[0]
+      if (match.switch) {
+        schema.oneOf = _.map(match.switch, (condition) => {
+          return this.parse(condition.then || condition.otherwise)
+        })
+      } else if (match.then || match.otherwise) {
+        schema.oneOf = []
+        if (match.then) schema.oneOf.push(this.parse(match.then))
+        if (match.otherwise) schema.oneOf.push(this.parse(match.otherwise))
+      }
     } else {
       schema.oneOf = _.map(joiSpec.matches, (match) => {
         return this.parse(match.schema)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joi-to-json",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "joi to JSON / OpenAPI Schema Converter",
   "main": "index.js",
   "repository": {
@@ -27,10 +27,10 @@
     "semver-compare": "^1.0.0"
   },
   "devDependencies": {
-    "ajv": "^8.6.3",
+    "ajv": "^8.11.0",
     "ajv-draft-04": "^1.0.0",
-    "eslint": "^7.32.0",
-    "jest": "^27.2.0",
+    "eslint": "^8.12.0",
+    "jest": "^27.5.1",
     "joi-12": "npm:@commercial/joi@^12.1.0",
     "joi-13": "npm:joi@^13.7.0",
     "joi-14": "npm:joi@^14.3.1",