Merge a66ddb8 into 7263ffe

open-cli-tools · Sep 27, 2021 · 7ffcb26 · 7ffcb26
2 parents 7263ffe + a66ddb8
commit 7ffcb26
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/bin/concurrently.js b/bin/concurrently.js
@@ -169,7 +169,8 @@ concurrently(args._.map((command, index) => {
     restartDelay: args.restartAfter,
     restartTries: args.restartTries,
     successCondition: args.success,
-    timestampFormat: args.timestampFormat
+    timestampFormat: args.timestampFormat,
+    prefixColors
 }).then(
     () => process.exit(0),
     () => process.exit(1)

diff --git a/index.js b/index.js
@@ -43,7 +43,8 @@ module.exports = exports = (commands, options = {}) => {
                 logger,
                 conditions: options.killOthers
             })
-        ]
+        ],
+        prefixColors: options.prefixColors || []
     });
 };
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/concurrently.js b/src/concurrently.js
@@ -24,6 +24,9 @@ module.exports = (commands, options) => {
     assert.ok(Array.isArray(commands), '[concurrently] commands should be an array');
     assert.notStrictEqual(commands.length, 0, '[concurrently] no commands provided');
 
+    const prefixColors = options.prefixColors;
+
+    delete options.prefixColors;
     options = _.defaults(options, defaults);
 
     const commandParsers = [
@@ -32,21 +35,25 @@ module.exports = (commands, options) => {
         new ExpandNpmWildcard()
     ];
 
+    let lastColor = undefined;
     commands = _(commands)
         .map(mapToCommandInfo)
         .flatMap(command => parseCommand(command, commandParsers))
-        .map((command, index) => new Command(
-            Object.assign({
-                index,
-                spawnOpts: getSpawnOpts({
-                    raw: options.raw,
-                    env: command.env,
-                    cwd: command.cwd || options.cwd,
-                }),
-                killProcess: options.kill,
-                spawn: options.spawn,
-            }, command)
-        ))
+        .map((command, index) => {
+            lastColor = prefixColors && prefixColors[index] || lastColor;
+            return new Command(
+                Object.assign({
+                    index,
+                    spawnOpts: getSpawnOpts({
+                        raw: options.raw,
+                        env: command.env,
+                        cwd: command.cwd || options.cwd,
+                    }),
+                    killProcess: options.kill,
+                    spawn: options.spawn,
+                }, command, lastColor ? { prefixColor: lastColor } : null)
+            );
+        })
         .value();
 
     const handleResult = options.controllers.reduce(
@@ -55,11 +62,11 @@ module.exports = (commands, options) => {
             return {
                 commands,
                 onFinishCallbacks: _.concat(onFinishCallbacks, onFinish ? [onFinish] : [])
-            }
+            };
         },
         { commands, onFinishCallbacks: [] }
     );
-    commands = handleResult.commands
+    commands = handleResult.commands;
 
     const commandsLeft = commands.slice();
     const maxProcesses = Math.max(1, Number(options.maxProcesses) || commandsLeft.length);