joi-to-json 2.3.5 → 2.5.0

package/README.md

@@ -95,6 +95,13 @@ const jsonSchema = parse(joiSchema)
 // const openApiSchema = parse(joiSchema, 'open-api')
 ```
 
+## Browser support
+For generating JSON Schema in a browser you should use below import syntax for `joi` library in order to work because the `joi` browser minimized build does not have `describe` api which the `joi-to-json` relies on.
+
+```typescript
+  import Joi from 'joi/lib/index';
+```
+
 ## Test
 
 >npm run test

package/index.d.ts

@@ -0,0 +1,18 @@
+import Joi from 'joi-17';
+
+declare module Joi2Json {
+  /**
+   * @type {string}
+   */
+  export type Mode = 'json' | 'open-api' | 'json-draft-2019-09' | 'json-draft-04';
+
+  /**
+   * @param {string} joi - A Joi schema.
+   * @param {string} [mode='json'] - json / open-api / json-draft-2019-09 / json-draft-04
+   * @param {Record} [sharedSchema={}] - Passed-in object storing shared schemas
+   * @returns {any} Converted JSON schema object.
+   */
+  export function parse(joi: Joi.Schema, mode?: Mode, sharedSchema?: Record<string, any>): any;
+}
+
+export default Joi2Json.parse;

package/index.js

@@ -1,25 +1,26 @@
 const cmp = require('semver-compare')
-const fs = require('fs')
-const path = require('path')
 
-const convertorsDir = path.resolve(__dirname, './lib/convertors')
-const parsersDir = path.resolve(__dirname, './lib/parsers')
-const convertors = []
-const parsers = {}
+const c17 = require('./lib/convertors/v17')
+const c16 = require('./lib/convertors/v16')
+const c15 = require('./lib/convertors/v15')
+const c14 = require('./lib/convertors/v14')
+const c13 = require('./lib/convertors/v13')
+const c12 = require('./lib/convertors/v12')
 
-fs.readdirSync(convertorsDir).sort().reverse().forEach(file => {
-  if (file.endsWith('.js')) {
-    const convertor = require(`${convertorsDir}/${file}`)
-    convertors.push(convertor)
-  }
-})
+const JoiJsonSchemaParser = require('./lib/parsers/json')
+const JoiOpenApiSchemaParser = require('./lib/parsers/open-api')
+const JoiJsonDraftSchemaParser19 = require('./lib/parsers/json-draft-2019-09')
+const JoiJsonDraftSchemaParser = require('./lib/parsers/json-draft-04')
 
-fs.readdirSync(parsersDir).forEach(file => {
-  if (file.endsWith('.js')) {
-    const parser = require(`${parsersDir}/${file}`)
-    parsers[file.split('.')[0]] = parser
-  }
-})
+const convertors = [
+  c17, c16, c15, c14, c13, c12
+]
+const parsers = {
+  'json-draft-2019-09': JoiJsonDraftSchemaParser19,
+  'json-draft-4': JoiJsonDraftSchemaParser,
+  json: JoiJsonSchemaParser,
+  'open-api': JoiOpenApiSchemaParser
+}
 
 function parse(joiObj, type = 'json', definitions = {}) {
   if (typeof joiObj.describe !== 'function') {

package/lib/parsers/json.js

@@ -420,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joi-to-json",
-  "version": "2.3.5",
+  "version": "2.5.0",
   "description": "joi to JSON / OpenAPI Schema Converter",
   "main": "index.js",
   "repository": {
@@ -36,10 +36,12 @@
     "joi-14": "npm:joi@^14.3.1",
     "joi-15": "npm:@hapi/joi@^15.1.1",
     "joi-16": "npm:@hapi/joi@^16.1.8",
-    "joi-17": "npm:joi@^17.4.2"
+    "joi-17": "npm:joi@^17.6.0"
   },
+  "types": "index.d.ts",
   "files": [
     "lib/**/*.js",
-    "index.js"
+    "index.js",
+    "index.d.ts"
   ]
 }