creevey 0.9.0-beta.13 → 0.9.0-beta.14

package/lib/esm/client/shared/components/PageFooter/Paging.js

@@ -13,10 +13,9 @@ export function Paging(props) {
         {
           return /*#__PURE__*/React.createElement(StyledButton, {
             disabled: true,
-            key: "dots".concat(index < 5 ? 'Left' : 'Right')
+            key: `dots${index < 5 ? 'Left' : 'Right'}`
           }, '...');
         }
-
       case 'forward':
         {
           const disabled = props.activePage === props.pagesCount;
@@ -29,7 +28,6 @@ export function Paging(props) {
             icon: "arrowright"
           })));
         }
-
       default:
         {
           return /*#__PURE__*/React.createElement(StyledButton, {
@@ -41,16 +39,13 @@ export function Paging(props) {
         }
     }
   };
-
   const goToPage = pageNumber => {
     if (1 <= pageNumber && pageNumber !== props.activePage && pageNumber <= props.pagesCount) {
       props.onPageChange(pageNumber);
     }
   };
-
   return /*#__PURE__*/React.createElement("div", null, getItems(props.activePage, props.pagesCount).map(renderItem));
 }
-
 function getItems(active, total) {
   const result = [];
   const left = Math.max(Math.min(active - 2, total - 4), 1);
@@ -59,22 +54,17 @@ function getItems(active, total) {
   const from = hasLeftDots ? left : 1;
   const hasRightDots = right < total - 2;
   const to = hasRightDots ? right : total;
-
   if (hasLeftDots) {
     result.push(1, '.');
   }
-
   for (let i = from; i <= to; ++i) {
     result.push(i);
   }
-
   if (hasRightDots) {
     result.push('.');
   }
-
   if (hasRightDots && isFinite(total)) {
     result.push(total);
   }
-
   return result.concat('forward');
 }

package/lib/esm/client/shared/components/PageHeader/ImagePreview.js

@@ -29,18 +29,31 @@ const Image = withTheme(styled.img(_ref2 => {
     theme
   } = _ref2;
   return {
-    maxHeight: "".concat(IMG_SIZE, "px"),
-    width: "".concat(IMG_SIZE, "px"),
+    maxHeight: `${IMG_SIZE}px`,
+    width: `${IMG_SIZE}px`,
     overflow: 'hidden',
     transform: hasBorder ? 'translateY(2px)' : undefined,
     '&::before': {
       content: "' '",
       display: 'block',
-      height: "".concat(IMG_SIZE - 8, "px"),
-      width: "".concat(IMG_SIZE - 8, "px"),
+      height: `${IMG_SIZE - 8}px`,
+      width: `${IMG_SIZE - 8}px`,
       margin: '4px',
       backgroundColor: backgroundColor,
-      backgroundImage: "linear-gradient(\n      45deg,\n      rgba(0, 0, 0, 0) ".concat(DIAG_LENGTH / 2 - 0.5, "px,\n      ").concat(theme.color.medium, " ").concat(DIAG_LENGTH / 2 - 0.5, "px,\n      ").concat(theme.color.medium, " ").concat(DIAG_LENGTH / 2 + 0.5, "px,\n      rgba(0, 0, 0, 0) ").concat(DIAG_LENGTH / 2 + 0.5, "px\n    ),\n    linear-gradient(\n      315deg,\n      rgba(0, 0, 0, 0) ").concat(DIAG_LENGTH / 2 + 0.2, "px,\n      ").concat(theme.color.medium, " ").concat(DIAG_LENGTH / 2 + 0.2, "px,\n      ").concat(theme.color.medium, " ").concat(DIAG_LENGTH / 2 + 1.2, "px,\n      rgba(0, 0, 0, 0) ").concat(DIAG_LENGTH / 2 + 1.2, "px\n    )")
+      backgroundImage: `linear-gradient(
+      45deg,
+      rgba(0, 0, 0, 0) ${DIAG_LENGTH / 2 - 0.5}px,
+      ${theme.color.medium} ${DIAG_LENGTH / 2 - 0.5}px,
+      ${theme.color.medium} ${DIAG_LENGTH / 2 + 0.5}px,
+      rgba(0, 0, 0, 0) ${DIAG_LENGTH / 2 + 0.5}px
+    ),
+    linear-gradient(
+      315deg,
+      rgba(0, 0, 0, 0) ${DIAG_LENGTH / 2 + 0.2}px,
+      ${theme.color.medium} ${DIAG_LENGTH / 2 + 0.2}px,
+      ${theme.color.medium} ${DIAG_LENGTH / 2 + 1.2}px,
+      rgba(0, 0, 0, 0) ${DIAG_LENGTH / 2 + 1.2}px
+    )`
     }
   };
 }));
