fix(pnp): search virtual path base when api can't be located for virt…

…ual path target

.yarn/versions/109cba4d.yml

@@ -0,0 +1,25 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-pnp": patch
+  "@yarnpkg/pnp": patch
+  "@yarnpkg/pnpify": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-node-modules"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

packages/yarnpkg-pnp/sources/loader/makeManager.ts

@@ -90,10 +90,9 @@ export function makeManager(pnpapi: PnpApi, opts: MakeManagerOptions) {
     } while (curr !== end);
   }
 
-  function findApiPathFor(modulePath: NativePath) {
-    const start = VirtualFS.resolveVirtual(
-      ppath.resolve(npath.toPortablePath(modulePath)),
-    );
+  function findApiPathFor(modulePath: NativePath): PortablePath | null {
+    const pModulePath = ppath.resolve(npath.toPortablePath(modulePath));
+    const start = VirtualFS.resolveVirtual(pModulePath);
 
     let curr: PortablePath;
     let next = start;
@@ -122,8 +121,17 @@ export function makeManager(pnpapi: PnpApi, opts: MakeManagerOptions) {
       next = ppath.dirname(curr);
     } while (curr !== PortablePath.root);
 
-    addToCache(start, curr, null);
-    return null;
+    if (pModulePath === start) {
+      addToCache(start, curr, null);
+      return null;
+    } else {
+      // Can't locate pnpapi from virtual path target, so try from the base
+      return findApiPathFor(
+        npath.fromPortablePath(
+          pModulePath.substr(0, pModulePath.indexOf(`$$virtual`) - 1)
+        )
+      );
+    }
   }
 
   function getApiPathFromParent(parent: Module | null | undefined): PortablePath | null {