mirror of
https://github.com/pnpm/pnpm.git
synced 2026-06-28 09:55:39 -04:00
ae2175829a
* feat(registry-access): extract setDistTag and dogfood from tests
Add `@pnpm/registry-access.commands#setDistTag` — the low-level PUT to
`/-/package/:pkg/dist-tags/:tag`. The CLI `dist-tag add` handler now
calls it instead of issuing the fetch inline.
Tests in this monorepo now use a thin new package
`@pnpm/testing.registry-mock` (REGISTRY_MOCK_PORT + REGISTRY_MOCK_CREDENTIALS
baked in) that delegates to `setDistTag`, replacing `addDistTag` from
`@pnpm/registry-mock`. That dropped helper relied on
`anonymous-npm-registry-client` and a verdaccio-era
fetch-then-DELETE-then-PUT dance that is no longer needed against
pnpm-registry.
39 test files swapped from `@pnpm/registry-mock` to
`@pnpm/testing.registry-mock`.
* fix: move setDistTag to its own package to break tsconfig project-reference cycle
testing/registry-mock → registry-access.commands → releasing/commands
→ installing/commands → installing/deps-installer → testing/registry-mock.
Extract setDistTag into @pnpm/registry-access.set-dist-tag (only depends
on @pnpm/error, @pnpm/network.fetch, @pnpm/npm-package-arg). Both
@pnpm/registry-access.commands and @pnpm/testing.registry-mock import
from it. Cycle gone.
* feat(registry-access): extract addUser helper, dogfood from login + tests
Add @pnpm/registry-access.add-user — a small helper that PUTs to
/-/user/org.couchdb.user:<name> and returns { token }. The CLI's
classicLogin (pnpm login fallback path) now calls it, and tests
use it via @pnpm/testing.registry-mock instead of the legacy
addUser from @pnpm/registry-mock.
Swapped 3 call sites: globalSetup.js, installing/deps-installer's
auth.ts, and pnpm/test/dlx.ts. AddUserHttpError exposes status +
text + parsed-json-if-applicable + headers so the CLI can still
do its OTP detection. One webauth-OTP login test mock had to be
adjusted to provide its body via `text` (JSON-stringified) rather
than `json` only, since the helper consumes the body via `text()`.
* refactor: consolidate set-dist-tag + add-user helpers into one @pnpm/registry-access.client package
One shared package is better than splitting per endpoint. Future endpoints
(publish, deprecate, etc.) can land here without another wrapper.
No behavioral change — same setDistTag and addUser exports as before,
just under one roof. Callers updated: registry-access.commands,
auth.commands, testing.registry-mock.
* fix(registry-access): sort imports
156 lines
3.6 KiB
TypeScript
156 lines
3.6 KiB
TypeScript
import path from 'node:path'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { install, update } from '@pnpm/installing.commands'
|
|
import { prepare } from '@pnpm/prepare'
|
|
import { addDistTag } from '@pnpm/testing.registry-mock'
|
|
import type { ProjectManifest } from '@pnpm/types'
|
|
import { loadJsonFileSync } from 'load-json-file'
|
|
|
|
import { DEFAULT_OPTS } from '../utils/index.js'
|
|
|
|
// This must be a function because some of its values depend on CWD
|
|
const createOptions = (jsr: string = DEFAULT_OPTS.registry) => ({
|
|
...DEFAULT_OPTS,
|
|
configByUri: {},
|
|
registries: {
|
|
...DEFAULT_OPTS.registries,
|
|
'@jsr': jsr,
|
|
},
|
|
dir: process.cwd(),
|
|
cacheDir: path.resolve('cache'),
|
|
storeDir: path.resolve('store'),
|
|
})
|
|
|
|
test('jsr without alias', async () => {
|
|
await addDistTag({ package: '@jsr/pnpm-e2e__bar', version: '2.0.0', distTag: 'latest' })
|
|
|
|
const project = prepare({
|
|
dependencies: {
|
|
'@pnpm-e2e/bar': 'jsr:1.0.0',
|
|
},
|
|
})
|
|
|
|
await install.handler(createOptions())
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'@pnpm-e2e/bar': {
|
|
specifier: 'jsr:1.0.0',
|
|
version: '@jsr/pnpm-e2e__bar@1.0.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__bar@1.0.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__bar@1.0.0': expect.any(Object),
|
|
},
|
|
})
|
|
|
|
await update.handler({
|
|
...createOptions(),
|
|
latest: true,
|
|
})
|
|
expect(loadJsonFileSync('package.json')).toMatchObject({
|
|
dependencies: {
|
|
'@pnpm-e2e/bar': 'jsr:2.0.0',
|
|
},
|
|
} as Partial<ProjectManifest>)
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'@pnpm-e2e/bar': {
|
|
specifier: 'jsr:2.0.0',
|
|
version: '@jsr/pnpm-e2e__bar@2.0.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__bar@2.0.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__bar@2.0.0': expect.any(Object),
|
|
},
|
|
})
|
|
})
|
|
|
|
test('jsr with alias', async () => {
|
|
await addDistTag({ package: '@jsr/pnpm-e2e__bar', version: '2.0.0', distTag: 'latest' })
|
|
|
|
const project = prepare({
|
|
dependencies: {
|
|
'bar-from-jsr': 'jsr:@pnpm-e2e/bar@1.0.0',
|
|
},
|
|
})
|
|
|
|
await install.handler(createOptions())
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'bar-from-jsr': {
|
|
specifier: 'jsr:@pnpm-e2e/bar@1.0.0',
|
|
version: '@jsr/pnpm-e2e__bar@1.0.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__bar@1.0.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__bar@1.0.0': expect.any(Object),
|
|
},
|
|
})
|
|
|
|
await update.handler({
|
|
...createOptions(),
|
|
latest: true,
|
|
})
|
|
expect(loadJsonFileSync('package.json')).toMatchObject({
|
|
dependencies: {
|
|
'bar-from-jsr': 'jsr:@pnpm-e2e/bar@2.0.0',
|
|
},
|
|
} as Partial<ProjectManifest>)
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'bar-from-jsr': {
|
|
specifier: 'jsr:@pnpm-e2e/bar@2.0.0',
|
|
version: '@jsr/pnpm-e2e__bar@2.0.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__bar@2.0.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__bar@2.0.0': expect.any(Object),
|
|
},
|
|
})
|
|
})
|