@pnpm/cli.default-reporter 1100.3.1 → 1100.3.2

package/lib/index.js

@@ -1,4 +1,3 @@
-import createDiffer from 'ansi-diff';
 import * as Rx from 'rxjs';
 import { filter, map, mergeAll } from 'rxjs/operators';
 import { EOL } from './constants.js';
@@ -6,6 +5,11 @@ 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.
+const ERASE_TO_END_OF_DISPLAY = '\x1b[0J';
 export function initDefaultReporter(opts) {
     const proc = opts.context.process ?? process;
     const outputMaxWidth = opts.reportingOptions?.outputMaxWidth ?? (proc.stdout.columns && proc.stdout.columns - 2) ?? 80;
@@ -32,10 +36,6 @@ export function initDefaultReporter(opts) {
             subscription.unsubscribe();
         };
     }
-    const diff = createDiffer({
-        height: proc.stdout.rows,
-        outputMaxWidth,
-    });
     const subscription = output$
         .subscribe({
         complete() { }, // eslint-disable-line:no-empty
@@ -47,18 +47,39 @@ export function initDefaultReporter(opts) {
     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;
-        write(diff.update(view));
+        // 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);
     }
     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/reportLockfileVerification.js

@@ -7,8 +7,8 @@ import { map } from 'rxjs/operators';
 export function reportLockfileVerification(lockfileVerification$, opts) {
     const expectedDir = opts.workspaceDir ?? opts.cwd;
     // A single inner observable so the `done` message overwrites the
-    // transient `started` message in ansi-diff mode. In appendOnly mode
-    // both lines are printed.
+    // transient `started` message when the reporter redraws in place. In
+    // appendOnly mode both lines are printed.
     return Rx.of(lockfileVerification$.pipe(map((log) => {
         const path_ = formatLockfilePath(log.lockfilePath, opts.cwd, expectedDir);
         if (log.status === 'cached') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/cli.default-reporter",
-  "version": "1100.3.1",
+  "version": "1100.3.2",
   "description": "The default reporter of pnpm",
   "keywords": [
     "pnpm",
@@ -33,7 +33,6 @@
   },
   "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,14 +44,14 @@
     "semver": "^7.8.4",
     "stacktracey": "^2.2.0",
     "string-length": "^7.0.1",
-    "@pnpm/deps.inspection.peers-issues-renderer": "1100.0.6",
-    "@pnpm/error": "1100.0.0",
-    "@pnpm/installing.dedupe.types": "1100.0.1",
-    "@pnpm/types": "1101.3.2",
     "@pnpm/cli.meta": "1100.0.8",
-    "@pnpm/config.reader": "1101.9.0",
+    "@pnpm/config.reader": "1101.10.0",
+    "@pnpm/core-loggers": "1100.2.1",
+    "@pnpm/types": "1101.3.2",
     "@pnpm/installing.dedupe.issues-renderer": "1100.0.1",
-    "@pnpm/core-loggers": "1100.2.1"
+    "@pnpm/installing.dedupe.types": "1100.0.1",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/deps.inspection.peers-issues-renderer": "1100.0.6"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -65,7 +64,7 @@
     "ghooks": "2.0.4",
     "load-json-file": "^7.0.1",
     "normalize-newline": "5.0.0",
-    "@pnpm/cli.default-reporter": "1100.3.1",
+    "@pnpm/cli.default-reporter": "1100.3.2",
     "@pnpm/logger": "1100.0.0"
   },
   "engines": {