From 9f75cfb7bcf559122443c4485017212e3fbf2a34 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 22 Jan 2024 18:42:05 +0100 Subject: [PATCH 1/4] feat(use): add `--from-npm` CLI flag --- README.md | 4 ++- sources/commands/Base.ts | 11 +++++++-- sources/commands/Use.ts | 53 +++++++++++++++++++++++++++++++++------- sources/specUtils.ts | 2 +- tests/Use.test.ts | 19 ++++++++++++++ 5 files changed, 76 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 18bcf88e9..7877e3108 100644 --- a/README.md +++ b/README.md @@ -200,11 +200,13 @@ calling their respective binaries outside of projects defining the Download the selected package managers and store them inside a tarball suitable for use with `corepack install -g`. -### `corepack use ]>` +### `corepack use ]> [--from-npm]` When run, this command will retrieve the latest release matching the provided descriptor, assign it to the project's package.json file, and automatically perform an install. +When passing the `--from-npm` flag, Corepack will use the latest version of the +package with the corresponding name from the npm registry. ### `corepack up` diff --git a/sources/commands/Base.ts b/sources/commands/Base.ts index 78556f292..1e4ed420b 100644 --- a/sources/commands/Base.ts +++ b/sources/commands/Base.ts @@ -49,9 +49,16 @@ export abstract class BaseCommand extends Command { const newContent = nodeUtils.normalizeLineEndings(content, `${JSON.stringify(data, null, indent)}\n`); await fs.promises.writeFile(lookup.target, newContent, `utf8`); - const command = this.context.engine.getPackageManagerSpecFor(info.locator).commands?.use ?? null; - if (command === null) + let command: Array; + try { + const _command = this.context.engine.getPackageManagerSpecFor(info.locator).commands?.use; + if (_command == null) + return 0; + + command = _command; + } catch { return 0; + } // Adding it into the environment avoids breaking package managers that // don't expect those options. diff --git a/sources/commands/Use.ts b/sources/commands/Use.ts index 13c96b4ae..736fc0539 100644 --- a/sources/commands/Use.ts +++ b/sources/commands/Use.ts @@ -1,12 +1,20 @@ import {Command, Option, UsageError} from 'clipanion'; + +import {fetchLatestStableVersion} from '../corepackUtils'; + import {BaseCommand} from './Base'; + export class UseCommand extends BaseCommand { static paths = [ [`use`], ]; + fromNpm = Option.Boolean(`--from-npm`, false, { + description: `If true, the package manager will be installed from the npm registry`, + }); + static usage = Command.Usage({ description: `Define the package manager to use for the current project`, details: ` @@ -17,24 +25,51 @@ export class UseCommand extends BaseCommand { examples: [[ `Configure the project to use the latest Yarn release`, `corepack use yarn`, + ], [ + `Configure the project to use the latest Yarn release available from the "yarn" package on the npm registry`, + `corepack use yarn --from-npm`, ]], }); pattern = Option.String(); async execute() { - const [descriptor] = await this.resolvePatternsToDescriptors({ - all: false, - patterns: [this.pattern], - }); + let packageManagerInfo: Parameters[0]; + if (this.fromNpm) { + const registry = { + type: `npm` as const, + package: this.pattern, + }; + const versionWithHash = await fetchLatestStableVersion(registry); + const [version, hash] = versionWithHash.split(`+`); + const location = `https://registry.npmjs.com/${this.pattern}/-/${this.pattern}-${version}.tgz`; + packageManagerInfo = { + locator: { + name: this.pattern as any, + reference: location, + }, + spec: { + bin: {}, + registry, + url: location, + }, + hash, + location, + }; + } else { + const [descriptor] = await this.resolvePatternsToDescriptors({ + all: false, + patterns: [this.pattern], + }); - const resolved = await this.context.engine.resolveDescriptor(descriptor, {allowTags: true, useCache: false}); - if (resolved === null) - throw new UsageError(`Failed to successfully resolve '${descriptor.range}' to a valid ${descriptor.name} release`); + const resolved = await this.context.engine.resolveDescriptor(descriptor, {allowTags: true, useCache: false}); + if (resolved === null) + throw new UsageError(`Failed to successfully resolve '${descriptor.range}' to a valid ${descriptor.name} release`); - this.context.stdout.write(`Installing ${resolved.name}@${resolved.reference} in the project...\n`); + this.context.stdout.write(`Installing ${resolved.name}@${resolved.reference} in the project...\n`); - const packageManagerInfo = await this.context.engine.ensurePackageManager(resolved); + packageManagerInfo = await this.context.engine.ensurePackageManager(resolved); + } await this.setLocalPackageManager(packageManagerInfo); } } diff --git a/sources/specUtils.ts b/sources/specUtils.ts index dcf51f9b3..451245a2a 100644 --- a/sources/specUtils.ts +++ b/sources/specUtils.ts @@ -17,7 +17,7 @@ export function parseSpec(raw: unknown, source: string, {enforceExactVersion = t throw new UsageError(`Invalid package manager specification in ${source} (${raw}); expected a semver version${enforceExactVersion ? `` : `, range, or tag`}`); if (!isSupportedPackageManager(match[1])) - throw new UsageError(`Unsupported package manager specification (${match})`); + throw new UsageError(`Unsupported package manager specification (${match}) ${enforceExactVersion ? `` : `. Consider using the \`--from-npm\` flag if you meant to use the npm package \`${match[1]}\` as your package manager`}`); return { name: match[1], diff --git a/tests/Use.test.ts b/tests/Use.test.ts index 10deef19e..93092686f 100644 --- a/tests/Use.test.ts +++ b/tests/Use.test.ts @@ -63,4 +63,23 @@ describe(`UseCommand`, () => { }); }); }); + + it(`should accept --from-npm CLI flag`, async () => { + await xfs.mktempPromise(async cwd => { + await expect(runCli(cwd, [`use`, `test`])).resolves.toMatchObject({ + exitCode: 1, + stdout: /Invalid package manager specification in CLI arguments. Consider adding the `--from-npm` flag if you meant to use the npm package `test` as your package manager/, + stderr: ``, + }); + + await expect(runCli(cwd, [`use`, `test`, `--from-npm`])).resolves.toMatchObject({ + exitCode: 0, + stderr: ``, + }); + + await expect(xfs.readJsonPromise(ppath.join(cwd, `package.json`))).resolves.toMatchObject({ + packageManager: `test@https://registry.npmjs.com/test/-/test-3.3.0.tgz+sha1.a2b56c6aa386c5732065793e8d9d92074a9cdd41`, + }); + }); + }); }); From 7d57f9f53204295124523b0fa54575a4965ba5b0 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 22 Jan 2024 23:35:42 +0100 Subject: [PATCH 2/4] fixes --- sources/commands/Base.ts | 2 +- sources/commands/Use.ts | 6 ++++-- tests/Use.test.ts | 2 +- tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-1.dat | Bin 0 -> 7 bytes tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-2.dat | Bin 0 -> 25264 bytes 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-1.dat create mode 100644 tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-2.dat diff --git a/sources/commands/Base.ts b/sources/commands/Base.ts index 1e4ed420b..baa0bd665 100644 --- a/sources/commands/Base.ts +++ b/sources/commands/Base.ts @@ -44,7 +44,7 @@ export abstract class BaseCommand extends Command { const {data, indent} = nodeUtils.readPackageJson(content); const previousPackageManager = data.packageManager ?? `unknown`; - data.packageManager = `${info.locator.name}@${info.locator.reference}+${info.hash}`; + data.packageManager = `${info.locator.name}@${info.locator.reference}${typeof info.locator.reference === `string` ? `+` : `#`}${info.hash}`; const newContent = nodeUtils.normalizeLineEndings(content, `${JSON.stringify(data, null, indent)}\n`); await fs.promises.writeFile(lookup.target, newContent, `utf8`); diff --git a/sources/commands/Use.ts b/sources/commands/Use.ts index 736fc0539..d5ceb21db 100644 --- a/sources/commands/Use.ts +++ b/sources/commands/Use.ts @@ -45,8 +45,10 @@ export class UseCommand extends BaseCommand { const location = `https://registry.npmjs.com/${this.pattern}/-/${this.pattern}-${version}.tgz`; packageManagerInfo = { locator: { - name: this.pattern as any, - reference: location, + // @ts-expect-error Needs type update from the other PR + name: this.pattern, + // @ts-expect-error Needs type update from the other PR + reference: new URL(location), }, spec: { bin: {}, diff --git a/tests/Use.test.ts b/tests/Use.test.ts index 93092686f..b177a1f31 100644 --- a/tests/Use.test.ts +++ b/tests/Use.test.ts @@ -78,7 +78,7 @@ describe(`UseCommand`, () => { }); await expect(xfs.readJsonPromise(ppath.join(cwd, `package.json`))).resolves.toMatchObject({ - packageManager: `test@https://registry.npmjs.com/test/-/test-3.3.0.tgz+sha1.a2b56c6aa386c5732065793e8d9d92074a9cdd41`, + packageManager: `test@https://registry.npmjs.com/test/-/test-3.3.0.tgz#sha1.a2b56c6aa386c5732065793e8d9d92074a9cdd41`, }); }); }); diff --git a/tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-1.dat b/tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-1.dat new file mode 100644 index 0000000000000000000000000000000000000000..b03652e61c40452494e185715af92d4f9a618540 GIT binary patch literal 7 Ocmey*@5rFSzyJUV3juTh literal 0 HcmV?d00001 diff --git a/tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-2.dat b/tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-2.dat new file mode 100644 index 0000000000000000000000000000000000000000..2e1571cbbe17d78ed61fcd2c7a5bd362bb61bb1c GIT binary patch literal 25264 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 Date: Wed, 21 Feb 2024 05:26:01 +0100 Subject: [PATCH 3/4] nock --- tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-2.dat | Bin 25264 -> 30245 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-2.dat b/tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-2.dat index 2e1571cbbe17d78ed61fcd2c7a5bd362bb61bb1c..406b28f5c5f3a7b99ed274eb8df451d006bb56e2 100644 GIT binary patch literal 30245 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 EFT~(2KmY&$ literal 25264 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 Date: Wed, 21 Feb 2024 05:43:46 +0100 Subject: [PATCH 4/4] remove quirks --- sources/commands/Base.ts | 2 +- sources/commands/Use.ts | 4 ++-- tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-1.dat | Bin 7 -> 0 bytes 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-1.dat diff --git a/sources/commands/Base.ts b/sources/commands/Base.ts index 99c0e7c2d..c1dfff0cc 100644 --- a/sources/commands/Base.ts +++ b/sources/commands/Base.ts @@ -39,7 +39,7 @@ export abstract class BaseCommand extends Command { const {data, indent} = nodeUtils.readPackageJson(content); const previousPackageManager = data.packageManager ?? `unknown`; - data.packageManager = `${info.locator.name}@${info.locator.reference}${typeof info.locator.reference === `string` ? `+` : `#`}${info.hash}`; + data.packageManager = `${info.locator.name}@${info.locator.reference}${URL.canParse(info.locator.reference) ? `#` : `+`}${info.hash}`; const newContent = nodeUtils.normalizeLineEndings(content, `${JSON.stringify(data, null, indent)}\n`); await fs.promises.writeFile(lookup.target, newContent, `utf8`); diff --git a/sources/commands/Use.ts b/sources/commands/Use.ts index de6b01928..fb6060081 100644 --- a/sources/commands/Use.ts +++ b/sources/commands/Use.ts @@ -46,8 +46,7 @@ export class UseCommand extends BaseCommand { packageManagerInfo = { locator: { name: this.pattern, - // @ts-expect-error Needs type update from the other PR - reference: new URL(location), + reference: location, }, spec: { bin: {}, @@ -56,6 +55,7 @@ export class UseCommand extends BaseCommand { }, hash, location, + bin: undefined, }; } else { const [descriptor] = await this.resolvePatternsToDescriptors({ diff --git a/tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-1.dat b/tests/nock/fsYZFJKYLkFfDv-Jyd3j2w-1.dat deleted file mode 100644 index b03652e61c40452494e185715af92d4f9a618540..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7 Ocmey*@5rFSzyJUV3juTh