mocha 9.2.0 → 9.2.1

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/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/mocha-es2018.js

@@ -1,4 +1,4 @@
-// mocha@9.2.0 in javascript ES2018
+// mocha@9.2.1 in javascript ES2018
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -14279,6 +14279,11 @@
 
   exports.inlineDiffs = false;
 
+  /**
+   * Truncate diffs longer than this value to avoid slow performance
+   */
+  exports.maxDiffSize = 8192;
+
   /**
    * Default color map.
    */
@@ -14411,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      ' +
@@ -14541,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';
@@ -17093,7 +17109,7 @@
   });
 
   var name = "mocha";
-  var version = "9.2.0";
+  var version = "9.2.1";
   var homepage = "https://mochajs.org/";
   var notifyLogo = "https://ibin.co/4QuRuGjXvl36.png";
   var _package = {

package/mocha.js

@@ -1,4 +1,4 @@
-// mocha@9.2.0 transpiled to javascript ES5
+// mocha@9.2.1 transpiled to javascript ES5
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
@@ -25532,6 +25532,11 @@
 	   */
 
 	  exports.inlineDiffs = false;
+	  /**
+	   * Truncate diffs longer than this value to avoid slow performance
+	   */
+
+	  exports.maxDiffSize = 8192;
 	  /**
 	   * Default color map.
 	   */
@@ -25658,17 +25663,22 @@
 
 	  var generateDiff = exports.generateDiff = function (actual, expected) {
 	    try {
-	      var diffSize = 2048;
+	      var maxLen = exports.maxDiffSize;
+	      var skipped = 0;
 
-	      if (actual.length > diffSize) {
-	        actual = actual.substring(0, diffSize) + ' ... Lines skipped';
+	      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';
+	      var result = exports.inlineDiffs ? inlineDiff(actual, expected) : unifiedDiff(actual, expected);
+
+	      if (skipped > 0) {
+	        result = "".concat(result, "\n      [mocha] output truncated to ").concat(maxLen, " characters, see \"maxDiffSize\" reporter-option\n");
 	      }
 
-	      return exports.inlineDiffs ? inlineDiff(actual, expected) : unifiedDiff(actual, expected);
+	      return result;
 	    } catch (err) {
 	      var msg = '\n      ' + color('diff added', '+ expected') + ' ' + color('diff removed', '- actual:  failed to generate Mocha diff') + '\n';
 	      return msg;
@@ -25785,6 +25795,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';
@@ -28308,7 +28324,7 @@
 	});
 
 	var name = "mocha";
-	var version = "9.2.0";
+	var version = "9.2.1";
 	var homepage = "https://mochajs.org/";
 	var notifyLogo = "https://ibin.co/4QuRuGjXvl36.png";
 	var _package = {