Implements better support for exact ranges (#870)

* Implements better support for exact ranges

* Fixes remaining version issues

Author: arcanis

.pnp.js

@@ -0,0 +1,2 @@
+releases:
+  "@yarnpkg/plugin-interactive-tools": prerelease

.yarn/versions/bc1107f7.yml

@@ -7,7 +7,8 @@
     "clipanion": "^2.1.5",
     "diff": "^4.0.1",
     "ink": "^2.3.0",
-    "react": "^16.8.4"
+    "react": "^16.8.4",
+    "semver": "^5.6.0"
   },
   "peerDependencies": {
     "@yarnpkg/cli": "^2.0.0-rc.28",
@@ -17,6 +18,7 @@
   "devDependencies": {
     "@types/diff": "^4.0.2",
     "@types/react": "^16.8.0",
+    "@types/semver": "^6.0.2",
     "@yarnpkg/builder": "workspace:^2.0.0-rc.18",
     "@yarnpkg/cli": "workspace:^2.0.0-rc.28",
     "@yarnpkg/core": "workspace:^2.0.0-rc.22",

packages/plugin-interactive-tools/package.json

@@ -9,8 +9,9 @@ import {Command, Usage}
 import {diffWords}                                                                                                         from 'diff';
 import {Box, Color}                                                                                                        from 'ink';
 import React, {useEffect, useState}                                                                                        from 'react';
+import semver                                                                                                              from 'semver';
 
-const SIMPLE_SEMVER = /^((?:[\^~]|>=?)?)([0-9+])(\.[0-9]+)(\.[0-9]+)((?:-\S+)?)$/;
+const SIMPLE_SEMVER = /^((?:[\^~]|>=?)?)([0-9]+)(\.[0-9]+)(\.[0-9]+)((?:-\S+)?)$/;
 
 // eslint-disable-next-line arca/no-default-export
 export default class UpgradeInteractiveCommand extends BaseCommand {
@@ -101,8 +102,12 @@ export default class UpgradeInteractiveCommand extends BaseCommand {
     };
 
     const fetchSuggestions = async (descriptor: Descriptor) => {
+      const referenceRange = semver.valid(descriptor.range)
+        ? `^${descriptor.range}`
+        : descriptor.range;
+
       const [resolution, dependency] = await Promise.all([
-        fetchUpdatedDescriptor(descriptor, descriptor.range, descriptor.range),
+        fetchUpdatedDescriptor(descriptor, descriptor.range, referenceRange),
         fetchUpdatedDescriptor(descriptor, descriptor.range, `latest`),
       ]);
 
@@ -118,7 +123,7 @@ export default class UpgradeInteractiveCommand extends BaseCommand {
         });
       }
 
-      if (dependency !== resolution) {
+      if (dependency !== resolution && dependency !== descriptor.range) {
         suggestions.push({
           value: dependency,
           label: colorizeVersionDiff(descriptor.range, dependency),

packages/plugin-interactive-tools/sources/commands/upgrade-interactive.tsx

@@ -5202,6 +5202,7 @@ __metadata:
   dependencies:
     "@types/diff": ^4.0.2
     "@types/react": ^16.8.0
+    "@types/semver": ^6.0.2
     "@yarnpkg/builder": "workspace:^2.0.0-rc.18"
     "@yarnpkg/cli": "workspace:^2.0.0-rc.28"
     "@yarnpkg/core": "workspace:^2.0.0-rc.22"
@@ -5211,6 +5212,7 @@ __metadata:
     diff: ^4.0.1
     ink: ^2.3.0
     react: ^16.8.4
+    semver: ^5.6.0
     typescript: ^3.7.4
   peerDependencies:
     "@yarnpkg/cli": ^2.0.0-rc.28