From acffba7fa90990f8fe44fe8fc160f73ac9aff130 Mon Sep 17 00:00:00 2001
From: Victor Savkin <vic.savkin@gmail.com>
Date: Mon, 24 Jan 2022 14:18:14 -0500
Subject: [PATCH] fix(core): normalize command to avoid nx run nx run (#8678)

---
 .../src/tasks-runner/forked-process-task-runner.ts         | 6 +++---
 .../life-cycles/empty-terminal-output-life-cycle.ts        | 5 +----
 .../static-run-many-terminal-output-life-cycle.ts          | 5 +----
 .../static-run-one-terminal-output-life-cycle.ts           | 2 +-
 packages/workspace/src/utilities/output.ts                 | 7 +++++++
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/workspace/src/tasks-runner/forked-process-task-runner.ts b/packages/workspace/src/tasks-runner/forked-process-task-runner.ts
index 9f2f6b534f..0863385a37 100644
--- a/packages/workspace/src/tasks-runner/forked-process-task-runner.ts
+++ b/packages/workspace/src/tasks-runner/forked-process-task-runner.ts
@@ -40,7 +40,7 @@ export class ForkedProcessTaskRunner {
           );
         } else {
           const args = getCommandArgsForTask(Object.values(taskGraph.tasks)[0]);
-          output.logCommand(`${args.filter((a) => a !== 'run').join(' ')}`);
+          output.logCommand(args.join(' '));
           output.addNewline();
         }
 
@@ -98,7 +98,7 @@ export class ForkedProcessTaskRunner {
       try {
         const args = getCommandArgsForTask(task);
         if (forwardOutput) {
-          output.logCommand(`${args.filter((a) => a !== 'run').join(' ')}`);
+          output.logCommand(args.join(' '));
           output.addNewline();
         }
         const p = fork(this.cliPath, args, {
@@ -163,7 +163,7 @@ export class ForkedProcessTaskRunner {
       try {
         const args = getCommandArgsForTask(task);
         if (forwardOutput) {
-          output.logCommand(`${args.filter((a) => a !== 'run').join(' ')}`);
+          output.logCommand(args.join(' '));
           output.addNewline();
         }
         const p = fork(this.cliPath, args, {
diff --git a/packages/workspace/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.ts b/packages/workspace/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.ts
index fb4cc0fe9a..bae135a73e 100644
--- a/packages/workspace/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.ts
+++ b/packages/workspace/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.ts
@@ -16,10 +16,7 @@ export class EmptyTerminalOutputLifeCycle implements LifeCycle {
       cacheStatus === 'skipped'
     ) {
       const args = getCommandArgsForTask(task);
-      output.logCommand(
-        `${args.filter((a) => a !== 'run').join(' ')}`,
-        cacheStatus
-      );
+      output.logCommand(args.join(' '), cacheStatus);
       output.addNewline();
       process.stdout.write(terminalOutput);
     }
diff --git a/packages/workspace/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.ts b/packages/workspace/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.ts
index 6a6d20f83d..2e714c0bc8 100644
--- a/packages/workspace/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.ts
+++ b/packages/workspace/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.ts
@@ -147,10 +147,7 @@ export class StaticRunManyTerminalOutputLifeCycle implements LifeCycle {
     terminalOutput: string
   ) {
     const args = getCommandArgsForTask(task);
-    output.logCommand(
-      `${args.filter((a) => a !== 'run').join(' ')}`,
-      cacheStatus
-    );
+    output.logCommand(args.join(' '), cacheStatus);
     output.addNewline();
     process.stdout.write(terminalOutput);
   }
diff --git a/packages/workspace/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.ts b/packages/workspace/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.ts
index b510afb87b..715cc0c7c5 100644
--- a/packages/workspace/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.ts
+++ b/packages/workspace/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.ts
@@ -118,7 +118,7 @@ export class StaticRunOneTerminalOutputLifeCycle implements LifeCycle {
       task.target.project === this.initiatingProject
     ) {
       const args = getCommandArgsForTask(task);
-      output.logCommand(`${args.filter((a) => a !== 'run').join(' ')}`, status);
+      output.logCommand(args.join(' '), status);
       output.addNewline();
       process.stdout.write(terminalOutput);
     }
diff --git a/packages/workspace/src/utilities/output.ts b/packages/workspace/src/utilities/output.ts
index f4eaa97b96..ba95b8b166 100644
--- a/packages/workspace/src/utilities/output.ts
+++ b/packages/workspace/src/utilities/output.ts
@@ -207,6 +207,13 @@ class CLIOutput {
   }
 
   logCommand(message: string, taskStatus?: TaskStatus) {
+    // normalize the message
+    if (message.startsWith('nx run ')) {
+      message = message.substring('nx run '.length);
+    } else if (message.startsWith('run ')) {
+      message = message.substring('run '.length);
+    }
+
     this.addNewline();
     let commandOutput = `${chalk.dim('> nx run')} ${message}`;
     if (taskStatus === 'local-cache') {