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.
113 lines
3.0 KiB
TypeScript
113 lines
3.0 KiB
TypeScript
import { expect, test } from '@jest/globals'
|
|
|
|
import { diffDir, DIR, type DirDiff, type InodeMap } from '../src/DirPatcher.js'
|
|
|
|
test('produces a diff', () => {
|
|
const unchangedParts = {
|
|
'not-changed': DIR,
|
|
'not-changed/foo': DIR,
|
|
'not-changed/foo/foo.txt': 123,
|
|
'not-changed/foo/bar.txt': 456,
|
|
'not-changed/bar': DIR,
|
|
'some-files-changed/not-changed.txt': 623,
|
|
'some-parts-deleted/file-not-deleted.txt': 624,
|
|
'some-parts-added/file-not-added.txt': 145,
|
|
} satisfies InodeMap
|
|
|
|
const oldModifiedParts = {
|
|
'some-files-changed': DIR,
|
|
'some-files-changed/changed-file.txt': 887,
|
|
} satisfies InodeMap
|
|
|
|
const newModifiedParts: typeof oldModifiedParts = {
|
|
'some-files-changed': DIR,
|
|
'some-files-changed/changed-file.txt': 553,
|
|
}
|
|
|
|
const oldOnlyParts = {
|
|
'some-parts-deleted': DIR,
|
|
'some-parts-deleted/file-deleted.txt': 654,
|
|
'some-parts-deleted/dir-deleted': DIR,
|
|
'some-parts-deleted/dir-deleted/foo.txt': 325,
|
|
'some-parts-deleted/dir-deleted/bar.txt': 231,
|
|
} satisfies InodeMap
|
|
|
|
const newOnlyParts = {
|
|
'some-parts-added': DIR,
|
|
'some-parts-added/file-added.txt': 362,
|
|
'some-parts-added/dir-added': DIR,
|
|
'some-parts-added/dir-added/foo.txt': 472,
|
|
'some-parts-added/dir-added/bar.txt': 241,
|
|
} satisfies InodeMap
|
|
|
|
const oldIndex: InodeMap = {
|
|
...unchangedParts,
|
|
...oldModifiedParts,
|
|
...oldOnlyParts,
|
|
}
|
|
|
|
const newIndex: InodeMap = {
|
|
...unchangedParts,
|
|
...newModifiedParts,
|
|
...newOnlyParts,
|
|
}
|
|
|
|
const expectedDiff: DirDiff = {
|
|
added: [
|
|
{
|
|
path: 'some-parts-added',
|
|
newValue: DIR,
|
|
},
|
|
{
|
|
path: 'some-parts-added/dir-added',
|
|
newValue: DIR,
|
|
},
|
|
{
|
|
path: 'some-parts-added/file-added.txt',
|
|
newValue: newOnlyParts['some-parts-added/file-added.txt'],
|
|
},
|
|
{
|
|
path: 'some-parts-added/dir-added/bar.txt',
|
|
newValue: newOnlyParts['some-parts-added/dir-added/bar.txt'],
|
|
},
|
|
{
|
|
path: 'some-parts-added/dir-added/foo.txt',
|
|
newValue: newOnlyParts['some-parts-added/dir-added/foo.txt'],
|
|
},
|
|
],
|
|
modified: [
|
|
{
|
|
path: 'some-files-changed/changed-file.txt',
|
|
oldValue: oldModifiedParts['some-files-changed/changed-file.txt'],
|
|
newValue: newModifiedParts['some-files-changed/changed-file.txt'],
|
|
},
|
|
],
|
|
removed: [
|
|
{
|
|
path: 'some-parts-deleted',
|
|
oldValue: DIR,
|
|
},
|
|
{
|
|
path: 'some-parts-deleted/dir-deleted',
|
|
oldValue: DIR,
|
|
},
|
|
{
|
|
path: 'some-parts-deleted/file-deleted.txt',
|
|
oldValue: oldOnlyParts['some-parts-deleted/file-deleted.txt'],
|
|
},
|
|
{
|
|
path: 'some-parts-deleted/dir-deleted/bar.txt',
|
|
oldValue: oldOnlyParts['some-parts-deleted/dir-deleted/bar.txt'],
|
|
},
|
|
{
|
|
path: 'some-parts-deleted/dir-deleted/foo.txt',
|
|
oldValue: oldOnlyParts['some-parts-deleted/dir-deleted/foo.txt'],
|
|
},
|
|
],
|
|
}
|
|
|
|
const receivedDiff = diffDir(oldIndex, newIndex)
|
|
|
|
expect(receivedDiff).toStrictEqual(expectedDiff)
|
|
})
|