mirror of
https://github.com/pnpm/pnpm.git
synced 2026-07-23 14:13:09 -04:00
187049055f
* chore: upgrade @typescript/native-preview to 7.0.0-dev.20260421.2
- Add explicit `types: ["node"]` to the shared tsconfig because tsgo
20260421 no longer auto-acquires `@types/*` from `node_modules`.
- Refactor test files to explicitly import jest globals (`describe`,
`it`, `test`, `expect`, `beforeEach`, etc.) from `@jest/globals`
instead of relying on `@types/jest` ambient declarations. Under the
new tsgo build, `import { jest } from '@jest/globals'` shadows the
ambient `jest` namespace, breaking `@types/jest`'s `declare var
describe: jest.Describe;` globals.
- Add `@jest/globals` to each package's devDependencies where tests
now import from it, and add `@types/node` to packages that need it
but were relying on hoisted resolution.
- Replace `fail()` calls with `throw new Error(...)` since `fail` is
no longer globally available.
* chore: fix remaining tsgo type-strictness errors
- Strip `as <PnpmType>` casts on objects passed to toMatchObject /
toStrictEqual / toEqual; @jest/globals rejects the typed objects
(which include AsymmetricMatchers) vs. the repo-specific type.
- Type `jest.fn<...>()` explicitly where the mock's signature matters
for toHaveBeenCalledWith.
- Replace `beforeEach(() => X)` with `beforeEach(() => { X })` so the
return value is void, as the stricter jest typing requires.
- Use `expect.objectContaining({...})` in one place where the full
expected object triggered stricter type resolution.
- Cast `prompt.mock.calls` arg through `as unknown as Record<...>[]`
for patch.test.ts's nested-array matchers.
- Fix off-by-one `<reference path>` in pnpm/test/getConfig.test.ts
that only surfaced now.
- Move `@jest/globals` from devDependencies to dependencies in the
two `__utils__` packages that import it from `src/`.
- Clean up unused imports from the @jest/globals migration.
* chore: address Copilot review on #11332
- Move misplaced `@jest/globals` imports to the top import block in
checkEngine, run.ts, and workspace/root-finder tests where the
script dropped them below executable code.
- Replace `try { await x(); throw new Error('should have thrown') } catch`
in bins/linker, lockfile/fs, and resolving/local-resolver tests with
`await expect(x()).rejects.toMatchObject({...})`. The old pattern
swallowed an unrelated `throw` if the under-test call silently
succeeded, which would fail on the catch-block assertion with a
misleading message.
130 lines
4.8 KiB
TypeScript
130 lines
4.8 KiB
TypeScript
import fs, { promises as fsPromises } from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
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'),
|
|
])
|
|
})
|