@pnpm/resolving.default-resolver 1100.0.11 → 1100.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/index.d.ts +2 -2
  2. package/lib/index.js +15 -7
  3. package/package.json +19 -16
package/lib/index.d.ts CHANGED
@@ -5,14 +5,14 @@ import type { FetchFromRegistry, GetAuthHeader } from '@pnpm/fetching.types';
5
5
  import { type CustomResolver } from '@pnpm/hooks.types';
6
6
  import { type GitResolveResult } from '@pnpm/resolving.git-resolver';
7
7
  import { type LocalResolveResult } from '@pnpm/resolving.local-resolver';
8
- import { type JsrResolveResult, type NpmResolveResult, type PackageMeta, type PackageMetaCache, type ResolverFactoryOptions, type WorkspaceResolveResult } from '@pnpm/resolving.npm-resolver';
8
+ import { type JsrResolveResult, type NamedRegistryResolveResult, type NpmResolveResult, type PackageMeta, type PackageMetaCache, type ResolverFactoryOptions, type WorkspaceResolveResult } from '@pnpm/resolving.npm-resolver';
9
9
  import type { ResolveFunction, ResolveOptions, ResolveResult, WantedDependency } from '@pnpm/resolving.resolver-base';
10
10
  import { type TarballResolveResult } from '@pnpm/resolving.tarball-resolver';
11
11
  export type { PackageMeta, PackageMetaCache, ResolveFunction, ResolverFactoryOptions, };
12
12
  export interface CustomResolverResolveResult extends ResolveResult {
13
13
  resolvedVia: 'custom-resolver';
14
14
  }
15
- export type DefaultResolveResult = NpmResolveResult | JsrResolveResult | GitResolveResult | LocalResolveResult | TarballResolveResult | WorkspaceResolveResult | NodeRuntimeResolveResult | DenoRuntimeResolveResult | BunRuntimeResolveResult | CustomResolverResolveResult;
15
+ export type DefaultResolveResult = NpmResolveResult | JsrResolveResult | NamedRegistryResolveResult | GitResolveResult | LocalResolveResult | TarballResolveResult | WorkspaceResolveResult | NodeRuntimeResolveResult | DenoRuntimeResolveResult | BunRuntimeResolveResult | CustomResolverResolveResult;
16
16
  export type DefaultResolver = (wantedDependency: WantedDependency, opts: ResolveOptions) => Promise<DefaultResolveResult>;
