Replace deprecated RxJS code (#343)

open-cli-tools · Jun 24, 2023 · eadbc6a · eadbc6a
1 parent 744ece9
commit eadbc6a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/bin/concurrently.spec.ts b/bin/concurrently.spec.ts
@@ -80,8 +80,9 @@ const run = (args: string, ctrlcWrapper?: boolean) => {
     });
 
     const exit = Rx.firstValueFrom(
-        Rx.fromEvent<[number | null, NodeJS.Signals | null]>(child, 'exit').pipe(
-            map((exit) => {
+        Rx.fromEvent(child, 'exit').pipe(
+            map((event) => {
+                const exit = event as [number | null, NodeJS.Signals | null];
                 return {
                     /** The exit code if the child exited on its own. */
                     code: exit[0],

diff --git a/src/command.ts b/src/command.ts
@@ -150,14 +150,15 @@ export class Command implements CommandInfo {
         const highResStartTime = process.hrtime();
         this.timer.next({ startDate });
 
-        Rx.fromEvent<unknown>(child, 'error').subscribe((event) => {
+        Rx.fromEvent(child, 'error').subscribe((event) => {
             this.process = undefined;
             const endDate = new Date(Date.now());
             this.timer.next({ startDate, endDate });
             this.error.next(event);
         });
-        Rx.fromEvent<[number | null, NodeJS.Signals | null]>(child, 'close').subscribe(
-            ([exitCode, signal]) => {
+        Rx.fromEvent(child, 'close')
+            .pipe(Rx.map((event) => event as [number | null, NodeJS.Signals | null]))
+            .subscribe(([exitCode, signal]) => {
                 this.process = undefined;
                 this.exited = true;
 
@@ -175,10 +176,17 @@ export class Command implements CommandInfo {
                         durationSeconds: durationSeconds + durationNanoSeconds / 1e9,
                     },
                 });
-            }
-        );
-        child.stdout && pipeTo(Rx.fromEvent<Buffer>(child.stdout, 'data'), this.stdout);
-        child.stderr && pipeTo(Rx.fromEvent<Buffer>(child.stderr, 'data'), this.stderr);
+            });
+        child.stdout &&
+            pipeTo(
+                Rx.fromEvent(child.stdout, 'data').pipe(Rx.map((event) => event as Buffer)),
+                this.stdout
+            );
+        child.stderr &&
+            pipeTo(
+                Rx.fromEvent(child.stderr, 'data').pipe(Rx.map((event) => event as Buffer)),
+                this.stderr
+            );
         this.stdin = child.stdin || undefined;
     }
 

diff --git a/src/completion-listener.ts b/src/completion-listener.ts
@@ -93,7 +93,7 @@ export class CompletionListener {
                 switchMap((exitInfos) =>
                     this.isSuccess(exitInfos)
                         ? this.emitWithScheduler(Rx.of(exitInfos))
-                        : this.emitWithScheduler(Rx.throwError(exitInfos))
+                        : this.emitWithScheduler(Rx.throwError(() => exitInfos))
                 ),
                 take(1)
             )

diff --git a/src/flow-control/restart-process.ts b/src/flow-control/restart-process.ts
@@ -1,5 +1,5 @@
 import * as Rx from 'rxjs';
-import { defaultIfEmpty, delay, filter, mapTo, skip, take, takeWhile } from 'rxjs/operators';
+import { defaultIfEmpty, delay, filter, map, skip, take, takeWhile } from 'rxjs/operators';
 
 import { Command } from '../command';
 import * as defaults from '../defaults';
@@ -49,11 +49,18 @@ export class RestartProcess implements FlowController {
                 Rx.merge(
                     // Delay the emission (so that the restarts happen on time),
                     // explicitly telling the subscriber that a restart is needed
-                    failure.pipe(delay(this.delay, this.scheduler), mapTo(true)),
+                    failure.pipe(
+                        delay(this.delay, this.scheduler),
+                        map(() => true)
+                    ),
                     // Skip the first N emissions (as these would be duplicates of the above),
                     // meaning it will be empty because of success, or failed all N times,
                     // and no more restarts should be attempted.
-                    failure.pipe(skip(this.tries), mapTo(false), defaultIfEmpty(false))
+                    failure.pipe(
+                        skip(this.tries),
+                        map(() => false),
+                        defaultIfEmpty(false)
+                    )
                 ).subscribe((restart) => {
                     const command = commands[index];
                     if (restart) {