Merge pull request #14 from henrymercer/henrymercer/no-throw-if-file-…

…on-path

 Don't throw if a file is on the search path

src/index.test.ts

@@ -1,5 +1,6 @@
 import test from "ava";
 import { safeWhich, isWindows } from "./index";
+import * as os from "os";
 import * as path from "path";
 
 const originalEnv = process.env;
@@ -71,6 +72,11 @@ else {
 		t.deepEqual(await safeWhich("program"), path.join(testResources, "path", "program"));
 	});
 
+	test("does not throw if a non-directory file is on the search path", async (t) => {
+		process.env.PATH = path.join(testResources, "path/program") + path.delimiter + path.join(testResources, "path");
+		t.deepEqual(await safeWhich("program"), path.join(testResources, "path", "program"));
+	});
+
 	test("program is not found if not executable", async (t) => {
 		process.env.PATH = path.join(testResources, "path");
 		await t.throwsAsync(safeWhich("non-executable-file"));

src/index.ts

@@ -29,9 +29,17 @@ export async function safeWhich(program: string): Promise<string> {
 				return completePath;
 			}
 			catch (err) {
-				if (err.code !== "ENOENT") {
-					throw err;
+				if (typeof err === "object" && err !== null && 'code' in err) {
+					if (err.code === "ENOTDIR") {
+						console.warn(`While resolving program ${program}, skipping ${searchPath} ` + 
+							"because it is not a directory.");
+						break;
+					}
+					if (err.code === "ENOENT") {
+						continue;
+					}
 				}
+				throw err;
 			}
 		}
 	}