@yarnpkg/plugin-essentials 4.3.2 → 4.4.0

package/lib/commands/add.js

@@ -82,10 +82,20 @@ class AddCommand extends cli_1.BaseCommand {
         const maxResults = interactive
             ? Infinity
             : 1;
+        const jsrToDescriptor = (pseudoDescriptor) => {
+            const descriptor = core_3.structUtils.tryParseDescriptor(pseudoDescriptor.slice(4));
+            if (!descriptor)
+                return null;
+            if (descriptor.range === `unknown`)
+                return core_3.structUtils.makeDescriptor(descriptor, `jsr:${core_3.structUtils.stringifyIdent(descriptor)}@latest`);
+            return core_3.structUtils.makeDescriptor(descriptor, `jsr:${descriptor.range}`);
+        };
         const allSuggestions = await Promise.all(this.packages.map(async (pseudoDescriptor) => {
             const request = pseudoDescriptor.match(/^\.{0,2}\//)
                 ? await suggestUtils.extractDescriptorFromPath(pseudoDescriptor, { cwd: this.context.cwd, workspace })
-                : core_3.structUtils.tryParseDescriptor(pseudoDescriptor);
+                : pseudoDescriptor.startsWith(`jsr:`)
+                    ? jsrToDescriptor(pseudoDescriptor)
+                    : core_3.structUtils.tryParseDescriptor(pseudoDescriptor);
             const unsupportedPrefix = pseudoDescriptor.match(/^(https?:|git@github)/);
             if (unsupportedPrefix)
                 throw new clipanion_1.UsageError(`It seems you are trying to add a package using a ${core_1.formatUtils.pretty(configuration, `${unsupportedPrefix[0]}...`, core_1.formatUtils.Type.RANGE)} url; we now require package names to be explicitly specified.\nTry running the command again with the package name prefixed: ${core_1.formatUtils.pretty(configuration, `yarn add`, core_1.formatUtils.Type.CODE)} ${core_1.formatUtils.pretty(configuration, core_3.structUtils.makeDescriptor(core_3.structUtils.makeIdent(null, `my-package`), `${unsupportedPrefix[0]}...`), core_1.formatUtils.Type.DESCRIPTOR)}`);

package/lib/suggestUtils.js

@@ -167,15 +167,36 @@ async function extractDescriptorFromPath(path, { cwd, workspace }) {
         return core_2.structUtils.makeDescriptor(manifest.name, path);
     });
 }
+function extractInferenceParametersFromRequest(request) {
+    if (request.range === `unknown`)
+        return { type: `resolve`, range: `latest` };
+    if (core_2.semverUtils.validRange(request.range))
+        return { type: `fixed`, range: request.range };
+    if (core_1.TAG_REGEXP.test(request.range))
+        return { type: `resolve`, range: request.range };
+    const registryProtocol = request.range.match(/^(?:jsr:|npm:)(.*)/);
+    if (!registryProtocol)
+        return { type: `fixed`, range: request.range };
+    let [, range] = registryProtocol;
+    // Try to handle the case of "foo@jsr:foo@latest", because otherwise there
+    // would be no way to cleanly add a package from a 3rd-party registry using
+    // a tag (since foo@jsr:latest would refer to "the package named 'latest'").
+    const selfRegistryPrefix = `${core_2.structUtils.stringifyIdent(request)}@`;
+    if (range.startsWith(selfRegistryPrefix))
+        range = range.slice(selfRegistryPrefix.length);
+    if (core_2.semverUtils.validRange(range))
+        return { type: `fixed`, range: request.range };
+    if (core_1.TAG_REGEXP.test(range))
+        return { type: `resolve`, range: request.range };
+    return { type: `fixed`, range: request.range };
+}
 async function getSuggestedDescriptors(request, { project, workspace, cache, target, fixed, modifier, strategies, maxResults = Infinity }) {
     if (!(maxResults >= 0))
         throw new Error(`Invalid maxResults (${maxResults})`);
-    const [requestRange, requestTag] = request.range !== `unknown`
-        ? fixed || core_2.semverUtils.validRange(request.range) || !request.range.match(/^[a-z0-9._-]+$/i)
-            ? [request.range, `latest`]
-            : [`unknown`, request.range]
-        : [`unknown`, `latest`];
-    if (requestRange !== `unknown`) {
+    const inference = !fixed || request.range === `unknown`
+        ? extractInferenceParametersFromRequest(request)
+        : { type: `fixed`, range: request.range };
+    if (inference.type === `fixed`) {
         return {
             suggestions: [{
                     descriptor: request,
@@ -289,7 +310,7 @@ async function getSuggestedDescriptors(request, { project, workspace, cache, tar
                             });
                         }
                         else {
-                            const latest = await fetchDescriptorFrom(request, requestTag, { project, cache, workspace, modifier });
+                            const latest = await fetchDescriptorFrom(request, inference.range, { project, cache, workspace, modifier });
                             if (latest) {
                                 suggested.push({
                                     descriptor: latest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.3.2",
+  "version": "4.4.0",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "exports": {
@@ -20,16 +20,16 @@
     "typanion": "^3.14.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.8.0",
-    "@yarnpkg/core": "^4.3.0",
+    "@yarnpkg/cli": "^4.9.0",
+    "@yarnpkg/core": "^4.4.0",
     "@yarnpkg/plugin-git": "^3.1.1"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.8.0",
-    "@yarnpkg/core": "^4.3.0",
+    "@yarnpkg/cli": "^4.9.0",
+    "@yarnpkg/core": "^4.4.0",
     "@yarnpkg/plugin-git": "^3.1.1"
   },
   "repository": {