concurrently 6.5.1 → 7.2.0

package/{src → dist/src}/logger.js

@@ -1,107 +1,134 @@
-const chalk = require('chalk');
-const _ = require('lodash');
-const formatDate = require('date-fns/format');
-
-const defaults = require('./defaults');
-
-module.exports = class Logger {
-    constructor({ hide, outputStream, prefixFormat, prefixLength, raw, timestampFormat }) {
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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 Rx = __importStar(require("rxjs"));
+const defaults = __importStar(require("./defaults"));
+class Logger {
+    constructor({ hide, prefixFormat, prefixLength, raw = false, timestampFormat }) {
+        /**
+         * Observable that emits when there's been output logged.
+         * If `command` is is `undefined`, then the log is for a global event.
+         */
+        this.output = new Rx.Subject();
         // To avoid empty strings from hiding the output of commands that don't have a name,
         // 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 = _.castArray(hide).filter(name => name || name === 0).map(String);
+        this.hide = lodash_1.default.castArray(hide).filter(name => name || name === 0).map(String);
         this.raw = raw;
-        this.outputStream = outputStream;
         this.prefixFormat = prefixFormat;
         this.prefixLength = prefixLength || defaults.prefixLength;
         this.timestampFormat = timestampFormat || defaults.timestampFormat;
     }
-
     shortenText(text) {
         if (!text || text.length <= this.prefixLength) {
             return text;
         }
-
         const ellipsis = '..';
         const prefixLength = this.prefixLength - ellipsis.length;
         const endLength = Math.floor(prefixLength / 2);
         const beginningLength = prefixLength - endLength;
-
         const beginnning = text.substring(0, beginningLength);
         const end = text.substring(text.length - endLength, text.length);
         return beginnning + ellipsis + end;
     }
-
     getPrefixesFor(command) {
         return {
-            none: '',
-            pid: command.pid,
-            index: command.index,
+            pid: String(command.pid),
+            index: String(command.index),
             name: command.name,
             command: this.shortenText(command.command),
-            time: formatDate(Date.now(), this.timestampFormat)
+            time: (0, format_1.default)(Date.now(), this.timestampFormat),
         };
     }
-
     getPrefix(command) {
         const prefix = this.prefixFormat || (command.name ? 'name' : 'index');
         if (prefix === 'none') {
             return '';
         }
-
         const prefixes = this.getPrefixesFor(command);
         if (Object.keys(prefixes).includes(prefix)) {
             return `[${prefixes[prefix]}]`;
         }
-
-        return _.reduce(prefixes, (prev, val, key) => {
-            const keyRegex = new RegExp(_.escapeRegExp(`{${key}}`), 'g');
-            return prev.replace(keyRegex, val);
+        return lodash_1.default.reduce(prefixes, (prev, val, key) => {
+            const keyRegex = new RegExp(lodash_1.default.escapeRegExp(`{${key}}`), 'g');
+            return prev.replace(keyRegex, String(val));
         }, prefix);
     }
-
     colorText(command, text) {
         let color;
         if (command.prefixColor && command.prefixColor.startsWith('#')) {
-            color = chalk.hex(command.prefixColor);
-        } else {
-            const defaultColor = _.get(chalk, defaults.prefixColors, chalk.reset);
-            color = _.get(chalk, command.prefixColor, defaultColor);
+            color = chalk_1.default.hex(command.prefixColor);
+        }
+        else {
+            const defaultColor = lodash_1.default.get(chalk_1.default, defaults.prefixColors, chalk_1.default.reset);
+            color = lodash_1.default.get(chalk_1.default, command.prefixColor, defaultColor);
         }
         return color(text);
     }
-
+    /**
+     * Logs an event for a command (e.g. start, stop).
+     *
+     * If raw mode is on, then nothing is logged.
+     */
     logCommandEvent(text, command) {
         if (this.raw) {
             return;
         }
-
-        this.logCommandText(chalk.reset(text) + '\n', command);
+        this.logCommandText(chalk_1.default.reset(text) + '\n', command);
     }
-
     logCommandText(text, command) {
         if (this.hide.includes(String(command.index)) || this.hide.includes(command.name)) {
             return;
         }
-
         const prefix = this.colorText(command, this.getPrefix(command));
-        return this.log(prefix + (prefix ? ' ' : ''), text);
+        return this.log(prefix + (prefix ? ' ' : ''), text, command);
     }
-
+    /**
+     * Logs a global event (e.g. sending signals to processes).
+     *
+     * If raw mode is on, then nothing is logged.
+     */
     logGlobalEvent(text) {
         if (this.raw) {
             return;
         }
-
-        this.log(chalk.reset('-->') + ' ', chalk.reset(text) + '\n');
+        this.log(chalk_1.default.reset('-->') + ' ', chalk_1.default.reset(text) + '\n');
     }
-
+    /**
+     * Logs a table from an input object array, like `console.table`.
+     *
+     * Each row is a single input item, and they are presented in the input order.
+     */
     logTable(tableContents) {
         // For now, can only print array tables with some content.
         if (this.raw || !Array.isArray(tableContents) || !tableContents.length) {
             return;
         }
-
         let nextColIndex = 0;
         const headers = {};
         const contentRows = tableContents.map(row => {
@@ -110,11 +137,9 @@ module.exports = class Logger {
                 if (!headers[col]) {
                     headers[col] = {
                         index: nextColIndex++,
-                        //
                         length: col.length,
                     };
                 }
-
                 const colIndex = headers[col].index;
                 const formattedValue = String(row[col] == null ? '' : row[col]);
                 // Update the column length in case this rows value is longer than the previous length for the column.
@@ -124,22 +149,17 @@ module.exports = class Logger {
             });
             return rowContents;
         });
-
         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, '─'));
-
         this.logGlobalEvent(`┌─${borderRowFormatted.join('─┬─')}─┐`);
         this.logGlobalEvent(`│ ${headersFormatted.join(' │ ')} │`);
         this.logGlobalEvent(`├─${borderRowFormatted.join('─┼─')}─┤`);
-
         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.
@@ -149,18 +169,14 @@ module.exports = class Logger {
             });
             this.logGlobalEvent(`│ ${contentRowFormatted.join(' │ ')} │`);
         });
-
         this.logGlobalEvent(`└─${borderRowFormatted.join('─┴─')}─┘`);
     }
