mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-13 11:05:52 -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.
67 lines
2.4 KiB
TypeScript
67 lines
2.4 KiB
TypeScript
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { expect } from '@jest/globals'
|
|
import { getIntegrity, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
|
import { StoreIndex, storeIndexKey } from '@pnpm/store.index'
|
|
|
|
export interface StoreAssertions {
|
|
getPkgIndexFilePath: (pkgName: string, version: string) => string
|
|
cafsHas: (pkgName: string, version: string) => void
|
|
cafsHasNot: (pkgName: string, version: string) => void
|
|
storeHas: (pkgName: string, version?: string) => void
|
|
storeHasNot: (pkgName: string, version?: string) => void
|
|
resolve: (pkgName: string, version?: string, relativePath?: string) => string
|
|
}
|
|
|
|
export function assertStore (
|
|
storePath: string,
|
|
encodedRegistryName?: string
|
|
): StoreAssertions {
|
|
// eslint-disable-next-line
|
|
const ok = (value: any) => expect(value).toBeTruthy()
|
|
// eslint-disable-next-line
|
|
const notOk = (value: any) => expect(value).toBeFalsy()
|
|
const ern = encodedRegistryName ?? `localhost+${REGISTRY_MOCK_PORT}`
|
|
const store = {
|
|
getPkgIndexFilePath (pkgName: string, version: string): string {
|
|
const integrity = getIntegrity(pkgName, version)
|
|
return storeIndexKey(integrity, `${pkgName}@${version}`)
|
|
},
|
|
cafsHas (pkgName: string, version: string): void {
|
|
const pathToCheck = store.getPkgIndexFilePath(pkgName, version)
|
|
const storeIndex = new StoreIndex(storePath)
|
|
try {
|
|
ok(storeIndex.get(pathToCheck) != null)
|
|
} finally {
|
|
storeIndex.close()
|
|
}
|
|
},
|
|
cafsHasNot (pkgName: string, version: string): void {
|
|
const pathToCheck = store.getPkgIndexFilePath(pkgName, version)
|
|
const storeIndex = new StoreIndex(storePath)
|
|
try {
|
|
notOk(storeIndex.get(pathToCheck) != null)
|
|
} finally {
|
|
storeIndex.close()
|
|
}
|
|
},
|
|
storeHas (pkgName: string, version?: string): void {
|
|
const pathToCheck = store.resolve(pkgName, version)
|
|
ok(fs.existsSync(pathToCheck))
|
|
},
|
|
storeHasNot (pkgName: string, version?: string): void {
|
|
const pathToCheck = store.resolve(pkgName, version)
|
|
notOk(fs.existsSync(pathToCheck))
|
|
},
|
|
resolve (pkgName: string, version?: string, relativePath?: string): string {
|
|
const pkgFolder = version ? path.join(ern, pkgName, version) : pkgName
|
|
if (relativePath) {
|
|
return path.join(storePath, pkgFolder, relativePath)
|
|
}
|
|
return path.join(storePath, pkgFolder)
|
|
},
|
|
}
|
|
return store
|
|
}
|