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.
73 lines
1.8 KiB
TypeScript
73 lines
1.8 KiB
TypeScript
import os, { cpus } from 'node:os'
|
|
|
|
import { afterEach, beforeEach, expect, jest, test } from '@jest/globals'
|
|
|
|
import { getDefaultWorkspaceConcurrency, getWorkspaceConcurrency, resetAvailableParallelismCache } from '../lib/concurrency.js'
|
|
|
|
const hostCores = cpus().length
|
|
|
|
beforeEach(() => {
|
|
resetAvailableParallelismCache()
|
|
})
|
|
|
|
afterEach(() => {
|
|
resetAvailableParallelismCache()
|
|
jest.restoreAllMocks()
|
|
})
|
|
|
|
function mockAvailableParallelism (value: number) {
|
|
if ('availableParallelism' in os) {
|
|
jest.spyOn(os, 'availableParallelism').mockReturnValue(value)
|
|
}
|
|
jest.spyOn(os, 'cpus').mockReturnValue(Array(value).fill(cpus()[0]))
|
|
}
|
|
|
|
test('getDefaultWorkspaceConcurrency: cpu num < 4', () => {
|
|
mockAvailableParallelism(1)
|
|
expect(getDefaultWorkspaceConcurrency(false)).toBe(1)
|
|
})
|
|
|
|
test('getDefaultWorkspaceConcurrency: cpu num > 4', () => {
|
|
mockAvailableParallelism(5)
|
|
expect(getDefaultWorkspaceConcurrency(false)).toBe(4)
|
|
})
|
|
|
|
test('getDefaultWorkspaceConcurrency: cpu num = 4', () => {
|
|
mockAvailableParallelism(4)
|
|
expect(getDefaultWorkspaceConcurrency(false)).toBe(4)
|
|
})
|
|
|
|
test('getDefaultWorkspaceConcurrency: using cache', () => {
|
|
mockAvailableParallelism(4)
|
|
expect(getDefaultWorkspaceConcurrency()).toBe(4)
|
|
|
|
mockAvailableParallelism(5)
|
|
expect(getDefaultWorkspaceConcurrency()).toBe(4)
|
|
})
|
|
|
|
test('default workspace concurrency', () => {
|
|
const n = getWorkspaceConcurrency(undefined)
|
|
|
|
expect(n).toBe(4)
|
|
})
|
|
|
|
test('get back positive amount', () => {
|
|
expect(getWorkspaceConcurrency(5)).toBe(5)
|
|
})
|
|
|
|
test('match host cores amount', () => {
|
|
const n = getWorkspaceConcurrency(0)
|
|
|
|
expect(n).toBe(hostCores)
|
|
})
|
|
|
|
test('host cores minus X', () => {
|
|
const n1 = getWorkspaceConcurrency(-1)
|
|
|
|
expect(n1).toBe(Math.max(1, hostCores - 1))
|
|
|
|
const n2 = getWorkspaceConcurrency(-9999)
|
|
|
|
expect(n2).toBe(1)
|
|
})
|