Upgrade modules

Author: kmalakoff

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: git config --global user.name "Github Actions"
       - run: git config --global user.email "[email protected]"
-      - run: npm install ts-dev-stack node-version-use depcheck -g --force
+      - run: npm install ts-dev-stack node-version-use depcheck -g -f
       - run: depcheck
       - run: npm ci
       - run: npm run build

package-lock.json

@@ -44,7 +44,7 @@
     "version": "tsds version"
   },
   "dependencies": {
-    "cross-spawn-cb": "^2.1.0",
+    "cross-spawn-cb": "^2.1.2",
     "exit": "^0.1.2",
     "getopts-compat": "^2.2.5",
     "queue-cb": "^1.4.10",

package.json

@@ -31,14 +31,17 @@ export default (argv, name) => {
   options.stdio = 'inherit';
   disDat(args, options, (err, results) => {
     if (err && err.message.indexOf('ExperimentalWarning') >= 0) err = null;
-    if (err) console.log(err.message);
-
+    if (err) {
+      results = err.results;
+      console.log(err.message);
+    }
     const errors = results.filter((result) => !!result.error);
+
     if (!options.silent) {
       console.log('\n======================');
       console.log(`${name} "${args.join('" "')}" ${errors.length ? 'failed' : 'succeeded'}`);
       results.forEach((res) => console.log(`${res.error ? figures.cross : figures.tick} ${[res.command].concat(res.args).join(' ')}${res.error ? ` Error: ${res.error.message}` : ''}`));
     }
-    exit(errors.length ? -1 : 0);
+    exit(err || errors.length ? -1 : 0);
   });
 };

src/cli.js

@@ -9,37 +9,36 @@ module.exports = function run(commands, options, callback) {
   let results = [];
   const queue = new Queue(options.concurrency || Infinity);
 
-  for (let index = 0; index < commands.length; index++) {
-    ((index) => {
-      queue.defer((cb) => {
-        const command = commands[index];
-        const match = commands[index].match(bracketsRegEx);
-        const argv = match ? parse(match[1]) : parse(command);
-        const args = argv.slice(1);
+  commands.forEach((_command, index) => {
+    queue.defer((cb) => {
+      const command = commands[index];
+      const match = commands[index].match(bracketsRegEx);
+      const argv = match ? parse(match[1]) : parse(command);
+      const args = argv.slice(1);
 
-        !options.header || options.header(command);
-        spawn(argv[0], args, spawnOptions, (err, result) => {
-          if (err && err.message.indexOf('ExperimentalWarning') >= 0) {
-            res = err;
-            err = null;
-          }
+      !options.header || options.header(command);
+      spawn(argv[0], args, spawnOptions, (err, result) => {
+        if (err && err.message.indexOf('ExperimentalWarning') >= 0) {
+          res = err;
+          err = null;
+        }
 
-          // suppress error
-          if (err && match) {
-            result = err;
-            err = null;
-          }
+        // suppress error
+        if (err && match) {
+          result = err;
+          err = null;
+        }
 
-          results.push({ index, command: argv[0], args, error: err, result });
-          if (err && options.concurrency === 1) return cb(err); // break early
-          cb();
-        });
+        results.push({ index, command: argv[0], args, error: err, result });
+        if (err && options.concurrency === 1) return cb(err); // break early
+        cb();
       });
-    })(index);
-  }
+    });
+  });
 
-  queue.await(() => {
+  queue.await((err) => {
     results = results.sort((a, b) => a.index - b.index);
-    callback(null, results);
+    if (err) err.results = results;
+    err ? callback(err) : callback(null, results);
   });
 };

src/worker.js

@@ -35,7 +35,7 @@ describe('cli', () => {
         assert.ok(err.status !== 0);
         const lines = cr(err.stdout).split('\n');
         const versions = lines.slice(-3, -1);
-        assert.equal(versions.length, 1);
+        assert.equal(versions.length, 2);
         assert.equal(versions[0], 'hello');
         done();
       });

test/spec/cli.test.js

@@ -36,8 +36,9 @@ describe('library', () => {
       assert.ok(isVersion(cr(results[1].result.stdout).split('\n').slice(-2, -1)[0], 'v'));
     });
     it('handles errors - stops in dtd', (done) => {
-      disDat(['echo "hello"', 'this is an error', 'node --version'], { concurrency: 1, encoding: 'utf8' }, (err, results) => {
-        if (err) return done(err);
+      disDat(['echo "hello"', 'this is an error', 'node --version'], { concurrency: 1, encoding: 'utf8' }, (err) => {
+        assert.ok(!!err);
+        const results = err.results;
         assert.ok(results.length === 2);
         assert.equal(cr(results[0].result.stdout).split('\n').slice(-2, -1)[0], 'hello');
         assert.ok(results[1].error);