mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-12 10:11:42 -04:00
4d7cd56ccc
* 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.
170 lines
5.8 KiB
TypeScript
170 lines
5.8 KiB
TypeScript
import { expect, test } from '@jest/globals'
|
|
|
|
import { getPatchInfo } from '../src/getPatchInfo.js'
|
|
import type { PatchGroupRecord } from '../src/index.js'
|
|
|
|
test('getPatchInfo(undefined, ...) returns undefined', () => {
|
|
expect(getPatchInfo(undefined, 'foo', '1.0.0')).toBeUndefined()
|
|
})
|
|
|
|
test('getPatchInfo() returns an exact version patch if the name and version match', () => {
|
|
const patchedDependencies = {
|
|
foo: {
|
|
exact: {
|
|
'1.0.0': {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@1.0.0',
|
|
},
|
|
},
|
|
range: [],
|
|
all: undefined,
|
|
},
|
|
} satisfies PatchGroupRecord
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.0.0')).toStrictEqual(patchedDependencies.foo.exact['1.0.0'])
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.1.0')).toBeUndefined()
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '2.0.0')).toBeUndefined()
|
|
expect(getPatchInfo(patchedDependencies, 'bar', '1.0.0')).toBeUndefined()
|
|
})
|
|
|
|
test('getPatchInfo() returns a range version patch if the name matches and the version satisfied', () => {
|
|
const patchedDependencies = {
|
|
foo: {
|
|
exact: {},
|
|
range: [{
|
|
version: '1',
|
|
patch: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@1',
|
|
},
|
|
}],
|
|
all: undefined,
|
|
},
|
|
} satisfies PatchGroupRecord
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.0.0')).toStrictEqual(patchedDependencies.foo.range[0].patch)
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.1.0')).toStrictEqual(patchedDependencies.foo.range[0].patch)
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '2.0.0')).toBeUndefined()
|
|
expect(getPatchInfo(patchedDependencies, 'bar', '1.0.0')).toBeUndefined()
|
|
})
|
|
|
|
test('getPatchInfo() returns name-only patch if the name matches', () => {
|
|
const patchedDependencies = {
|
|
foo: {
|
|
exact: {},
|
|
range: [],
|
|
all: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo',
|
|
},
|
|
},
|
|
} satisfies PatchGroupRecord
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.0.0')).toStrictEqual(patchedDependencies.foo.all)
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.1.0')).toStrictEqual(patchedDependencies.foo.all)
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '2.0.0')).toStrictEqual(patchedDependencies.foo.all)
|
|
expect(getPatchInfo(patchedDependencies, 'bar', '1.0.0')).toBeUndefined()
|
|
})
|
|
|
|
test('exact version patches override version range patches, version range patches override name-only patches', () => {
|
|
const patchedDependencies = {
|
|
foo: {
|
|
exact: {
|
|
'1.0.0': {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@1.0.0',
|
|
},
|
|
'1.1.0': {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@1.1.0',
|
|
},
|
|
},
|
|
range: [
|
|
{
|
|
version: '1',
|
|
patch: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@1',
|
|
},
|
|
},
|
|
{
|
|
version: '2',
|
|
patch: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@2',
|
|
},
|
|
},
|
|
],
|
|
all: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo',
|
|
},
|
|
},
|
|
} satisfies PatchGroupRecord
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.0.0')).toStrictEqual(patchedDependencies.foo.exact['1.0.0'])
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.1.0')).toStrictEqual(patchedDependencies.foo.exact['1.1.0'])
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '1.1.1')).toStrictEqual(patchedDependencies.foo.range[0].patch)
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '2.0.0')).toStrictEqual(patchedDependencies.foo.range[1].patch)
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '2.1.0')).toStrictEqual(patchedDependencies.foo.range[1].patch)
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '3.0.0')).toStrictEqual(patchedDependencies.foo.all)
|
|
expect(getPatchInfo(patchedDependencies, 'bar', '1.0.0')).toBeUndefined()
|
|
})
|
|
|
|
test('getPatchInfo(_, name, version) throws an error when name@version matches more than one version range patches', () => {
|
|
const patchedDependencies = {
|
|
foo: {
|
|
exact: {},
|
|
range: [
|
|
{
|
|
version: '>=1.0.0 <3.0.0',
|
|
patch: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@>=1.0.0 <3.0.0',
|
|
},
|
|
},
|
|
{
|
|
version: '>=2.0.0',
|
|
patch: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@>=2.0.0',
|
|
},
|
|
},
|
|
],
|
|
all: undefined,
|
|
},
|
|
} satisfies PatchGroupRecord
|
|
expect(() => getPatchInfo(patchedDependencies, 'foo', '2.1.0')).toThrow(expect.objectContaining({
|
|
code: 'ERR_PNPM_PATCH_KEY_CONFLICT',
|
|
message: 'Unable to choose between 2 version ranges to patch foo@2.1.0: >=1.0.0 <3.0.0, >=2.0.0',
|
|
hint: 'Explicitly set the exact version (foo@2.1.0) to resolve conflict',
|
|
}))
|
|
})
|
|
|
|
test('getPatchInfo(_, name, version) does not throw an error when name@version matches an exact version patch and more than one version range patches', () => {
|
|
const patchedDependencies = {
|
|
foo: {
|
|
exact: {
|
|
'2.1.0': {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@>=1.0.0 <3.0.0',
|
|
},
|
|
},
|
|
range: [
|
|
{
|
|
version: '>=1.0.0 <3.0.0',
|
|
patch: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@>=1.0.0 <3.0.0',
|
|
},
|
|
},
|
|
{
|
|
version: '>=2.0.0',
|
|
patch: {
|
|
hash: '00000000000000000000000000000000',
|
|
key: 'foo@>=2.0.0',
|
|
},
|
|
},
|
|
],
|
|
all: undefined,
|
|
},
|
|
} satisfies PatchGroupRecord
|
|
expect(getPatchInfo(patchedDependencies, 'foo', '2.1.0')).toStrictEqual(patchedDependencies.foo.exact['2.1.0'])
|
|
})
|