refactor: use vscode-find-up

Author: 9romise

package.json

@@ -238,6 +238,7 @@
     "vite-tsconfig-paths": "catalog:test",
     "vitest": "catalog:test",
     "vscode-ext-gen": "catalog:dev",
+    "vscode-find-up": "catalog:inline",
     "yaml": "catalog:inline"
   }
 }

pnpm-lock.yaml

@@ -19,6 +19,7 @@ catalogs:
     perfect-debounce: ^2.1.0
     reactive-vscode: ^1.0.0-beta.2
     semver: ^7.7.4
+    vscode-find-up: ^0.1.1
     yaml: ^2.8.2
   test:
     jest-mock-vscode: ^4.11.0

pnpm-workspace.yaml

@@ -1,8 +1,9 @@
 import { PACKAGE_JSON_BASENAME } from '#constants'
 import { logger } from '#state'
 import { npmxFileUrl } from '#utils/links'
-import { findNearestFile, resolvePackageJson } from '#utils/resolve'
+import { resolvePackageJson } from '#utils/resolve'
 import { env, Uri, window } from 'vscode'
+import { findUp } from 'vscode-find-up'
 
 export async function openFileInNpmx(fileUri?: Uri) {
   const textEditor = window.activeTextEditor
@@ -23,7 +24,9 @@ export async function openFileInNpmx(fileUri?: Uri) {
   }
 
   // Find the associated package manifest and the relative path to the given file.
-  const pkgJsonUri = await findNearestFile(PACKAGE_JSON_BASENAME, uri, (u) => u.path.endsWith('/node_modules'))
+  const pkgJsonUri = await findUp(PACKAGE_JSON_BASENAME, {
+    cwd: uri,
+  })
   const manifest = pkgJsonUri ? await resolvePackageJson(pkgJsonUri) : undefined
   if (!pkgJsonUri || !manifest) {
     logger.warn(`Could not resolve npmx url: ${uri.toString()}`)

src/commands/open-file-in-npmx.ts

@@ -1,32 +1,5 @@
-import { Uri, workspace } from 'vscode'
-
-export function* walkAncestors(start: Uri, shouldStop?: (uri: Uri) => boolean): Generator<Uri, void, void> {
-  let current = start
-  while (true) {
-    yield current
-
-    if (shouldStop?.(current))
-      return
-
-    const parent = Uri.joinPath(current, '..')
-    if (parent.toString() === current.toString())
-      return
-
-    current = parent
-  }
-}
-
-export async function findNearestFile(filename: string, start: Uri, shouldStop?: (uri: Uri) => boolean): Promise<Uri | undefined> {
-  for (const dir of walkAncestors(start, shouldStop)) {
-    const fileUri = Uri.joinPath(dir, filename)
-    try {
-      await workspace.fs.stat(fileUri)
-      return fileUri
-    } catch {
-      continue
-    }
-  }
-}
+import type { Uri } from 'vscode'
+import { workspace } from 'vscode'
 
 /** A parsed `package.json` manifest file. */
 interface PackageManifest {