mirror of
https://github.com/pnpm/pnpm.git
synced 2026-04-27 18:46:18 -04:00
4a36b9a110
## 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
129 lines
4.8 KiB
TypeScript
129 lines
4.8 KiB
TypeScript
import fs, { promises as fsPromises } from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { temporaryDirectory } from 'tempy'
|
|
|
|
import { getBinNodePaths } from '../src/getBinNodePaths.js'
|
|
|
|
// On Windows, temporaryDirectory() may return 8.3 short paths (e.g., RUNNER~1)
|
|
// but getBinNodePaths resolves these via fs.promises.realpath (the native
|
|
// implementation that uses GetFinalPathNameByHandleW), returning long paths.
|
|
// Use the same fs.promises.realpath so expected and received paths match.
|
|
// Note: fs.realpathSync does NOT resolve 8.3 names — it uses a JS-only
|
|
// implementation that only resolves symlinks.
|
|
async function tmpdir (): Promise<string> {
|
|
return fsPromises.realpath(temporaryDirectory())
|
|
}
|
|
|
|
test('returns package node_modules and sibling node_modules for virtual store layout', async () => {
|
|
const tmp = await tmpdir()
|
|
// Simulate: .pnpm/pkg@1.0.0/node_modules/pkg/bin/cli.js
|
|
const binPath = path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules', 'pkg', 'bin', 'cli.js')
|
|
fs.mkdirSync(path.dirname(binPath), { recursive: true })
|
|
fs.writeFileSync(binPath, '')
|
|
|
|
const result = await getBinNodePaths(binPath)
|
|
|
|
expect(result).toEqual([
|
|
path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules', 'pkg', 'node_modules'),
|
|
path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules'),
|
|
])
|
|
})
|
|
|
|
test('returns only the node_modules dir when binary is directly inside node_modules/pkg', async () => {
|
|
const tmp = await tmpdir()
|
|
// Simulate: node_modules/pkg/bin/cli.js
|
|
const binPath = path.join(tmp, 'node_modules', 'pkg', 'bin', 'cli.js')
|
|
fs.mkdirSync(path.dirname(binPath), { recursive: true })
|
|
fs.writeFileSync(binPath, '')
|
|
|
|
const result = await getBinNodePaths(binPath)
|
|
|
|
expect(result).toEqual([
|
|
path.join(tmp, 'node_modules', 'pkg', 'node_modules'),
|
|
path.join(tmp, 'node_modules'),
|
|
])
|
|
})
|
|
|
|
test('returns empty array when there is no node_modules ancestor', async () => {
|
|
const tmp = await tmpdir()
|
|
// Simulate: some/path/bin/cli.js (no node_modules)
|
|
const binPath = path.join(tmp, 'some', 'path', 'bin', 'cli.js')
|
|
fs.mkdirSync(path.dirname(binPath), { recursive: true })
|
|
fs.writeFileSync(binPath, '')
|
|
|
|
const result = await getBinNodePaths(binPath)
|
|
|
|
expect(result).toEqual([])
|
|
})
|
|
|
|
test('resolves symlinks to find the real path', async () => {
|
|
const tmp = await tmpdir()
|
|
// Real location: .pnpm/pkg@1.0.0/node_modules/pkg/bin/cli.js
|
|
const realBinDir = path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules', 'pkg', 'bin')
|
|
fs.mkdirSync(realBinDir, { recursive: true })
|
|
fs.writeFileSync(path.join(realBinDir, 'cli.js'), '')
|
|
|
|
// Symlink: node_modules/pkg -> .pnpm/pkg@1.0.0/node_modules/pkg
|
|
const symlinkTarget = path.join(tmp, 'node_modules', 'pkg')
|
|
fs.mkdirSync(path.join(tmp, 'node_modules'), { recursive: true })
|
|
fs.symlinkSync(
|
|
path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules', 'pkg'),
|
|
symlinkTarget,
|
|
'junction'
|
|
)
|
|
|
|
// Pass the symlinked path
|
|
const binPath = path.join(symlinkTarget, 'bin', 'cli.js')
|
|
const result = await getBinNodePaths(binPath)
|
|
|
|
// Should resolve through the symlink and return paths based on the real location
|
|
expect(result).toEqual([
|
|
path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules', 'pkg', 'node_modules'),
|
|
path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules'),
|
|
])
|
|
})
|
|
|
|
test('falls back to original path when target directory does not exist', async () => {
|
|
const tmp = await tmpdir()
|
|
// Path that does not exist on disk
|
|
const binPath = path.join(tmp, 'node_modules', 'pkg', 'bin', 'cli.js')
|
|
|
|
const result = await getBinNodePaths(binPath)
|
|
|
|
expect(result).toEqual([
|
|
path.join(tmp, 'node_modules', 'pkg', 'node_modules'),
|
|
path.join(tmp, 'node_modules'),
|
|
])
|
|
})
|
|
|
|
test('handles scoped packages in virtual store layout', async () => {
|
|
const tmp = await tmpdir()
|
|
// Simulate: .pnpm/@scope+pkg@1.0.0/node_modules/@scope/pkg/bin/cli.js
|
|
const binPath = path.join(tmp, '.pnpm', '@scope+pkg@1.0.0', 'node_modules', '@scope', 'pkg', 'bin', 'cli.js')
|
|
fs.mkdirSync(path.dirname(binPath), { recursive: true })
|
|
fs.writeFileSync(binPath, '')
|
|
|
|
const result = await getBinNodePaths(binPath)
|
|
|
|
expect(result).toEqual([
|
|
path.join(tmp, '.pnpm', '@scope+pkg@1.0.0', 'node_modules', '@scope', 'pkg', 'node_modules'),
|
|
path.join(tmp, '.pnpm', '@scope+pkg@1.0.0', 'node_modules'),
|
|
])
|
|
})
|
|
|
|
test('binary at root of package (no subdirectory)', async () => {
|
|
const tmp = await tmpdir()
|
|
// Simulate: .pnpm/pkg@1.0.0/node_modules/pkg/cli.js (binary at package root)
|
|
const binPath = path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules', 'pkg', 'cli.js')
|
|
fs.mkdirSync(path.dirname(binPath), { recursive: true })
|
|
fs.writeFileSync(binPath, '')
|
|
|
|
const result = await getBinNodePaths(binPath)
|
|
|
|
expect(result).toEqual([
|
|
path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules', 'pkg', 'node_modules'),
|
|
path.join(tmp, '.pnpm', 'pkg@1.0.0', 'node_modules'),
|
|
])
|
|
})
|