17
17
  export declare function createResolver(fetchFromRegistry: FetchFromRegistry, getAuthHeader: GetAuthHeader, pnpmOpts: ResolverFactoryOptions & {
18
18
  nodeDownloadMirrors?: Record<string, string>;
package/lib/index.js CHANGED
@@ -4,7 +4,7 @@ import { resolveNodeRuntime } from '@pnpm/engine.runtime.node-resolver';
4
4
  import { PnpmError } from '@pnpm/error';
5
5
  import { checkCustomResolverCanResolve } from '@pnpm/hooks.types';
6
6
  import { createGitResolver } from '@pnpm/resolving.git-resolver';
7
- import { resolveFromLocal } from '@pnpm/resolving.local-resolver';
7
+ import { resolveFromLocalPath, resolveFromLocalScheme } from '@pnpm/resolving.local-resolver';
8
8
  import { createNpmResolver, } from '@pnpm/resolving.npm-resolver';
9
9
  import { resolveFromTarball } from '@pnpm/resolving.tarball-resolver';
10
10
  async function resolveFromCustomResolvers(customResolvers, wantedDependency, opts) {
@@ -34,11 +34,11 @@ async function resolveFromCustomResolvers(customResolvers, wantedDependency, opt
34
34
  return null;
35
35
  }
36
36
  export function createResolver(fetchFromRegistry, getAuthHeader, pnpmOpts) {
37
- const { resolveFromNpm, resolveFromJsr, clearCache } = createNpmResolver(fetchFromRegistry, getAuthHeader, pnpmOpts);
37
+ const { resolveFromNpm, resolveFromJsr, resolveFromNamedRegistry, clearCache } = createNpmResolver(fetchFromRegistry, getAuthHeader, pnpmOpts);
38
38
  const resolveFromGit = createGitResolver(pnpmOpts);
39
- const _resolveFromLocal = resolveFromLocal.bind(null, {
40
- preserveAbsolutePaths: pnpmOpts.preserveAbsolutePaths,
41
- });
39
+ const localCtx = { preserveAbsolutePaths: pnpmOpts.preserveAbsolutePaths };
40
+ const _resolveFromLocalScheme = resolveFromLocalScheme.bind(null, localCtx);
41
+ const _resolveFromLocalPath = resolveFromLocalPath.bind(null, localCtx);
42
42
  const _resolveNodeRuntime = resolveNodeRuntime.bind(null, { fetchFromRegistry, offline: pnpmOpts.offline, nodeDownloadMirrors: pnpmOpts.nodeDownloadMirrors });
43
43
  const _resolveDenoRuntime = resolveDenoRuntime.bind(null, { fetchFromRegistry, offline: pnpmOpts.offline, resolveFromNpm });
44
44
  const _resolveBunRuntime = resolveBunRuntime.bind(null, { fetchFromRegistry, offline: pnpmOpts.offline, resolveFromNpm });
@@ -52,10 +52,18 @@ export function createResolver(fetchFromRegistry, getAuthHeader, pnpmOpts) {
52
52
  await resolveFromJsr(wantedDependency, opts) ??
53
53
  (wantedDependency.bareSpecifier && (await resolveFromGit(wantedDependency, opts) ??
54
54
  await resolveFromTarball(fetchFromRegistry, wantedDependency) ??
55
- await _resolveFromLocal(wantedDependency, opts))) ??
55
+ await _resolveFromLocalScheme(wantedDependency, opts))) ??
56
56
  await _resolveNodeRuntime(wantedDependency, opts) ??
57
57
  await _resolveDenoRuntime(wantedDependency, opts) ??
58
- await _resolveBunRuntime(wantedDependency, opts);
58
+ await _resolveBunRuntime(wantedDependency, opts) ??
59
+ // Named-registry runs between the explicit local schemes above and the
60
+ // path-shape match below, so `<alias>:@scope/pkg` reaches the configured
61
+ // registry while a colliding `file:`/`link:`/`workspace:` alias cannot
62
+ // hijack the built-in protocols.
63
+ await resolveFromNamedRegistry(wantedDependency, opts) ??
64
+ (wantedDependency.bareSpecifier
65
+ ? await _resolveFromLocalPath(wantedDependency, opts)
66
+ : null);
59
67
  if (!resolution) {
60
68
  let specifier = `${wantedDependency.alias ? wantedDependency.alias + '@' : ''}${wantedDependency.bareSpecifier ?? ''}`;
61
69
  if (specifier !== '') {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnpm/resolving.default-resolver",
3
- "version": "1100.0.11",
3
+ "version": "1100.1.1",
4
4
  "description": "pnpm's default package resolver",
5
5
  "keywords": [
6
6
  "pnpm",
@@ -26,26 +26,29 @@
26
26
  "!*.map"
27
27
  ],
28
28
  "dependencies": {
29
- "@pnpm/engine.runtime.bun-resolver": "1101.0.4",
30
- "@pnpm/engine.runtime.deno-resolver": "1101.0.4",
29
+ "@pnpm/engine.runtime.bun-resolver": "1101.0.5",
30
+ "@pnpm/engine.runtime.deno-resolver": "1101.0.5",
31
+ "@pnpm/engine.runtime.node-resolver": "1101.0.7",
31
32
  "@pnpm/error": "1100.0.0",
32
33
  "@pnpm/fetching.types": "1100.0.1",
33
- "@pnpm/hooks.types": "1100.0.5",
34
- "@pnpm/resolving.git-resolver": "1100.0.5",
35
- "@pnpm/resolving.npm-resolver": "1101.0.3",
36
- "@pnpm/resolving.resolver-base": "1100.1.2",
37
- "@pnpm/resolving.local-resolver": "1100.0.5",
38
- "@pnpm/engine.runtime.node-resolver": "1101.0.6",
39
- "@pnpm/resolving.tarball-resolver": "1100.0.4",
40
- "@pnpm/types": "1101.0.0"
34
+ "@pnpm/hooks.types": "1100.0.6",
35
+ "@pnpm/resolving.git-resolver": "1100.0.6",
36
+ "@pnpm/resolving.tarball-resolver": "1100.0.5",
37
+ "@pnpm/types": "1101.1.0",
38
+ "@pnpm/resolving.resolver-base": "1100.1.3",
39
+ "@pnpm/resolving.local-resolver": "1101.0.0",
40
+ "@pnpm/resolving.npm-resolver": "1101.1.0"
41
41
  },
42
42
  "devDependencies": {
43
43
  "@jest/globals": "30.3.0",
44
- "@pnpm/fetching.fetcher-base": "1100.1.2",
45
- "@pnpm/fetching.tarball-fetcher": "1101.0.4",
46
- "@pnpm/network.fetch": "1100.0.2",
47
- "@pnpm/resolving.default-resolver": "1100.0.11",
48
- "@pnpm/store.cafs-types": "1100.0.1"
44
+ "load-json-file": "^7.0.1",
45
+ "tempy": "3.0.0",
46
+ "@pnpm/fetching.fetcher-base": "1100.1.3",
47
+ "@pnpm/fetching.tarball-fetcher": "1101.0.6",
48
+ "@pnpm/network.fetch": "1100.0.3",
49
+ "@pnpm/store.cafs-types": "1100.0.1",
50
+ "@pnpm/resolving.default-resolver": "1100.1.1",
51
+ "@pnpm/testing.mock-agent": "1100.0.3"
49
52
  },
50
53
  "engines": {
51
54
  "node": ">=22.13"