mirror of
https://github.com/pnpm/pnpm.git
synced 2026-07-22 13:42:50 -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.
114 lines
3.9 KiB
TypeScript
114 lines
3.9 KiB
TypeScript
import { expect, test } from '@jest/globals'
|
|
import type { PkgIdWithPatchHash, PkgResolutionId, ProjectRootDir } from '@pnpm/types'
|
|
|
|
import type { NodeId } from '../lib/nextNodeId.js'
|
|
import type { DependenciesTreeNode } from '../lib/resolveDependencies.js'
|
|
import { type PartialResolvedPackage, resolvePeers } from '../lib/resolvePeers.js'
|
|
|
|
test('packages are not deduplicated when versions do not match', async () => {
|
|
const fooPkg: PartialResolvedPackage = {
|
|
name: 'foo',
|
|
version: '1.0.0',
|
|
pkgIdWithPatchHash: 'foo/1.0.0' as PkgIdWithPatchHash,
|
|
id: '' as PkgResolutionId,
|
|
peerDependencies: {
|
|
bar: { version: '1.0.0 || 2.0.0' },
|
|
baz: { version: '1.0.0 || 2.0.0', optional: true },
|
|
},
|
|
}
|
|
|
|
const peers: Record<string, PartialResolvedPackage> = Object.fromEntries(
|
|
[
|
|
['bar', '1.0.0'],
|
|
['bar', '2.0.0'],
|
|
['baz', '1.0.0'],
|
|
['baz', '2.0.0'],
|
|
].map(([name, version]) => [
|
|
`${name}_${version.replace(/\./g, '_')}`,
|
|
{
|
|
name,
|
|
version,
|
|
pkgIdWithPatchHash: `${name}/${version}` as PkgIdWithPatchHash,
|
|
peerDependencies: {},
|
|
id: '' as PkgResolutionId,
|
|
} satisfies PartialResolvedPackage,
|
|
])
|
|
)
|
|
|
|
const { dependenciesByProjectId } = await resolvePeers({
|
|
allPeerDepNames: new Set(['bar', 'baz']),
|
|
projects: [
|
|
{
|
|
directNodeIdsByAlias: new Map([
|
|
['foo', '>project1>foo/1.0.0>' as NodeId],
|
|
['bar', '>project1>bar/1.0.0>' as NodeId],
|
|
]),
|
|
topParents: [],
|
|
rootDir: '' as ProjectRootDir,
|
|
id: 'project1' as PkgResolutionId,
|
|
},
|
|
{
|
|
directNodeIdsByAlias: new Map([
|
|
['foo', '>project2>foo/1.0.0>' as NodeId],
|
|
['bar', '>project2>bar/1.0.0>' as NodeId],
|
|
['baz', '>project2>baz/1.0.0>' as NodeId],
|
|
]),
|
|
topParents: [],
|
|
rootDir: '' as ProjectRootDir,
|
|
id: 'project2' as PkgResolutionId,
|
|
},
|
|
{
|
|
directNodeIdsByAlias: new Map([
|
|
['foo', '>project3>foo/1.0.0>' as NodeId],
|
|
['bar', '>project3>bar/2.0.0>' as NodeId],
|
|
]),
|
|
topParents: [],
|
|
rootDir: '' as ProjectRootDir,
|
|
id: 'project3' as PkgResolutionId,
|
|
},
|
|
{
|
|
directNodeIdsByAlias: new Map([
|
|
['foo', '>project4>foo/1.0.0>' as NodeId],
|
|
['bar', '>project4>bar/2.0.0>' as NodeId],
|
|
['baz', '>project4>baz/2.0.0>' as NodeId],
|
|
]),
|
|
topParents: [],
|
|
rootDir: '' as ProjectRootDir,
|
|
id: 'project4' as PkgResolutionId,
|
|
},
|
|
],
|
|
resolvedImporters: {},
|
|
dependenciesTree: new Map<NodeId, DependenciesTreeNode<PartialResolvedPackage>>(([
|
|
['>project1>foo/1.0.0>' as NodeId, fooPkg],
|
|
['>project1>bar/1.0.0>' as NodeId, peers.bar_1_0_0],
|
|
|
|
['>project2>foo/1.0.0>' as NodeId, fooPkg],
|
|
['>project2>bar/1.0.0>' as NodeId, peers.bar_1_0_0],
|
|
['>project2>baz/1.0.0>' as NodeId, peers.baz_1_0_0],
|
|
|
|
['>project3>foo/1.0.0>' as NodeId, fooPkg],
|
|
['>project3>bar/2.0.0>' as NodeId, peers.bar_2_0_0],
|
|
|
|
['>project4>foo/1.0.0>' as NodeId, fooPkg],
|
|
['>project4>bar/2.0.0>' as NodeId, peers.bar_2_0_0],
|
|
['>project4>baz/2.0.0>' as NodeId, peers.baz_2_0_0],
|
|
|
|
] satisfies Array<[NodeId, PartialResolvedPackage]>).map(([path, resolvedPackage]) => [path, {
|
|
children: {},
|
|
installable: {},
|
|
resolvedPackage,
|
|
depth: 0,
|
|
} as DependenciesTreeNode<PartialResolvedPackage>])),
|
|
dedupePeerDependents: true,
|
|
virtualStoreDir: '',
|
|
virtualStoreDirMaxLength: 120,
|
|
lockfileDir: '',
|
|
peersSuffixMaxLength: 1000,
|
|
workspaceProjectIds: new Set(),
|
|
})
|
|
|
|
expect(dependenciesByProjectId.project1.get('foo')).toEqual(dependenciesByProjectId.project2.get('foo'))
|
|
expect(dependenciesByProjectId.project1.get('foo')).not.toEqual(dependenciesByProjectId.project3.get('foo'))
|
|
expect(dependenciesByProjectId.project3.get('foo')).toEqual(dependenciesByProjectId.project4.get('foo'))
|
|
})
|