mirror of
https://github.com/pnpm/pnpm.git
synced 2026-04-11 10:40:53 -04:00
## Summary Rename all internal packages so their npm names follow the `@pnpm/<domain>.<leaf>` convention, matching their directory structure. Also rename directories to remove redundancy and improve clarity. ### Bulk rename (94 packages) All `@pnpm/` packages now derive their name from their directory path using dot-separated segments. Exceptions: `packages/`, `__utils__/`, and `pnpm/artifacts/` keep leaf names only. ### Directory renames (removing redundant prefixes) - `cli/cli-meta` → `cli/meta`, `cli/cli-utils` → `cli/utils` - `config/config` → `config/reader`, `config/config-writer` → `config/writer` - `fetching/fetching-types` → `fetching/types` - `lockfile/lockfile-to-pnp` → `lockfile/to-pnp` - `store/store-connection-manager` → `store/connection-manager` - `store/store-controller-types` → `store/controller-types` - `store/store-path` → `store/path` ### Targeted renames (clarity improvements) - `deps/dependency-path` → `deps/path` (`@pnpm/deps.path`) - `deps/calc-dep-state` → `deps/graph-hasher` (`@pnpm/deps.graph-hasher`) - `deps/inspection/dependencies-hierarchy` → `deps/inspection/tree-builder` (`@pnpm/deps.inspection.tree-builder`) - `bins/link-bins` → `bins/linker`, `bins/remove-bins` → `bins/remover`, `bins/package-bins` → `bins/resolver` - `installing/get-context` → `installing/context` - `store/package-store` → `store/controller` - `pkg-manifest/manifest-utils` → `pkg-manifest/utils` ### Manifest reader/writer renames - `workspace/read-project-manifest` → `workspace/project-manifest-reader` (`@pnpm/workspace.project-manifest-reader`) - `workspace/write-project-manifest` → `workspace/project-manifest-writer` (`@pnpm/workspace.project-manifest-writer`) - `workspace/read-manifest` → `workspace/workspace-manifest-reader` (`@pnpm/workspace.workspace-manifest-reader`) - `workspace/manifest-writer` → `workspace/workspace-manifest-writer` (`@pnpm/workspace.workspace-manifest-writer`) ### Workspace package renames - `workspace/find-packages` → `workspace/projects-reader` - `workspace/find-workspace-dir` → `workspace/root-finder` - `workspace/resolve-workspace-range` → `workspace/range-resolver` - `workspace/filter-packages-from-dir` merged into `workspace/filter-workspace-packages` → `workspace/projects-filter` ### Domain moves - `pkg-manifest/read-project-manifest` → `workspace/project-manifest-reader` - `pkg-manifest/write-project-manifest` → `workspace/project-manifest-writer` - `pkg-manifest/exportable-manifest` → `releasing/exportable-manifest` ### Scope - 1206 files changed - Updated: package.json names/deps, TypeScript imports, tsconfig references, changeset files, renovate.json, test fixtures, import ordering
213 lines
10 KiB
TypeScript
213 lines
10 KiB
TypeScript
/// <reference path="../../../__typings__/index.d.ts"/>
|
|
import { createRequire } from 'node:module'
|
|
import path from 'node:path'
|
|
|
|
import { jest } from '@jest/globals'
|
|
import { logger } from '@pnpm/logger'
|
|
import { resolveFromLocal } 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 resolveFromLocal({}, { 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 resolveFromLocal({}, { 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 resolveFromLocal({ 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 resolveFromLocal(
|
|
{ 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 resolveFromLocal({}, { 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 resolveFromLocal({}, { 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 resolveFromLocal({}, { 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 resolveFromLocal({}, { 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 resolveFromLocal({}, 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 resolveFromLocal({}, 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 resolveFromLocal({}, 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 resolveFromLocal({}, 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 () => {
|
|
try {
|
|
const wantedDependency = { bareSpecifier: 'link:./pnpm-local-resolver-0.1.1.tgz' }
|
|
await resolveFromLocal({}, wantedDependency, { projectDir: TEST_DIR })
|
|
fail()
|
|
} catch (err: any) { // eslint-disable-line
|
|
expect(err).toBeDefined()
|
|
expect(err.code).toBe('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(
|
|
resolveFromLocal({}, 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 resolveFromLocal({}, 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 () => {
|
|
try {
|
|
await resolveFromLocal({}, { bareSpecifier: 'path:..' }, { projectDir: import.meta.dirname })
|
|
fail()
|
|
} catch (err: any) { // eslint-disable-line
|
|
expect(err).toBeDefined()
|
|
expect(err.code).toBe('ERR_PNPM_PATH_IS_UNSUPPORTED_PROTOCOL')
|
|
expect(err.bareSpecifier).toBe('path:..')
|
|
expect(err.protocol).toBe('path:')
|
|
}
|
|
})
|