README.md

@@ -24,7 +24,8 @@ module.exports.swagger = {
   },
   definitions: {
       // your optional additional custom #/definitions
-  }
+  },
+  ignoredRoutes: [] // routes that should not be picked into swagger file
 };
 ```
 

lib/xfmr.js

@@ -1,5 +1,6 @@
 import hoek from 'hoek'
 import _ from 'lodash'
+import { _ as lodash } from 'lodash-new'
 import Spec from './spec'
 import pluralize from 'pluralize'
 
@@ -85,7 +86,9 @@ const Transformer = {
     getDefinitions(sails) {
         let definitions = _.transform(sails.models, (definitions, model, modelName) => {
             definitions[model.identity] = {
-                properties: Transformer.getDefinitionProperties(model.definition)
+                properties: Transformer.getDefinitionProperties(
+                    _.merge(model._attributes, model.definition)
+                )
             }
         })
         definitions = _.merge(definitions, Transformer.getDefinitionsFromSwaggerConfig(sails))
@@ -105,16 +108,31 @@ const Transformer = {
     },
 
     getDefinitionProperties(definition) {
-        console.log(JSON.stringify(definition, null, 2))
-
         return _.mapValues(definition, (def, attrName) => {
             let property = _.pick(def, [
-                'type', 'description', 'format', 'model', 'enum'
+                'type', 'description', 'format', 'model', 'enum', 'example', 'required', 'defaultsTo', 'collection'
             ])
 
-            return property.model && sails.config.blueprints.populate ?
-                { '$ref': Transformer.generateDefinitionReference(property.model) }
-            :   _.omit(_.merge(property, Spec.getPropertyType(property.type)), 'model')
+            if (property.model && sails.config.blueprints.populate)
+                return { '$ref': Transformer.generateDefinitionReference(property.model) }
+
+            if (property.collection)
+                return {
+                    'type': 'array',
+                    'items': {
+                        '$ref': Transformer.generateDefinitionReference(property.collection)
+                    } 
+                }
+
+            if (property.defaultsTo) {
+                property.default = property.defaultsTo
+                delete property.defaultsTo
+            }
+
+            return _.chain(property)
+                    .omit('model')
+                    .merge(Spec.getPropertyType(property.type))
+                    .value()
         })
     },
 
@@ -218,6 +236,7 @@ const Transformer = {
             swaggerPaths[sPath] = _.merge(  swaggerPaths[sPath] || {}, swaggerDefinitions[defRoute] );
         }
 
+        swaggerPaths = _.omit(swaggerPaths, sails.config.swagger.ignoredRoutes);
         return swaggerPaths || [];
     },