concurrently 7.0.0 → 7.1.0

package/README.md

@@ -1,6 +1,6 @@
 # Concurrently
 
-[![Build Status](https://github.com/open-cli-tools/concurrently/workflows/Tests/badge.svg)](https://github.com/open-cli-tools/concurrently/actions?workflow=Tests) 
+[![Build Status](https://github.com/open-cli-tools/concurrently/workflows/Tests/badge.svg)](https://github.com/open-cli-tools/concurrently/actions?workflow=Tests)
 [![Coverage Status](https://coveralls.io/repos/github/open-cli-tools/concurrently/badge.svg?branch=master)](https://coveralls.io/github/open-cli-tools/concurrently?branch=master)
 
 [![NPM Badge](https://nodei.co/npm/concurrently.png?downloads=true)](https://www.npmjs.com/package/concurrently)
@@ -109,6 +109,26 @@ concurrently -n w: npm:watch-*
 concurrently -n w:js,w:css,w:node "npm run watch-js" "npm run watch-css" "npm run watch-node"
 ```
 
+Exclusion is also supported. Given the following scripts in package.json:
+```javascript
+{
+    // ...
+    "scripts": {
+      "lint:js": "...",
+      "lint:ts": "...",
+      "lint:fix:js": "...",
+      "lint:fix:ts": "...",
+      // ...
+    }
+    // ...
+}
+```
+```bash
+# Running only lint:js and lint:ts
+#   with lint:fix:js and lint:fix:ts excluded
+concurrently "npm:lint:*(!fix)"
+```
+
 Good frontend one-liner example [here](https://github.com/kimmobrunfeldt/dont-copy-paste-this-frontend-template/blob/5cd2bde719654941bdfc0a42c6f1b8e69ae79980/package.json#L9).
 
 Help:
@@ -280,7 +300,7 @@ concurrently can be used programmatically by using the API documented below:
     - `timestampFormat`: a [date-fns format](https://date-fns.org/v2.0.1/docs/format)
     to use when prefixing with `time`. Default: `yyyy-MM-dd HH:mm:ss.ZZZ`
 
-> **Returns:** an object in the shape `{ commands, result }`.
+> **Returns:** an object in the shape `{ result, commands }`.
 > - `result`: a `Promise` that resolves if the run was successful (according to `successCondition` option),
 >   or rejects, containing an array of [`CloseEvent`](#CloseEvent), in the order that the commands terminated.
 > - `commands`: an array of all spawned [`Command`s](#Command).
@@ -289,7 +309,7 @@ Example:
 
 ```js
 const concurrently = require('concurrently');
-concurrently([
+const { result } = concurrently([
     'npm:watch-*',
     { command: 'nodemon', name: 'server' },
     { command: 'deploy', name: 'deploy', env: { PUBLIC_KEY: '...' } },
@@ -299,11 +319,12 @@ concurrently([
     killOthers: ['failure', 'success'],
     restartTries: 3,
     cwd: path.resolve(__dirname, 'scripts'),
-}).then(success, failure);
+});
+result.then(success, failure);
 ```
 
 ### `Command`
-An object that contains all information about a spawned command, and ways to interact with it.  
+An object that contains all information about a spawned command, and ways to interact with it.<br>
 It has the following properties:
 
 - `index`: the index of the command among all commands spawned.
@@ -321,11 +342,11 @@ It has the following properties:
 - `timer`: an RxJS observable to the command's timing events (e.g. starting, stopping).
 - `close`: an RxJS observable to the command's close events.
   See [`CloseEvent`](#CloseEvent) for more information.
-- `start()`: starts the command, setting up all 
+- `start()`: starts the command, setting up all
 - `kill([signal])`: kills the command, optionally specifying a signal (e.g. `SIGTERM`, `SIGKILL`, etc).
 
 ### `CloseEvent`
-An object with information about a command's closing event.  
+An object with information about a command's closing event.<br>
 It contains the following properties:
 
 - `command`: a stripped down version of [`Command`](#command), including only `name`, `command`, `env` and `cwd` properties.

package/dist/bin/epilogue.js

@@ -52,6 +52,10 @@ const examples = [
     {
         description: 'Shortened NPM run command with wildcard (make sure to wrap it in quotes!)',
         example: '$ $0 "npm:watch-*"',
+    },
+    {
+        description: 'Exclude patterns so that between "lint:js" and "lint:fix:js", only "lint:js" is ran',
+        example: '$ $0 "npm:*(!fix)"'
     }
 ];
 exports.epilogue = `

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

@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpandNpmWildcard = void 0;
 const fs = __importStar(require("fs"));
 const _ = __importStar(require("lodash"));
+const OMISSION = /\(!([^\)]+)\)/;
 /**
  * Finds wildcards in npm/yarn/pnpm run commands and replaces them with all matching scripts in the
  * `package.json` file of the current directory.
@@ -50,13 +51,21 @@ class ExpandNpmWildcard {
         if (!this.scripts) {
             this.scripts = Object.keys(this.readPackage().scripts || {});
         }
-        const preWildcard = _.escapeRegExp(cmdName.substr(0, wildcardPosition));
-        const postWildcard = _.escapeRegExp(cmdName.substr(wildcardPosition + 1));
+        const omissionRegex = cmdName.match(OMISSION);
+        const cmdNameSansOmission = cmdName.replace(OMISSION, '');
+        const preWildcard = _.escapeRegExp(cmdNameSansOmission.substr(0, wildcardPosition));
+        const postWildcard = _.escapeRegExp(cmdNameSansOmission.substr(wildcardPosition + 1));
         const wildcardRegex = new RegExp(`^${preWildcard}(.*?)${postWildcard}$`);
         const currentName = 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 Object.assign({}, commandInfo, {
                     command: `${npmCmd} run ${script}${args}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "concurrently",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "Run commands concurrently",
   "main": "index.js",
   "types": "dist/src/index.d.ts",
@@ -69,7 +69,8 @@
     "index.js",
     "index.mjs",
     "!**/fixtures",
-    "!**/*.spec.js"
+    "!**/*.spec.js",
+    "!**/*.spec.d.ts"
   ],
   "jest": {
     "preset": "ts-jest",

package/dist/bin/concurrently.spec.d.ts

@@ -1 +0,0 @@
-export {};

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

@@ -1 +0,0 @@
-export {};

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

@@ -1 +0,0 @@
-export {};

package/dist/src/command-parser/strip-quotes.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/command.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/completion-listener.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/concurrently.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/flow-control/input-handler.spec.d.ts

@@ -1 +0,0 @@
-export {};

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

@@ -1 +0,0 @@
-export {};

package/dist/src/flow-control/kill-others.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/flow-control/log-error.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/flow-control/log-exit.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/flow-control/log-output.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/flow-control/log-timings.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/flow-control/restart-process.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/get-spawn-opts.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/logger.spec.d.ts

@@ -1 +0,0 @@
-export {};

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

@@ -1 +0,0 @@
-export {};