mirror of
https://github.com/pnpm/pnpm.git
synced 2026-06-28 09:55:39 -04:00
## Summary - The local resolver's path-shape match was claiming any specifier containing `/` as a local directory, so `pnpm add bit:@teambit/bit` (with `bit` configured under `namedRegistries`) installed a bogus link to `bit:@teambit/bit/` instead of resolving from the configured registry. - Split the local resolver into two exports: `resolveFromLocalScheme` (handles `file:`/`link:`/`workspace:`/`path:`) and `resolveFromLocalPath` (path-shape match — tarball extension, `path.sep`, `isFilespec`). `resolveFromLocal` is removed. - Re-order the default-resolver chain so the scheme pass runs *before* `resolveFromNamedRegistry` and the path pass runs *after*. Explicit local protocols still win even when a user configures a colliding `namedRegistries` alias; named-registry aliases reach their configured URL. Repro before the fix: ``` $ cat pnpm-workspace.yaml namedRegistries: bit: https://node-registry.bit.cloud/ $ pnpm add bit:@teambit/bit [WARN] Installing a dependency from a non-existent directory: /private/tmp/.../bit:@teambit/bit dependencies: + bit 0.0.0 <- bit:@teambit/bit ``` After the fix, the same command resolves `@teambit/bit 1.13.173` from `https://node-registry.bit.cloud/` and writes `"@teambit/bit": "bit:^1.13.173"` to `package.json`.
215 lines
11 KiB
TypeScript
215 lines
11 KiB
TypeScript
/// <reference path="../../../__typings__/index.d.ts"/>
|
|
import { createRequire } from 'node:module'
|
|
import path from 'node:path'
|
|
|
|
import { expect, jest, test } from '@jest/globals'
|
|
import { logger } from '@pnpm/logger'
|
|
import { resolveFromLocalPath, resolveFromLocalScheme } from '@pnpm/resolving.local-resolver'
|
|
import type { DirectoryResolution } from '@pnpm/resolving.resolver-base'
|
|
import normalize from 'normalize-path'
|
|
|
|
const require = createRequire(import.meta.dirname)
|
|
const TEST_DIR = path.dirname(require.resolve('@pnpm/tgz-fixtures/tgz/pnpm-local-resolver-0.1.1.tgz'))
|
|
|
|
test('resolve directory', async () => {
|
|
const resolveResult = await resolveFromLocalPath({}, { bareSpecifier: '..' }, { projectDir: import.meta.dirname })
|
|
expect(resolveResult!.id).toBe('link:..')
|
|
expect(resolveResult!.normalizedBareSpecifier).toBe('link:..')
|
|
expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver')
|
|
expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalize(path.join(import.meta.dirname, '..')))
|
|
expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory')
|
|
})
|
|
|
|
test('resolve directory specified using absolute path', async () => {
|
|
const linkedDir = path.join(import.meta.dirname, '..')
|
|
const normalizedLinkedDir = normalize(linkedDir)
|
|
const resolveResult = await resolveFromLocalScheme({}, { bareSpecifier: `link:${linkedDir}` }, { projectDir: import.meta.dirname })
|
|
expect(resolveResult!.id).toBe('link:..')
|
|
expect(resolveResult!.normalizedBareSpecifier).toBe(`link:${normalizedLinkedDir}`)
|
|
expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver')
|
|
expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalizedLinkedDir)
|
|
expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory')
|
|
})
|
|
|
|
test('resolve directory specified using absolute path with preserveAbsolutePaths', async () => {
|
|
const linkedDir = path.join(import.meta.dirname, '..')
|
|
const normalizedLinkedDir = normalize(linkedDir)
|
|
const resolveResult = await resolveFromLocalScheme({ preserveAbsolutePaths: true }, { bareSpecifier: `link:${linkedDir}` }, { projectDir: import.meta.dirname })
|
|
expect(resolveResult!.id).toBe(`link:${normalizedLinkedDir}`)
|
|
expect(resolveResult!.normalizedBareSpecifier).toBe(`link:${normalizedLinkedDir}`)
|
|
expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver')
|
|
expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalizedLinkedDir)
|
|
expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory')
|
|
})
|
|
|
|
test('resolve directory specified using absolute path with preserveAbsolutePaths and file: scheme', async () => {
|
|
const linkedDir = path.join(import.meta.dirname, '..')
|
|
const normalizedLinkedDir = normalize(linkedDir)
|
|
const resolveResult = await resolveFromLocalScheme(
|
|
{ preserveAbsolutePaths: true },
|
|
{ bareSpecifier: `file:${linkedDir}` },
|
|
{ projectDir: import.meta.dirname }
|
|
)
|
|
expect(resolveResult!.id).toBe(`file:${normalizedLinkedDir}`)
|
|
expect(resolveResult!.normalizedBareSpecifier).toBe(`file:${normalizedLinkedDir}`)
|
|
expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver')
|
|
expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalizedLinkedDir)
|
|
expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory')
|
|
})
|
|
|
|
test('resolve injected directory', async () => {
|
|
const resolveResult = await resolveFromLocalPath({}, { injected: true, bareSpecifier: '..' }, { projectDir: import.meta.dirname })
|
|
expect(resolveResult!.id).toBe('file:..')
|
|
expect(resolveResult!.normalizedBareSpecifier).toBe('file:..')
|
|
expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver')
|
|
expect((resolveResult!.resolution as DirectoryResolution).directory).toBe('..')
|
|
expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory')
|
|
})
|
|
|
|
test('resolve workspace directory', async () => {
|
|
const resolveResult = await resolveFromLocalScheme({}, { bareSpecifier: 'workspace:..' }, { projectDir: import.meta.dirname })
|
|
expect(resolveResult!.id).toBe('link:..')
|
|
expect(resolveResult!.normalizedBareSpecifier).toBe('link:..')
|
|
expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver')
|
|
expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalize(path.join(import.meta.dirname, '..')))
|
|
expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory')
|
|
})
|
|
|
|
test('resolve directory specified using the file: protocol', async () => {
|
|
const resolveResult = await resolveFromLocalScheme({}, { bareSpecifier: 'file:..' }, { projectDir: import.meta.dirname })
|
|
expect(resolveResult!.id).toBe('file:..')
|
|
expect(resolveResult!.normalizedBareSpecifier).toBe('file:..')
|
|
expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver')
|
|
expect((resolveResult!.resolution as DirectoryResolution).directory).toBe('..')
|
|
expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory')
|
|
})
|
|
|
|
test('resolve directory specified using the link: protocol', async () => {
|
|
const resolveResult = await resolveFromLocalScheme({}, { bareSpecifier: 'link:..' }, { projectDir: import.meta.dirname })
|
|
expect(resolveResult!.id).toBe('link:..')
|
|
expect(resolveResult!.normalizedBareSpecifier).toBe('link:..')
|
|
expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver')
|
|
expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalize(path.join(import.meta.dirname, '..')))
|
|
expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory')
|
|
})
|
|
|
|
test('resolve file', async () => {
|
|
const wantedDependency = { bareSpecifier: './pnpm-local-resolver-0.1.1.tgz' }
|
|
const resolveResult = await resolveFromLocalPath({}, wantedDependency, { projectDir: TEST_DIR })
|
|
|
|
expect(resolveResult).toEqual({
|
|
id: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
normalizedBareSpecifier: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
resolution: {
|
|
integrity: 'sha512-UHd2zKRT/w70KKzFlj4qcT81A1Q0H7NM9uKxLzIZ/VZqJXzt5Hnnp2PYPb5Ezq/hAamoYKIn5g7fuv69kP258w==',
|
|
tarball: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
},
|
|
resolvedVia: 'local-filesystem',
|
|
})
|
|
})
|
|
|
|
test("resolve file when lockfile directory differs from the package's dir", async () => {
|
|
const wantedDependency = { bareSpecifier: './pnpm-local-resolver-0.1.1.tgz' }
|
|
const resolveResult = await resolveFromLocalPath({}, wantedDependency, {
|
|
lockfileDir: path.join(TEST_DIR, '..'),
|
|
projectDir: TEST_DIR,
|
|
})
|
|
|
|
expect(resolveResult).toEqual({
|
|
id: 'file:tgz/pnpm-local-resolver-0.1.1.tgz',
|
|
normalizedBareSpecifier: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
resolution: {
|
|
integrity: 'sha512-UHd2zKRT/w70KKzFlj4qcT81A1Q0H7NM9uKxLzIZ/VZqJXzt5Hnnp2PYPb5Ezq/hAamoYKIn5g7fuv69kP258w==',
|
|
tarball: 'file:tgz/pnpm-local-resolver-0.1.1.tgz',
|
|
},
|
|
resolvedVia: 'local-filesystem',
|
|
})
|
|
})
|
|
|
|
test('resolve tarball specified with file: protocol', async () => {
|
|
const wantedDependency = { bareSpecifier: 'file:./pnpm-local-resolver-0.1.1.tgz' }
|
|
const resolveResult = await resolveFromLocalScheme({}, wantedDependency, { projectDir: TEST_DIR })
|
|
|
|
expect(resolveResult).toEqual({
|
|
id: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
normalizedBareSpecifier: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
resolution: {
|
|
integrity: 'sha512-UHd2zKRT/w70KKzFlj4qcT81A1Q0H7NM9uKxLzIZ/VZqJXzt5Hnnp2PYPb5Ezq/hAamoYKIn5g7fuv69kP258w==',
|
|
tarball: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
},
|
|
resolvedVia: 'local-filesystem',
|
|
})
|
|
})
|
|
|
|
test('resolve file with different integrity (forceFetch)', async () => {
|
|
const wantedDependency = { bareSpecifier: 'file:./pnpm-local-resolver-0.1.1.tgz' }
|
|
const resolveResult = await resolveFromLocalScheme({}, wantedDependency, {
|
|
projectDir: TEST_DIR,
|
|
currentPkg: {
|
|
id: 'file:pnpm-local-resolver-0.1.1.tgz' as any, // eslint-disable-line
|
|
resolution: {
|
|
tarball: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
integrity: 'sha512-OLD_INTEGRITY',
|
|
},
|
|
},
|
|
})
|
|
|
|
expect(resolveResult).toEqual({
|
|
id: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
normalizedBareSpecifier: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
resolution: {
|
|
integrity: 'sha512-UHd2zKRT/w70KKzFlj4qcT81A1Q0H7NM9uKxLzIZ/VZqJXzt5Hnnp2PYPb5Ezq/hAamoYKIn5g7fuv69kP258w==',
|
|
tarball: 'file:pnpm-local-resolver-0.1.1.tgz',
|
|
},
|
|
resolvedVia: 'local-filesystem',
|
|
})
|
|
})
|
|
|
|
test('fail when resolving tarball specified with the link: protocol', async () => {
|
|
const wantedDependency = { bareSpecifier: 'link:./pnpm-local-resolver-0.1.1.tgz' }
|
|
await expect(
|
|
resolveFromLocalScheme({}, wantedDependency, { projectDir: TEST_DIR })
|
|
).rejects.toMatchObject({ code: 'ERR_PNPM_NOT_PACKAGE_DIRECTORY' })
|
|
})
|
|
|
|
test('fail when resolving from not existing directory an injected dependency', async () => {
|
|
const wantedDependency = { bareSpecifier: 'file:./dir-does-not-exist' }
|
|
const projectDir = import.meta.dirname
|
|
await expect(
|
|
resolveFromLocalScheme({}, wantedDependency, { projectDir })
|
|
).rejects.toThrow(`Could not install from "${path.join(projectDir, 'dir-does-not-exist')}" as it does not exist.`)
|
|
})
|
|
|
|
test('do not fail when resolving from not existing directory', async () => {
|
|
jest.spyOn(logger, 'warn')
|
|
const wantedDependency = { bareSpecifier: 'link:./dir-does-not-exist' }
|
|
const resolveResult = await resolveFromLocalScheme({}, wantedDependency, { projectDir: import.meta.dirname })
|
|
expect(resolveResult?.manifest).toStrictEqual({
|
|
name: 'dir-does-not-exist',
|
|
version: '0.0.0',
|
|
})
|
|
expect(logger.warn).toHaveBeenCalledWith({
|
|
message: `Installing a dependency from a non-existent directory: ${path.join(import.meta.dirname, './dir-does-not-exist')}`,
|
|
prefix: import.meta.dirname,
|
|
})
|
|
jest.mocked(logger.warn).mockRestore()
|
|
})
|
|
|
|
test('throw error when the path: protocol is used', async () => {
|
|
await expect(
|
|
resolveFromLocalScheme({}, { bareSpecifier: 'path:..' }, { projectDir: import.meta.dirname })
|
|
).rejects.toMatchObject({
|
|
code: 'ERR_PNPM_PATH_IS_UNSUPPORTED_PROTOCOL',
|
|
bareSpecifier: 'path:..',
|
|
protocol: 'path:',
|
|
})
|
|
})
|
|
|
|
test('resolveFromLocalPath ignores explicit local schemes', async () => {
|
|
await expect(resolveFromLocalScheme({}, { bareSpecifier: 'foo' }, { projectDir: import.meta.dirname })).resolves.toBeNull()
|
|
await expect(resolveFromLocalPath({}, { bareSpecifier: 'link:..' }, { projectDir: import.meta.dirname })).resolves.toBeNull()
|
|
await expect(resolveFromLocalPath({}, { bareSpecifier: 'workspace:..' }, { projectDir: import.meta.dirname })).resolves.toBeNull()
|
|
await expect(resolveFromLocalPath({}, { bareSpecifier: 'file:..' }, { projectDir: import.meta.dirname })).resolves.toBeNull()
|
|
await expect(resolveFromLocalPath({}, { bareSpecifier: 'path:..' }, { projectDir: import.meta.dirname })).resolves.toBeNull()
|
|
})
|