@pnpm/cli.default-reporter 1100.3.3 → 1100.3.4

package/lib/index.js

@@ -1,3 +1,4 @@
+import createDiffer from 'ansi-diff';
 import * as Rx from 'rxjs';
 import { filter, map, mergeAll } from 'rxjs/operators';
 import { EOL } from './constants.js';
@@ -5,10 +6,9 @@ import { mergeOutputs } from './mergeOutputs.js';
 import { reporterForClient } from './reporterForClient/index.js';
 import { formatWarn } from './reporterForClient/utils/formatWarn.js';
 export { formatWarn };
-// ANSI "erase from cursor to end of display". Emitted before reprinting each
-// frame so that anything an external process (e.g. an SSH passphrase prompt)
-// wrote to the terminal between progress updates is cleared instead of bleeding
-// into the progress output.
+// ANSI "erase from cursor to end of display". Appended after each
+// differential update so that anything an external process (e.g. an SSH
+// passphrase prompt) wrote below the rendered frame is cleared.
 const ERASE_TO_END_OF_DISPLAY = '\x1b[0J';
 export function initDefaultReporter(opts) {
     const proc = opts.context.process ?? process;
@@ -36,6 +36,12 @@ export function initDefaultReporter(opts) {
             subscription.unsubscribe();
         };
     }
+    const stream = opts.useStderr ? proc.stderr : proc.stdout;
+    const write = stream.write.bind(stream);
+    const diff = createDiffer({
+        height: stream.rows,
+        width: stream.columns ?? outputMaxWidth,
+    });
     const subscription = output$
         .subscribe({
         complete() { }, // eslint-disable-line:no-empty
@@ -44,42 +50,26 @@ export function initDefaultReporter(opts) {
         },
         next: logUpdate,
     });
-    const write = opts.useStderr
-        ? proc.stderr.write.bind(proc.stderr)
-        : proc.stdout.write.bind(proc.stdout);
-    let prevRows = 0;
     function logUpdate(view) {
         // A new line should always be appended in case a prompt needs to appear.
         // Without a new line the prompt will be joined with the previous output.
         // An example of such prompt may be seen by running: pnpm update --interactive
         if (!view.endsWith(EOL))
             view += EOL;
-        // Redraw the whole frame in place: return the cursor to the top-left of the
-        // previous frame, erase everything below it, then reprint. The `\r` resets
-        // the column to 0 (cursor-up alone keeps the column) so the redraw starts
-        // cleanly even when an external process left the cursor mid-line. Doing it
-        // in a single write keeps the redraw atomic (no flicker) and clears any
-        // characters an external process wrote in between.
-        const moveToFrameTop = prevRows > 0 ? `\x1b[${prevRows}A\r` : '\r';
-        write(`${moveToFrameTop}${ERASE_TO_END_OF_DISPLAY}${view}`);
-        prevRows = countRows(view);
+        // `\r` resets the column to 0 in case an external process (e.g. an SSH
+        // passphrase prompt) left the cursor mid-line. `ansi-diff` then writes
+        // only the differential — the characters that actually changed between
+        // the previous frame and this one — so sticky blocks like the lockfile
+        // verdict and deprecation warnings are not re-written on every progress
+        // tick. `\x1b[K` erases trailing characters on the current line;
+        // `\x1b[0J` erases anything an external process wrote below the
+        // rendered frame.
+        write(`\r${diff.update(view)}\x1b[K${ERASE_TO_END_OF_DISPLAY}`);
     }
     return () => {
         subscription.unsubscribe();
     };
 }
-// Number of terminal rows a frame occupies. The frame always ends with a
-// newline, so this also equals how far below the frame's top the cursor rests
-// after printing it. Lines are assumed not to soft-wrap, matching how the
-// progress output is width-constrained before it reaches here.
-function countRows(frame) {
-    let rows = 0;
-    for (let i = 0; i < frame.length; i++) {
-        if (frame.charCodeAt(i) === 10 /* \n */)
-            rows++;
-    }
-    return rows;
-}
 export function toOutput$(opts) {
     opts = opts || {};
     const contextPushStream = new Rx.Subject();

package/lib/reporterForClient/reportLifecycleScripts.js

@@ -180,6 +180,10 @@ function formatLine(maxWidth, logObj) {
 function cutLine(line, maxLength) {
     if (!line)
         return '';
+    // Streamed lifecycle output is printed in full (maxLength is Infinity).
+    // cli-truncate rejects a non-finite width, so skip truncation in that case.
+    if (!Number.isFinite(maxLength))
+        return line;
     return cliTruncate(line, maxLength);
 }
 function aggregateOutput(source) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/cli.default-reporter",
-  "version": "1100.3.3",
+  "version": "1100.3.4",
   "description": "The default reporter of pnpm",
   "keywords": [
     "pnpm",
@@ -33,6 +33,7 @@
   },
   "dependencies": {
     "@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",
@@ -45,10 +46,10 @@
     "stacktracey": "^2.2.0",
     "string-length": "^7.0.1",
     "@pnpm/cli.meta": "1100.0.8",
-    "@pnpm/config.reader": "1101.10.1",
+    "@pnpm/config.reader": "1101.11.0",
     "@pnpm/deps.inspection.peers-issues-renderer": "1100.0.6",
-    "@pnpm/error": "1100.0.1",
     "@pnpm/core-loggers": "1100.2.1",
+    "@pnpm/error": "1100.0.1",
     "@pnpm/installing.dedupe.issues-renderer": "1100.0.1",
     "@pnpm/installing.dedupe.types": "1100.0.1",
     "@pnpm/types": "1101.3.2"
@@ -64,8 +65,8 @@
     "ghooks": "2.0.4",
     "load-json-file": "^7.0.1",
     "normalize-newline": "5.0.0",
-    "@pnpm/cli.default-reporter": "1100.3.3",
-    "@pnpm/logger": "1100.0.0"
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/cli.default-reporter": "1100.3.4"
   },
   "engines": {
     "node": ">=22.13"