use lodash to check types in resolver.js

lib/auth.js

@@ -22,7 +22,7 @@ var SwaggerAuthorizations = module.exports.SwaggerAuthorizations = function (aut
  *
  */
 SwaggerAuthorizations.prototype.add = function (name, auth) {
-  if(name && typeof name === 'object') {
+  if(_.isObject(name)) {
     for (var key in name) {
       this.authz[key] = name[key];
     }

lib/client.js

@@ -7,6 +7,7 @@ var _ = {
   forEach: require('lodash-compat/collection/forEach'),
   indexOf: require('lodash-compat/array/indexOf'),
   isArray: require('lodash-compat/lang/isArray'),
+  isObject: require('lodash-compat/lang/isObject'),
   isFunction: require('lodash-compat/lang/isFunction'),
   isPlainObject: require('lodash-compat/lang/isPlainObject'),
   isUndefined: require('lodash-compat/lang/isUndefined')
@@ -108,7 +109,7 @@ SwaggerClient.prototype.initialize = function (url, options) {
 
   if (typeof url === 'string') {
     this.url = url;
-  } else if (typeof url === 'object') {
+  } else if (_.isObject(url)) {
     options = url;
     this.url = options.url;
   }

lib/http.js

@@ -4,6 +4,9 @@ var helpers = require('./helpers');
 var jQuery = require('jquery');
 var request = require('superagent');
 var jsyaml = require('js-yaml');
+var _ = {
+  isObject: require('lodash-compat/lang/isObject')
+};
 
 /*
  * JQueryHttpClient is a light-weight, node or browser HTTP client
@@ -49,7 +52,7 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
   };
 
 
-  if (obj && typeof obj.body === 'object') {
+  if (_.isObject(obj) && _.isObject(obj.body)) {
     // special processing for file uploads via jquery
     if (obj.body.type && obj.body.type === 'formData'){
       obj.contentType = false;

lib/resolver.js

@@ -1,8 +1,13 @@
 'use strict';
 
 var SwaggerHttp = require('./http');
+var _ = {
+  isObject: require('lodash-compat/lang/isObject'),
+  isArray: require('lodash-compat/lang/isArray')
+};
+
 
-/** 
+/**
  * Resolves a spec's remote references
  */
 var Resolver = module.exports = function () {};
@@ -80,7 +85,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
           var response = operation.responses[responseCode];
           location = '/paths' + name + '/' + method + '/responses/' + responseCode;
 
-          if(typeof response === 'object') {
+          if(_.isObject(response)) {
             if(response.$ref) {
               // response reference
               this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);
@@ -346,7 +351,7 @@ Resolver.prototype.getRefs = function(spec, obj) {
     if(key === '$ref' && typeof item === 'string') {
       output[item] = null;
     }
-    else if(typeof item === 'object') {
+    else if(_.isObject(item)) {
       var o = this.getRefs(item);
       for(var k in o) {
         output[k] = null;
@@ -370,7 +375,7 @@ Resolver.prototype.retainRoot = function(obj, root) {
         obj[key] = item;
       }
     }
-    else if(typeof item === 'object') {
+    else if(_.isObject(item)) {
       this.retainRoot(item, root);
     }
   }
@@ -476,7 +481,7 @@ Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
     var item = obj[key];
     if(item && typeof item.allOf !== 'undefined') {
       var allOf = item.allOf;
-      if(Array.isArray(allOf)) {
+      if(_.isArray(allOf)) {
         var output = {};
         output['x-composed'] = true;
         for(var i = 0; i < allOf.length; i++) {
@@ -526,7 +531,7 @@ Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
         obj[key] = output;
       }
     }
-    if(typeof item === 'object') {
+    if(_.isObject(item)) {
       this.resolveAllOf(spec, item, depth + 1);
     }
   }

lib/spec-converter.js

@@ -1,6 +1,9 @@
 'use strict';
 
 var SwaggerHttp = require('./http');
+var _ = {
+  isObject: require('lodash-compat/lang/isObject')
+};
 
 var SwaggerSpecConverter = module.exports = function () {
   this.errors = [];
@@ -105,7 +108,7 @@ SwaggerSpecConverter.prototype.declaration = function(obj, swagger) {
   }
 
   // build a mapping of id to name for 1.0 model resolutions
-  if(typeof obj === 'object') {
+  if(_.isObject(obj)) {
     for(name in obj.models) {
       var existingModel = obj.models[name];
       var key = (existingModel.id || name);
@@ -125,7 +128,7 @@ SwaggerSpecConverter.prototype.declaration = function(obj, swagger) {
 };
 
 SwaggerSpecConverter.prototype.models = function(obj, swagger) {
-  if(typeof obj !== 'object') {
+  if(!_.isObject(obj)) {
     return;
   }
   var name;
@@ -267,7 +270,7 @@ SwaggerSpecConverter.prototype.operations = function(path, resourcePath, obj, re
 };
 
 SwaggerSpecConverter.prototype.responseMessages = function(operation, existingOperation) {
-  if(typeof existingOperation !== 'object') {
+  if(!_.isObject(existingOperation)) {
     return;
   }
   // build default response from the operation (1.x)
@@ -310,7 +313,7 @@ SwaggerSpecConverter.prototype.responseMessages = function(operation, existingOp
 
 SwaggerSpecConverter.prototype.authorizations = function(obj) {
   // TODO
-  if(typeof obj !== 'object') {
+  if(!_.isObject(obj)) {
     return;
   }
 };
@@ -363,7 +366,7 @@ SwaggerSpecConverter.prototype.parameters = function(operation, obj) {
 };
 
 SwaggerSpecConverter.prototype.dataType = function(source, target) {
-  if(typeof source !== 'object') {
+  if(!_.isObject(source)) {
     return;
   }
 

lib/types/operation.js

@@ -3,7 +3,8 @@
 var _ = {
   cloneDeep: require('lodash-compat/lang/cloneDeep'),
   isUndefined: require('lodash-compat/lang/isUndefined'),
-  isEmpty: require('lodash-compat/lang/isEmpty')
+  isEmpty: require('lodash-compat/lang/isEmpty'),
+  isObject: require('lodash-compat/lang/isObject')
 };
 var helpers = require('../helpers');
 var Model = require('./model');
@@ -585,7 +586,7 @@ Operation.prototype.getModelSampleJSON = function (type, models) {
 
     if (typeof sampleJson === 'string') {
       return sampleJson;
-    } else if (typeof sampleJson === 'object') {
+    } else if (_.isObject(sampleJson)) {
       var t = sampleJson;
 
       if (sampleJson instanceof Array && sampleJson.length > 0) {
@@ -619,7 +620,7 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
   var args = arg1 || {};
   var opts = {}, success, error;
 
-  if (typeof arg2 === 'object') {
+  if (_.isObject(arg2)) {
     opts = arg2;
     success = arg3;
     error = arg4;
@@ -795,7 +796,7 @@ Operation.prototype.setContentTypes = function (args, opts) {
 
 /**
  * Returns true if the request accepts header matches anything in this.produces.
- *  If this.produces contains * / *, ignore the accept header. 
+ *  If this.produces contains * / *, ignore the accept header.
  * @param {string=} accepts The client request accept header.
  * @return {boolean}
  */
@@ -827,7 +828,7 @@ Operation.prototype.asCurl = function (args) {
   if (obj.body) {
     var body;
 
-    if (typeof obj.body === 'object') {
+    if (_.isObject(obj.body)) {
       body = JSON.stringify(obj.body);
     } else {
       body = obj.body;