concurrently 7.3.0 → 7.4.0

package/README.md

@@ -57,6 +57,9 @@ npm install concurrently --save
 
 ## Usage
 
+> **Note**
+> The `concurrently` command is now also available under the shorthand alias `conc`.
+
 Remember to surround separate commands with quotes:
 
 ```bash
@@ -149,8 +152,8 @@ General
                                template.
                                Example names: "main,browser,server"     [string]
       --name-separator         The character to split <names> on. Example usage:
-                               concurrently -n "styles|scripts|server"
-                               --name-separator "|"               [default: ","]
+                               -n "styles|scripts|server" --name-separator "|"
+                                                                  [default: ","]
   -s, --success                Which command(s) must exit with code 0 in order
                                for concurrently exit with code 0 too. Options
                                are:

package/dist/bin/concurrently.js

@@ -35,7 +35,7 @@ const epilogue_1 = require("./epilogue");
 // Clean-up arguments (yargs expects only the arguments after the program name)
 const cleanArgs = (0, helpers_1.hideBin)(process.argv);
 // Find argument separator (double dash)
-const argsSepIdx = cleanArgs.findIndex(arg => arg === '--');
+const argsSepIdx = cleanArgs.findIndex((arg) => arg === '--');
 // Arguments before separator
 const argsBeforeSep = argsSepIdx >= 0 ? cleanArgs.slice(0, argsSepIdx) : cleanArgs;
 // Arguments after separator
@@ -65,7 +65,7 @@ const args = (0, yargs_1.default)(argsBeforeSep)
     },
     'name-separator': {
         describe: 'The character to split <names> on. Example usage:\n' +
-            'concurrently -n "styles|scripts|server" --name-separator "|"',
+            '-n "styles|scripts|server" --name-separator "|"',
         default: defaults.nameSeparator,
     },
     success: {

package/dist/bin/epilogue.js

@@ -69,7 +69,7 @@ const examplesString = examples
     ` - ${description}`,
     example
         .split('\n')
-        .map(line => `     ${line}`)
+        .map((line) => `     ${line}`)
         .join('\n'),
 ].join('\n\n'))
     .join('\n\n');

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

@@ -42,7 +42,7 @@ class ExpandNpmWildcard {
         const wildcardRegex = new RegExp(`^${preWildcard}(.*?)${postWildcard}$`);
         const currentName = commandInfo.name || '';
         return this.scripts
-            .map(script => {
+            .map((script) => {
             const match = script.match(wildcardRegex);
             if (omissionRegex) {
                 const toOmit = script.match(new RegExp(omissionRegex[1]));

package/dist/src/command.js

@@ -57,7 +57,7 @@ class Command {
         const startDate = new Date(Date.now());
         const highResStartTime = process.hrtime();
         this.timer.next({ startDate });
-        Rx.fromEvent(child, 'error').subscribe(event => {
+        Rx.fromEvent(child, 'error').subscribe((event) => {
             this.process = undefined;
             const endDate = new Date(Date.now());
             this.timer.next({ startDate, endDate });
@@ -100,5 +100,5 @@ exports.Command = Command;
  * Pipes all events emitted by `stream` into `subject`.
  */
 function pipeTo(stream, subject) {
-    stream.subscribe(event => subject.next(event));
+    stream.subscribe((event) => subject.next(event));
 }

package/dist/src/completion-listener.js

@@ -53,11 +53,11 @@ class CompletionListener {
         const targetCommandsEvents = events.filter(({ command, index }) => command.name === nameOrIndex || index === Number(nameOrIndex));
         if (this.successCondition.startsWith('!')) {
             // All commands except the specified ones must exit succesfully
-            return events.every(event => targetCommandsEvents.includes(event) || event.exitCode === 0);
+            return events.every((event) => targetCommandsEvents.includes(event) || event.exitCode === 0);
         }
         // Only the specified commands must exit succesfully
         return (targetCommandsEvents.length > 0 &&
-            targetCommandsEvents.every(event => event.exitCode === 0));
+            targetCommandsEvents.every((event) => event.exitCode === 0));
     }
     /**
      * Given a list of commands, wait for all of them to exit and then evaluate their exit codes.
@@ -65,8 +65,8 @@ class CompletionListener {
      * @returns A Promise that resolves if the success condition is met, or rejects otherwise.
      */
     listen(commands) {
-        const closeStreams = commands.map(command => command.close);
-        return Rx.lastValueFrom(Rx.merge(...closeStreams).pipe((0, operators_1.bufferCount)(closeStreams.length), (0, operators_1.switchMap)(exitInfos => this.isSuccess(exitInfos)
+        const closeStreams = commands.map((command) => command.close);
+        return Rx.lastValueFrom(Rx.merge(...closeStreams).pipe((0, operators_1.bufferCount)(closeStreams.length), (0, operators_1.switchMap)((exitInfos) => this.isSuccess(exitInfos)
             ? Rx.of(exitInfos, this.scheduler)
             : Rx.throwError(exitInfos, this.scheduler)), (0, operators_1.take)(1)));
     }

package/dist/src/concurrently.js

@@ -44,7 +44,7 @@ function concurrently(baseCommands, baseOptions) {
     let lastColor = '';
     let commands = (0, lodash_1.default)(baseCommands)
         .map(mapToCommandInfo)
-        .flatMap(command => parseCommand(command, commandParsers))
+        .flatMap((command) => parseCommand(command, commandParsers))
         .map((command, index) => {
         // Use documented behaviour of repeating last color when specifying more commands than colors
         lastColor = (options.prefixColors && options.prefixColors[index]) || lastColor;
@@ -83,7 +83,7 @@ function concurrently(baseCommands, baseOptions) {
     const result = new completion_listener_1.CompletionListener({ successCondition: options.successCondition })
         .listen(commands)
         .finally(() => {
-        handleResult.onFinishCallbacks.forEach(onFinish => onFinish());
+        handleResult.onFinishCallbacks.forEach((onFinish) => onFinish());
     });
     return {
         result,
@@ -113,7 +113,7 @@ function mapToCommandInfo(command) {
     };
 }
 function parseCommand(command, parsers) {
-    return parsers.reduce((commands, parser) => lodash_1.default.flatMap(commands, command => parser.parse(command)), lodash_1.default.castArray(command));
+    return parsers.reduce((commands, parser) => lodash_1.default.flatMap(commands, (command) => parser.parse(command)), lodash_1.default.castArray(command));
 }
 function maybeRunMore(commandsLeft) {
     const command = commandsLeft.shift();

package/dist/src/flow-control/input-handler.js

@@ -48,12 +48,12 @@ class InputHandler {
             return { commands };
         }
         Rx.fromEvent(this.inputStream, 'data')
-            .pipe((0, operators_1.map)(data => data.toString()))
-            .subscribe(data => {
+            .pipe((0, operators_1.map)((data) => data.toString()))
+            .subscribe((data) => {
             const dataParts = data.split(/:(.+)/);
             const targetId = dataParts.length > 1 ? dataParts[0] : this.defaultInputTarget;
             const input = dataParts[1] || data;
-            const command = commands.find(command => command.name === targetId ||
+            const command = commands.find((command) => command.name === targetId ||
                 command.index.toString() === targetId.toString());
             if (command && command.stdin) {
                 command.stdin.write(input);

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

@@ -12,15 +12,15 @@ class KillOnSignal {
     }
     handle(commands) {
         let caughtSignal;
-        ['SIGINT', 'SIGTERM', 'SIGHUP'].forEach(signal => {
+        ['SIGINT', 'SIGTERM', 'SIGHUP'].forEach((signal) => {
             this.process.on(signal, () => {
                 caughtSignal = signal;
-                commands.forEach(command => command.kill(signal));
+                commands.forEach((command) => command.kill(signal));
             });
         });
         return {
-            commands: commands.map(command => {
-                const closeStream = command.close.pipe((0, operators_1.map)(exitInfo => {
+            commands: commands.map((command) => {
+                const closeStream = command.close.pipe((0, operators_1.map)((exitInfo) => {
                     const exitCode = caughtSignal === 'SIGINT' ? 0 : exitInfo.exitCode;
                     return { ...exitInfo, exitCode };
                 }));

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

@@ -15,16 +15,16 @@ class KillOthers {
         this.conditions = lodash_1.default.castArray(conditions);
     }
     handle(commands) {
-        const conditions = this.conditions.filter(condition => condition === 'failure' || condition === 'success');
+        const conditions = this.conditions.filter((condition) => condition === 'failure' || condition === 'success');
         if (!conditions.length) {
             return { commands };
         }
-        const closeStates = commands.map(command => command.close.pipe((0, operators_1.map)(({ exitCode }) => exitCode === 0 ? 'success' : 'failure'), (0, operators_1.filter)(state => conditions.includes(state))));
-        closeStates.forEach(closeState => closeState.subscribe(() => {
-            const killableCommands = commands.filter(command => command.killable);
+        const closeStates = commands.map((command) => command.close.pipe((0, operators_1.map)(({ exitCode }) => exitCode === 0 ? 'success' : 'failure'), (0, operators_1.filter)((state) => conditions.includes(state))));
+        closeStates.forEach((closeState) => closeState.subscribe(() => {
+            const killableCommands = commands.filter((command) => command.killable);
             if (killableCommands.length) {
                 this.logger.logGlobalEvent('Sending SIGTERM to other processes..');
-                killableCommands.forEach(command => command.kill());
+                killableCommands.forEach((command) => command.kill());
             }
         }));
         return { commands };

package/dist/src/flow-control/log-error.js

@@ -9,7 +9,7 @@ class LogError {
         this.logger = logger;
     }
     handle(commands) {
-        commands.forEach(command => command.error.subscribe(event => {
+        commands.forEach((command) => command.error.subscribe((event) => {
             this.logger.logCommandEvent(`Error occurred when executing command: ${command.command}`, command);
             const errorText = String(event instanceof Error ? event.stack || event : event);
             this.logger.logCommandEvent(errorText, command);

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

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

package/dist/src/flow-control/log-output.js

@@ -9,9 +9,9 @@ class LogOutput {
         this.logger = logger;
     }
     handle(commands) {
-        commands.forEach(command => {
-            command.stdout.subscribe(text => this.logger.logCommandText(text.toString(), command));
-            command.stderr.subscribe(text => this.logger.logCommandText(text.toString(), command));
+        commands.forEach((command) => {
+            command.stdout.subscribe((text) => this.logger.logCommandText(text.toString(), command));
+            command.stderr.subscribe((text) => this.logger.logCommandText(text.toString(), command));
         });
         return { commands };
     }

package/dist/src/flow-control/log-timings.js

@@ -65,7 +65,7 @@ class LogTimings {
             return { commands };
         }
         // individual process timings
-        commands.forEach(command => {
+        commands.forEach((command) => {
             command.timer.subscribe(({ startDate, endDate }) => {
                 if (!endDate) {
                     const formattedStartDate = (0, format_1.default)(startDate, this.timestampFormat);
@@ -79,9 +79,9 @@ class LogTimings {
             });
         });
         // overall summary timings
-        const closeStreams = commands.map(command => command.close);
+        const closeStreams = commands.map((command) => command.close);
         const allProcessesClosed = Rx.merge(...closeStreams).pipe((0, operators_1.bufferCount)(closeStreams.length), (0, operators_1.take)(1));
-        allProcessesClosed.subscribe(exitInfos => this.printExitInfoTimingTable(exitInfos));
+        allProcessesClosed.subscribe((exitInfos) => this.printExitInfoTimingTable(exitInfos));
         return { commands };
     }
 }

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

@@ -43,7 +43,7 @@ class RestartProcess {
             return { commands };
         }
         commands
-            .map(command => command.close.pipe((0, operators_1.take)(this.tries), (0, operators_1.takeWhile)(({ exitCode }) => exitCode !== 0)))
+            .map((command) => command.close.pipe((0, operators_1.take)(this.tries), (0, operators_1.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
@@ -51,7 +51,7 @@ class RestartProcess {
         // 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((0, operators_1.skip)(this.tries), (0, operators_1.mapTo)(false), (0, operators_1.defaultIfEmpty)(false))).subscribe(restart => {
+        failure.pipe((0, operators_1.skip)(this.tries), (0, operators_1.mapTo)(false), (0, operators_1.defaultIfEmpty)(false))).subscribe((restart) => {
             const command = commands[index];
             if (restart) {
                 this.logger.logCommandEvent(`${command.command} restarted`, command);
@@ -59,7 +59,7 @@ class RestartProcess {
             }
         }));
         return {
-            commands: commands.map(command => {
+            commands: commands.map((command) => {
                 const closeStream = command.close.pipe((0, operators_1.filter)(({ exitCode }, emission) => {
                     // We let all success codes pass, and failures only after restarting won't happen again
                     return exitCode === 0 || emission >= this.tries;

package/dist/src/index.d.ts

@@ -71,4 +71,4 @@ export declare type ConcurrentlyOptions = BaseConcurrentlyOptions & {
 };
 declare const _default: (commands: ConcurrentlyCommandInput[], options?: Partial<ConcurrentlyOptions>) => ConcurrentlyResult;
 export default _default;
-export { concurrently, ConcurrentlyCommandInput, ConcurrentlyResult, Logger, Command, CloseEvent, TimerEvent, CommandIdentifier, FlowController, InputHandler, KillOnSignal, KillOthers, LogError, LogExit, LogOutput, LogTimings, RestartProcess, };
+export { CloseEvent, Command, CommandIdentifier, concurrently, ConcurrentlyCommandInput, ConcurrentlyResult, FlowController, InputHandler, KillOnSignal, KillOthers, LogError, LogExit, Logger, LogOutput, LogTimings, RestartProcess, TimerEvent, };

package/dist/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RestartProcess = exports.LogTimings = exports.LogOutput = exports.LogExit = exports.LogError = exports.KillOthers = exports.KillOnSignal = exports.InputHandler = exports.Command = exports.Logger = exports.concurrently = void 0;
+exports.RestartProcess = exports.LogTimings = exports.LogOutput = exports.Logger = exports.LogExit = exports.LogError = exports.KillOthers = exports.KillOnSignal = exports.InputHandler = exports.concurrently = exports.Command = void 0;
 const command_1 = require("./command");
 Object.defineProperty(exports, "Command", { enumerable: true, get: function () { return command_1.Command; } });
 const concurrently_1 = require("./concurrently");

package/dist/src/logger.js

@@ -28,8 +28,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const lodash_1 = __importDefault(require("lodash"));
 const format_1 = __importDefault(require("date-fns/format"));
+const lodash_1 = __importDefault(require("lodash"));
 const Rx = __importStar(require("rxjs"));
 const defaults = __importStar(require("./defaults"));
 class Logger {
@@ -43,7 +43,7 @@ class Logger {
         // keep in the list of commands to hide only strings with some length.
         // This might happen through the CLI when no `--hide` argument is specified, for example.
         this.hide = lodash_1.default.castArray(hide)
-            .filter(name => name || name === 0)
+            .filter((name) => name || name === 0)
             .map(String);
         this.raw = raw;
         this.prefixFormat = prefixFormat;
@@ -137,9 +137,9 @@ class Logger {
         }
         let nextColIndex = 0;
         const headers = {};
-        const contentRows = tableContents.map(row => {
+        const contentRows = tableContents.map((row) => {
             const rowContents = [];
-            Object.keys(row).forEach(col => {
+            Object.keys(row).forEach((col) => {
                 if (!headers[col]) {
                     headers[col] = {
                         index: nextColIndex++,
@@ -155,16 +155,16 @@ class Logger {
             });
             return rowContents;
         });
-        const headersFormatted = Object.keys(headers).map(header => header.padEnd(headers[header].length, ' '));
+        const headersFormatted = Object.keys(headers).map((header) => header.padEnd(headers[header].length, ' '));
         if (!headersFormatted.length) {
             // No columns exist.
             return;
         }
-        const borderRowFormatted = headersFormatted.map(header => '─'.padEnd(header.length, '─'));
+        const borderRowFormatted = headersFormatted.map((header) => '─'.padEnd(header.length, '─'));
         this.logGlobalEvent(`┌─${borderRowFormatted.join('─┬─')}─┐`);
         this.logGlobalEvent(`│ ${headersFormatted.join(' │ ')} │`);
         this.logGlobalEvent(`├─${borderRowFormatted.join('─┼─')}─┤`);
-        contentRows.forEach(contentRow => {
+        contentRows.forEach((contentRow) => {
             const contentRowFormatted = headersFormatted.map((header, colIndex) => {
                 // If the table was expanded after this row was processed, it won't have this column.
                 // Use an empty string in this case.

package/dist/src/output-writer.js

@@ -35,7 +35,7 @@ class OutputWriter {
         this.group = group;
         this.buffers = commands.map(() => []);
         if (this.group) {
-            Rx.merge(...commands.map(c => c.close)).subscribe(command => {
+            Rx.merge(...commands.map((c) => c.close)).subscribe((command) => {
                 if (command.index !== this.activeCommandIndex) {
                     return;
                 }
@@ -64,7 +64,7 @@ class OutputWriter {
         }
     }
     flushBuffer(index) {
-        this.buffers[index].forEach(t => this.outputStream.write(t));
+        this.buffers[index].forEach((t) => this.outputStream.write(t));
         this.buffers[index] = [];
     }
 }

package/index.js

@@ -1,8 +1,9 @@
-//
-// While in local development, make sure you've run `npm run build` first.
-//
+/*
+ * While in local development, make sure you've run `npm run build` first.
+ */
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const concurrently = require('./dist/src/index.js');
+
 module.exports = exports = concurrently.default;
 Object.assign(exports, concurrently);

package/index.mjs

@@ -1,9 +1,10 @@
-//
-// While in local development, make sure you've run `npm run build` first.
-//
+/*
+ * While in local development, make sure you've run `npm run build` first.
+ */
+
+import concurrently from './dist/src/index.js';
 
 // NOTE: the star reexport doesn't work in Node <12.20, <14.13 and <15.
 export * from './dist/src/index.js';
 
-import concurrently from './dist/src/index.js';
 export default concurrently.default;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "concurrently",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "Run commands concurrently",
   "main": "index.js",
   "types": "dist/src/index.d.ts",
   "type": "commonjs",
   "bin": {
-    "concurrently": "./dist/bin/concurrently.js"
+    "concurrently": "./dist/bin/concurrently.js",
+    "conc": "./dist/bin/concurrently.js"
   },
   "engines": {
     "node": "^12.20.0 || ^14.13.0 || >=16.0.0"
@@ -26,7 +27,7 @@
     "clean": "tsc --build --clean",
     "format": "prettier --ignore-path .gitignore --check '**/{!(package-lock).json,*.y?(a)ml,*.md}'",
     "format:fix": "npm run format -- --write",
-    "lint": "eslint . --ext js,ts --ignore-path .gitignore",
+    "lint": "eslint . --ext mjs,js,ts --ignore-path .gitignore",
     "lint:fix": "npm run lint -- --fix",
     "prepublishOnly": "npm run build",
     "report-coverage": "cat coverage/lcov.info | coveralls",
@@ -36,6 +37,7 @@
     "type": "git",
     "url": "https://github.com/open-cli-tools/concurrently.git"
   },
+  "funding": "https://github.com/open-cli-tools/concurrently?sponsor=1",
   "keywords": [
     "bash",
     "concurrent",
@@ -48,7 +50,7 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^4.1.0",
-    "date-fns": "^2.16.1",
+    "date-fns": "^2.29.1",
     "lodash": "^4.17.21",
     "rxjs": "^7.0.0",
     "shell-quote": "^1.7.3",
@@ -58,26 +60,32 @@
     "yargs": "^17.3.1"
   },
   "devDependencies": {
-    "@swc-node/register": "^1.5.1",
-    "@swc/core": "^1.2.204",
+    "@hirez_io/observer-spy": "^2.2.0",
+    "@swc/core": "^1.2.224",
     "@swc/jest": "^0.2.21",
-    "@types/jest": "^27.0.3",
+    "@types/jest": "^28.1.6",
     "@types/lodash": "^4.14.178",
-    "@types/node": "^17.0.0",
+    "@types/node": "^16.11.47",
     "@types/shell-quote": "^1.7.1",
     "@types/supports-color": "^8.1.1",
-    "@types/yargs": "^17.0.8",
-    "@typescript-eslint/eslint-plugin": "^5.8.1",
-    "@typescript-eslint/parser": "^5.8.1",
+    "@types/yargs": "^17.0.11",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.0",
     "coveralls-next": "^4.1.2",
-    "eslint": "^8.15.0",
+    "ctrlc-wrapper": "^0.0.4",
+    "esbuild": "^0.15.1",
+    "eslint": "^8.21.0",
     "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^26.8.2",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.5.1",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
+    "jest": "^28.1.3",
     "jest-create-mock-instance": "^2.0.0",
     "lint-staged": "^12.4.1",
     "prettier": "^2.6.2",
     "simple-git-hooks": "^2.7.0",
+    "string-argv": "^0.3.1",
     "typescript": "^4.5.4"
   },
   "files": [
@@ -92,7 +100,7 @@
     "pre-commit": "npx lint-staged"
   },
   "lint-staged": {
-    "*.{js,ts}": "eslint --fix",
-    "{!(package-lock).json,*.y?(a)ml,*.md}": "prettier --write"
+    "*.m?{js,ts}": "eslint --fix",
+    "{!(package-lock).json,*.{y?(a)ml,md}}": "prettier --write"
   }
 }