v1.3.0: fix for schema definitions handling

ecomclub · Oct 26, 2018 · 9b4446d · 9b4446d
1 parent ca7d585
commit 9b4446d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/dist/twbschema.min.js b/dist/twbschema.min.js
diff --git a/main.js b/main.js
@@ -13,6 +13,8 @@ window.twbschema = (function () {
   var counter = 0
   // control row colors
   var rowBgClass = ''
+  // handle schema definitions
+  var defs
 
   var gen = function (json, dotNotation) {
     var i
@@ -25,6 +27,10 @@ window.twbschema = (function () {
     if (!dotNotation) {
       root = true
       dotNotation = ''
+      // check definitions on root object
+      if (json.definitions) {
+        defs = json.definitions
+      }
     }
 
     // start treating schema
@@ -33,8 +39,6 @@ window.twbschema = (function () {
     var req = json.required
     // merge all object properties
     var props = Object.assign({}, json.properties, json.patternProperties)
-    // handle schema definitions
-    var defs = json.definitions
 
     // check each object property
     // first row without border
@@ -66,7 +70,7 @@ window.twbschema = (function () {
             var model = prop.$ref.replace('#/definitions/', '')
             if (defs.hasOwnProperty(model)) {
               // merge definition model to prop object
-              Object.assign(prop, defs[model])
+              prop = Object.assign({}, defs[model], prop)
             }
           }
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twbschema",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Docs with Boostrap 4 for your JSON schema types",
   "main": "main.js",
   "scripts": {