refactor: fold autodetect() into detect()

Author: dominykas

bin/detect-node-support

@@ -18,7 +18,7 @@ exports.main = async ([nodeBin, thisBin, what]) => {
         return;
     }
 
-    const result = await NodeSupport.autoDetect(what);
+    const result = await NodeSupport.detect(what);
 
     console.log(result);
 };

lib/index.js

@@ -1,15 +1,12 @@
 'use strict';
 
-const Fs = require('fs');
-const { URL } = require('url');
-
 const Engines = require('./engines');
 const Package = require('./package');
 const Travis = require('./travis');
 
-exports.detect = async function ({ path, repository, packageName }) {
+exports.detect = async function (what) {
 
-    const packageInfo = await Package.detect({ path, repository, packageName });
+    const packageInfo = await Package.detect(what);
 
     const result = {};
 
@@ -25,30 +22,3 @@ exports.detect = async function ({ path, repository, packageName }) {
 
     return result;
 };
-
-// eslint-disable-next-line require-await
-exports.autoDetect = async function (what) {
-
-    try {
-        var url = new URL(what);
-    }
-    catch (err) {
-        if (err.code !== 'ERR_INVALID_URL') {
-            throw err;
-        }
-    }
-
-    if (url) {
-        return exports.detect({ repository: url.href });
-    }
-
-    if (Fs.existsSync(what)) {
-        return exports.detect({ path: what });
-    }
-
-    if (what.includes('/') && !what.startsWith('@')) {
-        return exports.detect({ repository: `https://github.com/${what}` });
-    }
-
-    return exports.detect({ packageName: what });
-};

lib/package.js

@@ -1,9 +1,45 @@
 'use strict';
 
+const Fs = require('fs');
+const { URL } = require('url');
+
 const Loader = require('./loader');
 
 
-exports.detect = async ({ path, repository, packageName }) => {
+const internals = {};
+
+internals.what = (what) => {
+
+    if (typeof what !== 'string') {
+        return what;
+    }
+
+    try {
+        var url = new URL(what);
+    }
+    catch (err) {
+        // do nothing - attempt to use the string as a package name
+    }
+
+    if (url) {
+        return { repository: url.href };
+    }
+
+    if (Fs.existsSync(what)) {
+        return { path: what };
+    }
+
+    if (what.includes('/') && !what.startsWith('@')) {
+        return { repository: `https://github.com/${what}` };
+    }
+
+    return { packageName: what };
+};
+
+
+exports.detect = async (what) => {
+
+    const { path, repository, packageName } = internals.what(what);
 
     const { loadFile, getCommit } = await Loader.create({ path, repository, packageName });