-
-    log(prefix, text) {
+    log(prefix, text, command) {
         if (this.raw) {
-            return this.outputStream.write(text);
+            return this.emit(command, text);
         }
-
         // #70 - replace some ANSI code that would impact clearing lines
         text = text.replace(/\u2026/g, '...');
-
         const lines = text.split('\n').map((line, index, lines) => {
             // First line will write prefix only if we finished the last write with a LF.
             // Last line won't write prefix because it should be empty.
@@ -169,12 +185,15 @@ module.exports = class Logger {
             }
             return prefix + line;
         });
-
         if (!this.lastChar || this.lastChar === '\n') {
-            this.outputStream.write(prefix);
+            this.emit(command, prefix);
         }
-
         this.lastChar = text[text.length - 1];
-        this.outputStream.write(lines.join('\n'));
+        this.emit(command, lines.join('\n'));
     }
-};
+    emit(command, text) {
+        this.output.next({ command, text });
+    }
+}
+exports.Logger = Logger;
+;

package/dist/src/output-writer.d.ts

@@ -0,0 +1,19 @@
+/// <reference types="node" />
+import { Writable } from 'stream';
+import { Command } from './command';
+/**
+ * Class responsible for actually writing output onto a writable stream.
+ */
+export declare class OutputWriter {
+    private readonly outputStream;
+    private readonly group;
+    readonly buffers: string[][];
+    activeCommandIndex: number;
+    constructor({ outputStream, group, commands }: {
+        outputStream: Writable;
+        group: boolean;
+        commands: Command[];
+    });
+    write(command: Command | undefined, text: string): void;
+    private flushBuffer;
+}

package/dist/src/output-writer.js

@@ -0,0 +1,69 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OutputWriter = void 0;
+const Rx = __importStar(require("rxjs"));
+/**
+ * Class responsible for actually writing output onto a writable stream.
+ */
+class OutputWriter {
+    constructor({ outputStream, group, commands }) {
+        this.activeCommandIndex = 0;
+        this.outputStream = outputStream;
+        this.group = group;
+        this.buffers = commands.map(() => []);
+        if (this.group) {
+            Rx.merge(...commands.map(c => c.close))
+                .subscribe(command => {
+                if (command.index !== this.activeCommandIndex) {
+                    return;
+                }
+                for (let i = command.index + 1; i < commands.length; i++) {
+                    this.activeCommandIndex = i;
+                    this.flushBuffer(i);
+                    if (!commands[i].exited) {
+                        break;
+                    }
+                }
+            });
+        }
+    }
+    write(command, text) {
+        if (this.group && command) {
+            if (command.index <= this.activeCommandIndex) {
+                this.outputStream.write(text);
+            }
+            else {
+                this.buffers[command.index].push(text);
+            }
+        }
+        else {
+            // "global" logs (command=null) are output out of order
+            this.outputStream.write(text);
+        }
+    }
+    flushBuffer(index) {
+        this.buffers[index].forEach(t => this.outputStream.write(t));
+        this.buffers[index] = [];
+    }
+}
+exports.OutputWriter = OutputWriter;
+;

package/index.js

@@ -1,69 +1,7 @@
-const InputHandler = require('./src/flow-control/input-handler');
-const KillOnSignal = require('./src/flow-control/kill-on-signal');
-const KillOthers = require('./src/flow-control/kill-others');
-const LogError = require('./src/flow-control/log-error');
-const LogExit = require('./src/flow-control/log-exit');
-const LogOutput = require('./src/flow-control/log-output');
-const RestartProcess = require('./src/flow-control/restart-process');
+//
+// While in local development, make sure you've run `npm run build` first.
+//
 
