mirror of
https://github.com/pnpm/pnpm.git
synced 2026-04-11 02:29:48 -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
309 lines
8.0 KiB
TypeScript
309 lines
8.0 KiB
TypeScript
import path from 'node:path'
|
|
|
|
import { jest } from '@jest/globals'
|
|
import type { DepPath, ProjectId } from '@pnpm/types'
|
|
import { temporaryDirectory } from 'tempy'
|
|
|
|
jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() }))
|
|
|
|
const { getCurrentBranch } = await import('@pnpm/network.git-utils')
|
|
const {
|
|
existsNonEmptyWantedLockfile,
|
|
readCurrentLockfile,
|
|
readWantedLockfile,
|
|
writeCurrentLockfile,
|
|
writeWantedLockfile,
|
|
} = await import('@pnpm/lockfile.fs')
|
|
|
|
process.chdir(import.meta.dirname)
|
|
|
|
test('readWantedLockfile()', async () => {
|
|
{
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '2'), {
|
|
ignoreIncompatible: false,
|
|
})
|
|
expect(lockfile?.lockfileVersion).toBe('9.0')
|
|
expect(lockfile?.importers).toStrictEqual({
|
|
'.': {
|
|
dependencies: {
|
|
foo: '1.0.0',
|
|
},
|
|
devDependencies: undefined,
|
|
optionalDependencies: undefined,
|
|
specifiers: {
|
|
foo: '1',
|
|
},
|
|
dependenciesMeta: {
|
|
foo: { injected: true },
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
try {
|
|
await readWantedLockfile(path.join('fixtures', '3'), {
|
|
ignoreIncompatible: false,
|
|
wantedVersions: ['3'],
|
|
})
|
|
fail()
|
|
} catch (err: any) { // eslint-disable-line
|
|
expect(err.code).toBe('ERR_PNPM_LOCKFILE_BREAKING_CHANGE')
|
|
}
|
|
})
|
|
|
|
test('readWantedLockfile() when lockfileVersion is a string', async () => {
|
|
{
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '4'), {
|
|
ignoreIncompatible: false,
|
|
wantedVersions: ['3'],
|
|
})
|
|
expect(lockfile!.lockfileVersion).toBe('v3')
|
|
}
|
|
|
|
{
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '5'), {
|
|
ignoreIncompatible: false,
|
|
wantedVersions: ['3'],
|
|
})
|
|
expect(lockfile!.lockfileVersion).toBe('3')
|
|
}
|
|
})
|
|
|
|
test('readCurrentLockfile()', async () => {
|
|
const lockfile = await readCurrentLockfile('fixtures/2/node_modules/.pnpm', {
|
|
ignoreIncompatible: false,
|
|
})
|
|
expect(lockfile!.lockfileVersion).toBe('6.0')
|
|
})
|
|
|
|
test('writeWantedLockfile()', async () => {
|
|
const projectPath = temporaryDirectory()
|
|
const wantedLockfile = {
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'is-negative': '1.0.0',
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-negative': '^1.0.0',
|
|
'is-positive': '^1.0.0',
|
|
},
|
|
},
|
|
},
|
|
lockfileVersion: '9.0',
|
|
packages: {
|
|
'is-negative@1.0.0': {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@2.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
},
|
|
registry: 'https://registry.npmjs.org',
|
|
}
|
|
await writeWantedLockfile(projectPath, wantedLockfile)
|
|
expect(await readCurrentLockfile(projectPath, { ignoreIncompatible: false })).toBeNull()
|
|
expect(await readWantedLockfile(projectPath, { ignoreIncompatible: false })).toEqual(wantedLockfile)
|
|
})
|
|
|
|
test('writeCurrentLockfile()', async () => {
|
|
const projectPath = temporaryDirectory()
|
|
const wantedLockfile = {
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'is-negative': '1.0.0',
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-negative': '^1.0.0',
|
|
'is-positive': '^1.0.0',
|
|
},
|
|
},
|
|
},
|
|
lockfileVersion: '9.0',
|
|
packages: {
|
|
'is-negative@1.0.0': {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@2.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
},
|
|
registry: 'https://registry.npmjs.org',
|
|
}
|
|
await writeCurrentLockfile(projectPath, wantedLockfile)
|
|
expect(await readWantedLockfile(projectPath, { ignoreIncompatible: false })).toBeNull()
|
|
expect(await readCurrentLockfile(projectPath, { ignoreIncompatible: false })).toEqual(wantedLockfile)
|
|
})
|
|
|
|
test('existsNonEmptyWantedLockfile()', async () => {
|
|
const projectPath = temporaryDirectory()
|
|
expect(await existsNonEmptyWantedLockfile(projectPath)).toBe(false)
|
|
await writeWantedLockfile(projectPath, {
|
|
importers: {
|
|
['.' as ProjectId]: {
|
|
dependencies: {
|
|
'is-negative': '1.0.0',
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-negative': '^1.0.0',
|
|
'is-positive': '^1.0.0',
|
|
},
|
|
},
|
|
},
|
|
lockfileVersion: '3',
|
|
packages: {
|
|
['is-negative/1.0.0' as DepPath]: {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
['is-positive/1.0.0' as DepPath]: {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
['is-positive/2.0.0' as DepPath]: {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
},
|
|
})
|
|
expect(await existsNonEmptyWantedLockfile(projectPath)).toBe(true)
|
|
})
|
|
|
|
test('readWantedLockfile() when useGitBranchLockfile', async () => {
|
|
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve('branch'))
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '6'), {
|
|
ignoreIncompatible: false,
|
|
})
|
|
expect(lockfile?.importers).toEqual({
|
|
'.': {
|
|
dependencies: {
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-positive': '1.0.0',
|
|
},
|
|
},
|
|
})
|
|
expect(lockfile?.packages).toStrictEqual({
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
})
|
|
|
|
const gitBranchLockfile = await readWantedLockfile(path.join('fixtures', '6'), {
|
|
ignoreIncompatible: false,
|
|
useGitBranchLockfile: true,
|
|
})
|
|
expect(gitBranchLockfile?.importers).toEqual({
|
|
'.': {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
},
|
|
})
|
|
expect(gitBranchLockfile?.packages).toStrictEqual({
|
|
'is-positive@2.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
})
|
|
})
|
|
|
|
test('readWantedLockfile() when useGitBranchLockfile and mergeGitBranchLockfiles', async () => {
|
|
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve('branch'))
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '6'), {
|
|
ignoreIncompatible: false,
|
|
useGitBranchLockfile: true,
|
|
mergeGitBranchLockfiles: true,
|
|
})
|
|
expect(lockfile?.importers).toEqual({
|
|
'.': {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
},
|
|
})
|
|
expect(lockfile?.packages).toStrictEqual({
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@2.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
})
|
|
})
|
|
|
|
test('readWantedLockfile() with inlineSpecifiersFormat', async () => {
|
|
const wantedLockfile = {
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-positive': '^1.0.0',
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
},
|
|
registry: 'https://registry.npmjs.org',
|
|
}
|
|
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '7'), { ignoreIncompatible: false })
|
|
expect(lockfile?.importers).toEqual(wantedLockfile.importers)
|
|
expect(lockfile?.packages).toEqual(wantedLockfile.packages)
|
|
})
|