concurrently 9.0.1 → 9.1.0

package/dist/bin/concurrently.js

@@ -36,7 +36,7 @@ const read_package_1 = require("./read-package");
 const version = String((0, read_package_1.readPackage)().version);
 const epilogue = `For documentation and more examples, visit:\nhttps://github.com/open-cli-tools/concurrently/tree/v${version}/docs`;
 // Clean-up arguments (yargs expects only the arguments after the program name)
-const args = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
+const program = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .parserConfiguration({
     // Avoids options that can be specified multiple times from requiring a `--` to pass commands
     'greedy-arrays': false,
@@ -211,12 +211,16 @@ const args = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .group(['i', 'default-input-target'], 'Input handling')
     .group(['k', 'kill-others-on-fail', 'kill-signal'], 'Killing other processes')
     .group(['restart-tries', 'restart-after'], 'Restarting')
-    .epilogue(epilogue)
-    .parseSync();
+    .epilogue(epilogue);
+const args = program.parseSync();
 // Get names of commands by the specified separator
 const names = (args.names || '').split(args.nameSeparator);
 const additionalArguments = lodash_1.default.castArray(args['--'] ?? []).map(String);
 const commands = args.passthroughArguments ? args._ : args._.concat(additionalArguments);
+if (!commands.length) {
+    program.showHelp();
+    process.exit();
+}
 (0, index_1.concurrently)(commands.map((command, index) => ({
     command: String(command),
     name: names[index],

package/dist/src/command-parser/expand-shortcut.d.ts

@@ -0,0 +1,17 @@
+import { CommandInfo } from '../command';
+import { CommandParser } from './command-parser';
+/**
+ * Expands shortcuts according to the following table:
+ *
+ * | Syntax          | Expands to            |
+ * | --------------- | --------------------- |
+ * | `npm:<script>`  | `npm run <script>`    |
+ * | `pnpm:<script>` | `pnpm run <script>`   |
+ * | `yarn:<script>` | `yarn run <script>`   |
+ * | `bun:<script>`  | `bun run <script>`    |
+ * | `node:<script>` | `node --run <script>` |
+ * | `deno:<script>` | `deno task <script>`  |
+ */
+export declare class ExpandShortcut implements CommandParser {
+    parse(commandInfo: CommandInfo): CommandInfo;
+}

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

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExpandShortcut = void 0;
+/**
+ * Expands shortcuts according to the following table:
+ *
+ * | Syntax          | Expands to            |
+ * | --------------- | --------------------- |
+ * | `npm:<script>`  | `npm run <script>`    |
+ * | `pnpm:<script>` | `pnpm run <script>`   |
+ * | `yarn:<script>` | `yarn run <script>`   |
+ * | `bun:<script>`  | `bun run <script>`    |
+ * | `node:<script>` | `node --run <script>` |
+ * | `deno:<script>` | `deno task <script>`  |
+ */
+class ExpandShortcut {
+    parse(commandInfo) {
+        const [, prefix, script, args] = /^(npm|yarn|pnpm|bun|node|deno):(\S+)(.*)/.exec(commandInfo.command) || [];
+        if (!script) {
+            return commandInfo;
+        }
+        let command;
+        if (prefix === 'node') {
+            command = 'node --run';
+        }
+        else if (prefix === 'deno') {
+            command = 'deno task';
+        }
+        else {
+            command = `${prefix} run`;
+        }
+        return {
+            ...commandInfo,
+            name: commandInfo.name || script,
+            command: `${command} ${script}${args}`,
+        };
+    }
+}
+exports.ExpandShortcut = ExpandShortcut;

package/dist/src/command-parser/expand-wildcard.d.ts

@@ -0,0 +1,18 @@
+import { CommandInfo } from '../command';
+import { CommandParser } from './command-parser';
+/**
+ * Finds wildcards in 'npm/yarn/pnpm/bun run', 'node --run' and 'deno task'
+ * commands and replaces them with all matching scripts in the `package.json`
+ * and `deno.json` files of the current directory.
+ */
+export declare class ExpandWildcard implements CommandParser {
+    private readonly readDeno;
+    private readonly readPackage;
+    static readDeno(): any;
+    static readPackage(): any;
+    private packageScripts?;
+    private denoTasks?;
+    constructor(readDeno?: typeof ExpandWildcard.readDeno, readPackage?: typeof ExpandWildcard.readPackage);
+    private relevantScripts;
+    parse(commandInfo: CommandInfo): CommandInfo | CommandInfo[];
+}

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

@@ -0,0 +1,100 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExpandWildcard = void 0;
+const fs_1 = __importDefault(require("fs"));
+const lodash_1 = __importDefault(require("lodash"));
+// Matches a negative filter surrounded by '(!' and ')'.
+const OMISSION = /\(!([^)]+)\)/;
+/**
+ * Finds wildcards in 'npm/yarn/pnpm/bun run', 'node --run' and 'deno task'
+ * commands and replaces them with all matching scripts in the `package.json`
+ * and `deno.json` files of the current directory.
+ */
+class ExpandWildcard {
+    readDeno;
+    readPackage;
+    static readDeno() {
+        try {
+            const json = fs_1.default.readFileSync('deno.json', { encoding: 'utf-8' });
+            return JSON.parse(json);
+        }
+        catch (e) {
+            return {};
+        }
+    }
+    static readPackage() {
+        try {
+            const json = fs_1.default.readFileSync('package.json', { encoding: 'utf-8' });
+            return JSON.parse(json);
+        }
+        catch (e) {
+            return {};
+        }
+    }
+    packageScripts;
+    denoTasks;
+    constructor(readDeno = ExpandWildcard.readDeno, readPackage = ExpandWildcard.readPackage) {
+        this.readDeno = readDeno;
+        this.readPackage = readPackage;
+    }
+    relevantScripts(command) {
+        if (!this.packageScripts) {
+            this.packageScripts = Object.keys(this.readPackage().scripts || {});
+        }
+        if (command === 'deno task') {
+            if (!this.denoTasks) {
+                // If Deno tries to run a task that doesn't exist,
+                // it can fall back to running a script with the same name.
+                // Therefore, the actual list of tasks is the union of the tasks and scripts.
+                this.denoTasks = [
+                    ...Object.keys(this.readDeno().tasks || {}),
+                    ...this.packageScripts,
+                ];
+            }
+            return this.denoTasks;
+        }
+        return this.packageScripts;
+    }
+    parse(commandInfo) {
+        // We expect one of the following patterns:
+        // - <npm|yarn|pnpm|bun> run <script> [args]
+        // - node --run <script> [args]
+        // - deno task <script> [args]
+        const [, command, scriptGlob, args] = /((?:npm|yarn|pnpm|bun) (?:run)|node --run|deno task) (\S+)([^&]*)/.exec(commandInfo.command) || [];
+        const wildcardPosition = (scriptGlob || '').indexOf('*');
+        // If the regex didn't match an npm script, or it has no wildcard,
+        // then we have nothing to do here
+        if (wildcardPosition === -1) {
+            return commandInfo;
+        }
+        const [, omission] = OMISSION.exec(scriptGlob) || [];
+        const scriptGlobSansOmission = scriptGlob.replace(OMISSION, '');
+        const preWildcard = lodash_1.default.escapeRegExp(scriptGlobSansOmission.slice(0, wildcardPosition));
+        const postWildcard = lodash_1.default.escapeRegExp(scriptGlobSansOmission.slice(wildcardPosition + 1));
+        const wildcardRegex = new RegExp(`^${preWildcard}(.*?)${postWildcard}$`);
+        // If 'commandInfo.name' doesn't match 'scriptGlob', this means a custom name
+        // has been specified and thus becomes the prefix (as described in the README).
+        const prefix = commandInfo.name !== scriptGlob ? commandInfo.name : '';
+        return this.relevantScripts(command)
+            .map((script) => {
+            if (omission && RegExp(omission).test(script)) {
+                return;
+            }
+            const [, match] = wildcardRegex.exec(script) || [];
+            if (match !== undefined) {
+                return {
+                    ...commandInfo,
+                    command: `${command} ${script}${args}`,
+                    // Will use an empty command name if no prefix has been specified and
+                    // the wildcard match is empty, e.g. if `npm:watch-*` matches `npm run watch-`.
+                    name: prefix + match,
+                };
+            }
+        })
+            .filter((commandInfo) => !!commandInfo);
+    }
+}
+exports.ExpandWildcard = ExpandWildcard;

package/dist/src/concurrently.js

@@ -10,8 +10,8 @@ const os_1 = require("os");
 const tree_kill_1 = __importDefault(require("tree-kill"));
 const command_1 = require("./command");
 const expand_arguments_1 = require("./command-parser/expand-arguments");
-const expand_npm_shortcut_1 = require("./command-parser/expand-npm-shortcut");
-const expand_npm_wildcard_1 = require("./command-parser/expand-npm-wildcard");
+const expand_shortcut_1 = require("./command-parser/expand-shortcut");
+const expand_wildcard_1 = require("./command-parser/expand-wildcard");
 const strip_quotes_1 = require("./command-parser/strip-quotes");
 const completion_listener_1 = require("./completion-listener");
 const output_writer_1 = require("./output-writer");
@@ -37,8 +37,8 @@ function concurrently(baseCommands, baseOptions) {
     const prefixColorSelector = new prefix_color_selector_1.PrefixColorSelector(options.prefixColors || []);
     const commandParsers = [
         new strip_quotes_1.StripQuotes(),
-        new expand_npm_shortcut_1.ExpandNpmShortcut(),
-        new expand_npm_wildcard_1.ExpandNpmWildcard(),
+        new expand_shortcut_1.ExpandShortcut(),
+        new expand_wildcard_1.ExpandWildcard(),
     ];
     if (options.additionalArguments) {
         commandParsers.push(new expand_arguments_1.ExpandArguments(options.additionalArguments));

package/dist/src/flow-control/kill-on-signal.d.ts

@@ -16,5 +16,6 @@ export declare class KillOnSignal implements FlowController {
     });
     handle(commands: Command[]): {
         commands: Command[];
+        onFinish: () => void;
     };
 }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KillOnSignal = void 0;
 const operators_1 = require("rxjs/operators");
+const SIGNALS = ['SIGINT', 'SIGTERM', 'SIGHUP'];
 /**
  * Watches the main concurrently process for signals and sends the same signal down to each spawned
  * command.
@@ -15,13 +16,12 @@ class KillOnSignal {
     }
     handle(commands) {
         let caughtSignal;
-        ['SIGINT', 'SIGTERM', 'SIGHUP'].forEach((signal) => {
-            this.process.on(signal, () => {
-                caughtSignal = signal;
-                this.abortController?.abort();
-                commands.forEach((command) => command.kill(signal));
-            });
-        });
+        const signalListener = (signal) => {
+            caughtSignal = signal;
+            this.abortController?.abort();
+            commands.forEach((command) => command.kill(signal));
+        };
+        SIGNALS.forEach((signal) => this.process.on(signal, signalListener));
         return {
             commands: commands.map((command) => {
                 const closeStream = command.close.pipe((0, operators_1.map)((exitInfo) => {
@@ -37,6 +37,10 @@ class KillOnSignal {
                     },
                 });
             }),
+            onFinish: () => {
+                // Avoids MaxListenersExceededWarning when running programmatically
+                SIGNALS.forEach((signal) => this.process.off(signal, signalListener));
+            },
         };
     }
 }

package/docs/cli/shortcuts.md

@@ -1,6 +1,6 @@
 # Command Shortcuts
 
-Package managers that execute scripts from a `package.json` file can be shortened when in concurrently.<br/>
+Package managers that execute scripts from a `package.json` or `deno.json` file can be shortened when in concurrently.<br/>
 The following are supported:
 
 | Syntax          | Expands to            |
@@ -10,6 +10,7 @@ The following are supported:
 | `yarn:<script>` | `yarn run <script>`   |
 | `bun:<script>`  | `bun run <script>`    |
 | `node:<script>` | `node --run <script>` |
+| `deno:<script>` | `deno task <script>`  |
 
 > [!NOTE]
 >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "concurrently",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "description": "Run commands concurrently",
   "packageManager": "pnpm@8.15.9+sha256.daa27a0b541bc635323ff96c2ded995467ff9fe6d69ff67021558aa9ad9dcc36",
   "main": "index.js",

package/dist/src/command-parser/expand-npm-shortcut.d.ts

@@ -1,8 +0,0 @@
-import { CommandInfo } from '../command';
-import { CommandParser } from './command-parser';
-/**
- * Expands commands prefixed with `node:`, `npm:`, `yarn:`, `pnpm:`, or `bun:` into the full version `npm run <command>` and so on.
- */
-export declare class ExpandNpmShortcut implements CommandParser {
-    parse(commandInfo: CommandInfo): CommandInfo;
-}

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

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpandNpmShortcut = void 0;
-/**
- * Expands commands prefixed with `node:`, `npm:`, `yarn:`, `pnpm:`, or `bun:` into the full version `npm run <command>` and so on.
- */
-class ExpandNpmShortcut {
-    parse(commandInfo) {
-        const [, npmCmd, cmdName, args] = commandInfo.command.match(/^(node|npm|yarn|pnpm|bun):(\S+)(.*)/) || [];
-        if (!cmdName) {
-            return commandInfo;
-        }
-        const runCmd = npmCmd === 'node' ? '--run' : 'run';
-        return {
-            ...commandInfo,
-            name: commandInfo.name || cmdName,
-            command: `${npmCmd} ${runCmd} ${cmdName}${args}`,
-        };
-    }
-}
-exports.ExpandNpmShortcut = ExpandNpmShortcut;

package/dist/src/command-parser/expand-npm-wildcard.d.ts

@@ -1,13 +0,0 @@
-import { CommandInfo } from '../command';
-import { CommandParser } from './command-parser';
-/**
- * Finds wildcards in npm/yarn/pnpm/bun run commands and replaces them with all matching scripts in the
- * `package.json` file of the current directory.
- */
-export declare class ExpandNpmWildcard implements CommandParser {
-    private readonly readPackage;
-    static readPackage(): any;
-    private scripts?;
-    constructor(readPackage?: typeof ExpandNpmWildcard.readPackage);
-    parse(commandInfo: CommandInfo): CommandInfo | CommandInfo[];
-}

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

@@ -1,70 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpandNpmWildcard = void 0;
-const fs_1 = __importDefault(require("fs"));
-const lodash_1 = __importDefault(require("lodash"));
-const OMISSION = /\(!([^)]+)\)/;
-/**
- * Finds wildcards in npm/yarn/pnpm/bun run commands and replaces them with all matching scripts in the
- * `package.json` file of the current directory.
- */
-class ExpandNpmWildcard {
-    readPackage;
-    static readPackage() {
-        try {
-            const json = fs_1.default.readFileSync('package.json', { encoding: 'utf-8' });
-            return JSON.parse(json);
-        }
-        catch (e) {
-            return {};
-        }
-    }
-    scripts;
-    constructor(readPackage = ExpandNpmWildcard.readPackage) {
-        this.readPackage = readPackage;
-    }
-    parse(commandInfo) {
-        const [, npmCmd, runCmd, cmdName, args] = commandInfo.command.match(/(node|npm|yarn|pnpm|bun) ((?:--)?run) (\S+)([^&]*)/) || [];
-        const wildcardPosition = (cmdName || '').indexOf('*');
-        // If the regex didn't match an npm script, or it has no wildcard,
-        // then we have nothing to do here
-        if (!cmdName || wildcardPosition === -1) {
-            return commandInfo;
-        }
-        if (!this.scripts) {
-            this.scripts = Object.keys(this.readPackage().scripts || {});
-        }
-        const omissionRegex = cmdName.match(OMISSION);
-        const cmdNameSansOmission = cmdName.replace(OMISSION, '');
-        const preWildcard = lodash_1.default.escapeRegExp(cmdNameSansOmission.slice(0, wildcardPosition));
-        const postWildcard = lodash_1.default.escapeRegExp(cmdNameSansOmission.slice(wildcardPosition + 1));
-        const wildcardRegex = new RegExp(`^${preWildcard}(.*?)${postWildcard}$`);
-        // If 'commandInfo.name' doesn't match 'cmdName', this means a custom name
-        // has been specified and thus becomes the prefix (as described in the README).
-        const prefix = commandInfo.name !== cmdName ? commandInfo.name : '';
-        return this.scripts
-            .map((script) => {
-            const match = script.match(wildcardRegex);
-            if (omissionRegex) {
-                const toOmit = script.match(new RegExp(omissionRegex[1]));
-                if (toOmit) {
-                    return;
-                }
-            }
-            if (match) {
-                return {
-                    ...commandInfo,
-                    command: `${npmCmd} ${runCmd} ${script}${args}`,
-                    // Will use an empty command name if no prefix has been specified and
-                    // the wildcard match is empty, e.g. if `npm:watch-*` matches `npm run watch-`.
-                    name: prefix + match[1],
-                };
-            }
-        })
-            .filter((commandInfo) => !!commandInfo);
-    }
-}
-exports.ExpandNpmWildcard = ExpandNpmWildcard;