refactor: resolvePrivateRequest

yarnpkg · Sep 19, 2022 · 240af2c · 240af2c
1 parent a0de5e1
commit 240af2c
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 41 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/packages/yarnpkg-pnp/sources/hook.js b/packages/yarnpkg-pnp/sources/hook.js
diff --git a/packages/yarnpkg-pnp/sources/loader/makeApi.ts b/packages/yarnpkg-pnp/sources/loader/makeApi.ts
@@ -869,6 +869,29 @@ export function makeApi(runtimeState: RuntimeState, opts: MakeApiOptions): PnpAp
     }
   }
 
+  function resolvePrivateRequest(request: PortablePath, issuer: PortablePath | null, opts: ResolveRequestOptions) {
+    if (!issuer)
+      throw new Error(`Assertion failed: An issuer is required to resolve private import mappings`);
+
+    const resolved = packageImportsResolve({
+      name: request,
+      base: pathToFileURL(npath.fromPortablePath(issuer)),
+      conditions: opts.conditions ?? defaultExportsConditions,
+      readFileSyncFn: tryReadFile,
+    });
+
+    if (resolved instanceof URL) {
+      return resolveUnqualified(npath.toPortablePath(fileURLToPath(resolved)), {extensions: opts.extensions});
+    } else {
+      if (resolved.startsWith(`#`))
+        // Node behaves interestingly by default so just block the request for now.
+        // https://github.com/nodejs/node/issues/40579
+        throw new Error(`Mapping from one private import to another isn't allowed`);
+
+      return resolveRequest(resolved as PortablePath, issuer, opts);
+    }
+  }
+
   /**
    * Transforms a request into a fully qualified path.
    *
@@ -877,30 +900,12 @@ export function makeApi(runtimeState: RuntimeState, opts: MakeApiOptions): PnpAp
    * imports won't be computed correctly (they'll get resolved relative to "/tmp/" instead of "/tmp/foo/").
    */
 
-  function resolveRequest(request: PortablePath, issuer: PortablePath | null, {considerBuiltins, extensions, conditions}: ResolveRequestOptions = {}): PortablePath | null {
+  function resolveRequest(request: PortablePath, issuer: PortablePath | null, opts: ResolveRequestOptions = {}): PortablePath | null {
     try {
-      if (request.startsWith(`#`)) {
-        if (!issuer)
-          throw new Error(`Assertion failed: An issuer is required to resolve private import mappings`);
-
-        const resolved = packageImportsResolve({
-          name: request,
-          base: pathToFileURL(npath.fromPortablePath(issuer)),
-          conditions: conditions ?? defaultExportsConditions,
-          readFileSyncFn: tryReadFile,
-        });
-
-        if (resolved instanceof URL) {
-          return resolveUnqualified(npath.toPortablePath(fileURLToPath(resolved)), {extensions});
-        } else {
-          if (resolved.startsWith(`#`))
-            // Node behaves interestingly by default so just block the request for now.
-            // https://github.com/nodejs/node/issues/40579
-            throw new Error(`Mapping from one private import to another isn't allowed`);
+      if (request.startsWith(`#`))
+        return resolvePrivateRequest(request, issuer, opts);
 
-          return resolveRequest(resolved as PortablePath, issuer, {conditions, considerBuiltins, extensions});
-        }
-      }
+      const {considerBuiltins, extensions, conditions} = opts;
 
       const unqualifiedPath = resolveToUnqualified(request, issuer, {considerBuiltins});