mirror of
https://github.com/pnpm/pnpm.git
synced 2026-06-28 09:55:39 -04:00
* 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
225 lines
5.9 KiB
TypeScript
225 lines
5.9 KiB
TypeScript
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { afterEach, expect, test } from '@jest/globals'
|
|
import { add } from '@pnpm/installing.commands'
|
|
import { prepare, preparePackages } from '@pnpm/prepare'
|
|
import { getMockAgent, setupMockAgent, teardownMockAgent } from '@pnpm/testing.mock-agent'
|
|
import { addDistTag } from '@pnpm/testing.registry-mock'
|
|
import { loadJsonFileSync } from 'load-json-file'
|
|
import { readYamlFileSync } from 'read-yaml-file'
|
|
|
|
import { DEFAULT_OPTS } from './utils/index.js'
|
|
|
|
// This must be a function because some of its values depend on CWD
|
|
const createOptions = (saveCatalogName = 'default'): add.AddCommandOptions => ({
|
|
...DEFAULT_OPTS,
|
|
saveCatalogName,
|
|
dir: process.cwd(),
|
|
cacheDir: path.resolve('cache'),
|
|
storeDir: path.resolve('store'),
|
|
})
|
|
|
|
afterEach(async () => {
|
|
await teardownMockAgent()
|
|
})
|
|
|
|
test('saveCatalogName creates new workspace manifest with the new catalogs', async () => {
|
|
const project = prepare({
|
|
name: 'test-save-catalog',
|
|
version: '0.0.0',
|
|
private: true,
|
|
})
|
|
|
|
await addDistTag({ package: '@pnpm.e2e/foo', version: '100.1.0', distTag: 'latest' })
|
|
|
|
await add.handler(createOptions(), ['@pnpm.e2e/foo'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toHaveProperty(['dependencies'], {
|
|
'@pnpm.e2e/foo': 'catalog:',
|
|
})
|
|
|
|
expect(readYamlFileSync('pnpm-workspace.yaml')).toHaveProperty(['catalog'], {
|
|
'@pnpm.e2e/foo': '^100.1.0',
|
|
})
|
|
|
|
expect(project.readLockfile()).toStrictEqual(expect.objectContaining({
|
|
catalogs: {
|
|
default: {
|
|
'@pnpm.e2e/foo': {
|
|
specifier: '^100.1.0',
|
|
version: '100.1.0',
|
|
},
|
|
},
|
|
},
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'@pnpm.e2e/foo': {
|
|
specifier: 'catalog:',
|
|
version: '100.1.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@pnpm.e2e/foo@100.1.0': {
|
|
resolution: expect.anything(),
|
|
},
|
|
},
|
|
}))
|
|
})
|
|
|
|
test('saveCatalogName works with different protocols', async () => {
|
|
const project = prepare({
|
|
name: 'test-save-catalog',
|
|
version: '0.0.0',
|
|
private: true,
|
|
})
|
|
// Mock the HEAD request that isRepoPublic() in @pnpm/resolving.git-resolver makes.
|
|
// Without this, transient network failures cause fallback to git+https:// resolution.
|
|
await setupMockAgent()
|
|
getMockAgent().enableNetConnect()
|
|
getMockAgent().get('https://github.com')
|
|
.intercept({ path: '/kevva/is-positive', method: 'HEAD' })
|
|
.reply(200)
|
|
|
|
const options = createOptions()
|
|
options.registries['@jsr'] = 'https://npm.jsr.io/'
|
|
await add.handler(options, [
|
|
'@pnpm.e2e/foo@100.1.0',
|
|
'jsr:@rus/greet@0.0.3',
|
|
'github:kevva/is-positive#97edff6',
|
|
])
|
|
|
|
expect(loadJsonFileSync('package.json')).toHaveProperty(['dependencies'], {
|
|
'@pnpm.e2e/foo': 'catalog:',
|
|
'@rus/greet': 'catalog:',
|
|
'is-positive': 'catalog:',
|
|
})
|
|
|
|
expect(readYamlFileSync('pnpm-workspace.yaml')).toHaveProperty(['catalog'], {
|
|
'@pnpm.e2e/foo': '100.1.0',
|
|
'@rus/greet': 'jsr:0.0.3',
|
|
'is-positive': 'github:kevva/is-positive#97edff6',
|
|
})
|
|
|
|
expect(project.readLockfile()).toStrictEqual(expect.objectContaining({
|
|
catalogs: {
|
|
default: {
|
|
'@pnpm.e2e/foo': {
|
|
specifier: '100.1.0',
|
|
version: '100.1.0',
|
|
},
|
|
'@rus/greet': {
|
|
specifier: 'jsr:0.0.3',
|
|
version: '0.0.3',
|
|
},
|
|
'is-positive': {
|
|
specifier: 'github:kevva/is-positive#97edff6',
|
|
version: '3.1.0',
|
|
},
|
|
},
|
|
},
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'@pnpm.e2e/foo': {
|
|
specifier: 'catalog:',
|
|
version: '100.1.0',
|
|
},
|
|
'@rus/greet': {
|
|
specifier: 'catalog:',
|
|
version: '@jsr/rus__greet@0.0.3',
|
|
},
|
|
'is-positive': {
|
|
specifier: 'catalog:',
|
|
version: 'https://codeload.github.com/kevva/is-positive/tar.gz/97edff6f525f192a3f83cea1944765f769ae2678',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}))
|
|
})
|
|
|
|
test('saveCatalogName does not work with local dependencies', async () => {
|
|
preparePackages([
|
|
{
|
|
name: 'local-dep',
|
|
version: '0.1.2-local',
|
|
private: true,
|
|
},
|
|
{
|
|
name: 'main',
|
|
version: '0.0.0',
|
|
private: true,
|
|
},
|
|
])
|
|
|
|
process.chdir('main')
|
|
|
|
await add.handler(createOptions(), ['../local-dep'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toStrictEqual({
|
|
name: 'main',
|
|
version: '0.0.0',
|
|
private: true,
|
|
dependencies: {
|
|
'local-dep': process.platform === 'win32'
|
|
? 'link:..\\local-dep'
|
|
: 'link:../local-dep',
|
|
},
|
|
})
|
|
|
|
expect(fs.existsSync('pnpm-workspace.yaml')).toBe(false)
|
|
|
|
expect(readYamlFileSync('pnpm-lock.yaml')).not.toHaveProperty(['catalog'])
|
|
expect(readYamlFileSync('pnpm-lock.yaml')).not.toHaveProperty(['catalogs'])
|
|
})
|
|
|
|
test('saveCatalogName with non-default name', async () => {
|
|
const project = prepare({
|
|
name: 'test-save-catalog',
|
|
version: '0.0.0',
|
|
private: true,
|
|
})
|
|
|
|
await addDistTag({ package: '@pnpm.e2e/foo', version: '100.1.0', distTag: 'latest' })
|
|
|
|
await add.handler(createOptions('my-catalog'), ['@pnpm.e2e/foo'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toHaveProperty(['dependencies'], {
|
|
'@pnpm.e2e/foo': 'catalog:my-catalog',
|
|
})
|
|
|
|
expect(readYamlFileSync('pnpm-workspace.yaml')).toHaveProperty(['catalogs', 'my-catalog'], {
|
|
'@pnpm.e2e/foo': '^100.1.0',
|
|
})
|
|
|
|
expect(project.readLockfile()).toStrictEqual(expect.objectContaining({
|
|
catalogs: {
|
|
'my-catalog': {
|
|
'@pnpm.e2e/foo': {
|
|
specifier: '^100.1.0',
|
|
version: '100.1.0',
|
|
},
|
|
},
|
|
},
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'@pnpm.e2e/foo': {
|
|
specifier: 'catalog:my-catalog',
|
|
version: '100.1.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@pnpm.e2e/foo@100.1.0': {
|
|
resolution: expect.anything(),
|
|
},
|
|
},
|
|
}))
|
|
})
|