creevey 0.9.0-beta.0 → 0.9.0-beta.10

package/lib/cjs/server/storybook/providers/browser.js

@@ -3,30 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadStories = loadStories;
+exports.loadStories = void 0;
 
-var _cluster = _interopRequireWildcard(require("cluster"));
+var _cluster = _interopRequireDefault(require("cluster"));
 
 var _selenium = require("../../selenium");
 
 var _messages = require("../../messages");
 
-var _shared = require("../../../shared");
-
 var _types = require("../../../types");
 
 var _logger = require("../../logger");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-async function loadStories(_config, {
-  port
-}, storiesListener) {
-  if (_cluster.isMaster) {
+const loadStories = async (_config, _options, storiesListener) => {
+  if (_cluster.default.isPrimary) {
     return new Promise(resolve => {
-      const worker = Object.values(_cluster.default.workers).filter(_types.isDefined).find(worker => worker.isConnected());
+      const worker = Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).find(worker => worker.isConnected());
 
       if (worker) {
         const unsubscribe = (0, _messages.subscribeOnWorker)(worker, 'stories', message => {
@@ -61,7 +55,7 @@ async function loadStories(_config, {
       });
       if (message.type == 'update') storiesListener(new Map(message.payload));
     });
-    const stories = (0, _shared.deserializeRawStories)(await (0, _selenium.loadStoriesFromBrowser)(port));
+    const stories = await (0, _selenium.loadStoriesFromBrowser)();
     const storiesWithOldTests = [];
     Object.values(stories).forEach(story => {
       var _parameters, _parameters$creevey;
@@ -75,4 +69,6 @@ async function loadStories(_config, {
     });
     return stories;
   }
-}
+};
+
+exports.loadStories = loadStories;

package/lib/cjs/server/storybook/providers/hybrid.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadStories = loadStories;
+exports.loadStories = void 0;
 
 var _chokidar = _interopRequireDefault(require("chokidar"));
 
@@ -11,7 +11,7 @@ var _browser = require("./browser");
 
 var _logger = require("../../logger");
 
-var _parser = _interopRequireDefault(require("../../parser"));
+var _parser = _interopRequireDefault(require("../../testsFiles/parser"));
 
 var _utils = require("../../../server/utils");
 
@@ -19,9 +19,11 @@ var _shared = require("../../../shared");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-async function loadStories(_config, {
-  port
-}, storiesListener) {
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const loadStories = async (_config, _options, storiesListener) => {
   let creeveyParamsByStoryId = {};
 
   const mergeParamsFromTestsToStory = (story, creeveyParams) => {
@@ -30,9 +32,7 @@ async function loadStories(_config, {
     }
   };
 
-  const stories = await (0, _browser.loadStories)(_config, {
-    port
-  }, updatedStoriesByFiles => {
+  const stories = await (0, _browser.loadStories)(_config, {}, updatedStoriesByFiles => {
     Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
       storiesArray.forEach(story => {
         const creeveyParams = creeveyParamsByStoryId[story.id];
@@ -52,18 +52,21 @@ async function loadStories(_config, {
     mergeParamsFromTestsToStory(story, creeveyParamsByStoryId[storyId]);
   });
   return stories;
-}
+};
+
+exports.loadStories = loadStories;
 
-function parseParams(config, listener) {
-  if (!config.testDir) {
+async function parseParams(config, listener) {
+  if (!config.testsDir) {
     return Promise.resolve({});
   }
 
-  const testFiles = (0, _utils.readDirRecursive)(config.testDir).filter(file => {
-    var _config$testRegex;
+  const testFiles = (0, _utils.readDirRecursive)(config.testsDir).filter(file => {
+    var _config$testsRegex;
 
-    return (_config$testRegex = config.testRegex) === null || _config$testRegex === void 0 ? void 0 : _config$testRegex.test(file);
+    return (_config$testsRegex = config.testsRegex) === null || _config$testsRegex === void 0 ? void 0 : _config$testsRegex.test(file);
   });
+  await (await Promise.resolve().then(() => _interopRequireWildcard(require('../../testsFiles/register')))).default(config);
 
   if (listener) {
     _chokidar.default.watch(testFiles).on('change', filePath => {

package/lib/cjs/server/storybook/providers/nodejs.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadStories = loadStories;
 exports.extractStoriesData = extractStoriesData;
+exports.loadStories = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _cluster = require("cluster");
+var _cluster = _interopRequireDefault(require("cluster"));
 
 var _chokidar = _interopRequireDefault(require("chokidar"));
 
@@ -22,8 +22,6 @@ var _helpers = require("../helpers");
 
 var _logger = require("../../logger");
 
-var _shared = require("../../../shared");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -46,7 +44,7 @@ async function initStorybookEnvironment() {
     logger
   } = await (0, _helpers.importStorybookClientLogger)(); // NOTE: Disable duplication warnings for >=6.2 storybook
 
-  if (_cluster.isWorker) logger.warn = _types.noop; // NOTE: disable logger for 5.x storybook
+  if (_cluster.default.isWorker) logger.warn = _types.noop; // NOTE: disable logger for 5.x storybook
 
   logger.debug = _types.noop;
   return Promise.resolve().then(() => _interopRequireWildcard(require('../entry')));
@@ -60,7 +58,7 @@ function watchStories(channel, watcher, initialFiles) {
   watcher.on('change', filePath => storiesByFiles.set(_path.default.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
   watcher.on('unlink', filePath => storiesByFiles.set(_path.default.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
   return data => {
-    const stories = (0, _helpers.isStorybookVersionLessThan)(6) || (0, _helpers.isStorybookVersionGreaterThan)(6, 3) ? data.stories : (0, _shared.denormalizeStoryParameters)(data);
+    const stories = data.stories;
     const files = new Set(Object.values(stories).map(story => story.parameters.fileName));
     const addedFiles = Array.from(files).filter(filePath => !watchingFiles.has(filePath));
     const removedFiles = Array.from(watchingFiles).filter(filePath => !files.has(filePath));
@@ -126,7 +124,7 @@ async function loadStoriesDirectly(config, {
     stories
   } = await (0, _helpers.importStorybookConfig)();
   const contexts = stories.map(entry => {
-    const normalizedEntry = (0, _helpers.isStorybookVersionLessThan)(6, 4) ? entry : normalizeStoriesEntry(entry, {
+    const normalizedEntry = normalizeStoriesEntry(entry, {
       configDir: config.storybookDir,
       workingDir: process.cwd()
     });
@@ -175,7 +173,7 @@ async function loadStoriesDirectly(config, {
     try {
       configure(contexts.map(ctx => ctx()), module, false);
     } catch (error) {
-      if (_cluster.isMaster) _logger.logger.error(error);
+      if (_cluster.default.isPrimary) _logger.logger.error(error);
     }
   }
 
@@ -191,10 +189,10 @@ async function loadStoriesDirectly(config, {
 } // TODO Do we need to support multiple storybooks here?
 
 
-async function loadStories(config, {
+const loadStories = async (config, {
   watch,
   debug
-}, storiesListener) {
+}, storiesListener) => {
   const storybookApi = await initStorybookEnvironment();
   const Events = await (0, _helpers.importStorybookCoreEvents)();
   const {
@@ -208,7 +206,7 @@ async function loadStories(config, {
   });
   const loadPromise = new Promise(resolve => {
     channel.once(Events.SET_STORIES, data => {
-      const stories = (0, _helpers.isStorybookVersionLessThan)(6) || (0, _helpers.isStorybookVersionGreaterThan)(6, 3) ? data.stories : (0, _shared.denormalizeStoryParameters)(data);
+      const stories = data.stories;
       const files = new Set(Object.values(stories).map(story => story.parameters.fileName));
       if (watcher) channel.on(Events.SET_STORIES, watchStories(channel, watcher, files));
       resolve(stories);
@@ -219,7 +217,9 @@ async function loadStories(config, {
     debug
   });
   return loadPromise;
-}
+};
+
+exports.loadStories = loadStories;
 
 async function extractStoriesData(config, {
   watch,

package/lib/cjs/server/{parser.js → testsFiles/parser.js}

@@ -13,20 +13,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 async function parse(files) {
-  result = {}; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-
-  (await Promise.resolve().then(() => _interopRequireWildcard(require('@babel/register')))).default({
-    babelrc: false,
-    rootMode: 'upward-optional',
-    ignore: [/node_modules/],
-    extensions: ['.js', '.jsx', '.ts', '.tsx'],
-    plugins: [['@babel/plugin-transform-runtime']],
-    presets: ['@babel/preset-typescript', ['@babel/preset-env', {
-      targets: {
-        node: '10'
-      }
-    }]]
-  });
+  result = {};
   await Promise.all(files.map(async file => Promise.resolve(`${file}`).then(s => _interopRequireWildcard(require(s)))));
   return result;
 }

package/lib/cjs/server/testsFiles/register.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = register;
+
+var _pirates = require("pirates");
+
+var _getTsconfig = require("get-tsconfig");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+async function register(config) {
+  (0, _pirates.addHook)(() => '', {
+    exts: ['.jpg', '.jpeg', '.png', '.gif', '.eot', '.otf', '.svg', '.ttf', '.woff', '.woff2', '.css', '.less', '.scss', '.styl'],
+    ignoreNodeModules: false
+  });
+  const {
+    path: tsConfigPath
+  } = (0, _getTsconfig.getTsconfig)(config.tsConfig) || {}; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+
+  (await Promise.resolve().then(() => _interopRequireWildcard(require('@babel/register')))).default(config.babelOptions({
+    babelrc: false,
+    rootMode: 'upward-optional',
+    ignore: [/node_modules/],
+    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+    parserOpts: {
+      sourceType: 'module',
+      plugins: ['jsx', 'typescript']
+    },
+    presets: ['@babel/preset-typescript', ['@babel/preset-env', {
+      targets: {
+        node: '10'
+      },
+      modules: 'commonjs'
+    }]],
+    plugins: [['@babel/plugin-transform-runtime'], ...(tsConfigPath ? [['babel-plugin-tsconfig-paths', {
+      tsconfig: tsConfigPath
+    }]] : [])]
+  })); // (await import('ts-node')).register({ project: tsConfigPath, transpileOnly: true });
+}

package/lib/cjs/server/update.js

@@ -31,11 +31,7 @@ function tryToLoadTestsData(filename) {
 const actualRegex = /^(.*)-actual-(\d+)\.png$/i;
 
 function approve(dirents, srcPath, dstPath, testPaths, isMatch) {
-  dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(_types.isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(_path.default.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => {
-    var _images$get;
-
-    return Number(retry) > ((_images$get = images.get(imageName)) !== null && _images$get !== void 0 ? _images$get : -1) ? images.set(imageName, Number(retry)) : images;
-  }, new Map()).forEach((retry, imageName) => {
+  dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(_types.isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(_path.default.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => Number(retry) > (images.get(imageName) ?? -1) ? images.set(imageName, Number(retry)) : images, new Map()).forEach((retry, imageName) => {
     (0, _fs.mkdirSync)(dstPath, {
       recursive: true
     });

package/lib/cjs/server/utils.js

@@ -3,15 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldSkip = shouldSkip;
-exports.shutdownWorkers = shutdownWorkers;
-exports.shutdown = shutdown;
+exports.extensions = exports.downloadBinary = exports.LOCALHOST_REGEXP = void 0;
 exports.getCreeveyCache = getCreeveyCache;
+exports.isShuttingDown = exports.isInsideDocker = void 0;
+exports.readDirRecursive = readDirRecursive;
+exports.removeProps = removeProps;
 exports.runSequence = runSequence;
+exports.shouldSkip = shouldSkip;
+exports.shouldSkipByOption = shouldSkipByOption;
+exports.shutdown = shutdown;
+exports.shutdownWorkers = shutdownWorkers;
+exports.skipOptionKeys = void 0;
 exports.testsToImages = testsToImages;
-exports.removeProps = removeProps;
-exports.readDirRecursive = readDirRecursive;
-exports.downloadBinary = exports.isInsideDocker = exports.skipOptionKeys = exports.extensions = exports.LOCALHOST_REGEXP = exports.isShuttingDown = void 0;
 
 var _fs = require("fs");
 
@@ -47,38 +50,30 @@ function shouldSkip(browser, meta, skipOptions, test) {
     return skipOptions;
   }
 
-  if (Array.isArray(skipOptions)) {
-    for (const skip of skipOptions) {
-      const reason = shouldSkip(browser, meta, skip, test);
-      if (reason) return reason;
-    }
-
-    return false;
+  for (const skipKey in skipOptions) {
+    const reason = shouldSkipByOption(browser, meta, skipOptions[skipKey], skipKey, test);
+    if (reason) return reason;
   }
 
-  let hasSkipOptionKeys = false;
+  return false;
+}
 
-  for (const skipKey in skipOptions) {
-    if (skipOptionKeys.includes(skipKey)) {
-      hasSkipOptionKeys = true;
-      continue;
+function shouldSkipByOption(browser, meta, skipOption, reason, test) {
+  if (Array.isArray(skipOption)) {
+    for (const skip of skipOption) {
+      const result = shouldSkipByOption(browser, meta, skip, reason, test);
+      if (result) return result;
     }
 
-    const reason = shouldSkip(browser, meta, {
-      reason: skipKey,
-      ...skipOptions[skipKey]
-    }, test);
-    if (reason) return reason;
+    return false;
   }
 
-  if (!hasSkipOptionKeys) return false;
   const {
     in: browsers,
     kinds,
     stories,
-    tests,
-    reason = true
-  } = skipOptions;
+    tests
+  } = skipOption;
   const {
     kind,
     story
@@ -92,7 +87,7 @@ function shouldSkip(browser, meta, skipOptions, test) {
 
 async function shutdownWorkers() {
   isShuttingDown.current = true;
-  await Promise.all(Object.values(_cluster.default.workers).filter(_types.isDefined).filter(worker => worker.isConnected()).map(worker => new Promise(resolve => {
+  await Promise.all(Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).filter(worker => worker.isConnected()).map(worker => new Promise(resolve => {
     const timeout = setTimeout(() => worker.kill(), 10000);
     worker.on('exit', () => {
       clearTimeout(timeout);
@@ -128,9 +123,9 @@ function testsToImages(tests) {
     storyPath,
     results
   }) => {
-    var _results$slice$0$imag, _results$slice$;
+    var _results$slice$;
 
-    return Object.keys((_results$slice$0$imag = results === null || results === void 0 ? void 0 : (_results$slice$ = results.slice(-1)[0]) === null || _results$slice$ === void 0 ? void 0 : _results$slice$.images) !== null && _results$slice$0$imag !== void 0 ? _results$slice$0$imag : {}).map(image => `${[...storyPath, testName, browser, browser == image ? undefined : image].filter(_types.isDefined).join('/')}.png`);
+    return Object.keys((results === null || results === void 0 ? void 0 : (_results$slice$ = results.slice(-1)[0]) === null || _results$slice$ === void 0 ? void 0 : _results$slice$.images) ?? {}).map(image => `${[...storyPath, testName, browser, browser == image ? undefined : image].filter(_types.isDefined).join('/')}.png`);
   })));
 } // https://tuhrig.de/how-to-know-you-are-inside-a-docker-container/
 
@@ -139,19 +134,15 @@ const isInsideDocker = (0, _fs.existsSync)('/proc/1/cgroup') && /docker/.test((0
 exports.isInsideDocker = isInsideDocker;
 
 const downloadBinary = (downloadUrl, destination) => new Promise((resolve, reject) => (0, _https.get)(downloadUrl, response => {
-  var _response$statusCode2;
-
   if (response.statusCode == 302) {
-    var _response$statusCode;
-
     const {
       location
     } = response.headers;
-    if (!location) return reject(new Error(`Couldn't download selenoid. Status code: ${(_response$statusCode = response.statusCode) !== null && _response$statusCode !== void 0 ? _response$statusCode : 'UNKNOWN'}`));
+    if (!location) return reject(new Error(`Couldn't download selenoid. Status code: ${response.statusCode ?? 'UNKNOWN'}`));
     return resolve(downloadBinary(location, destination));
   }
 
-  if (response.statusCode != 200) return reject(new Error(`Couldn't download selenoid. Status code: ${(_response$statusCode2 = response.statusCode) !== null && _response$statusCode2 !== void 0 ? _response$statusCode2 : 'UNKNOWN'}`));
+  if (response.statusCode != 200) return reject(new Error(`Couldn't download selenoid. Status code: ${response.statusCode ?? 'UNKNOWN'}`));
   const fileStream = (0, _fs.createWriteStream)(destination);
   response.pipe(fileStream);
   fileStream.on('finish', () => {

package/lib/cjs/server/worker/reporter.js

@@ -17,8 +17,6 @@ var _logger = require("../logger");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const testLevels = {
   INFO: _chalk.default.green('PASS'),
   WARN: _chalk.default.yellow('START'),
@@ -43,11 +41,7 @@ class CreeveyReporter extends _mocha.reporters.Base {
 
     runner.on('test', test => testLogger.warn(_chalk.default.cyan(test.titlePath().join('/'))));
     runner.on('pass', test => testLogger.info(_chalk.default.cyan(test.titlePath().join('/'))));
-    runner.on('fail', (test, error) => testLogger.error(_chalk.default.cyan(test.titlePath().join('/')), '\n  ', getErrors(error, (error, imageName) => `${_chalk.default.bold(imageName !== null && imageName !== void 0 ? imageName : topLevelSuite)}:${error}`, error => {
-      var _error$stack;
-
-      return `${(_error$stack = error.stack) !== null && _error$stack !== void 0 ? _error$stack : error.message}`;
-    }).join('\n  ')));
+    runner.on('fail', (test, error) => testLogger.error(_chalk.default.cyan(test.titlePath().join('/')), '\n  ', getErrors(error, (error, imageName) => `${_chalk.default.bold(imageName ?? topLevelSuite)}:${error}`, error => `${error.stack ?? error.message}`).join('\n  ')));
   }
 
 }
@@ -57,20 +51,11 @@ exports.CreeveyReporter = CreeveyReporter;
 class TeamcityReporter extends _mocha.reporters.Base {
   constructor(runner, options) {
     super(runner);
-
-    _defineProperty(this, "escape", str => {
-      if (!str) return '';
-      return str.toString() // eslint-disable-next-line no-control-regex
-      .replace(/\x1B.*?m/g, '').replace(/\|/g, '||').replace(/\n/g, '|n').replace(/\r/g, '|r').replace(/\[/g, '|[').replace(/\]/g, '|]').replace(/\u0085/g, '|x').replace(/\u2028/g, '|l').replace(/\u2029/g, '|p').replace(/'/g, "|'");
-    });
-
     const topLevelSuite = this.escape(options.reporterOptions.topLevelSuite);
     const reporterOptions = options.reporterOptions;
     runner.on('suite', suite => suite.root ? console.log(`##teamcity[testSuiteStarted name='${topLevelSuite}' flowId='${process.pid}']`) : console.log(`##teamcity[testSuiteStarted name='${this.escape(suite.title)}' flowId='${process.pid}']`));
     runner.on('test', test => console.log(`##teamcity[testStarted name='${this.escape(test.title)}' flowId='${process.pid}']`));
     runner.on('fail', (test, error) => {
-      var _error$stack2;
-
       Object.entries(reporterOptions.images).forEach(([name, image]) => {
         if (!image) return;
         const filePath = test.titlePath().concat(name == topLevelSuite ? [] : [topLevelSuite]).map(this.escape).join('/'); // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -86,7 +71,7 @@ class TeamcityReporter extends _mocha.reporters.Base {
       }); // Output failed test as passed due TC don't support retry mechanic
       // https://teamcity-support.jetbrains.com/hc/en-us/community/posts/207216829-Count-test-as-successful-if-at-least-one-try-is-successful?page=1#community_comment_207394125
 
-      reporterOptions.willRetry ? console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`) : console.log(`##teamcity[testFailed name='${this.escape(test.title)}' message='${this.escape(error.message)}' details='${this.escape((_error$stack2 = error.stack) !== null && _error$stack2 !== void 0 ? _error$stack2 : '')}' flowId='${process.pid}']`);
+      reporterOptions.willRetry ? console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`) : console.log(`##teamcity[testFailed name='${this.escape(test.title)}' message='${this.escape(error.message)}' details='${this.escape(error.stack ?? '')}' flowId='${process.pid}']`);
     });
     runner.on('pending', test => console.log(`##teamcity[testIgnored name='${this.escape(test.title)}' message='${this.escape(typeof test.skipReason == 'boolean' ? test.title : test.skipReason)}' flowId='${process.pid}']`));
     runner.on('test end', test => console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`));
@@ -94,6 +79,11 @@ class TeamcityReporter extends _mocha.reporters.Base {
     runner.on('end', () => console.log(`##teamcity[testSuiteFinished name='${topLevelSuite}' flowId='${process.pid}']`));
   }
 
+  escape = str => {
+    if (!str) return '';
+    return str.toString() // eslint-disable-next-line no-control-regex
+    .replace(/\x1B.*?m/g, '').replace(/\|/g, '||').replace(/\n/g, '|n').replace(/\r/g, '|r').replace(/\[/g, '|[').replace(/\]/g, '|]').replace(/\u0085/g, '|x').replace(/\u2028/g, '|l').replace(/\u2029/g, '|p').replace(/'/g, "|'");
+  };
 }
 
 exports.TeamcityReporter = TeamcityReporter;
@@ -110,9 +100,7 @@ function getErrors(error, imageErrorToString, errorToString) {
   } else {
     const imageErrors = error.images;
     Object.keys(imageErrors).forEach(imageName => {
-      var _imageErrors$imageNam;
-
-      errors.push(imageErrorToString((_imageErrors$imageNam = imageErrors[imageName]) !== null && _imageErrors$imageNam !== void 0 ? _imageErrors$imageNam : '', imageName));
+      errors.push(imageErrorToString(imageErrors[imageName] ?? '', imageName));
     });
   }
 

package/lib/cjs/server/worker/worker.js

@@ -57,9 +57,7 @@ async function getLastImageNumber(imageDir, imageName) {
   const actualImagesRegexp = new RegExp(`${imageName}-actual-(\\d+)\\.png`);
 
   try {
-    var _await$readdirAsync$m;
-
-    return (_await$readdirAsync$m = (await readdirAsync(imageDir)).map(filename => filename.replace(actualImagesRegexp, '$1')).map(Number).filter(x => !isNaN(x)).sort((a, b) => b - a)[0]) !== null && _await$readdirAsync$m !== void 0 ? _await$readdirAsync$m : 0;
+    return (await readdirAsync(imageDir)).map(filename => filename.replace(actualImagesRegexp, '$1')).map(Number).filter(x => !isNaN(x)).sort((a, b) => b - a)[0] ?? 0;
   } catch (_error) {
     return 0;
   }
@@ -77,8 +75,6 @@ async function worker(config, options) {
 
   function runHandler(failures) {
     if (failures > 0 && (error || Object.values(images).some(image => (image === null || image === void 0 ? void 0 : image.error) != null))) {
-      var _error2;
-
       const isTimeout = hasTimeout(error) || Object.values(images).some(image => hasTimeout(image === null || image === void 0 ? void 0 : image.error));
       const payload = {
         status: 'failed',
@@ -88,7 +84,7 @@ async function worker(config, options) {
       isTimeout ? (0, _messages.emitWorkerMessage)({
         type: 'error',
         payload: {
-          error: (_error2 = error) !== null && _error2 !== void 0 ? _error2 : 'Unknown error'
+          error: error ?? 'Unknown error'
         }
       }) : (0, _messages.emitTestMessage)({
         type: 'end',
@@ -119,20 +115,18 @@ async function worker(config, options) {
   }
 
   async function getExpected(assertImageName) {
-    var _images$imageName;
-
     // context => [kind, story, test, browser]
     // rootSuite -> kindSuite -> storyTest -> [browsers.png]
     // rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
     const testPath = [...testScope];
-    const imageName = assertImageName !== null && assertImageName !== void 0 ? assertImageName : testPath.pop();
+    const imageName = assertImageName ?? testPath.pop();
     const imagesMeta = [];
 
     const reportImageDir = _path.default.join(config.reportDir, ...testPath);
 
     const imageNumber = (await getLastImageNumber(reportImageDir, imageName)) + 1;
     const actualImageName = `${imageName}-actual-${imageNumber}.png`;
-    const image = images[imageName] = (_images$imageName = images[imageName]) !== null && _images$imageName !== void 0 ? _images$imageName : {
+    const image = images[imageName] = images[imageName] ?? {
       actual: actualImageName
     };
 
@@ -195,14 +189,12 @@ async function worker(config, options) {
 
     }
   };
-  const mocha = new _mocha.default(mochaOptions); // @ts-expect-error: @types/mocha has out-dated types
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-
+  const mocha = new _mocha.default(mochaOptions);
   mocha.cleanReferencesAfterRun(false);
 
   _chai.default.use((0, _chaiImage.default)(getExpected, config.diffOptions));
 
-  if ((await (0, _selenium.getBrowser)(config, options.browser)) == null) return;
+  if ((await (0, _selenium.getBrowser)(config, options)) == null) return;
   await (0, _helpers.addTestsFromStories)(mocha.suite, config, {
     browser: options.browser,
     watch: options.ui,
@@ -213,12 +205,12 @@ async function worker(config, options) {
   try {
     var _await$getBrowser;
 
-    await ((_await$getBrowser = await (0, _selenium.getBrowser)(config, options.browser)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
+    await ((_await$getBrowser = await (0, _selenium.getBrowser)(config, options)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
   } catch (_) {
     await (0, _selenium.closeBrowser)();
   }
 
-  const browser = await (0, _selenium.getBrowser)(config, options.browser);
+  const browser = await (0, _selenium.getBrowser)(config, options);
   const sessionId = (_await$browser$getSes = await (browser === null || browser === void 0 ? void 0 : browser.getSession())) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
   if (browser == null) return;
   const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
@@ -250,9 +242,7 @@ async function worker(config, options) {
       if (!(reason instanceof Error)) {
         error = reason;
       } else if (!(0, _types.isImageError)(reason)) {
-        var _reason$stack;
-
-        error = (_reason$stack = reason.stack) !== null && _reason$stack !== void 0 ? _reason$stack : reason.message;
+        error = reason.stack ?? reason.message;
       } else if (typeof reason.images == 'string') {
         const image = images[testScope.slice(-1)[0]];
         if (image) image.error = reason.images;