feat: Added support for monorepo by considering the relative path to the package.json itself instead of the workspace itself

Author: rentalhost

src/Diagnostic.ts

@@ -1,4 +1,4 @@
-import { sep } from "node:path"
+import { dirname, sep } from "node:path"
 import {
   intersects,
   maxSatisfying,
@@ -44,7 +44,6 @@ import {
 } from "./Settings"
 import { Icons } from "./Theme"
 import { promiseLimit } from "./Utils"
-import { getWorkspacePath } from "./Workspace"
 
 const isPackageJsonDocument = (document: TextDocument): boolean =>
   document.fileName.endsWith(`${sep}package.json`)
@@ -85,7 +84,7 @@ export const diagnosticSubscribe = (
   // Trigger when any file in the workspace is modified.
   // Our interest here is to know about the package.json itself, package-lock.json or pnpm-lock.yaml.
   const lockerUpdated = (uri: Uri): void => {
-    const workspacePath = getWorkspacePath(uri)
+    const workspacePath = dirname(uri.fsPath)
 
     packageManagerCaches.get(workspacePath)?.invalidate()
     packagesInstalledCaches.get(workspacePath)?.invalidate()

src/PackageManager.ts

@@ -1,12 +1,12 @@
 import { exec } from "node:child_process"
 import { existsSync } from "node:fs"
+import { dirname } from "node:path"
 import { prerelease } from "semver"
 import { TextDocument } from "vscode"
 import { Cache } from "./Cache"
 import { PackageInfo } from "./PackageInfo"
 import { getCacheLifetime } from "./Settings"
 import { cacheEnabled, fetchLite } from "./Utils"
-import { getWorkspacePath } from "./Workspace"
 
 const PACKAGE_VERSION_REGEXP = /^\d+\.\d+\.\d+$/
 
@@ -99,7 +99,7 @@ const supportsPackageManager = async (
       return
     }
 
-    const cwd = getWorkspacePath(document.uri)
+    const cwd = dirname(document.uri.fsPath)
 
     exec(`${cmd} --version`, { cwd }, (error, stdout) => {
       const isInstalled =
@@ -121,7 +121,7 @@ export const packageManagerCaches = new Map<
 export const getPackageManager = async (
   document: TextDocument,
 ): Promise<PackageManager> => {
-  const cwd = getWorkspacePath(document.uri)
+  const cwd = dirname(document.uri.fsPath)
 
   if (cacheEnabled()) {
     const packageManagerCache = packageManagerCaches.get(cwd)
@@ -194,7 +194,7 @@ export const packagesInstalledCaches = new Map<
 export const getPackagesInstalled = async (
   document: TextDocument,
 ): Promise<PackagesInstalled | undefined> => {
-  const cwd = getWorkspacePath(document.uri)
+  const cwd = dirname(document.uri.fsPath)
 
   if (cacheEnabled()) {
     const cache = packagesInstalledCaches.get(cwd)

src/TestUtils.ts

@@ -366,10 +366,6 @@ export const vscodeSimulator = async (options: SimulatorOptions = {}) => {
     ),
   })
 
-  vscodeMock.workspace.getWorkspaceFolder = (): unknown => ({
-    uri: { fsPath: "<root>/" },
-  })
-
   vscodeMock.languages.createDiagnosticCollection = jest.fn(() => ({
     clear: jest.fn(),
     delete: jest.fn(),

src/Workspace.ts

@@ -710,7 +710,7 @@ describe("code coverage", () => {
 
     subscriptions.find(
       (subscription) => subscription[0] === "onDidChange",
-    )?.[1]()
+    )?.[1]({ fsPath: "/repo/package.json" })
 
     expect(diagnostics).toHaveLength(0)
     expect(decorations).toStrictEqual([])