Merge branch 'master' into chore-jest

* master:
  Release v1.0.35
  broken npm lock
  npm lock after removing mkdirp dep
  Fix returning promise with passing options
  getPort/getPorts return promise if no callback

# Conflicts:
#	package-lock.json

Author: eriktrom

lib/portfinder.d.ts

@@ -61,6 +61,7 @@ export function setBasePath(path: string): void;
 /**
  * Responds with a unbound port on the current machine.
  */
+export function getPort(options: PortFinderOptions): Promise<number>;
 export function getPort(callback: PortfinderCallback): void;
 export function getPort(options: PortFinderOptions, callback: PortfinderCallback): void;
 
@@ -72,6 +73,7 @@ export function getPortPromise(options?: PortFinderOptions): Promise<number>;
 /**
  * Responds with an array of unbound ports on the current machine.
  */
+export function getPorts(count: number, options: PortFinderOptions): Promise<Array<number>>;
 export function getPorts(count: number, callback: (err: Error, ports: Array<number>) => void): void;
 export function getPorts(count: number, options: PortFinderOptions, callback: (err: Error, ports: Array<number>) => void): void;
 

lib/portfinder.js

@@ -121,20 +121,9 @@ exports.basePath = '/tmp/portfinder'
 //
 exports.setBasePath = function (path) {
   exports.basePath = path;
-}
-
-// ### function getPort (options, callback)
-// #### @options {Object} Settings to use when finding the necessary port
-// #### @callback {function} Continuation to respond to when complete.
-// Responds with a unbound port on the current machine.
-//
-exports.getPort = function (options, callback) {
-  if (!callback) {
-    callback = options;
-    options = {};
-
-  }
+};
 
+internals.getPort = function (options, callback) {
   options.port   = Number(options.port) || Number(exports.basePort);
   options.host   = options.host    || null;
   options.stopPort = Number(options.stopPort) || Number(exports.highestPort);
@@ -145,7 +134,7 @@ exports.getPort = function (options, callback) {
       throw Error('Provided options.startPort(' + options.startPort + ') is less than 0, which are cannot be bound.');
     }
     if(options.stopPort < options.startPort) {
-      throw Error('Provided options.stopPort(' + options.stopPort + 'is less than options.startPort (' + options.startPort + ')');
+      throw Error('Provided options.stopPort(' + options.stopPort + ') is less than options.startPort (' + options.startPort + ')');
     }
   }
 
@@ -188,7 +177,7 @@ exports.getPort = function (options, callback) {
         } else {
           const idx = exports._defaultHosts.indexOf(currentHost);
           exports._defaultHosts.splice(idx, 1);
-          return exports.getPort(options, callback);
+          return internals.getPort(options, callback);
         }
       } else {
         // error is not accounted for, file ticket, handle special case
@@ -214,51 +203,54 @@ exports.getPort = function (options, callback) {
       }
     } else {
       // otherwise, try again, using sorted port, aka, highest open for >= 1 host
-      return exports.getPort({ port: openPorts.pop(), host: options.host, startPort: options.startPort, stopPort: options.stopPort }, callback);
+      return internals.getPort({ port: openPorts.pop(), host: options.host, startPort: options.startPort, stopPort: options.stopPort }, callback);
     }
 
   });
 };
 
-//
-// ### function getPortPromise (options)
+// ### function getPort (options, callback)
 // #### @options {Object} Settings to use when finding the necessary port
-// Responds a promise to an unbound port on the current machine.
+// #### @callback {function} Continuation to respond to when complete.
+// Responds with a unbound port on the current machine.
 //
-exports.getPortPromise = function (options) {
-  if (!options) {
+exports.getPort = function (options, callback) {
+  if (typeof options === 'function') {
+    callback = options;
     options = {};
   }
-  return new Promise(function(resolve, reject) {
-    exports.getPort(options, function(err, port) {
-      if (err) {
-        return reject(err);
-      }
-      resolve(port);
+
+  options = options || {};
+
+  if (!callback) {
+    return new Promise(function (resolve, reject) {
+      internals.getPort(options, function (err, port) {
+        if (err) {
+          return reject(err);
+        }
+        resolve(port);
+      });
     });
-  });
-}
+  } else {
+    return internals.getPort(options, callback);
+  }
+};
 
 //
-// ### function getPorts (count, options, callback)
-// #### @count {Number} The number of ports to find
+// ### function getPortPromise (options)
 // #### @options {Object} Settings to use when finding the necessary port
-// #### @callback {function} Continuation to respond to when complete.
-// Responds with an array of unbound ports on the current machine.
+// Responds a promise to an unbound port on the current machine.
 //
-exports.getPorts = function (count, options, callback) {
-  if (!callback) {
-    callback = options;
-    options = {};
-  }
+exports.getPortPromise = exports.getPort;
 
+internals.getPorts = function (count, options, callback) {
   let lastPort = null;
   _async.timesSeries(count, function(index, asyncCallback) {
     if (lastPort) {
       options.port = exports.nextPort(lastPort);
     }
 
-    exports.getPort(options, function (err, port) {
+    internals.getPort(options, function (err, port) {
       if (err) {
         asyncCallback(err);
       } else {
@@ -270,24 +262,41 @@ exports.getPorts = function (count, options, callback) {
 };
 
 //
-// ### function getPortPromise (options)
+// ### function getPorts (count, options, callback)
 // #### @count {Number} The number of ports to find
 // #### @options {Object} Settings to use when finding the necessary port
-// Responds with a promise that resolves to an array of unbound ports on the current machine.
+// #### @callback {function} Continuation to respond to when complete.
+// Responds with an array of unbound ports on the current machine.
 //
-exports.getPortsPromise = function (count, options) {
-  if (!options) {
+exports.getPorts = function (count, options, callback) {
+  if (typeof options === 'function') {
+    callback = options;
     options = {};
   }
-  return new Promise(function(resolve, reject) {
-    exports.getPorts(count, options, function(err, ports) {
-      if (err) {
-        return reject(err);
-      }
-      resolve(ports);
+
+  options = options || {};
+
+  if (!callback) {
+    return new Promise(function(resolve, reject) {
+      internals.getPorts(count, options, function(err, ports) {
+        if (err) {
+          return reject(err);
+        }
+        resolve(ports);
+      });
     });
-  });
-}
+  } else {
+    return internals.getPorts(count, options, callback);
+  }
+};
+
+//
+// ### function getPortPromise (options)
+// #### @count {Number} The number of ports to find
+// #### @options {Object} Settings to use when finding the necessary port
+// Responds with a promise that resolves to an array of unbound ports on the current machine.
+//
+exports.getPortsPromise = exports.getPorts;
 
 //
 // ### function getSocket (options, callback)