@@ -53,9 +66,7 @@ export const ImagePreview = withTheme(_ref3 => {
     theme,
     error
   } = _ref3;
-
   const handleClick = () => onClick(imageName);
-
   return /*#__PURE__*/React.createElement(Button, {
     onClick: handleClick,
     borderColor: isActive ? theme.barSelectedColor : error ? theme.color.negative : undefined

package/lib/esm/client/shared/components/PageHeader/PageHeader.js

@@ -49,8 +49,6 @@ const ImagesEntriesContainer = styled.div({
   margin: '16px 0 8px'
 });
 export function PageHeader(_ref3) {
-  var _, _imageEntires$, _images$imageName;
-
   let {
     title,
     images = {},
@@ -63,13 +61,10 @@ export function PageHeader(_ref3) {
     onViewModeChange
   } = _ref3;
   const imageEntires = Object.entries(images);
-  const [imageName, setImageName] = useState((_ = ((_imageEntires$ = imageEntires[0]) !== null && _imageEntires$ !== void 0 ? _imageEntires$ : [])[0]) !== null && _ !== void 0 ? _ : '');
-
+  const [imageName, setImageName] = useState((imageEntires[0] ?? [])[0] ?? '');
   const handleImageChange = name => (setImageName(name), onImageChange(name));
-
   const handleViewModeChange = mode => onViewModeChange(mode);
-
-  const error = errorMessage || imagesWithError.includes(imageName) ? ((_images$imageName = images[imageName]) === null || _images$imageName === void 0 ? void 0 : _images$imageName.error) || errorMessage : null;
+  const error = errorMessage || imagesWithError.includes(imageName) ? images[imageName]?.error || errorMessage : null;
   return showTitle || error || imageEntires.length > 1 || showViewModes ? /*#__PURE__*/React.createElement(Container, null, showTitle && /*#__PURE__*/React.createElement(H1, null, title.flatMap(token => [token, /*#__PURE__*/React.createElement(HeaderDivider, {
     key: token
   }, "/")]).slice(0, -1)), error && /*#__PURE__*/React.createElement(ErrorContainer, null, /*#__PURE__*/React.createElement(Icons, {
@@ -79,7 +74,7 @@ export function PageHeader(_ref3) {
     return /*#__PURE__*/React.createElement(ImagePreview, {
       key: name,
       imageName: name,
-      url: "".concat(getImageUrl(title, name), "/").concat(image.actual),
+      url: `${getImageUrl(title, name)}/${image.actual}`,
       isActive: name === imageName,
       onClick: handleImageChange,
       error: imagesWithError.includes(name)

package/lib/esm/client/shared/components/ResultsPage.js

@@ -49,8 +49,6 @@ const Container = styled.div(_ref2 => {
   };
 });
 export function ResultsPageInternal(_ref3) {
-  var _results, _Object$keys$, _result$images, _result$images2;
-
   let {
     id,
     path,
@@ -62,27 +60,20 @@ export function ResultsPageInternal(_ref3) {
     height
   } = _ref3;
   const [retry, setRetry] = useState(results.length);
-  const result = (_results = results[retry - 1]) !== null && _results !== void 0 ? _results : {};
-  const [imageName, setImageName] = useState((_Object$keys$ = Object.keys((_result$images = result.images) !== null && _result$images !== void 0 ? _result$images : {})[0]) !== null && _Object$keys$ !== void 0 ? _Object$keys$ : '');
+  const result = results[retry - 1] ?? {};
+  const [imageName, setImageName] = useState(Object.keys(result.images ?? {})[0] ?? '');
   const [viewMode, setViewMode] = useState(getViewMode());
   useEffect(() => setRetry(results.length), [results.length]);
   const url = getImageUrl(path, imageName);
-  const image = (_result$images2 = result.images) === null || _result$images2 === void 0 ? void 0 : _result$images2[imageName];
+  const image = result.images?.[imageName];
   const canApprove = Boolean(image && approved[imageName] != retry - 1 && result.status != 'success');
-  const hasDiffAndExpect = canApprove && Boolean((image === null || image === void 0 ? void 0 : image.diff) && image.expect);
-  const imagesWithError = result.images ? Object.keys(result.images).filter(imageName => {
-    var _imageName;
-
-    return result.status != 'success' && approved[imageName] != retry - 1 && ((_imageName = (result.images || {})[imageName]) === null || _imageName === void 0 ? void 0 : _imageName.error) != null;
-  }) : [];
-
+  const hasDiffAndExpect = canApprove && Boolean(image?.diff && image.expect);
+  const imagesWithError = result.images ? Object.keys(result.images).filter(imageName => result.status != 'success' && approved[imageName] != retry - 1 && (result.images || {})[imageName]?.error != null) : [];
   const handleApprove = () => onImageApprove(id, retry - 1, imageName);
-
   const handleChangeViewMode = mode => {
     localStorage.setItem(VIEW_MODE_KEY, mode);
     setViewMode(mode);
   };
-
   return /*#__PURE__*/React.createElement(Container, {
     height: height
   }, /*#__PURE__*/React.createElement(HeaderContainer, null, /*#__PURE__*/React.createElement(PageHeader, {
@@ -104,7 +95,7 @@ export function ResultsPageInternal(_ref3) {
     image: image,
     canApprove: canApprove,
     mode: viewMode
-  }) : /*#__PURE__*/React.createElement(Placeholder, null, "Image ".concat(imageName, " not found")))))), results.length ? /*#__PURE__*/React.createElement(FooterContainer, null, /*#__PURE__*/React.createElement(PageFooter, {
+  }) : /*#__PURE__*/React.createElement(Placeholder, null, `Image ${imageName} not found`))))), results.length ? /*#__PURE__*/React.createElement(FooterContainer, null, /*#__PURE__*/React.createElement(PageFooter, {
     canApprove: canApprove,
     retry: retry,
     retriesCount: results.length,

package/lib/esm/client/shared/creeveyClientApi.js

@@ -5,12 +5,10 @@ export async function initCreeveyClientApi() {
   const updateListeners = new Set();
   let statusRequest = null;
   let statusResolver = noop;
-  const ws = new WebSocket("ws://".concat(getConnectionUrl()));
-
+  const ws = new WebSocket(`ws://${getConnectionUrl()}`);
   function send(request) {
     ws.send(JSON.stringify(request));
   }
-
   ws.addEventListener('open', () => {
     clientApiResolver({
       start(ids) {
@@ -19,13 +17,11 @@ export async function initCreeveyClientApi() {
           payload: ids
         });
       },
-
       stop() {
         send({
           type: 'stop'
         });
       },
-
       approve(id, retry, image) {
         send({
           type: 'approve',
@@ -36,12 +32,10 @@ export async function initCreeveyClientApi() {
           }
         });
       },
-
       onUpdate(fn) {
         updateListeners.add(fn);
         return () => updateListeners.delete(fn);
       },
-
       get status() {
         if (statusRequest) return statusRequest;
         send({
@@ -49,19 +43,18 @@ export async function initCreeveyClientApi() {
         });
         return statusRequest = new Promise(resolve => statusResolver = resolve);
       }
-
     });
   });
   ws.addEventListener('message', message => {
     const data = JSON.parse(message.data);
     if (data.type == 'update') updateListeners.forEach(fn => fn(data.payload));
-
     if (data.type == 'status') {
       statusResolver(data.payload);
       statusResolver = noop;
       statusRequest = null;
     }
-  }); // TODO Reconnect
+  });
+  // TODO Reconnect
 
   return new Promise(resolve => clientApiResolver = resolve);
 }

package/lib/esm/client/shared/helpers.js

@@ -3,7 +3,6 @@ import { parse, stringify } from 'qs';
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { isTest, isDefined } from '../../types';
 const statusUpdatesMap = new Map([[undefined, /(unknown|success|failed|pending|running)/], ['unknown', /(success|failed|pending|running)/], ['success', /(failed|pending|running)/], ['failed', /(pending|running)/], ['pending', /running/]]);
-
 function makeEmptySuiteNode() {
   let path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return {
@@ -15,11 +14,8 @@ function makeEmptySuiteNode() {
     children: {}
   };
 }
-
 export function calcStatus(oldStatus, newStatus) {
-  var _statusUpdatesMap$get;
-
-  return newStatus && (_statusUpdatesMap$get = statusUpdatesMap.get(oldStatus)) !== null && _statusUpdatesMap$get !== void 0 && _statusUpdatesMap$get.test(newStatus) ? newStatus : oldStatus;
+  return newStatus && statusUpdatesMap.get(oldStatus)?.test(newStatus) ? newStatus : oldStatus;
 }
 export function getTestPath(test) {
   const {
@@ -30,12 +26,10 @@ export function getTestPath(test) {
   return [...storyPath, testName, browser].filter(isDefined);
 }
 export function getSuiteByPath(suite, path) {
-  return path.reduce((suiteOrTest, pathToken) => isTest(suiteOrTest) ? suiteOrTest : suiteOrTest === null || suiteOrTest === void 0 ? void 0 : suiteOrTest.children[pathToken], suite);
+  return path.reduce((suiteOrTest, pathToken) => isTest(suiteOrTest) ? suiteOrTest : suiteOrTest?.children[pathToken], suite);
 }
 export function getTestByPath(suite, path) {
-  var _getSuiteByPath;
-
-  const test = (_getSuiteByPath = getSuiteByPath(suite, path)) !== null && _getSuiteByPath !== void 0 ? _getSuiteByPath : suite;
+  const test = getSuiteByPath(suite, path) ?? suite;
   return isTest(test) ? test : null;
 }
 export function getTestsByStoryId(suite, storyId) {
@@ -44,16 +38,13 @@ export function getTestsByStoryId(suite, storyId) {
     return getTestsByStoryId(suiteOrTest, storyId);
   }).filter(isDefined);
 }
-
 function checkTests(suiteOrTest, checked) {
   suiteOrTest.checked = checked;
-
   if (!isTest(suiteOrTest)) {
     suiteOrTest.indeterminate = false;
     Object.values(suiteOrTest.children).filter(isDefined).forEach(child => checkTests(child, checked));
   }
 }
-
 function updateChecked(suite) {
   const children = Object.values(suite.children).filter(isDefined).filter(child => !child.skip);
   const checkedEvery = children.every(test => test.checked);
@@ -63,7 +54,6 @@ function updateChecked(suite) {
   suite.checked = checked;
   suite.indeterminate = indeterminate;
 }
-
 export function checkSuite(suite, path, checked) {
   const subSuite = getSuiteByPath(suite, path);
   if (subSuite) checkTests(subSuite, checked);
@@ -87,14 +77,13 @@ export function treeifyTests(testsById) {
       if (!subSuite.skip) suite.skip = false;
       suite.children[token] = subSuite;
       suite.status = calcStatus(suite.status, subSuite.status);
-
       if (isTest(subSuite)) {
-        throw new Error("Suite and Test should not have same path '".concat(JSON.stringify(getTestPath(subSuite)), "'"));
+        throw new Error(`Suite and Test should not have same path '${JSON.stringify(getTestPath(subSuite))}'`);
       }
-
       return subSuite;
     }, rootSuite);
-    lastSuite.children[browser] = { ...test,
+    lastSuite.children[browser] = {
+      ...test,
       checked: true
     };
   });
@@ -108,14 +97,12 @@ export function getCheckedTests(suite) {
   });
 }
 export function updateTestStatus(suite, path, update) {
-  var _suite$children$title;
-
   const title = path.shift();
   if (!title) return;
-  const suiteOrTest = (_suite$children$title = suite.children[title]) !== null && _suite$children$title !== void 0 ? _suite$children$title : suite.children[title] = { ...(path.length == 0 ? update : makeEmptySuiteNode([...suite.path, title])),
+  const suiteOrTest = suite.children[title] ?? (suite.children[title] = {
+    ...(path.length == 0 ? update : makeEmptySuiteNode([...suite.path, title])),
     checked: suite.checked
-  };
-
+  });
   if (isTest(suiteOrTest)) {
     const test = suiteOrTest;
     const {
@@ -135,7 +122,6 @@ export function updateTestStatus(suite, path, update) {
     const subSuite = suiteOrTest;
     updateTestStatus(subSuite, path, update);
   }
-
   suite.skip = Object.values(suite.children).filter(isDefined).map(_ref2 => {
     let {
       skip
@@ -150,13 +136,11 @@ export function updateTestStatus(suite, path, update) {
   }).reduce(calcStatus);
 }
 export function removeTests(suite, path) {
-  var _suiteOrTest$children;
-
   const title = path.shift();
   if (!title) return;
   const suiteOrTest = suite.children[title];
   if (suiteOrTest && !isTest(suiteOrTest)) removeTests(suiteOrTest, path);
-  if (isTest(suiteOrTest) || Object.keys((_suiteOrTest$children = suiteOrTest === null || suiteOrTest === void 0 ? void 0 : suiteOrTest.children) !== null && _suiteOrTest$children !== void 0 ? _suiteOrTest$children : {}).length == 0) delete suite.children[title];
+  if (isTest(suiteOrTest) || Object.keys(suiteOrTest?.children ?? {}).length == 0) delete suite.children[title];
   if (Object.keys(suite.children).length == 0) return;
   updateChecked(suite);
   suite.skip = Object.values(suite.children).filter(isDefined).map(_ref4 => {
@@ -178,13 +162,13 @@ export function filterTests(suite, filter) {
     subStrings
   } = filter;
   if (!status && !subStrings.length) return suite;
-  const filteredSuite = { ...suite,
+  const filteredSuite = {
+    ...suite,
     children: {}
   };
   Object.entries(suite.children).forEach(_ref6 => {
     let [title, suiteOrTest] = _ref6;
     if (!suiteOrTest || suiteOrTest.skip) return;
-
     if (!status && subStrings.some(subString => title.toLowerCase().includes(subString))) {
       filteredSuite.children[title] = suiteOrTest;
     } else if (isTest(suiteOrTest)) {
@@ -223,7 +207,6 @@ export function countTestsStatus(suite) {
   let pendingCount = 0;
   const cases = Object.values(suite.children).filter(isDefined);
   let suiteOrTest;
-
   while (suiteOrTest = cases.pop()) {
     if (isTest(suiteOrTest)) {
       if (suiteOrTest.skip) skippedCount++;
@@ -234,7 +217,6 @@ export function countTestsStatus(suite) {
       cases.push(...Object.values(suiteOrTest.children).filter(isDefined));
     }
   }
-
   return {
     successCount,
     failedCount,
@@ -248,8 +230,8 @@ export function getConnectionUrl() {
 export function getImageUrl(path, imageName) {
   // path => [kind, story, test, browser]
   const browser = path.slice(-1)[0];
-  const imagesUrl = window.location.host ? "".concat(window.location.protocol, "//").concat(getConnectionUrl()).concat(window.location.pathname == '/' ? '/report' : window.location.pathname.split('/').slice(0, -1).join('/'), "/").concat(encodeURI(path.slice(0, -1).join('/'))) : encodeURI(path.slice(0, -1).join('/'));
-  return imageName == browser ? imagesUrl : "".concat(imagesUrl, "/").concat(encodeURI(browser));
+  const imagesUrl = window.location.host ? `${window.location.protocol}//${getConnectionUrl()}${window.location.pathname == '/' ? '/report' : window.location.pathname.split('/').slice(0, -1).join('/')}/${encodeURI(path.slice(0, -1).join('/'))}` : encodeURI(path.slice(0, -1).join('/'));
+  return imageName == browser ? imagesUrl : `${imagesUrl}/${encodeURI(browser)}`;
 }
 export function getBorderSize(element) {
   // NOTE Firefox returns empty string for `borderWidth` prop
@@ -269,12 +251,12 @@ export function useLoadImages(s1, s2, s3) {
   }, [s1, s2, s3]);
   return loaded;
 }
+
 /**
  * Uses the ResizeObserver API to observe changes within the given HTML Element DOM Rect.
  *
  * @returns dimensions of element's content box (which means without paddings and border width)
  */
-
 export function useResizeObserver(elementRef, onResize) {
   let debounceTimeout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 16;
   const observerRef = useRef(null);
@@ -282,11 +264,7 @@ export function useResizeObserver(elementRef, onResize) {
     if (!elementRef.current) return;
     observerRef.current = new ResizeObserver(onResize);
     observerRef.current.observe(elementRef.current);
-    return () => {
-      var _observerRef$current;
-
-      return (_observerRef$current = observerRef.current) === null || _observerRef$current === void 0 ? void 0 : _observerRef$current.disconnect();
-    };
+    return () => observerRef.current?.disconnect();
   }, [debounceTimeout, elementRef, onResize]);
 }
 export function useApplyScale(imageRef, scale, dependency) {
@@ -294,7 +272,7 @@ export function useApplyScale(imageRef, scale, dependency) {
     if (!imageRef.current) return;
     const image = imageRef.current;
     const borderSize = getBorderSize(image);
-    image.style.height = "".concat(image.naturalHeight * scale + borderSize * 2, "px");
+    image.style.height = `${image.naturalHeight * scale + borderSize * 2}px`;
   }, [imageRef, scale, dependency]);
 }
 export function useCalcScale(diffImageRef, loaded) {
@@ -311,16 +289,13 @@ export function useCalcScale(diffImageRef, loaded) {
   return scale;
 }
 const CREEVEY_THEME = 'Creevey_theme';
-
 function isTheme(theme) {
   return isDefined(theme) && Object.prototype.hasOwnProperty.call(themes, theme);
 }
-
 function initialTheme() {
   const theme = localStorage.getItem(CREEVEY_THEME);
   return isTheme(theme) ? theme : 'light';
 }
-
 export function useTheme() {
   const [theme, setTheme] = useState(initialTheme());
   useEffect(() => {
@@ -329,9 +304,9 @@ export function useTheme() {
   return [theme, setTheme];
 }
 export function setSearchParams(testPath) {
-  const pageUrl = "?".concat(stringify({
+  const pageUrl = `?${stringify({
     testPath
-  }));
+  })}`;
   window.history.pushState({
     testPath
   }, '', pageUrl);
@@ -339,12 +314,11 @@ export function setSearchParams(testPath) {
 export function getTestPathFromSearch() {
   const {
     testPath
-  } = parse(window.location.search.slice(1)); //@ts-expect-error: This expression is not callable.
-
+  } = parse(window.location.search.slice(1));
+  //@ts-expect-error: This expression is not callable.
   if (Array.isArray(testPath) && testPath.every(token => typeof token == 'string')) {
     return testPath;
   }
-
   return [];
 }
 export function useForceUpdate() {

package/lib/esm/client/web/192.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkcreevey=self.webpackChunkcreevey||[]).push([[192],{8192:(e,r,a)=>{a.r(r),a.d(r,{SyntaxHighlighter:()=>c.d3,createCopyToClipboardFunction:()=>c.xV,default:()=>c.qG});var c=a(23809)}}]);