mocha 9.1.4 → 9.2.2

package/lib/cli/config.js

@@ -30,10 +30,6 @@ exports.CONFIG_FILES = [
   '.mocharc.json'
 ];
 
-const isModuleNotFoundError = err =>
-  err.code === 'MODULE_NOT_FOUND' ||
-  err.message.indexOf('Cannot find module') !== -1;
-
 /**
  * Parsers for various config filetypes. Each accepts a filepath and
  * returns an object (but could throw)
@@ -41,17 +37,16 @@ const isModuleNotFoundError = err =>
 const parsers = (exports.parsers = {
   yaml: filepath => require('js-yaml').load(fs.readFileSync(filepath, 'utf8')),
   js: filepath => {
-    const cwdFilepath = path.resolve(filepath);
+    let cwdFilepath;
     try {
-      debug('parsers: load using cwd-relative path: "%s"', cwdFilepath);
+      debug('parsers: load cwd-relative path: "%s"', path.resolve(filepath));
+      cwdFilepath = require.resolve(path.resolve(filepath)); // evtl. throws
       return require(cwdFilepath);
     } catch (err) {
-      if (isModuleNotFoundError(err)) {
-        debug('parsers: retry load as module-relative path: "%s"', filepath);
-        return require(filepath);
-      } else {
-        throw err; // rethrow
-      }
+      if (cwdFilepath) throw err;
+
+      debug('parsers: retry load as module-relative path: "%s"', filepath);
+      return require(filepath);
     }
   },
   json: filepath =>

package/lib/cli/run-helpers.js

@@ -225,18 +225,18 @@ exports.validateLegacyPlugin = (opts, pluginType, map = {}) => {
 
   // if this exists, then it's already loaded, so nothing more to do.
   if (!map[pluginId]) {
+    let foundId;
     try {
-      map[pluginId] = require(pluginId);
+      foundId = require.resolve(pluginId);
+      map[pluginId] = require(foundId);
     } catch (err) {
-      if (err.code === 'MODULE_NOT_FOUND') {
-        // Try to load reporters from a path (absolute or relative)
-        try {
-          map[pluginId] = require(path.resolve(pluginId));
-        } catch (err) {
-          throw createUnknownError(err);
-        }
-      } else {
-        throw createUnknownError(err);
+      if (foundId) throw createUnknownError(err);
+
+      // Try to load reporters from a cwd-relative path
+      try {
+        map[pluginId] = require(path.resolve(pluginId));
+      } catch (e) {
+        throw createUnknownError(e);
       }
     }
   }

package/lib/mocha.js

@@ -16,7 +16,6 @@ var Suite = require('./suite');
 var esmUtils = require('./nodejs/esm-utils');
 var createStatsCollector = require('./stats-collector');
 const {
-  warn,
   createInvalidReporterError,
   createInvalidInterfaceError,
   createMochaInstanceAlreadyDisposedError,
@@ -335,35 +334,26 @@ Mocha.prototype.reporter = function (reporterName, reporterOptions) {
     }
     // Try to load reporters from process.cwd() and node_modules
     if (!reporter) {
+      let foundReporter;
       try {
-        reporter = require(reporterName);
+        foundReporter = require.resolve(reporterName);
+        reporter = require(foundReporter);
       } catch (err) {
-        if (err.code === 'MODULE_NOT_FOUND') {
-          // Try to load reporters from a path (absolute or relative)
-          try {
-            reporter = require(path.resolve(utils.cwd(), reporterName));
-          } catch (_err) {
-            _err.code === 'MODULE_NOT_FOUND'
-              ? warn(`'${reporterName}' reporter not found`)
-              : warn(
-                  `'${reporterName}' reporter blew up with error:\n ${err.stack}`
-                );
-          }
-        } else {
-          warn(`'${reporterName}' reporter blew up with error:\n ${err.stack}`);
+        if (foundReporter) {
+          throw createInvalidReporterError(err.message, foundReporter);
+        }
+        // Try to load reporters from a cwd-relative path
+        try {
+          reporter = require(path.resolve(reporterName));
+        } catch (e) {
+          throw createInvalidReporterError(e.message, reporterName);
         }
       }
     }
-    if (!reporter) {
-      throw createInvalidReporterError(
-        `invalid reporter '${reporterName}'`,
-        reporterName
-      );
-    }
     this._reporter = reporter;
   }
   this.options.reporterOption = reporterOptions;
-  // alias option name is used in public reporters xunit/tap/progress
+  // alias option name is used in built-in reporters xunit/tap/progress
   this.options.reporterOptions = reporterOptions;
   return this;
 };

package/lib/nodejs/buffered-worker-pool.js

@@ -75,7 +75,23 @@ class BufferedWorkerPool {
       process.execArgv.join(' ')
     );
 
-    this.options = {...WORKER_POOL_DEFAULT_OPTS, opts, maxWorkers};
+    let counter = 0;
+    const onCreateWorker = ({forkOpts}) => {
+      return {
+        forkOpts: {
+          ...forkOpts,
+          // adds an incremental id to all workers, which can be useful to allocate resources for each process
+          env: {...process.env, MOCHA_WORKER_ID: counter++}
+        }
+      };
+    };
+
+    this.options = {
+      ...WORKER_POOL_DEFAULT_OPTS,
+      ...opts,
+      maxWorkers,
+      onCreateWorker
+    };
     this._pool = workerpool.pool(WORKER_PATH, this.options);
   }
 

package/lib/reporters/base.js

@@ -56,6 +56,11 @@ exports.useColors =
 
 exports.inlineDiffs = false;
 
+/**
+ * Truncate diffs longer than this value to avoid slow performance
+ */
+exports.maxDiffSize = 8192;
+
 /**
  * Default color map.
  */
