joi-to-json 2.3.2 → 2.3.5

package/lib/parsers/json.js

@@ -29,7 +29,11 @@ class JoiJsonSchemaParser {
     this._setAnyProperties(schema, joiSpec, definitions, level)
     this._addNullTypeIfNullable(schema, joiSpec)
     this._setMetaProperties(schema, joiSpec)
-    this._setLinkFieldProperties(schema, joiSpec, definitions, level)
+    this._setLinkFieldProperties(schema, joiSpec)
+
+    if (!_.isEmpty(joiSpec.shared)) {
+      this.parse(joiSpec.shared[0], definitions, level)
+    }
 
     const schemaId = _.get(joiSpec, 'flags.id')
     if (schemaId) {
@@ -111,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)
     }
   }
@@ -137,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))
   }
 
@@ -441,7 +453,7 @@ class JoiJsonSchemaParser {
     })
   }
 
-  _setLinkFieldProperties(schema, joiSpec, definitions, level) {
+  _setLinkFieldProperties(schema, joiSpec) {
     if (schema.type !== 'link') {
       return
     }
@@ -450,10 +462,6 @@ class JoiJsonSchemaParser {
       schema.$ref = `${this._getLocalSchemaBasePath()}/${joiSpec.link.ref.path.join('/')}`
       delete schema.type
     }
-
-    if (!_.isEmpty(joiSpec.shared)) {
-      this.parse(joiSpec.shared[0], definitions, level)
-    }
   }
 }
 

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.2",
+  "version": "2.3.5",
   "description": "joi to JSON / OpenAPI Schema Converter",
   "main": "index.js",
   "repository": {