chore: move __{begin,end}SynchronizedUpdate functions to BaseReporter

Author: haze

packages/jest-reporters/src/BaseReporter.ts

@@ -5,14 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import type {WriteStream} from 'tty';
 import type {
   AggregatedResult,
   Test,
   TestCaseResult,
   TestContext,
   TestResult,
 } from '@jest/test-result';
-import {preRunMessage} from 'jest-util';
+import {isInteractive, preRunMessage} from 'jest-util';
 import type {Reporter, ReporterOnStartOptions} from './types';
 
 const {remove: preRunMessageRemove} = preRunMessage;
@@ -57,4 +58,16 @@ export default class BaseReporter implements Reporter {
   getLastError(): Error | undefined {
     return this._error;
   }
+
+  protected __beginSynchronizedUpdate(write: WriteStream['write']): void {
+    if (isInteractive) {
+      write('\u001B[?2026h');
+    }
+  }
+
+  protected __endSynchronizedUpdate(write: WriteStream['write']): void {
+    if (isInteractive) {
+      write('\u001B[?2026l');
+    }
+  }
 }

packages/jest-reporters/src/DefaultReporter.ts

@@ -39,6 +39,7 @@ export default class DefaultReporter extends BaseReporter {
   private readonly _out: write;
   private readonly _status: Status;
   private readonly _bufferedOutput: Set<FlushBufferedOutput>;
+  private readonly _bufferedOutput: Set<FlushBufferedOutput>;
 
   static readonly filename = __filename;
 
@@ -53,10 +54,14 @@ export default class DefaultReporter extends BaseReporter {
     this.__wrapStdio(process.stdout);
     this.__wrapStdio(process.stderr);
     this._status.onChange(() => {
-      this.__beginSynchronizedUpdate();
+      this.__beginSynchronizedUpdate(
+        this._globalConfig.useStderr ? this._err : this._out,
+      );
       this.__clearStatus();
       this.__printStatus();
-      this.__endSynchronizedUpdate();
+      this.__endSynchronizedUpdate(
+        this._globalConfig.useStderr ? this._err : this._out,
+      );
     });
   }
 
@@ -71,13 +76,17 @@ export default class DefaultReporter extends BaseReporter {
       buffer = [];
 
       // This is to avoid conflicts between random output and status text
-      this.__beginSynchronizedUpdate();
+      this.__beginSynchronizedUpdate(
+        this._globalConfig.useStderr ? this._err : this._out,
+      );
       this.__clearStatus();
       if (string) {
         write(string);
       }
       this.__printStatus();
-      this.__endSynchronizedUpdate();
+      this.__endSynchronizedUpdate(
+        this._globalConfig.useStderr ? this._err : this._out,
+      );
 
       this._bufferedOutput.delete(flushBufferedOutput);
     };
@@ -124,26 +133,6 @@ export default class DefaultReporter extends BaseReporter {
     }
   }
 
-  protected __beginSynchronizedUpdate(): void {
-    if (isInteractive) {
-      if (this._globalConfig.useStderr) {
-        this._err('\x1b[?2026h');
-      } else {
-        this._out('\x1b[?2026h');
-      }
-    }
-  }
-
-  protected __endSynchronizedUpdate(): void {
-    if (isInteractive) {
-      if (this._globalConfig.useStderr) {
-        this._err('\x1b[?2026l');
-      } else {
-        this._out('\x1b[?2026l');
-      }
-    }
-  }
-
   protected __printStatus(): void {
     const {content, clear} = this._status.get();
     this._clear = clear;