mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-05-07 07:27:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli): "multi outdated" prints one package only once

Browse Source 
Every package is printed once, dependent workspace packages are
grouped in the last columnt.
This commit is contained in:
Zoltan Kochan
2019-08-25 02:12:23 +03:00
parent cc3481a646
commit c809ad4439
3 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/pnpm/src/cmd/outdated.ts
View File

@@ -132,6 +132,7 @@ export async function outdatedDependenciesOfWorkspacePackages (
wantedLockfile,
}
return {
manifest,
outdatedPackages: args.length
? await outdatedForPackages(args, optsForOutdated)
: await outdated(optsForOutdated),

53
packages/pnpm/src/cmd/recursive/outdated.ts
View File

@@ -1,10 +1,17 @@
import { getLockfileImporterId } from '@pnpm/lockfile-file'
import { DependenciesField, PackageJson, Registries } from '@pnpm/types'
import chalk from 'chalk'
import R = require('ramda')
import stripColor = require('strip-color')
import table = require('text-table')
import { outdatedDependenciesOfWorkspacePackages } from '../outdated'
const DEP_PRIORITY: Record<DependenciesField, number> = {
optionalDependencies: 0,
dependencies: 1,
devDependencies: 2,
}
export default async (
pkgs: Array<{path: string, manifest: PackageJson}>,
args: string[],
@@ -35,45 +42,61 @@ export default async (
userAgent: string,
},
) => {
const outdatedPkgs = [] as Array<{
const outdatedByNameAndType = {} as Record<string, {
belongsTo: DependenciesField,
packageName: string,
current?: string,
wanted: string,
dependentPkgs: Array<{ location: string, manifest: PackageJson }>,
latest?: string,
prefix: string,
packageName: string,
wanted: string,
}>
if (opts.lockfileDirectory) {
const outdatedPackagesByProject = await outdatedDependenciesOfWorkspacePackages(pkgs, args, opts)
for (let { prefix, outdatedPackages } of outdatedPackagesByProject) {
outdatedPackages.forEach((outdatedPkg: any) => outdatedPkgs.push({ ...outdatedPkg, prefix })) // tslint:disable-line:no-any
for (let { prefix, outdatedPackages, manifest } of outdatedPackagesByProject) {
outdatedPackages.forEach((outdatedPkg) => {
const key = JSON.stringify([outdatedPkg.packageName, outdatedPkg.belongsTo])
if (!outdatedByNameAndType[key]) {
outdatedByNameAndType[key] = { ...outdatedPkg, dependentPkgs: [] }
}
outdatedByNameAndType[key].dependentPkgs.push({ location: prefix, manifest })
})
}
} else {
await Promise.all(pkgs.map(async ({ manifest, path }) => {
const { outdatedPackages } = (
await outdatedDependenciesOfWorkspacePackages([{ manifest, path }], args, { ...opts, lockfileDirectory: path })
)[0]
outdatedPackages.forEach((outdatedPkg: any) => // tslint:disable-line:no-any
outdatedPkgs.push({
...outdatedPkg,
prefix: getLockfileImporterId(opts.prefix, path),
}))
outdatedPackages.forEach((outdatedPkg) => {
const key = JSON.stringify([outdatedPkg.packageName, outdatedPkg.belongsTo])
if (!outdatedByNameAndType[key]) {
outdatedByNameAndType[key] = { ...outdatedPkg, dependentPkgs: [] }
}
outdatedByNameAndType[key].dependentPkgs.push({ location: getLockfileImporterId(opts.prefix, path), manifest })
})
}))
}
const columnNames = ['', 'Package', 'Current', 'Wanted', 'Latest', 'Belongs To'].map((txt) => chalk.underline(txt))
const columnNames = ['Package', 'Current', 'Wanted', 'Latest', 'Belongs To', 'Dependents'].map((txt) => chalk.underline(txt))
console.log(
table([
columnNames,
...outdatedPkgs
.sort((o1, o2) => o1.prefix.localeCompare(o2.prefix))
...R.sortWith(
[
(o1, o2) => o1.packageName.localeCompare(o2.packageName),
(o1, o2) => DEP_PRIORITY[o1.belongsTo] - DEP_PRIORITY[o2.belongsTo],
],
(Object.values(outdatedByNameAndType)),
)
.map((outdatedPkg) => [
outdatedPkg.prefix,
chalk.yellow(outdatedPkg.packageName),
outdatedPkg.current || 'missing',
chalk.green(outdatedPkg.wanted),
chalk.magenta(outdatedPkg.latest || ''),
outdatedPkg.belongsTo,
outdatedPkg.dependentPkgs
.map(({ manifest, location }) => manifest.name || location)
.sort()
.join(', '),
]),
], {
stringLength: (s: string) => stripColor(s).length,

28
packages/pnpm/test/recursive/outdated.ts
View File

@@ -12,7 +12,7 @@ const test = promisifyTape(tape)
const testOnly = promisifyTape(tape.only)
test('pnpm recursive outdated', async (t: tape.Test) => {
const projects = preparePackages(t, [
preparePackages(t, [
{
name: 'project-1',
version: '1.0.0',
@@ -29,6 +29,17 @@ test('pnpm recursive outdated', async (t: tape.Test) => {
'is-negative': '1.0.0',
},
},
{
name: 'project-3',
version: '1.0.0',
dependencies: {
'is-positive': '1.0.0',
},
devDependencies: {
'is-negative': '1.0.0',
},
},
])
await execPnpm('recursive', 'install')
@@ -38,10 +49,11 @@ test('pnpm recursive outdated', async (t: tape.Test) => {
t.equal(result.status, 0)
t.equal(normalizeNewline(result.stdout.toString()), ' ' + stripIndents`
Package Current Wanted Latest Belongs To
project-1 is-positive 1.0.0 1.0.0 3.1.0 dependencies
project-2 is-negative 1.0.0 1.0.0 2.1.0 dependencies
t.equal(normalizeNewline(result.stdout.toString()), stripIndents`
Package Current Wanted Latest Belongs To Dependents
is-negative 1.0.0 1.0.0 2.1.0 dependencies project-2
is-negative 1.0.0 1.0.0 2.1.0 devDependencies project-3
is-positive 1.0.0 1.0.0 3.1.0 dependencies project-1, project-3
` + '\n')
}
@@ -50,9 +62,9 @@ test('pnpm recursive outdated', async (t: tape.Test) => {
t.equal(result.status, 0)
t.equal(normalizeNewline(result.stdout.toString()), ' ' + stripIndents`
Package Current Wanted Latest Belongs To
project-1 is-positive 1.0.0 1.0.0 3.1.0 dependencies
t.equal(normalizeNewline(result.stdout.toString()), stripIndents`
Package Current Wanted Latest Belongs To Dependents
is-positive 1.0.0 1.0.0 3.1.0 dependencies project-1, project-3
` + '\n')
}
})