@@ -188,18 +193,23 @@ function stringifyDiffObjs(err) {
  * @param {string} expected
  * @return {string} Diff
  */
+
 var generateDiff = (exports.generateDiff = function (actual, expected) {
   try {
-    const diffSize = 2048;
-    if (actual.length > diffSize) {
-      actual = actual.substring(0, diffSize) + ' ... Lines skipped';
+    var maxLen = exports.maxDiffSize;
+    var skipped = 0;
+    if (maxLen > 0) {
+      skipped = Math.max(actual.length - maxLen, expected.length - maxLen);
+      actual = actual.slice(0, maxLen);
+      expected = expected.slice(0, maxLen);
     }
-    if (expected.length > diffSize) {
-      expected = expected.substring(0, diffSize) + ' ... Lines skipped';
-    }
-    return exports.inlineDiffs
+    let result = exports.inlineDiffs
       ? inlineDiff(actual, expected)
       : unifiedDiff(actual, expected);
+    if (skipped > 0) {
+      result = `${result}\n      [mocha] output truncated to ${maxLen} characters, see "maxDiffSize" reporter-option\n`;
+    }
+    return result;
   } catch (err) {
     var msg =
       '\n      ' +
@@ -318,6 +328,12 @@ function Base(runner, options) {
   this.runner = runner;
   this.stats = runner.stats; // assigned so Reporters keep a closer reference
 
+  var maxDiffSizeOpt =
+    this.options.reporterOption && this.options.reporterOption.maxDiffSize;
+  if (maxDiffSizeOpt !== undefined && !isNaN(Number(maxDiffSizeOpt))) {
+    exports.maxDiffSize = Number(maxDiffSizeOpt);
+  }
+
   runner.on(EVENT_TEST_PASS, function (test) {
     if (test.duration > test.slow()) {
       test.speed = 'slow';

package/lib/runner.js

@@ -655,7 +655,7 @@ Runner.prototype.parents = function () {
  * @private
  */
 Runner.prototype.runTest = function (fn) {
-  if (this._opts.dryRun) return fn();
+  if (this._opts.dryRun) return Runner.immediately(fn);
 
   var self = this;
   var test = this.test;

package/mocha-es2018.js

@@ -1,4 +1,4 @@
-// mocha@9.1.4 in javascript ES2018
+// mocha@9.2.2 in javascript ES2018
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -9425,30 +9425,22 @@
 
   var browser$2 = true;
 
-  // This alphabet uses `A-Za-z0-9_-` symbols. The genetic algorithm helped
-  // optimize the gzip compression for this alphabet.
   let urlAlphabet =
-    'ModuleSymbhasOwnPr-0123456789ABCDEFGHNRVfgctiUvz_KqYTJkLxpZXIjQW';
-
-  let customAlphabet = (alphabet, size) => {
-    return () => {
+    'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
+  let customAlphabet = (alphabet, defaultSize = 21) => {
+    return (size = defaultSize) => {
       let id = '';
-      // A compact alternative for `for (var i = 0; i < step; i++)`.
       let i = size;
       while (i--) {
-        // `| 0` is more compact and faster than `Math.floor()`.
         id += alphabet[(Math.random() * alphabet.length) | 0];
       }
       return id
     }
   };
-
   let nanoid = (size = 21) => {
     let id = '';
-    // A compact alternative for `for (var i = 0; i < step; i++)`.
     let i = size;
     while (i--) {
-      // `| 0` is more compact and faster than `Math.floor()`.
       id += urlAlphabet[(Math.random() * 64) | 0];
     }
     return id
@@ -10668,7 +10660,7 @@
 
   	/**
   	* Selects a color for a debug namespace
-  	* @param {String} namespace The namespace string for the for the debug instance to be colored
+  	* @param {String} namespace The namespace string for the debug instance to be colored
   	* @return {Number|String} An ANSI color code for the given namespace
   	* @api private
   	*/
@@ -13617,7 +13609,7 @@
    * @private
    */
   Runner.prototype.runTest = function (fn) {
-    if (this._opts.dryRun) return fn();
+    if (this._opts.dryRun) return Runner.immediately(fn);
 
     var self = this;
     var test = this.test;
@@ -14287,6 +14279,11 @@
 
   exports.inlineDiffs = false;
 
+  /**
+   * Truncate diffs longer than this value to avoid slow performance
+   */
+  exports.maxDiffSize = 8192;
+
   /**
    * Default color map.
    */
@@ -14419,18 +14416,23 @@
    * @param {string} expected
    * @return {string} Diff
    */
+
   var generateDiff = (exports.generateDiff = function (actual, expected) {
     try {
-      const diffSize = 2048;
-      if (actual.length > diffSize) {
-        actual = actual.substring(0, diffSize) + ' ... Lines skipped';
-      }
-      if (expected.length > diffSize) {
-        expected = expected.substring(0, diffSize) + ' ... Lines skipped';
-      }
-      return exports.inlineDiffs
+      var maxLen = exports.maxDiffSize;
+      var skipped = 0;
+      if (maxLen > 0) {
+        skipped = Math.max(actual.length - maxLen, expected.length - maxLen);
+        actual = actual.slice(0, maxLen);
+        expected = expected.slice(0, maxLen);
+      }
+      let result = exports.inlineDiffs
         ? inlineDiff(actual, expected)
         : unifiedDiff(actual, expected);
+      if (skipped > 0) {
+        result = `${result}\n      [mocha] output truncated to ${maxLen} characters, see "maxDiffSize" reporter-option\n`;
+      }
+      return result;
     } catch (err) {
       var msg =
         '\n      ' +
@@ -14549,6 +14551,12 @@
     this.runner = runner;
     this.stats = runner.stats; // assigned so Reporters keep a closer reference
 
+    var maxDiffSizeOpt =
+      this.options.reporterOption && this.options.reporterOption.maxDiffSize;
+    if (maxDiffSizeOpt !== undefined && !isNaN(Number(maxDiffSizeOpt))) {
+      exports.maxDiffSize = Number(maxDiffSizeOpt);
+    }
+
     runner.on(EVENT_TEST_PASS, function (test) {
       if (test.duration > test.slow()) {
         test.speed = 'slow';
@@ -16492,9 +16500,14 @@
 
     if (options && options.reporterOptions) {
       if (options.reporterOptions.output) {
-        {
+        if (!fs.createWriteStream) {
           throw createUnsupportedError('file output not supported in browser');
         }
+
+        fs.mkdirSync(path.dirname(options.reporterOptions.output), {
+          recursive: true
+        });
+        self.fileStream = fs.createWriteStream(options.reporterOptions.output);
       }
 
       // get the suite name from the reporter options (if provided)
@@ -17101,7 +17114,7 @@
   });
 
   var name = "mocha";
-  var version = "9.1.4";
+  var version = "9.2.2";
   var homepage = "https://mochajs.org/";
   var notifyLogo = "https://ibin.co/4QuRuGjXvl36.png";
   var _package = {
@@ -18205,7 +18218,6 @@
 
 
   const {
-    warn,
     createInvalidReporterError,
     createInvalidInterfaceError,
     createMochaInstanceAlreadyDisposedError,
@@ -18524,35 +18536,26 @@
       }
       // Try to load reporters from process.cwd() and node_modules
       if (!reporter) {
+        let foundReporter;
         try {
-          reporter = commonjsRequire(reporterName);
+          foundReporter = require.resolve(reporterName);
+          reporter = commonjsRequire(foundReporter);
         } catch (err) {
-          if (err.code === 'MODULE_NOT_FOUND') {
-            // Try to load reporters from a path (absolute or relative)
-            try {
-              reporter = commonjsRequire(path.resolve(utils.cwd(), reporterName));
-            } catch (_err) {
-              _err.code === 'MODULE_NOT_FOUND'
-                ? warn(`'${reporterName}' reporter not found`)
-                : warn(
-                    `'${reporterName}' reporter blew up with error:\n ${err.stack}`
-                  );
-            }
-          } else {
-            warn(`'${reporterName}' reporter blew up with error:\n ${err.stack}`);
+          if (foundReporter) {
+            throw createInvalidReporterError(err.message, foundReporter);
+          }
+          // Try to load reporters from a cwd-relative path
+          try {
+            reporter = commonjsRequire(path.resolve(reporterName));
+          } catch (e) {
+            throw createInvalidReporterError(e.message, reporterName);
           }
         }
       }
-      if (!reporter) {
-        throw createInvalidReporterError(
-          `invalid reporter '${reporterName}'`,
-          reporterName
-        );
-      }
       this._reporter = reporter;
     }
     this.options.reporterOption = reporterOptions;
-    // alias option name is used in public reporters xunit/tap/progress
+    // alias option name is used in built-in reporters xunit/tap/progress
     this.options.reporterOptions = reporterOptions;
     return this;
   };