mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-13 19:16:21 -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.
88 lines
2.8 KiB
TypeScript
88 lines
2.8 KiB
TypeScript
import { expect, test } from '@jest/globals'
|
|
import type { ExtendedPatchInfo, PatchGroupRecord } from '@pnpm/patching.types'
|
|
|
|
import { groupPatchedDependencies } from '../src/groupPatchedDependencies.js'
|
|
|
|
function sanitizePatchGroupRecord (patchGroups: PatchGroupRecord): PatchGroupRecord {
|
|
for (const name in patchGroups) {
|
|
patchGroups[name].range.sort((a, b) => a.version.localeCompare(b.version))
|
|
}
|
|
return patchGroups
|
|
}
|
|
|
|
const _groupPatchedDependencies: typeof groupPatchedDependencies = patchedDependencies => sanitizePatchGroupRecord(groupPatchedDependencies(patchedDependencies))
|
|
|
|
test('groups patchedDependencies according to names, match types, and versions', () => {
|
|
const patchedDependencies: Record<string, string> = {
|
|
'exact-version-only@0.0.0': '00000000000000000000000000000000',
|
|
'exact-version-only@1.2.3': '00000000000000000000000000000000',
|
|
'exact-version-only@2.1.0': '00000000000000000000000000000000',
|
|
'version-range-only@~1.2.0': '00000000000000000000000000000000',
|
|
'version-range-only@4': '00000000000000000000000000000000',
|
|
'star-version-range@*': '00000000000000000000000000000000',
|
|
'without-versions': '00000000000000000000000000000000',
|
|
'mixed-style@0.1.2': '00000000000000000000000000000000',
|
|
'mixed-style@1.x.x': '00000000000000000000000000000000',
|
|
'mixed-style': '00000000000000000000000000000000',
|
|
}
|
|
const info = (key: keyof typeof patchedDependencies): ExtendedPatchInfo => ({
|
|
key,
|
|
hash: patchedDependencies[key],
|
|
})
|
|
expect(_groupPatchedDependencies(patchedDependencies)).toStrictEqual({
|
|
'exact-version-only': {
|
|
exact: {
|
|
'0.0.0': info('exact-version-only@0.0.0'),
|
|
'1.2.3': info('exact-version-only@1.2.3'),
|
|
'2.1.0': info('exact-version-only@2.1.0'),
|
|
},
|
|
range: [],
|
|
all: undefined,
|
|
},
|
|
'version-range-only': {
|
|
exact: {},
|
|
range: [
|
|
{
|
|
version: '~1.2.0',
|
|
patch: info('version-range-only@~1.2.0'),
|
|
},
|
|
{
|
|
version: '4',
|
|
patch: info('version-range-only@4'),
|
|
},
|
|
],
|
|
all: undefined,
|
|
},
|
|
'star-version-range': {
|
|
exact: {},
|
|
range: [],
|
|
all: info('star-version-range@*'),
|
|
},
|
|
'without-versions': {
|
|
exact: {},
|
|
range: [],
|
|
all: info('without-versions'),
|
|
},
|
|
'mixed-style': {
|
|
exact: {
|
|
'0.1.2': info('mixed-style@0.1.2'),
|
|
},
|
|
range: [
|
|
{
|
|
version: '1.x.x',
|
|
patch: info('mixed-style@1.x.x'),
|
|
},
|
|
],
|
|
all: info('mixed-style'),
|
|
},
|
|
} as PatchGroupRecord)
|
|
})
|
|
|
|
test('errors on invalid version range', async () => {
|
|
expect(() => _groupPatchedDependencies({
|
|
'foo@link:packages/foo': '00000000000000000000000000000000',
|
|
})).toThrow(expect.objectContaining({
|
|
code: 'ERR_PNPM_PATCH_NON_SEMVER_RANGE',
|
|
}))
|
|
})
|