-const concurrently = require('./src/concurrently');
-const Logger = require('./src/logger');
-const LogTimings = require( './src/flow-control/log-timings' );
-
-module.exports = exports = (commands, options = {}) => {
-    const logger = new Logger({
-        hide: options.hide,
-        outputStream: options.outputStream || process.stdout,
-        prefixFormat: options.prefix,
-        prefixLength: options.prefixLength,
-        raw: options.raw,
-        timestampFormat: options.timestampFormat,
-    });
-
-    return concurrently(commands, {
-        maxProcesses: options.maxProcesses,
-        raw: options.raw,
-        successCondition: options.successCondition,
-        cwd: options.cwd,
-        controllers: [
-            new LogError({ logger }),
-            new LogOutput({ logger }),
-            new LogExit({ logger }),
-            new InputHandler({
-                logger,
-                defaultInputTarget: options.defaultInputTarget,
-                inputStream: options.inputStream || (options.handleInput && process.stdin),
-                pauseInputStreamOnFinish: options.pauseInputStreamOnFinish,
-            }),
-            new KillOnSignal({ process }),
-            new RestartProcess({
-                logger,
-                delay: options.restartDelay,
-                tries: options.restartTries,
-            }),
-            new KillOthers({
-                logger,
-                conditions: options.killOthers
-            }),
-            new LogTimings({
-                logger: options.timings ? logger: null,
-                timestampFormat: options.timestampFormat,
-            })
-        ],
-        prefixColors: options.prefixColors || [],
-        timings: options.timings
-    });
-};
-
-// Export all flow controllers and the main concurrently function,
-// so that 3rd-parties can use them however they want
-exports.concurrently = concurrently;
-exports.Logger = Logger;
-exports.InputHandler = InputHandler;
-exports.KillOnSignal = KillOnSignal;
-exports.KillOthers = KillOthers;
-exports.LogError = LogError;
-exports.LogExit = LogExit;
-exports.LogOutput = LogOutput;
-exports.RestartProcess = RestartProcess;
-exports.LogTimings = LogTimings;
+const concurrently = require('./dist/src/index.js');
+module.exports = exports = concurrently.default;
+Object.assign(exports, concurrently);

package/index.mjs

@@ -0,0 +1,9 @@
+//
+// While in local development, make sure you've run `npm run build` first.
+//
+
+// 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,16 +1,27 @@
 {
   "name": "concurrently",
-  "version": "6.5.1",
+  "version": "7.2.0",
   "description": "Run commands concurrently",
   "main": "index.js",
+  "types": "dist/src/index.d.ts",
+  "type": "commonjs",
   "bin": {
-    "concurrently": "./bin/concurrently.js"
+    "concurrently": "./dist/bin/concurrently.js"
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": "^12.20.0 || ^14.13.0 || >=16.0.0"
+  },
+  "exports": {
+    "import": "./index.mjs",
+    "require": "./index.js",
+    "default": "./index.js"
   },
   "scripts": {
-    "lint": "eslint . --ignore-path .gitignore",
+    "build": "tsc --build",
+    "postbuild": "chmod +x dist/bin/concurrently.js",
+    "clean": "tsc --build --clean",
+    "lint": "eslint . --ext js,ts --ignore-path .gitignore",
+    "prepublishOnly": "npm run build",
     "report-coverage": "cat coverage/lcov.info | coveralls",
     "test": "jest"
   },
@@ -33,33 +44,52 @@
     "date-fns": "^2.16.1",
     "lodash": "^4.17.21",
     "rxjs": "^6.6.3",
+    "shell-quote": "^1.7.3",
     "spawn-command": "^0.0.2-1",
     "supports-color": "^8.1.0",
     "tree-kill": "^1.2.2",
-    "yargs": "^16.2.0"
+    "yargs": "^17.3.1"
   },
   "devDependencies": {
+    "@types/jest": "^27.0.3",
+    "@types/lodash": "^4.14.178",
+    "@types/node": "^17.0.0",
+    "@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",
     "coveralls": "^3.1.0",
     "eslint": "^7.17.0",
     "jest": "^26.6.3",
-    "jest-create-mock-instance": "^1.1.0"
+    "jest-create-mock-instance": "^1.1.0",
+    "ts-jest": "^26.5.6",
+    "ts-node": "^10.4.0",
+    "typescript": "^4.5.4"
   },
   "files": [
-    "bin",
-    "!**/fixtures",
+    "dist",
     "index.js",
-    "src",
-    "!*.spec.js"
+    "index.mjs",
+    "!**/fixtures",
+    "!**/*.spec.js",
+    "!**/*.spec.d.ts"
   ],
   "jest": {
+    "preset": "ts-jest",
     "collectCoverage": true,
     "collectCoverageFrom": [
-      "src/**/*.js"
+      "src/**/*.ts",
+      "!src/index.ts"
     ],
     "coveragePathIgnorePatterns": [
       "/fixtures/",
       "/node_modules/"
     ],
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "/dist"
+    ]
   }
 }