refactor: outdated

pnpm · Nov 6, 2022 · 72b4d27 · 72b4d27
1 parent a755115
commit 72b4d27
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/packages/plugin-commands-outdated/src/outdated.ts b/packages/plugin-commands-outdated/src/outdated.ts
@@ -267,8 +267,9 @@ ${renderCurrent(outdatedPkg)} ${chalk.grey('=>')} ${renderLatest(outdatedPkg)}`
 }
 
 export interface OutdatedPackageJSONOutput {
-  currentVersion?: string
-  latestVersion?: string
+  current?: string
+  latest?: string
+  wanted: string
   isDeprecated: boolean
   dependencyType: DependenciesField
   latestManifest?: PackageManifest
@@ -278,8 +279,9 @@ function renderOutdatedJSON (outdatedPackages: readonly OutdatedPackage[], opts:
   const outdatedPackagesJSON: Record<string, OutdatedPackageJSONOutput> = sortOutdatedPackages(outdatedPackages)
     .reduce((acc, outdatedPkg) => {
       acc[outdatedPkg.packageName] = {
-        currentVersion: outdatedPkg.current,
-        latestVersion: outdatedPkg.latestManifest?.version,
+        current: outdatedPkg.current,
+        latest: outdatedPkg.latestManifest?.version,
+        wanted: outdatedPkg.wanted,
         isDeprecated: Boolean(outdatedPkg.latestManifest?.deprecated),
         dependencyType: outdatedPkg.belongsTo,
       }

diff --git a/packages/plugin-commands-outdated/src/recursive.ts b/packages/plugin-commands-outdated/src/recursive.ts
@@ -184,8 +184,9 @@ function renderOutdatedJSON (
   const outdatedPackagesJSON: Record<string, OutdatedPackageInWorkspaceJSONOutput> = sortOutdatedPackages(Object.values(outdatedMap))
     .reduce((acc, outdatedPkg) => {
       acc[outdatedPkg.packageName] = {
-        currentVersion: outdatedPkg.current,
-        latestVersion: outdatedPkg.latestManifest?.version,
+        current: outdatedPkg.current,
+        latest: outdatedPkg.latestManifest?.version,
+        wanted: outdatedPkg.wanted,
         isDeprecated: Boolean(outdatedPkg.latestManifest?.deprecated),
         dependencyType: outdatedPkg.belongsTo,
         dependentPackages: outdatedPkg.dependentPkgs.map(({ manifest, location }) => ({ name: manifest.name, location })),

diff --git a/packages/plugin-commands-outdated/test/index.ts b/packages/plugin-commands-outdated/test/index.ts
@@ -208,20 +208,23 @@ test('pnpm outdated: format json', async () => {
     expect(exitCode).toBe(1)
     expect(stripAnsi(output)).toBe(JSON.stringify({
       '@pnpm.e2e/deprecated': {
-        currentVersion: '1.0.0',
-        latestVersion: '1.0.0',
+        current: '1.0.0',
+        latest: '1.0.0',
+        wanted: '1.0.0',
         isDeprecated: true,
         dependencyType: 'dependencies',
       },
       'is-negative': {
-        currentVersion: '1.0.0',
-        latestVersion: '2.1.0',
+        current: '1.0.0',
+        latest: '2.1.0',
+        wanted: '1.0.0',
         isDeprecated: false,
         dependencyType: 'dependencies',
       },
       'is-positive': {
-        currentVersion: '1.0.0',
-        latestVersion: '3.1.0',
+        current: '1.0.0',
+        latest: '3.1.0',
+        wanted: '1.0.0',
         isDeprecated: false,
         dependencyType: 'devDependencies',
       },

diff --git a/packages/plugin-commands-outdated/test/recursive.ts b/packages/plugin-commands-outdated/test/recursive.ts
@@ -162,8 +162,9 @@ Dependent: project-2
     expect(exitCode).toBe(1)
     expect(stripAnsi(output as unknown as string)).toBe(JSON.stringify({
       'is-negative': {
-        currentVersion: '1.0.0',
-        latestVersion: '2.1.0',
+        current: '1.0.0',
+        latest: '2.1.0',
+        wanted: '1.0.0',
         isDeprecated: false,
         dependencyType: 'devDependencies',
         dependentPackages: [
@@ -174,8 +175,9 @@ Dependent: project-2
         ],
       },
       'is-positive': {
-        currentVersion: '2.0.0',
-        latestVersion: '3.1.0',
+        current: '2.0.0',
+        latest: '3.1.0',
+        wanted: '2.0.0',
         isDeprecated: false,
         dependencyType: 'dependencies',
         dependentPackages: [