Merge pull request #385 from whitlockjc/issue-306

Fix issue with nested schemas

Author: whitlockjc

browser/swagger-client.js

@@ -1,5 +1,9 @@
 'use strict';
 
+var _ = {
+  isPlainObject: require('lodash-compat/lang/isPlainObject')
+};
+
 module.exports.__bind = function (fn, me) {
   return function(){
     return fn.apply(me, arguments);
@@ -24,6 +28,14 @@ module.exports.optionHtml = function (label, value) {
   return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
 };
 
+var resolveSchema = module.exports.resolveSchema = function (schema) {
+  if (_.isPlainObject(schema.schema)) {
+    schema = resolveSchema(schema.schema);
+  }
+
+  return schema;
+};
+
 module.exports.typeFromJsonSchema = function (type, format) {
   var str;
 

browser/swagger-client.min.js

@@ -264,13 +264,16 @@ var schemaToHTML = function (name, schema, models) {
             var html = '<span class="propName ' + required + '">' + name + '</span> (';
             var model;
 
+            // Resolve the schema (Handle nested schemas)
+            property = helpers.resolveSchema(property);
+
             // We need to handle property references to primitives (Issue 339)
             if (!_.isUndefined(property.$ref)) {
               model = models[helpers.simpleRef(property.$ref)];
 
               if (_.isUndefined(model) || _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {
                 // Use referenced schema
-                property = model.definition;
+                property = helpers.resolveSchema(model.definition);
               }
             }
 
@@ -303,6 +306,8 @@ var schemaToHTML = function (name, schema, models) {
     return html + strongOpen + (isArray ? ']' : '}') + strongClose;
   };
 
+  // Resolve the schema (Handle nested schemas)
+  schema = helpers.resolveSchema(schema);
 
   // Generate current HTML
   var html = processModel(schema, name);
@@ -326,8 +331,11 @@ var schemaToHTML = function (name, schema, models) {
 };
 
 var schemaToJSON = function (schema, models, modelsToIgnore) {
+  // Resolve the schema (Handle nested schemas)
+  schema = helpers.resolveSchema(schema);
+
   var type = schema.type || 'object';
-  var format = schema.format
+  var format = schema.format;
   var model;
   var output;
 

lib/helpers.js

@@ -2,7 +2,6 @@
 
 'use strict';
 
-var test = require('unit.js');
 var expect = require('expect');
 var mock = require('./mock');
 var sample, instance;
@@ -21,19 +20,13 @@ describe('1.2 model signatures', function () {
   });
 
   it('returns the json representation of a pet with repeating models', function () {
-    var pet = sample.models.Animals;
+    var animals = sample.models.Animals;
+    var pet = sample.models.Pet;
 
-    test.object(pet);
-
-    // verify that each instance of `Pet` is represented
-    var petModel = '{"id":0,"category":{"id":0,"name":""},"name":"","photoUrls":[""],"tags":[{"id":0,"name":""}],"status":"","phone":{"code":"","number":""},"owner":{"name":"","phone":{"code":"","number":""}}}';
-    var model = '';
-
-    model += '{' + '"cat":' + petModel + ',';
-    model += '"dog":' + petModel + ',';
-    model += '"mouse":' + petModel + '}';
-
-    // TODO: enable with issue https://github.com/swagger-api/swagger-js/issues/306
-    // expect(JSON.stringify(pet.createJSONSample())).toBe(model);
+    expect(animals.createJSONSample()).toEqual({
+      cat: pet.createJSONSample(),
+      dog: pet.createJSONSample(),
+      mouse: pet.createJSONSample()
+    });
   });
 });