concurrently 5.2.0 → 5.3.0

package/README.md

@@ -251,7 +251,10 @@ concurrently can be used programmatically by using the API documented below:
     to use when prefixing with `time`. Default: `yyyy-MM-dd HH:mm:ss.ZZZ`
 
 > Returns: a `Promise` that resolves if the run was successful (according to `successCondition` option),
-> or rejects, containing an array with the exit codes of each command that has been run.
+> or rejects, containing an array of objects with information for each command that has been run, in the order
+> that the commands terminated. The objects have the shape `{ command, index, exitCode }`, where `command` is the object
+> passed in the `commands` array and `index` its index there. Default values (empty strings or objects) are returned for
+> the fields that were not specified.
 
 Example:
 
@@ -283,6 +286,6 @@ concurrently([
     So *null* means the process didn't terminate normally. This will make **concurrent**
     to return non-zero exit code too.
 
-* Does this work with the npm-replacement [yarn](https://github.com/yarnpkg/yarn)?
+* Does this work with the npm-replacements [yarn](https://github.com/yarnpkg/yarn) or [pnpm](https://pnpm.js.org/)?
 
-    Yes! In all examples above, you may replace "`npm`" with "`yarn`".
+    Yes! In all examples above, you may replace "`npm`" with "`yarn`" or "`pnpm`".

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "concurrently",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "description": "Run commands concurrently",
   "main": "index.js",
   "bin": {

package/src/command-parser/expand-npm-shortcut.js

@@ -1,6 +1,6 @@
 module.exports = class ExpandNpmShortcut {
     parse(commandInfo) {
-        const [, npmCmd, cmdName, args] = commandInfo.command.match(/^(npm|yarn):(\S+)(.*)/) || [];
+        const [, npmCmd, cmdName, args] = commandInfo.command.match(/^(npm|yarn|pnpm):(\S+)(.*)/) || [];
         if (!cmdName) {
             return commandInfo;
         }

package/src/command-parser/expand-npm-wildcard.js

@@ -7,7 +7,7 @@ module.exports = class ExpandNpmWildcard {
     }
 
     parse(commandInfo) {
-        const [, npmCmd, cmdName, args] = commandInfo.command.match(/(npm|yarn) run (\S+)([^&]*)/) || [];
+        const [, npmCmd, cmdName, args] = commandInfo.command.match(/(npm|yarn|pnpm) run (\S+)([^&]*)/) || [];
         const wildcardPosition = (cmdName || '').indexOf('*');
 
         // If the regex didn't match an npm script, or it has no wildcard,

package/src/command.js

@@ -5,11 +5,12 @@ module.exports = class Command {
         return !!this.process;
     }
 
-    constructor({ index, name, command, prefixColor, killProcess, spawn, spawnOpts }) {
+    constructor({ index, name, command, prefixColor, env, killProcess, spawn, spawnOpts }) {
         this.index = index;
         this.name = name;
         this.command = command;
         this.prefixColor = prefixColor;
+        this.env = env;
         this.killProcess = killProcess;
         this.spawn = spawn;
         this.spawnOpts = spawnOpts;
@@ -31,7 +32,16 @@ module.exports = class Command {
         });
         Rx.fromEvent(child, 'close').subscribe(([exitCode, signal]) => {
             this.process = undefined;
-            this.close.next(exitCode === null ? signal : exitCode);
+            this.close.next({
+                command: {
+                    command: this.command,
+                    name: this.name,
+                    prefixColor: this.prefixColor,
+                    env: this.env,
+                },
+                index: this.index,
+                exitCode: exitCode === null ? signal : exitCode,
+            });
         });
         child.stdout && pipeTo(Rx.fromEvent(child.stdout, 'data'), this.stdout);
         child.stderr && pipeTo(Rx.fromEvent(child.stderr, 'data'), this.stderr);

package/src/completion-listener.js

@@ -27,10 +27,10 @@ module.exports = class CompletionListener {
         return Rx.merge(...closeStreams)
             .pipe(
                 bufferCount(closeStreams.length),
-                switchMap(exitCodes =>
-                    this.isSuccess(exitCodes)
-                        ? Rx.of(exitCodes, this.scheduler)
-                        : Rx.throwError(exitCodes, this.scheduler)
+                switchMap(exitInfos =>
+                    this.isSuccess(exitInfos.map(({ exitCode }) => exitCode))
+                        ? Rx.of(exitInfos, this.scheduler)
+                        : Rx.throwError(exitInfos, this.scheduler)
                 ),
                 take(1)
             )

package/src/flow-control/kill-on-signal.js

@@ -16,8 +16,9 @@ module.exports = class KillOnSignal {
         });
 
         return commands.map(command => {
-            const closeStream = command.close.pipe(map(value => {
-                return caughtSignal === 'SIGINT' ? 0 : value;
+            const closeStream = command.close.pipe(map(exitInfo => {
+                const exitCode = caughtSignal === 'SIGINT' ? 0 : exitInfo.exitCode;
+                return Object.assign({}, exitInfo, { exitCode });
             }));
             return new Proxy(command, {
                 get(target, prop) {

package/src/flow-control/kill-others.js

@@ -18,7 +18,7 @@ module.exports = class KillOthers {
         }
 
         const closeStates = commands.map(command => command.close.pipe(
-            map(exitCode => exitCode === 0 ? 'success' : 'failure'),
+            map(({ exitCode }) => exitCode === 0 ? 'success' : 'failure'),
             filter(state => conditions.includes(state))
         ));
 

package/src/flow-control/log-exit.js

@@ -4,8 +4,8 @@ module.exports = class LogExit {
     }
 
     handle(commands) {
-        commands.forEach(command => command.close.subscribe(code => {
-            this.logger.logCommandEvent(`${command.command} exited with code ${code}`, command);
+        commands.forEach(command => command.close.subscribe(({ exitCode }) => {
+            this.logger.logCommandEvent(`${command.command} exited with code ${exitCode}`, command);
         }));
 
         return commands;

package/src/flow-control/restart-process.js

@@ -18,7 +18,7 @@ module.exports = class RestartProcess {
 
         commands.map(command => command.close.pipe(
             take(this.tries),
-            takeWhile(code => code !== 0)
+            takeWhile(({ exitCode }) => exitCode !== 0)
         )).map((failure, index) => Rx.merge(
             // Delay the emission (so that the restarts happen on time),
             // explicitly telling the subscriber that a restart is needed
@@ -36,9 +36,9 @@ module.exports = class RestartProcess {
         }));
 
         return commands.map(command => {
-            const closeStream = command.close.pipe(filter((value, emission) => {
+            const closeStream = command.close.pipe(filter(({ exitCode }, emission) => {
                 // We let all success codes pass, and failures only after restarting won't happen again
-                return value === 0 || emission >= this.tries;
+                return exitCode === 0 || emission >= this.tries;
             }));
 
             return new Proxy(command, {

package/src/logger.js

@@ -53,7 +53,7 @@ module.exports = class Logger {
         return _.reduce(prefixes, (prev, val, key) => {
             const keyRegex = new RegExp(_.escapeRegExp(`{${key}}`), 'g');
             return prev.replace(keyRegex, val);
-        }, prefix).trim();
+        }, prefix);
     }
 
     colorText(command, text) {