creevey 0.9.0-beta.2 → 0.9.0-beta.3

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,9 +189,7 @@ 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));
@@ -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;

package/lib/cjs/shared/index.js

@@ -0,0 +1,101 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.serializeRawStories = exports.deserializeStory = exports.deserializeRawStories = exports.denormalizeStoryParameters = exports.combineParameters = void 0;
+
+var _lodash = require("lodash");
+
+var _serializeRegExp = require("./serializeRegExp");
+
+// NOTE: Copy-paste from storybook/api
+const combineParameters = function () {
+  for (var _len = arguments.length, parameterSets = new Array(_len), _key = 0; _key < _len; _key++) {
+    parameterSets[_key] = arguments[_key];
+  }
+
+  return (// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    (0, _lodash.mergeWith)({}, ...parameterSets, (_, srcValue) => {
+      // Treat arrays as scalars:
+      if (Array.isArray(srcValue)) return srcValue;
+      return undefined;
+    })
+  );
+}; // NOTE: Copy-paste from storybook/api
+
+
+exports.combineParameters = combineParameters;
+
+const denormalizeStoryParameters = _ref => {
+  let {
+    globalParameters,
+    kindParameters,
+    stories
+  } = _ref;
+  return (0, _lodash.mapValues)(stories, storyData => {
+    var _kindParameters$story;
+
+    return { ...storyData,
+      parameters: combineParameters(globalParameters, (_kindParameters$story = kindParameters[storyData.kind]) !== null && _kindParameters$story !== void 0 ? _kindParameters$story : {}, storyData.parameters)
+    };
+  });
+};
+
+exports.denormalizeStoryParameters = denormalizeStoryParameters;
+
+const serializeRawStories = stories => {
+  return (0, _lodash.mapValues)(stories, storyData => {
+    const creevey = storyData.parameters.creevey;
+
+    if (creevey !== null && creevey !== void 0 && creevey.skip) {
+      return { ...storyData,
+        parameters: { ...storyData.parameters,
+          creevey: { ...creevey,
+            skip: (0, _lodash.cloneDeepWith)(creevey.skip, value => {
+              if ((0, _serializeRegExp.isRegExp)(value)) {
+                return (0, _serializeRegExp.serializeRegExp)(value);
+              }
+
+              return undefined;
+            })
+          }
+        }
+      };
+    }
+
+    return storyData;
+  });
+};
+
+exports.serializeRawStories = serializeRawStories;
+
+const deserializeRawStories = stories => {
+  return (0, _lodash.mapValues)(stories, deserializeStory);
+};
+
+exports.deserializeRawStories = deserializeRawStories;
+
+const deserializeStory = story => {
+  const creevey = story.parameters.creevey;
+
+  if (creevey !== null && creevey !== void 0 && creevey.skip) {
+    return { ...story,
+      parameters: { ...story.parameters,
+        creevey: { ...creevey,
+          skip: (0, _lodash.cloneDeepWith)(creevey.skip, value => {
+            if ((0, _serializeRegExp.isSerializedRegExp)(value)) {
+              return (0, _serializeRegExp.deserializeRegExp)(value);
+            }
+
+            return undefined;
+          })
+        }
+      }
+    };
+  }
+
+  return story;
+};
+
+exports.deserializeStory = deserializeStory;

package/lib/cjs/shared/serializeRegExp.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.serializeRegExp = exports.isSerializedRegExp = exports.isRegExp = exports.deserializeRegExp = void 0;
+
+const isRegExp = exp => {
+  return exp instanceof RegExp;
+};
+
+exports.isRegExp = isRegExp;
+
+const isSerializedRegExp = exp => {
+  return typeof exp === 'object' && exp !== null && Reflect.get(exp, '__regexp') === true;
+};
+
+exports.isSerializedRegExp = isSerializedRegExp;
+
+const serializeRegExp = exp => {
+  const {
+    source,
+    flags
+  } = exp;
+  return {
+    __regexp: true,
+    source,
+    flags
+  };
+};
+
+exports.serializeRegExp = serializeRegExp;
+
+const deserializeRegExp = _ref => {
+  let {
+    source,
+    flags
+  } = _ref;
+  return new RegExp(source, flags);
+};
+
+exports.deserializeRegExp = deserializeRegExp;

package/lib/cjs/types.js

@@ -3,19 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.noop = noop;
 exports.isDefined = isDefined;
-exports.isTest = isTest;
-exports.isObject = isObject;
-exports.isString = isString;
+exports.isDockerMessage = isDockerMessage;
 exports.isFunction = isFunction;
 exports.isImageError = isImageError;
+exports.isObject = isObject;
 exports.isProcessMessage = isProcessMessage;
-exports.isWorkerMessage = isWorkerMessage;
 exports.isStoriesMessage = isStoriesMessage;
+exports.isString = isString;
+exports.isTest = isTest;
 exports.isTestMessage = isTestMessage;
 exports.isWebpackMessage = isWebpackMessage;
-exports.isDockerMessage = isDockerMessage;
+exports.isWorkerMessage = isWorkerMessage;
+exports.noop = noop;
 
 /* eslint-disable @typescript-eslint/no-explicit-any */