@pnpm/cli.default-reporter 1100.3.11 → 1100.3.13

package/lib/reporterForClient/reportStats.js

@@ -0,0 +1,143 @@
+import chalk from 'chalk';
+import { repeat } from 'ramda';
+import * as Rx from 'rxjs';
+import { filter, map, reduce, take } from 'rxjs/operators';
+import stringLength from 'string-length';
+import { EOL } from '../constants.js';
+import { ADDED_CHAR, REMOVED_CHAR, } from './outputConstants.js';
+import { zoomOut } from './utils/zooming.js';
+export function reportStats(log$, opts) {
+    if (opts.hideProgressPrefix) {
+        return [statsForCurrentPackage(log$.stats, {
+                cmd: opts.cmd,
+                width: opts.width,
+            })];
+    }
+    const stats$ = opts.isRecursive
+        ? log$.stats
+        : log$.stats.pipe(filter((log) => log.prefix !== opts.cwd));
+    const outputs = [
+        statsForNotCurrentPackage(stats$, {
+            cmd: opts.cmd,
+            currentPrefix: opts.cwd,
+            width: opts.width,
+        }),
+    ];
+    if (!opts.isRecursive) {
+        outputs.push(statsForCurrentPackage(log$.stats.pipe(filter((log) => log.prefix === opts.cwd)), {
+            cmd: opts.cmd,
+            width: opts.width,
+        }));
+    }
+    return outputs;
+}
+function statsForCurrentPackage(stats$, opts) {
+    return stats$.pipe(take((opts.cmd === 'install' || opts.cmd === 'install-test' || opts.cmd === 'add' || opts.cmd === 'update' || opts.cmd === 'dlx') ? 2 : 1), reduce((acc, log) => {
+        if (typeof log['added'] === 'number') {
+            acc['added'] = log['added'];
+        }
+        else if (typeof log['removed'] === 'number') {
+            acc['removed'] = log['removed'];
+        }
+        return acc;
+    }, {}), map((stats) => {
+        if (!stats['removed'] && !stats['added']) {
+            if (opts.cmd === 'link') {
+                return Rx.NEVER;
+            }
+            return Rx.of({ msg: 'Already up to date' });
+        }
+        let msg = 'Packages:';
+        if (stats['added']) {
+            msg += ' ' + chalk.green(`+${stats['added'].toString()}`);
+        }
+        if (stats['removed']) {
+            msg += ' ' + chalk.red(`-${stats['removed'].toString()}`);
+        }
+        msg += EOL + printPlusesAndMinuses(opts.width, (stats['added'] ?? 0), (stats['removed'] ?? 0));
+        return Rx.of({ msg });
+    }));
+}
+function statsForNotCurrentPackage(stats$, opts) {
+    const stats = {};
+    const cookedStats$ = (opts.cmd !== 'remove'
+        ? stats$.pipe(map((log) => {
+            // As of pnpm v2.9.0, during `pnpm recursive link`, logging of removed stats happens twice
+            //  1. during linking
+            //  2. during installing
+            // Hence, the stats are added before reported
+            const { prefix } = log;
+            if (!stats[prefix]) {
+                stats[prefix] = log;
+                return { seed: stats, value: null };
+            }
+            else if (typeof stats[prefix].added === 'number' && typeof log['added'] === 'number') {
+                stats[prefix].added += log['added'];
+                return { seed: stats, value: null };
+            }
+            else if (typeof stats[prefix].removed === 'number' && typeof log['removed'] === 'number') {
+                stats[prefix].removed += log['removed'];
+                return { seed: stats, value: null };
+            }
+            else {
+                const value = { ...stats[prefix], ...log };
+                delete stats[prefix];
+                return value;
+            }
+        }, {}))
+        : stats$);
+    return cookedStats$.pipe(filter((stats) => stats !== null && Boolean(stats['removed'] || stats['added'])), map((stats) => {
+        const parts = [];
+        if (stats['added']) {
+            parts.push(padStep(chalk.green(`+${stats['added'].toString()}`), 4));
+        }
+        if (stats['removed']) {
+            parts.push(padStep(chalk.red(`-${stats['removed'].toString()}`), 4));
+        }
+        let msg = zoomOut(opts.currentPrefix, stats.prefix, parts.join(' '));
+        const rest = Math.max(0, opts.width - 1 - stringLength(msg));
+        msg += ' ' + printPlusesAndMinuses(rest, roundStats(stats['added'] || 0), roundStats(stats['removed'] || 0));
+        return Rx.of({ msg });
+    }));
+}
+function padStep(s, step) {
+    const sLength = stringLength(s);
+    const placeholderLength = Math.ceil(sLength / step) * step;
+    if (sLength < placeholderLength) {
+        return repeat(' ', placeholderLength - sLength).join('') + s;
+    }
+    return s;
+}
+function roundStats(stat) {
+    if (stat === 0)
+        return 0;
+    return Math.max(1, Math.round(stat / 10));
+}
+function printPlusesAndMinuses(maxWidth, added, removed) {
+    if (maxWidth === 0)
+        return '';
+    const changes = added + removed;
+    let addedChars;
+    let removedChars;
+    if (changes > maxWidth) {
+        if (!added) {
+            addedChars = 0;
+            removedChars = maxWidth;
+        }
+        else if (!removed) {
+            addedChars = maxWidth;
+            removedChars = 0;
+        }
+        else {
+            const p = maxWidth / changes;
+            addedChars = Math.min(Math.max(Math.floor(added * p), 1), maxWidth - 1);
+            removedChars = maxWidth - addedChars;
+        }
+    }
+    else {
+        addedChars = added;
+        removedChars = removed;
+    }
+    return `${repeat(ADDED_CHAR, addedChars).join('')}${repeat(REMOVED_CHAR, removedChars).join('')}`;
+}
+//# sourceMappingURL=reportStats.js.map

