mirror of
https://github.com/pnpm/pnpm.git
synced 2026-07-23 06:02:50 -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.
103 lines
2.6 KiB
TypeScript
103 lines
2.6 KiB
TypeScript
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { afterEach, expect, jest, test } from '@jest/globals'
|
|
import { prepareEmpty } from '@pnpm/prepare'
|
|
|
|
import { DIR, extendFilesMap, type ExtendFilesMapStats, type InodeMap } from '../src/DirPatcher.js'
|
|
|
|
const originalStat = fs.promises.stat
|
|
|
|
function mockFsPromiseStat (): jest.Mock {
|
|
const mockedMethod = jest.fn(fs.promises.stat)
|
|
fs.promises.stat = mockedMethod as typeof fs.promises.stat
|
|
return mockedMethod as jest.Mock
|
|
}
|
|
|
|
afterEach(() => {
|
|
jest.restoreAllMocks()
|
|
fs.promises.stat = originalStat
|
|
})
|
|
|
|
test('without provided stats', async () => {
|
|
prepareEmpty()
|
|
|
|
const filePaths = [
|
|
'deep/a/b/c/d/e/f.txt',
|
|
'foo/foo.txt',
|
|
'foo/bar.txt',
|
|
'foo_bar.txt',
|
|
]
|
|
const filesMap = new Map<string, string>()
|
|
for (const filePath of filePaths) {
|
|
filesMap.set(filePath, path.resolve(filePath))
|
|
fs.mkdirSync(path.dirname(filePath), { recursive: true })
|
|
fs.writeFileSync(filePath, '')
|
|
}
|
|
|
|
const statMethod = mockFsPromiseStat()
|
|
|
|
expect(await extendFilesMap({ filesMap })).toStrictEqual({
|
|
'.': DIR,
|
|
deep: DIR,
|
|
'deep/a': DIR,
|
|
'deep/a/b': DIR,
|
|
'deep/a/b/c': DIR,
|
|
'deep/a/b/c/d': DIR,
|
|
'deep/a/b/c/d/e': DIR,
|
|
'deep/a/b/c/d/e/f.txt': fs.statSync('deep/a/b/c/d/e/f.txt').ino,
|
|
foo: DIR,
|
|
'foo/foo.txt': fs.statSync('foo/foo.txt').ino,
|
|
'foo/bar.txt': fs.statSync('foo/bar.txt').ino,
|
|
'foo_bar.txt': fs.statSync('foo_bar.txt').ino,
|
|
} as InodeMap)
|
|
|
|
for (const filePath of filePaths) {
|
|
expect(statMethod).toHaveBeenCalledWith(filesMap.get(filePath))
|
|
}
|
|
})
|
|
|
|
test('with provided stats', async () => {
|
|
prepareEmpty()
|
|
|
|
const startingIno = 7000
|
|
const inoIncrement = 100
|
|
const filePaths = [
|
|
'deep/a/b/c/d/e/f.txt',
|
|
'foo/foo.txt',
|
|
'foo/bar.txt',
|
|
'foo_bar.txt',
|
|
]
|
|
const filesMap = new Map<string, string>()
|
|
const filesStats: Record<string, ExtendFilesMapStats> = {}
|
|
let ino = startingIno
|
|
for (const filePath of filePaths) {
|
|
filesMap.set(filePath, path.resolve(filePath))
|
|
filesStats[filePath] = {
|
|
ino,
|
|
isDirectory: () => false,
|
|
isFile: () => true,
|
|
}
|
|
ino += inoIncrement
|
|
}
|
|
|
|
const statMethod = mockFsPromiseStat()
|
|
|
|
expect(await extendFilesMap({ filesMap, filesStats })).toStrictEqual({
|
|
'.': DIR,
|
|
deep: DIR,
|
|
'deep/a': DIR,
|
|
'deep/a/b': DIR,
|
|
'deep/a/b/c': DIR,
|
|
'deep/a/b/c/d': DIR,
|
|
'deep/a/b/c/d/e': DIR,
|
|
'deep/a/b/c/d/e/f.txt': startingIno,
|
|
foo: DIR,
|
|
'foo/foo.txt': startingIno + inoIncrement,
|
|
'foo/bar.txt': startingIno + 2 * inoIncrement,
|
|
'foo_bar.txt': startingIno + 3 * inoIncrement,
|
|
} as InodeMap)
|
|
|
|
expect(statMethod).not.toHaveBeenCalled()
|
|
})
|