Fixed Issue APIDevTools#13 (APIDevTools#13)

Author: JamesMessinger

lib/index.js

@@ -49,7 +49,8 @@ function $RefParser() {
  */
 $RefParser.parse = function(schema, options, callback) {
   var Class = this; // eslint-disable-line consistent-this
-  return new Class().parse(schema, options, callback);
+  var instance = new Class();
+  return instance.parse.apply(instance, arguments);
 };
 
 /**
@@ -66,40 +67,37 @@ $RefParser.prototype.parse = function(schema, options, callback) {
   var args = normalizeArgs(arguments);
   var promise;
 
-  if (!args.schema || (typeof args.schema !== 'string' && typeof args.schema !== 'object')) {
-    var err = ono('Expected a file path, URL, or object. Got %s', args.schema);
+  if (!args.path && !args.schema) {
+    var err = ono('Expected a file path, URL, or object. Got %s', args.path || args.schema);
     return maybe(args.callback, Promise.reject(err));
   }
 
   // Reset everything
   this.schema = null;
   this.$refs = new $Refs();
 
-  if (typeof args.schema === 'object') {
-    // The schema is an object, not a path/url.
+  if (args.schema && typeof args.schema === 'object') {
+    // A schema object was passed-in.
     // So immediately add a new $Ref with the schema object as its value
-    this.$refs._add('', args.schema);
+    this.$refs._add(args.path, args.schema);
     promise = Promise.resolve(args.schema);
   }
   else {
-    // The schema is a path/url
-    var path = args.schema;
-
     // If it's a filesystem path, then convert it to a URL.
     // NOTE: According to the JSON Reference spec, these should already be URLs,
     // but, in practice, many people use local filesystem paths instead.
     // So we're being generous here and doing the conversion automatically.
     // This is not intended to be a 100% bulletproof solution.
     // If it doesn't work for your use-case, then use a URL instead.
-    if (url.isFileSystemPath(path)) {
-      path = url.fromFileSystemPath(path);
+    if (url.isFileSystemPath(args.path)) {
+      args.path = url.fromFileSystemPath(args.path);
     }
 
     // Resolve the absolute path of the schema
-    path = url.resolve(url.cwd(), path);
+    args.path = url.resolve(url.cwd(), args.path);
 
     // Parse the schema file/url
-    promise = parse(path, this.$refs, args.options);
+    promise = parse(args.path, this.$refs, args.options);
   }
 
   var me = this;
@@ -132,7 +130,8 @@ $RefParser.prototype.parse = function(schema, options, callback) {
  */
 $RefParser.resolve = function(schema, options, callback) {
   var Class = this; // eslint-disable-line consistent-this
-  return new Class().resolve(schema, options, callback);
+  var instance = new Class();
+  return instance.resolve.apply(instance, arguments);
 };
 
 /**
@@ -151,7 +150,7 @@ $RefParser.prototype.resolve = function(schema, options, callback) {
   var me = this;
   var args = normalizeArgs(arguments);
 
-  return this.parse(args.schema, args.options)
+  return this.parse(args.path, args.schema, args.options)
     .then(function() {
       return resolveExternal(me, args.options);
     })
@@ -175,7 +174,8 @@ $RefParser.prototype.resolve = function(schema, options, callback) {
  */
 $RefParser.bundle = function(schema, options, callback) {
   var Class = this; // eslint-disable-line consistent-this
-  return new Class().bundle(schema, options, callback);
+  var instance = new Class();
+  return instance.bundle.apply(instance, arguments);
 };
 
 /**
@@ -192,7 +192,7 @@ $RefParser.prototype.bundle = function(schema, options, callback) {
   var me = this;
   var args = normalizeArgs(arguments);
 
-  return this.resolve(args.schema, args.options)
+  return this.resolve(args.path, args.schema, args.options)
     .then(function() {
       bundle(me, args.options);
       return maybe(args.callback, Promise.resolve(me.schema));
@@ -213,7 +213,8 @@ $RefParser.prototype.bundle = function(schema, options, callback) {
  */
 $RefParser.dereference = function(schema, options, callback) {
   var Class = this; // eslint-disable-line consistent-this
-  return new Class().dereference(schema, options, callback);
+  var instance = new Class();
+  return instance.dereference.apply(instance, arguments);
 };
 
 /**
@@ -229,7 +230,7 @@ $RefParser.prototype.dereference = function(schema, options, callback) {
   var me = this;
   var args = normalizeArgs(arguments);
 
-  return this.resolve(args.schema, args.options)
+  return this.resolve(args.path, args.schema, args.options)
     .then(function() {
       dereference(me, args.options);
       return maybe(args.callback, Promise.resolve(me.schema));
@@ -246,16 +247,42 @@ $RefParser.prototype.dereference = function(schema, options, callback) {
  * @returns {object}
  */
 function normalizeArgs(args) {
-  var options = args[1], callback = args[2];
-  if (typeof options === 'function') {
-    callback = options;
-    options = undefined;
+  var path, schema, options, callback;
+  args = Array.prototype.slice.call(args);
+
+  if (typeof args[args.length - 1] === 'function') {
+    // The last parameter is a callback function
+    callback = args.pop();
+  }
+
+  if (typeof args[0] === 'string') {
+    // The first parameter is the path
+    path = args[0];
+    if (typeof args[2] === 'object') {
+      // The second parameter is the schema, and the third parameter is the options
+      schema = args[1];
+      options = args[2];
+    }
+    else {
+      // The second parameter is the options
+      schema = undefined;
+      options = args[1];
+    }
+  }
+  else {
+    // The first parameter is the schema
+    path = '';
+    schema = args[0];
+    options = args[1];
   }
+
   if (!(options instanceof Options)) {
     options = new Options(options);
   }
+
   return {
-    schema: args[0],
+    path: path,
+    schema: schema,
     options: options,
     callback: callback
   };