Collect shared schema for all element.

yarkoyarok · Jun 9, 2022 · d7ae706 · d7ae706
1 parent ba0e48b
commit d7ae706
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 29 deletions.
diff --git a/fixtures/joi-obj-16.js b/fixtures/joi-obj-16.js
@@ -10,6 +10,7 @@ const unitSchema = joi.object().keys({
   quantity: joi.number().precision(2).positive().greater(0).less(200),
   unit: joi.string().required()
 }).id('unit')
+const unifiedString = joi.string().id('unifiedString')
 
 module.exports = joi.object().keys({
   guid: joi.string().guid({ version: ['uuidv2', 'uuidv4'] }),
@@ -24,12 +25,12 @@ module.exports = joi.object().keys({
   genderSpecific: joi.when('gender', {
     is: 'Female',
     then: joi.number().valid(0, 1, 2).required(),
-    otherwise: joi.string()
+    otherwise: joi.link('#unifiedString')
   }),
   height: joi.link('#unit').shared(unitSchema),
   heightRank: joi.alternatives().conditional('height', {
     switch: [
-      { is: 0, then: joi.string() },
+      { is: 0, then: joi.link('#unifiedString') },
       { is: joi.number().greater(160), then: joi.number() },
       { is: joi.number().greater(300), then: joi.object().keys({ name: joi.string(), level: joi.number() }) }
     ]
@@ -76,4 +77,4 @@ module.exports = joi.object().keys({
     .description('Some kind of list')
     .optional(),
   children: joi.array().items(joi.link('#person'))
-}).id('person')
+}).id('person').shared(unifiedString)
diff --git a/fixtures/joi-obj-17.js b/fixtures/joi-obj-17.js
@@ -10,6 +10,7 @@ const unitSchema = joi.object().keys({
   quantity: joi.number().precision(2).positive().greater(0).less(200),
   unit: joi.string().required()
 }).id('unit')
+const unifiedString = joi.string().id('unifiedString')
 
 module.exports = joi.object().keys({
   guid: joi.string().guid({ version: ['uuidv2', 'uuidv4'] }),
@@ -24,7 +25,7 @@ module.exports = joi.object().keys({
   genderSpecific: joi.when('gender', {
     is: 'Female',
     then: joi.number().valid(0, 1, 2).required(),
-    otherwise: joi.string()
+    otherwise: joi.link('#unifiedString')
   }),
   maleSpecific: joi.alternatives().conditional('gender', {
     is: 'Male',
@@ -34,7 +35,7 @@ module.exports = joi.object().keys({
   height: joi.link('#unit').shared(unitSchema),
   heightRank: joi.alternatives().conditional('height', {
     switch: [
-      { is: 0, then: joi.string() },
+      { is: 0, then: joi.link('#unifiedString') },
       { is: joi.number().greater(160), then: joi.number() },
       { is: joi.number().greater(300), then: joi.object().keys({ name: joi.string(), level: joi.number() }) }
     ]
@@ -81,4 +82,4 @@ module.exports = joi.object().keys({
     .description('Some kind of list')
     .optional(),
   children: joi.array().items(joi.link('#person'))
-}).id('person')
+}).id('person').shared(unifiedString)
diff --git a/lib/parsers/json.js b/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) {
@@ -441,7 +445,7 @@ class JoiJsonSchemaParser {
     })
   }
 
-  _setLinkFieldProperties(schema, joiSpec, definitions, level) {
+  _setLinkFieldProperties(schema, joiSpec) {
     if (schema.type !== 'link') {
       return
     }
@@ -450,10 +454,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)
-    }
   }
 }
 

diff --git a/outputs/json-draft-04/joi-obj-16.json b/outputs/json-draft-04/joi-obj-16.json
@@ -1,6 +1,9 @@
 {
   "$ref": "#/definitions/person",
   "definitions": {
+    "unifiedString": {
+      "type": "string"
+    },
     "unit": {
       "type": "object",
       "additionalProperties": false,
@@ -97,7 +100,7 @@
               ]
             },
             {
-              "type": "string"
+              "$ref": "#/definitions/unifiedString"
             }
           ]
         },
@@ -110,7 +113,7 @@
         "heightRank": {
           "oneOf": [
             {
-              "type": "string"
+              "$ref": "#/definitions/unifiedString"
             },
             {
               "type": "number"

diff --git a/outputs/json-draft-04/joi-obj-17.json b/outputs/json-draft-04/joi-obj-17.json
@@ -1,6 +1,9 @@
 {
   "$ref": "#/definitions/person",
   "definitions": {
+    "unifiedString": {
+      "type": "string"
+    },
     "unit": {
       "type": "object",
       "additionalProperties": false,
@@ -97,7 +100,7 @@
               ]
             },
             {
-              "type": "string"
+              "$ref": "#/definitions/unifiedString"
             }
           ]
         },
@@ -110,7 +113,7 @@
         "heightRank": {
           "oneOf": [
             {
-              "type": "string"
+              "$ref": "#/definitions/unifiedString"
             },
             {
               "type": "number"

diff --git a/outputs/json-draft-2019-09/joi-obj-16.json b/outputs/json-draft-2019-09/joi-obj-16.json
@@ -1,6 +1,9 @@
 {
   "$ref": "#/$defs/person",
   "$defs": {
+    "unifiedString": {
+      "type": "string"
+    },
     "unit": {
       "type": "object",
       "additionalProperties": false,
@@ -97,7 +100,7 @@
               ]
             },
             {
-              "type": "string"
+              "$ref": "#/$defs/unifiedString"
             }
           ]
         },
@@ -110,7 +113,7 @@
         "heightRank": {
           "oneOf": [
             {
-              "type": "string"
+              "$ref": "#/$defs/unifiedString"
             },
             {
               "type": "number"

diff --git a/outputs/json-draft-2019-09/joi-obj-17.json b/outputs/json-draft-2019-09/joi-obj-17.json
@@ -1,6 +1,9 @@
 {
   "$ref": "#/$defs/person",
   "$defs": {
+    "unifiedString": {
+      "type": "string"
+    },
     "unit": {
       "type": "object",
       "additionalProperties": false,
@@ -97,7 +100,7 @@
               ]
             },
             {
-              "type": "string"
+              "$ref": "#/$defs/unifiedString"
             }
           ]
         },
@@ -110,7 +113,7 @@
         "heightRank": {
           "oneOf": [
             {
-              "type": "string"
+              "$ref": "#/$defs/unifiedString"
             },
             {
               "type": "number"

diff --git a/outputs/json/joi-obj-16.json b/outputs/json/joi-obj-16.json
@@ -1,6 +1,9 @@
 {
   "$ref": "#/$defs/person",
   "$defs": {
+    "unifiedString": {
+      "type": "string"
+    },
     "unit": {
       "type": "object",
       "additionalProperties": false,
@@ -97,7 +100,7 @@
               ]
             },
             {
-              "type": "string"
+              "$ref": "#/$defs/unifiedString"
             }
           ]
         },
@@ -110,7 +113,7 @@
         "heightRank": {
           "oneOf": [
             {
-              "type": "string"
+              "$ref": "#/$defs/unifiedString"
             },
             {
               "type": "number"

diff --git a/outputs/json/joi-obj-17.json b/outputs/json/joi-obj-17.json
@@ -1,6 +1,9 @@
 {
   "$ref": "#/$defs/person",
   "$defs": {
+    "unifiedString": {
+      "type": "string"
+    },
     "unit": {
       "type": "object",
       "additionalProperties": false,
@@ -95,7 +98,7 @@
               ]
             },
             {
-              "type": "string"
+              "$ref": "#/$defs/unifiedString"
             }
           ]
         },
@@ -108,7 +111,7 @@
         "heightRank": {
           "oneOf": [
             {
-              "type": "string"
+              "$ref": "#/$defs/unifiedString"
             },
             {
               "type": "number"

diff --git a/outputs/open-api/joi-obj-16.json b/outputs/open-api/joi-obj-16.json
@@ -1,6 +1,9 @@
 {
   "$ref": "#/components/schemas/person",
   "schemas": {
+    "unifiedString": {
+      "type": "string"
+    },
     "unit": {
       "type": "object",
       "additionalProperties": false,
@@ -102,7 +105,7 @@
               ]
             },
             {
-              "type": "string"
+              "$ref": "#/components/schemas/unifiedString"
             }
           ]
         },
@@ -116,7 +119,7 @@
         "heightRank": {
           "oneOf": [
             {
-              "type": "string"
+              "$ref": "#/components/schemas/unifiedString"
             },
             {
               "type": "number"

diff --git a/outputs/open-api/joi-obj-17.json b/outputs/open-api/joi-obj-17.json
@@ -1,6 +1,9 @@
 {
   "$ref": "#/components/schemas/person",
   "schemas": {
+    "unifiedString": {
+      "type": "string"
+    },
     "unit": {
       "type": "object",
       "additionalProperties": false,
@@ -102,7 +105,7 @@
               ]
             },
             {
-              "type": "string"
+              "$ref": "#/components/schemas/unifiedString"
             }
           ]
         },
@@ -116,7 +119,7 @@
         "heightRank": {
           "oneOf": [
             {
-              "type": "string"
+              "$ref": "#/components/schemas/unifiedString"
             },
             {
               "type": "number"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "joi-to-json",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "joi to JSON / OpenAPI Schema Converter",
   "main": "index.js",
   "repository": {