fix: check for all lockfiles before ascending directories (#179)

* chore: add .DS_Store to .gitignore

* fix: resolve lockfile

* chore: small tweak

---------

Co-authored-by: Daniel Roe <daniel@roe.dev>

.gitignore

@@ -4,3 +4,4 @@ node_modules
 *.tmp
 .nyc*
 coverage
+.DS_Store

src/index.ts

@@ -164,24 +164,24 @@ const lockFiles = [
 ];
 
 /**
- * Resolves the path to the nearest `tsconfig.json` file from a given directory.
+ * Resolves the path to the nearest lockfile from a given directory.
  * @param id - The base path for the search, defaults to the current working directory.
  * @param options - Options to modify the search behaviour. See {@link ResolveOptions}.
- * @returns A promise resolving to the path of the nearest `tsconfig.json` file.
+ * @returns A promise resolving to the path of the nearest lockfile.
  */
 export async function resolveLockfile(
   id: string = process.cwd(),
   options: ResolveOptions = {},
 ): Promise<string> {
   const resolvedPath = isAbsolute(id) ? id : await resolvePath(id, options);
   const _options = { startingFrom: resolvedPath, ...options };
-  for (const lockFile of lockFiles) {
-    try {
-      return await findNearestFile(lockFile, _options);
-    } catch {
-      // Ignore
-    }
+
+  try {
+    return await findNearestFile(lockFiles, _options);
+  } catch {
+    // Ignore
   }
+
   throw new Error("No lockfile found from " + id);
 }
 

src/utils.ts

@@ -53,9 +53,10 @@ const defaultFindOptions: Required<FindFileOptions> = {
  * @throws Will throw an error if the file cannot be found.
  */
 export async function findFile(
-  filename: string,
+  filename: string | string[],
   _options: FindFileOptions = {},
 ): Promise<string> {
+  const filenames = Array.isArray(filename) ? filename : [filename];
   const options = { ...defaultFindOptions, ..._options };
   const basePath = resolve(options.startingFrom);
   const leadingSlash = basePath[0] === "/";
@@ -74,16 +75,20 @@ export async function findFile(
 
   if (options.reverse) {
     for (let index = root + 1; index <= segments.length; index++) {
-      const filePath = join(...segments.slice(0, index), filename);
-      if (await options.test(filePath)) {
-        return filePath;
+      for (const filename of filenames) {
+        const filePath = join(...segments.slice(0, index), filename);
+        if (await options.test(filePath)) {
+          return filePath;
+        }
       }
     }
   } else {
     for (let index = segments.length; index > root; index--) {
-      const filePath = join(...segments.slice(0, index), filename);
-      if (await options.test(filePath)) {
-        return filePath;
+      for (const filename of filenames) {
+        const filePath = join(...segments.slice(0, index), filename);
+        if (await options.test(filePath)) {
+          return filePath;
+        }
       }
     }
   }
@@ -101,7 +106,7 @@ export async function findFile(
  * @returns A promise that resolves to the path of the next file found.
  */
 export function findNearestFile(
-  filename: string,
+  filename: string | string[],
   _options: FindFileOptions = {},
 ): Promise<string> {
   return findFile(filename, _options);