mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-16 12:51:45 -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.
134 lines
4.0 KiB
TypeScript
134 lines
4.0 KiB
TypeScript
import { describe, expect, test } from '@jest/globals'
|
|
import { lockfileToDepGraph } from '@pnpm/deps.graph-hasher'
|
|
import type { BinaryResolution } from '@pnpm/resolving.resolver-base'
|
|
import type { DepPath } from '@pnpm/types'
|
|
|
|
test('lockfileToDepGraph', () => {
|
|
expect(lockfileToDepGraph({
|
|
lockfileVersion: '9.0',
|
|
importers: {},
|
|
packages: {
|
|
['foo@1.0.0' as DepPath]: {
|
|
dependencies: {
|
|
bar: '1.0.0',
|
|
},
|
|
optionalDependencies: {
|
|
qar: '1.0.0',
|
|
},
|
|
resolution: {
|
|
integrity: '0',
|
|
},
|
|
},
|
|
['bar@1.0.0' as DepPath]: {
|
|
dependencies: {
|
|
qar: '1.0.0',
|
|
},
|
|
resolution: {
|
|
integrity: '1',
|
|
},
|
|
},
|
|
['qar@1.0.0' as DepPath]: {
|
|
resolution: {
|
|
integrity: '2',
|
|
},
|
|
},
|
|
},
|
|
})).toStrictEqual({
|
|
'bar@1.0.0': {
|
|
children: {
|
|
qar: 'qar@1.0.0',
|
|
},
|
|
fullPkgId: 'bar@1.0.0:1',
|
|
},
|
|
'foo@1.0.0': {
|
|
children: {
|
|
bar: 'bar@1.0.0',
|
|
qar: 'qar@1.0.0',
|
|
},
|
|
fullPkgId: 'foo@1.0.0:0',
|
|
},
|
|
'qar@1.0.0': {
|
|
children: {},
|
|
fullPkgId: 'qar@1.0.0:2',
|
|
},
|
|
})
|
|
})
|
|
|
|
describe('lockfileToDepGraph with variations resolution', () => {
|
|
const glibcVariantIntegrity = 'sha256-glibc=='
|
|
const muslVariantIntegrity = 'sha256-musl=='
|
|
const darwinVariantIntegrity = 'sha256-darwin=='
|
|
|
|
// Always-explicit selectors — don't rely on process.platform / host libc so
|
|
// these tests produce the same result on glibc, musl, macOS, and Windows CI.
|
|
const linuxGlibcSelector = { os: ['linux'], cpu: ['x64'], libc: ['glibc'] }
|
|
const linuxMuslSelector = { os: ['linux'], cpu: ['x64'], libc: ['musl'] }
|
|
const darwinSelector = { os: ['darwin'], cpu: ['arm64'] }
|
|
|
|
function variantResolution (integrity: string): BinaryResolution {
|
|
return {
|
|
type: 'binary',
|
|
archive: 'tarball',
|
|
bin: 'bin/node',
|
|
integrity,
|
|
url: `https://example.com/${integrity}.tar.gz`,
|
|
}
|
|
}
|
|
|
|
const pkgWithVariants = {
|
|
resolution: {
|
|
type: 'variations' as const,
|
|
variants: [
|
|
{
|
|
// Linux default (glibc) — variant has no libc marker.
|
|
targets: [{ os: 'linux', cpu: 'x64' }],
|
|
resolution: variantResolution(glibcVariantIntegrity),
|
|
},
|
|
{
|
|
targets: [{ os: 'linux', cpu: 'x64', libc: 'musl' as const }],
|
|
resolution: variantResolution(muslVariantIntegrity),
|
|
},
|
|
{
|
|
targets: [{ os: 'darwin', cpu: 'arm64' }],
|
|
resolution: variantResolution(darwinVariantIntegrity),
|
|
},
|
|
],
|
|
},
|
|
}
|
|
|
|
function graphFor (selector: Parameters<typeof lockfileToDepGraph>[1]) {
|
|
return lockfileToDepGraph(
|
|
{
|
|
lockfileVersion: '9.0',
|
|
importers: {},
|
|
packages: {
|
|
['node@runtime:22.0.0' as DepPath]: pkgWithVariants,
|
|
},
|
|
},
|
|
selector
|
|
)
|
|
}
|
|
|
|
test('picks the linux glibc variant when supportedArchitectures matches it', () => {
|
|
expect(graphFor(linuxGlibcSelector)['node@runtime:22.0.0' as DepPath].fullPkgId)
|
|
.toBe(`node@runtime:22.0.0:${glibcVariantIntegrity}`)
|
|
})
|
|
|
|
test('picks the linux musl variant when supportedArchitectures.libc=musl', () => {
|
|
expect(graphFor(linuxMuslSelector)['node@runtime:22.0.0' as DepPath].fullPkgId)
|
|
.toBe(`node@runtime:22.0.0:${muslVariantIntegrity}`)
|
|
})
|
|
|
|
test('picks the darwin variant when supportedArchitectures.os=darwin', () => {
|
|
expect(graphFor(darwinSelector)['node@runtime:22.0.0' as DepPath].fullPkgId)
|
|
.toBe(`node@runtime:22.0.0:${darwinVariantIntegrity}`)
|
|
})
|
|
|
|
test('different variants produce different fullPkgIds for the same runtime version', () => {
|
|
const glibc = graphFor(linuxGlibcSelector)['node@runtime:22.0.0' as DepPath].fullPkgId
|
|
const musl = graphFor(linuxMuslSelector)['node@runtime:22.0.0' as DepPath].fullPkgId
|
|
const darwin = graphFor(darwinSelector)['node@runtime:22.0.0' as DepPath].fullPkgId
|
|
expect(new Set([glibc, musl, darwin]).size).toBe(3)
|
|
})
|
|
})
|