package/lib/reporterForClient/reportSummary.d.ts

@@ -0,0 +1,19 @@
+import type { Config } from '@pnpm/config.reader';
+import type { DeprecationLog, PackageManifestLog, RootLog, SummaryLog } from '@pnpm/core-loggers';
+import * as Rx from 'rxjs';
+import { type PackageDiff } from './pkgsDiff.js';
+export declare function reportSummary(log$: {
+    deprecation: Rx.Observable<DeprecationLog>;
+    summary: Rx.Observable<SummaryLog>;
+    root: Rx.Observable<RootLog>;
+    packageManifest: Rx.Observable<PackageManifestLog>;
+}, opts: {
+    cmd: string;
+    cwd: string;
+    env: NodeJS.ProcessEnv;
+    filterPkgsDiff?: FilterPkgsDiff;
+    pnpmConfig?: Config;
+}): Rx.Observable<Rx.Observable<{
+    msg: string;
+}>>;
+export type FilterPkgsDiff = (pkgsDiff: PackageDiff) => boolean;

package/lib/reporterForClient/reportSummary.js

@@ -0,0 +1,79 @@
+import path from 'node:path';
+import chalk from 'chalk';
+import * as Rx from 'rxjs';
+import { map, take } from 'rxjs/operators';
+import semver from 'semver';
+import { EOL } from '../constants.js';
+import { ADDED_CHAR, REMOVED_CHAR, } from './outputConstants.js';
+import { getPkgsDiff, propertyByDependencyType, } from './pkgsDiff.js';
+const CONFIG_BY_DEP_TYPE = {
+    prod: 'production',
+    dev: 'dev',
+    optional: 'optional',
+};
+export function reportSummary(log$, opts) {
+    const pkgsDiff$ = getPkgsDiff(log$, { prefix: opts.pnpmConfig?.global ? undefined : opts.cwd });
+    const summaryLog$ = log$.summary.pipe(take(1));
+    const _printDiffs = printDiffs.bind(null, { cmd: opts.cmd, prefix: opts.cwd, pnpmConfig: opts.pnpmConfig });
+    return Rx.combineLatest(pkgsDiff$, summaryLog$)
+        .pipe(take(1), map(([pkgsDiff]) => {
+        let msg = '';
+        for (const depType of ['prod', 'optional', 'peer', 'dev', 'nodeModulesOnly']) {
+            let diffs = Object.values(pkgsDiff[depType]);
+            if (opts.filterPkgsDiff) {
+                // This filtering is only used by Bit CLI currently.
+                // Related PR: https://github.com/teambit/bit/pull/7176
+                diffs = diffs.filter((pkgDiff) => opts.filterPkgsDiff(pkgDiff));
+            }
+            if (diffs.length > 0) {
+                msg += EOL;
+                msg += chalk.cyanBright(opts.pnpmConfig?.global ? 'global:' : `${propertyByDependencyType[depType]}:`);
+                msg += EOL;
+                msg += _printDiffs(diffs, depType);
+                msg += EOL;
+            }
+            else if (CONFIG_BY_DEP_TYPE[depType] && opts.pnpmConfig?.[CONFIG_BY_DEP_TYPE[depType]] === false) {
+                msg += EOL;
+                msg += `${chalk.cyanBright(`${propertyByDependencyType[depType]}:`)} skipped`;
+                msg += EOL;
+            }
+        }
+        return Rx.of({ msg });
+    }));
+}
+function printDiffs(opts, pkgsDiff, depType) {
+    // Sorts by alphabet then by removed/added
+    // + ava 0.10.0
+    // - chalk 1.0.0
+    // + chalk 2.0.0
+    pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added))));
+    const msg = pkgsDiff.map((pkg) => {
+        let result = pkg.added
+            ? ADDED_CHAR
+            : REMOVED_CHAR;
+        if (!pkg.realName || pkg.name === pkg.realName) {
+            result += ` ${pkg.name}`;
+        }
+        else {
+            result += ` ${pkg.name} <- ${pkg.realName}`;
+        }
+        if (pkg.version) {
+            result += ` ${chalk.grey(pkg.version)}`;
+            if (pkg.latest && semver.lt(pkg.version, pkg.latest)) {
+                result += ` ${chalk.grey(`(${pkg.latest} is available)`)}`;
+            }
+        }
+        if (pkg.deprecated) {
+            result += ` ${chalk.red('deprecated')}`;
+        }
+        if (pkg.from) {
+            result += ` ${chalk.grey(`<- ${path.relative(opts.prefix, pkg.from) || pkg.from}`)}`;
+        }
+        if (pkg.added && depType === 'dev' && opts.pnpmConfig?.saveDev === false && opts.cmd === 'add') {
+            result += `${chalk.yellow(' already in devDependencies, was not moved to dependencies.')}`;
+        }
+        return result;
+    }).join(EOL);
+    return msg;
+}
+//# sourceMappingURL=reportSummary.js.map

