mirror of
https://github.com/pnpm/pnpm.git
synced 2026-04-12 02:57:44 -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
158 lines
5.3 KiB
TypeScript
158 lines
5.3 KiB
TypeScript
/// <reference path="../../../__typings__/index.d.ts"/>
|
|
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { jest } from '@jest/globals'
|
|
import { fixtures } from '@pnpm/test-fixtures'
|
|
import { lexCompare } from '@pnpm/util.lex-comparator'
|
|
import { rimrafSync } from '@zkochan/rimraf'
|
|
|
|
const debug = jest.fn()
|
|
jest.unstable_mockModule('@pnpm/logger', () => {
|
|
return ({ globalWarn: jest.fn(), debug, logger: () => ({ debug }) })
|
|
})
|
|
const { createDirectoryFetcher } = await import('@pnpm/fetching.directory-fetcher')
|
|
|
|
const f = fixtures(import.meta.dirname)
|
|
|
|
test('fetch including only package files', async () => {
|
|
process.chdir(f.find('simple-pkg'))
|
|
const fetcher = createDirectoryFetcher({ includeOnlyPackageFiles: true })
|
|
|
|
// eslint-disable-next-line
|
|
const fetchResult = await fetcher.directory({} as any, {
|
|
directory: '.',
|
|
type: 'directory',
|
|
}, {
|
|
lockfileDir: process.cwd(),
|
|
})
|
|
|
|
expect(fetchResult.local).toBe(true)
|
|
expect(fetchResult.packageImportMethod).toBe('hardlink')
|
|
expect(fetchResult.filesMap.get('package.json')).toBe(path.resolve('package.json'))
|
|
|
|
// Only those files are included which would get published
|
|
expect(Array.from(fetchResult.filesMap.keys()).sort(lexCompare)).toStrictEqual([
|
|
'index.js',
|
|
'package.json',
|
|
])
|
|
})
|
|
|
|
test('fetch including all files', async () => {
|
|
process.chdir(f.find('simple-pkg'))
|
|
const fetcher = createDirectoryFetcher()
|
|
|
|
// eslint-disable-next-line
|
|
const fetchResult = await fetcher.directory({} as any, {
|
|
directory: '.',
|
|
type: 'directory',
|
|
}, {
|
|
lockfileDir: process.cwd(),
|
|
})
|
|
|
|
expect(fetchResult.local).toBe(true)
|
|
expect(fetchResult.packageImportMethod).toBe('hardlink')
|
|
expect(fetchResult.filesMap.get('package.json')).toBe(path.resolve('package.json'))
|
|
|
|
// Only those files are included which would get published
|
|
expect(Array.from(fetchResult.filesMap.keys()).sort(lexCompare)).toStrictEqual([
|
|
'index.js',
|
|
'package.json',
|
|
'test.js',
|
|
])
|
|
})
|
|
|
|
test('fetch a directory that has no package.json', async () => {
|
|
process.chdir(f.find('no-manifest'))
|
|
const fetcher = createDirectoryFetcher()
|
|
|
|
// eslint-disable-next-line
|
|
const fetchResult = await fetcher.directory({} as any, {
|
|
directory: '.',
|
|
type: 'directory',
|
|
}, {
|
|
lockfileDir: process.cwd(),
|
|
readManifest: true,
|
|
})
|
|
|
|
expect(fetchResult.manifest).toBeUndefined()
|
|
expect(fetchResult.local).toBe(true)
|
|
expect(fetchResult.packageImportMethod).toBe('hardlink')
|
|
expect(fetchResult.filesMap.get('index.js')).toBe(path.resolve('index.js'))
|
|
|
|
// Only those files are included which would get published
|
|
expect(Array.from(fetchResult.filesMap.keys()).sort(lexCompare)).toStrictEqual([
|
|
'index.js',
|
|
])
|
|
})
|
|
|
|
test('fetch does not fail on package with broken symlink', async () => {
|
|
jest.mocked(debug).mockClear()
|
|
process.chdir(f.find('pkg-with-broken-symlink'))
|
|
const fetcher = createDirectoryFetcher()
|
|
|
|
// eslint-disable-next-line
|
|
const fetchResult = await fetcher.directory({} as any, {
|
|
directory: '.',
|
|
type: 'directory',
|
|
}, {
|
|
lockfileDir: process.cwd(),
|
|
})
|
|
|
|
expect(fetchResult.local).toBe(true)
|
|
expect(fetchResult.packageImportMethod).toBe('hardlink')
|
|
expect(fetchResult.filesMap.get('package.json')).toBe(path.resolve('package.json'))
|
|
|
|
// Only those files are included which would get published
|
|
expect(Array.from(fetchResult.filesMap.keys()).sort(lexCompare)).toStrictEqual([
|
|
'index.js',
|
|
'package.json',
|
|
])
|
|
expect(debug).toHaveBeenCalledWith({ brokenSymlink: path.resolve('not-exists') })
|
|
})
|
|
|
|
describe('fetch resolves symlinked files to their real locations', () => {
|
|
const indexJsPath = path.join(f.find('no-manifest'), 'index.js')
|
|
const srcPath = f.find('simple-pkg')
|
|
beforeAll(async () => {
|
|
process.chdir(f.find('pkg-with-symlinked-dir-and-files'))
|
|
rimrafSync('index.js')
|
|
fs.symlinkSync(indexJsPath, path.resolve('index.js'), 'file')
|
|
rimrafSync('src')
|
|
fs.symlinkSync(srcPath, path.resolve('src'), 'dir')
|
|
})
|
|
test('fetch resolves symlinked files to their real locations', async () => {
|
|
const fetcher = createDirectoryFetcher({ resolveSymlinks: true })
|
|
// eslint-disable-next-line
|
|
const fetchResult = await fetcher.directory({} as any, {
|
|
directory: '.',
|
|
type: 'directory',
|
|
}, {
|
|
lockfileDir: process.cwd(),
|
|
})
|
|
|
|
expect(fetchResult.local).toBe(true)
|
|
expect(fetchResult.packageImportMethod).toBe('hardlink')
|
|
expect(fetchResult.filesMap.get('package.json')).toBe(path.resolve('package.json'))
|
|
expect(fetchResult.filesMap.get('index.js')).toBe(indexJsPath)
|
|
expect(fetchResult.filesMap.get('src/index.js')).toBe(path.join(srcPath, 'index.js'))
|
|
})
|
|
test('fetch does not resolve symlinked files to their real locations by default', async () => {
|
|
const fetcher = createDirectoryFetcher()
|
|
|
|
// eslint-disable-next-line
|
|
const fetchResult = await fetcher.directory({} as any, {
|
|
directory: '.',
|
|
type: 'directory',
|
|
}, {
|
|
lockfileDir: process.cwd(),
|
|
})
|
|
|
|
expect(fetchResult.local).toBe(true)
|
|
expect(fetchResult.packageImportMethod).toBe('hardlink')
|
|
expect(fetchResult.filesMap.get('package.json')).toBe(path.resolve('package.json'))
|
|
expect(fetchResult.filesMap.get('index.js')).toBe(path.resolve('index.js'))
|
|
expect(fetchResult.filesMap.get('src/index.js')).toBe(path.resolve('src/index.js'))
|
|
})
|
|
})
|