Merge branch 'Thermeon-master'

Author: fehguy

browser/swagger-client.js

@@ -626,15 +626,14 @@ Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
     if(item && typeof item.allOf !== 'undefined') {
       var allOf = item.allOf;
       if(_.isArray(allOf)) {
-        var output = {};
+        var output = _.cloneDeep(item);
+        delete output['allOf'];
+
         output['x-composed'] = true;
         if (typeof item['x-resolved-from'] !== 'undefined') {
           output['x-resolved-from'] = item['x-resolved-from'];
         }
-        output.properties = {};
-        if ( item.example ){
-          output.example = item.example;
-        }
+
         for(var i = 0; i < allOf.length; i++) {
           var component = allOf[i];
           var source = 'self';
@@ -644,7 +643,7 @@ Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
 
           for(var part in component) {
             if(!output.hasOwnProperty(part)) {
-              output[part] = JSON.parse(JSON.stringify(component[part]));
+              output[part] = _.cloneDeep(component[part]);
               if(part === 'properties') {
                 for(name in output[part]) {
                   output[part][name]['x-resolved-from'] = source;
@@ -655,7 +654,7 @@ Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
               if(part === 'properties') {
                 var properties = component[part];
                 for(name in properties) {
-                  output.properties[name] = JSON.parse(JSON.stringify(properties[name]));
+                  output.properties[name] = _.cloneDeep(properties[name]);
                   var resolvedFrom = properties[name]['x-resolved-from'];
                   if (typeof resolvedFrom === 'undefined' || resolvedFrom === 'self') {
                     resolvedFrom = source;

browser/swagger-client.min.js

@@ -69,6 +69,7 @@ describe('swagger resolver', function () {
           } ]
         },
         Monster: {
+          description: 'useful information',
           allOf : [
             {
               $ref: '#/definitions/Ghoul'
@@ -84,6 +85,7 @@ describe('swagger resolver', function () {
           ]
         },
         Ghoul: {
+          description: 'a ghoul',
           required: [ 'fangs' ],
           properties: {
             fangs: {
@@ -113,6 +115,8 @@ describe('swagger resolver', function () {
       expect(properties.hasScales['x-resolved-from']).toBe('self');
       test.undefined(spec.definitions.Animal.properties.firstName);
       expect(spec.definitions.Human.example).toBe('this is example');
+      expect(spec.definitions.Ghoul.description).toBe('a ghoul');
+      expect(spec.definitions.Monster.description).toBe('useful information');
       done();
     });
   });