package/lib/reporterForClient/reportUpdateCheck.d.ts

@@ -0,0 +1,8 @@
+import type { UpdateCheckLog } from '@pnpm/core-loggers';
+import * as Rx from 'rxjs';
+export declare function reportUpdateCheck(log$: Rx.Observable<UpdateCheckLog>, opts: {
+    env: NodeJS.ProcessEnv;
+    process: NodeJS.Process;
+}): Rx.Observable<Rx.Observable<{
+    msg: string;
+}>>;

package/lib/reporterForClient/reportUpdateCheck.js

@@ -0,0 +1,42 @@
+import { detectIfCurrentPkgIsExecutable, isExecutedByCorepack } from '@pnpm/cli.meta';
+import boxen from 'boxen';
+import chalk from 'chalk';
+import * as Rx from 'rxjs';
+import { filter, map, take } from 'rxjs/operators';
+import semver from 'semver';
+export function reportUpdateCheck(log$, opts) {
+    return log$.pipe(take(1), filter((log) => semver.gt(log.latestVersion, log.currentVersion)), map((log) => {
+        const updateMessage = renderUpdateMessage({
+            currentPkgIsExecutable: detectIfCurrentPkgIsExecutable(opts.process),
+            latestVersion: log.latestVersion,
+            env: opts.env,
+        });
+        return Rx.of({
+            msg: boxen(`\
+Update available! ${chalk.red(log.currentVersion)} → ${chalk.green(log.latestVersion)}.
+${chalk.magenta('Changelog:')} https://pnpm.io/v/${log.latestVersion}
+${updateMessage}`, {
+                padding: 1,
+                margin: 1,
+                align: 'center',
+                borderColor: 'yellow',
+                borderStyle: 'round',
+            }),
+        });
+    }));
+}
+function renderUpdateMessage(opts) {
+    const updateCommand = renderUpdateCommand(opts);
+    return `To update, run: ${chalk.magenta(updateCommand)}`;
+}
+function renderUpdateCommand(opts) {
+    if (isExecutedByCorepack(opts.env)) {
+        return `corepack use pnpm@${opts.latestVersion}`;
+    }
+    if (opts.env.PNPM_HOME) {
+        return 'pnpm self-update';
+    }
+    const pkgName = opts.currentPkgIsExecutable ? '@pnpm/exe' : 'pnpm';
+    return `pnpm add -g ${pkgName}`;
+}
+//# sourceMappingURL=reportUpdateCheck.js.map

package/lib/reporterForClient/utils/formatPrefix.d.ts

@@ -0,0 +1,2 @@
+export declare function formatPrefix(cwd: string, prefix: string): string;
+export declare function formatPrefixNoTrim(cwd: string, prefix: string): string;

package/lib/reporterForClient/utils/formatPrefix.js

@@ -0,0 +1,19 @@
+import path from 'node:path';
+import normalize from 'normalize-path';
+import { PREFIX_MAX_LENGTH } from '../outputConstants.js';
+export function formatPrefix(cwd, prefix) {
+    prefix = formatPrefixNoTrim(cwd, prefix);
+    if (prefix.length <= PREFIX_MAX_LENGTH) {
+        return prefix;
+    }
+    const shortPrefix = prefix.slice(-PREFIX_MAX_LENGTH + 3);
+    const separatorLocation = shortPrefix.indexOf('/');
+    if (separatorLocation <= 0) {
+        return `...${shortPrefix}`;
+    }
+    return `...${shortPrefix.slice(separatorLocation)}`;
+}
+export function formatPrefixNoTrim(cwd, prefix) {
+    return normalize(path.relative(cwd, prefix) || '.');
+}
+//# sourceMappingURL=formatPrefix.js.map

package/lib/reporterForClient/utils/formatWarn.d.ts

@@ -0,0 +1 @@
+export declare function formatWarn(message: string): string;

package/lib/reporterForClient/utils/formatWarn.js

@@ -0,0 +1,5 @@
+import chalk from 'chalk';
+export function formatWarn(message) {
+    return `${chalk.bgYellow.yellow('[')}${chalk.bgYellow.black('WARN')}${chalk.bgYellow.yellow(']')} ${message}`;
+}
+//# sourceMappingURL=formatWarn.js.map

package/lib/reporterForClient/utils/zooming.d.ts

@@ -0,0 +1,4 @@
+export declare function autozoom(currentPrefix: string, logPrefix: string | undefined, line: string, opts: {
+    zoomOutCurrent: boolean;
+}): string;
+export declare function zoomOut(currentPrefix: string, logPrefix: string, line: string): string;

package/lib/reporterForClient/utils/zooming.js

@@ -0,0 +1,13 @@
+import { PREFIX_MAX_LENGTH } from '../outputConstants.js';
+import { formatPrefix } from './formatPrefix.js';
+export function autozoom(currentPrefix, logPrefix, line, opts) {
+    if (!logPrefix || !opts.zoomOutCurrent && currentPrefix === logPrefix) {
+        return line;
+    }
+    return zoomOut(currentPrefix, logPrefix, line);
+}
+export function zoomOut(currentPrefix, logPrefix, line) {
+    const prefix = formatPrefix(currentPrefix, logPrefix);
+    return `${prefix.padEnd(PREFIX_MAX_LENGTH)} | ${line}`;
+}
+//# sourceMappingURL=zooming.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/cli.default-reporter",
-  "version": "1100.3.11",
+  "version": "1100.3.13",
   "description": "The default reporter of pnpm",
   "keywords": [
     "pnpm",
@@ -32,25 +32,25 @@
     "pnpm-render": "bin/pnpm-render.mjs"
   },
   "dependencies": {
-    "@pnpm/cli.meta": "1100.0.10",
-    "@pnpm/config.reader": "1101.13.0",
-    "@pnpm/core-loggers": "1100.2.4",
-    "@pnpm/deps.inspection.peers-issues-renderer": "1100.0.8",
-    "@pnpm/error": "1100.0.1",
-    "@pnpm/installing.dedupe.issues-renderer": "1100.0.1",
-    "@pnpm/installing.dedupe.types": "1100.0.1",
-    "@pnpm/types": "1101.5.0",
+    "@pnpm/cli.meta": "1100.0.12",
+    "@pnpm/config.reader": "1101.15.0",
+    "@pnpm/core-loggers": "1100.3.0",
+    "@pnpm/deps.inspection.peers-issues-renderer": "1100.0.10",
+    "@pnpm/error": "1100.1.0",
+    "@pnpm/installing.dedupe.issues-renderer": "1100.0.3",
+    "@pnpm/installing.dedupe.types": "1100.0.2",
+    "@pnpm/types": "1101.7.0",
     "@pnpm/util.lex-comparator": "^4.0.1",
     "ansi-diff": "^1.2.0",
     "boxen": "npm:@zkochan/boxen@5.1.2",
-    "chalk": "^5.6.2",
-    "cli-truncate": "^6.0.0",
+    "chalk": "^6.0.0",
+    "cli-truncate": "^6.1.1",
     "normalize-path": "^3.0.0",
-    "pretty-bytes": "^7.1.0",
+    "pretty-bytes": "^7.1.1",
     "pretty-ms": "^9.3.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "rxjs": "^7.8.2",
-    "semver": "^7.8.4",
+    "semver": "^7.8.5",
     "stacktracey": "^2.2.0",
     "string-length": "^7.0.1"
   },
@@ -59,10 +59,10 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/cli.default-reporter": "1100.3.11",
+    "@pnpm/cli.default-reporter": "1100.3.13",
     "@pnpm/logger": "1100.0.0",
     "@types/normalize-path": "^3.0.2",
-    "@types/ramda": "0.31.1",
+    "@types/ramda": "0.32.0",
     "@types/semver": "7.7.1",
     "ghooks": "2.0.4",
     "load-json-file": "^7.0.1",