creevey 0.9.0-beta.2 → 0.9.0-beta.20

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

@@ -1,144 +1,89 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ResultsPageInternal = ResultsPageInternal;
 exports.ResultsPage = void 0;
-
+exports.ResultsPageInternal = ResultsPageInternal;
 var _react = _interopRequireWildcard(require("react"));
-
 var _ImagesView = require("./ImagesView/ImagesView");
-
 var _PageHeader = require("./PageHeader/PageHeader");
-
 var _PageFooter = require("./PageFooter/PageFooter");
-
 var _helpers = require("../helpers");
-
 var _theming = require("@storybook/theming");
-
 var _components = require("@storybook/components");
-
 var _viewMode = require("../viewMode");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-var Wrapper = _theming.styled.div({
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const Wrapper = _theming.styled.div({
   width: '100%',
   height: '100%',
   boxSizing: 'border-box',
   display: 'flex',
   flexDirection: 'column'
 });
-
-var ImagesViewContainer = _theming.styled.div(function (_ref) {
-  var theme = _ref.theme;
+const ImagesViewContainer = _theming.styled.div(_ref => {
+  let {
+    theme
+  } = _ref;
   return {
     background: theme.base == 'light' ? theme.color.mediumlight : theme.color.darker,
     flexGrow: 1,
     padding: '20px 0'
   };
 });
-
-var HeaderContainer = _theming.styled.div({
+const HeaderContainer = _theming.styled.div({
   position: 'sticky',
   top: 0,
   zIndex: 1
 });
-
-var BodyContainer = _theming.styled.div({
-  flexGrow: 1
+const BodyContainer = _theming.styled.div({
+  flexGrow: 1,
+  minHeight: 0
 });
-
-var FooterContainer = _theming.styled.div({
+const FooterContainer = _theming.styled.div({
   position: 'sticky',
   bottom: 0,
   zIndex: 1
 });
-
-var Container = _theming.styled.div(function (_ref2) {
-  var _ref2$height = _ref2.height,
-      height = _ref2$height === void 0 ? '100vh' : _ref2$height;
+const Container = _theming.styled.div(_ref2 => {
+  let {
+    height = '100vh'
+  } = _ref2;
   return {
-    height: height,
+    height,
     width: '100%',
     overflowY: 'hidden',
     display: 'flex',
     flexDirection: 'column'
   };
 });
-
 function ResultsPageInternal(_ref3) {
-  var _results, _Object$keys$, _result$images, _result$images2;
-
-  var id = _ref3.id,
-      path = _ref3.path,
-      _ref3$results = _ref3.results,
-      results = _ref3$results === void 0 ? [] : _ref3$results,
-      _ref3$approved = _ref3.approved,
-      approved = _ref3$approved === void 0 ? {} : _ref3$approved,
-      theme = _ref3.theme,
-      onImageApprove = _ref3.onImageApprove,
-      _ref3$showTitle = _ref3.showTitle,
-      showTitle = _ref3$showTitle === void 0 ? false : _ref3$showTitle,
-      height = _ref3.height;
-
-  var _useState = (0, _react.useState)(results.length),
-      _useState2 = _slicedToArray(_useState, 2),
-      retry = _useState2[0],
-      setRetry = _useState2[1];
-
-  var result = (_results = results[retry - 1]) !== null && _results !== void 0 ? _results : {};
-
-  var _useState3 = (0, _react.useState)((_Object$keys$ = Object.keys((_result$images = result.images) !== null && _result$images !== void 0 ? _result$images : {})[0]) !== null && _Object$keys$ !== void 0 ? _Object$keys$ : ''),
-      _useState4 = _slicedToArray(_useState3, 2),
-      imageName = _useState4[0],
-      setImageName = _useState4[1];
-
-  var _useState5 = (0, _react.useState)((0, _viewMode.getViewMode)()),
-      _useState6 = _slicedToArray(_useState5, 2),
-      viewMode = _useState6[0],
-      setViewMode = _useState6[1];
-
-  (0, _react.useEffect)(function () {
-    return setRetry(results.length);
-  }, [results.length]);
-  var url = (0, _helpers.getImageUrl)(path, imageName);
-  var image = (_result$images2 = result.images) === null || _result$images2 === void 0 ? void 0 : _result$images2[imageName];
-  var canApprove = Boolean(image && approved[imageName] != retry - 1 && result.status != 'success');
-  var hasDiffAndExpect = canApprove && Boolean((image === null || image === void 0 ? void 0 : image.diff) && image.expect);
-  var imagesWithError = result.images ? Object.keys(result.images).filter(function (imageName) {
-    var _imageName;
-
-    return result.status != 'success' && approved[imageName] != retry - 1 && ((_imageName = (result.images || {})[imageName]) === null || _imageName === void 0 ? void 0 : _imageName.error) != null;
-  }) : [];
-
-  var handleApprove = function handleApprove() {
-    return onImageApprove(id, retry - 1, imageName);
-  };
-
-  var handleChangeViewMode = function handleChangeViewMode(mode) {
+  let {
+    id,
+    path,
+    results = [],
+    approved = {},
+    theme,
+    onImageApprove,
+    showTitle = false,
+    height
+  } = _ref3;
+  const [retry, setRetry] = (0, _react.useState)(results.length);
+  const result = results[retry - 1] ?? {};
+  const [imageName, setImageName] = (0, _react.useState)(Object.keys(result.images ?? {})[0] ?? '');
+  const [viewMode, setViewMode] = (0, _react.useState)((0, _viewMode.getViewMode)());
+  (0, _react.useEffect)(() => setRetry(results.length), [results.length]);
+  const url = (0, _helpers.getImageUrl)(path, imageName);
+  const image = result.images?.[imageName];
+  const canApprove = Boolean(image && approved[imageName] != retry - 1 && result.status != 'success');
+  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(_viewMode.VIEW_MODE_KEY, mode);
     setViewMode(mode);
   };
-
   return /*#__PURE__*/_react.default.createElement(Container, {
     height: height
   }, /*#__PURE__*/_react.default.createElement(HeaderContainer, null, /*#__PURE__*/_react.default.createElement(_PageHeader.PageHeader, {
@@ -160,7 +105,7 @@ function ResultsPageInternal(_ref3) {
     image: image,
     canApprove: canApprove,
     mode: viewMode
-  }) : /*#__PURE__*/_react.default.createElement(_components.Placeholder, null, "Image ".concat(imageName, " not found")))))), results.length ? /*#__PURE__*/_react.default.createElement(FooterContainer, null, /*#__PURE__*/_react.default.createElement(_PageFooter.PageFooter, {
+  }) : /*#__PURE__*/_react.default.createElement(_components.Placeholder, null, `Image ${imageName} not found`))))), results.length ? /*#__PURE__*/_react.default.createElement(FooterContainer, null, /*#__PURE__*/_react.default.createElement(_PageFooter.PageFooter, {
     canApprove: canApprove,
     retry: retry,
     retriesCount: results.length,
@@ -168,6 +113,4 @@ function ResultsPageInternal(_ref3) {
     onApprove: handleApprove
   })) : null);
 }
-
-var ResultsPage = (0, _theming.withTheme)(ResultsPageInternal);
-exports.ResultsPage = ResultsPage;
+const ResultsPage = exports.ResultsPage = (0, _theming.withTheme)(ResultsPageInternal);

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

@@ -4,100 +4,63 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.initCreeveyClientApi = initCreeveyClientApi;
-
 var _types = require("../../types");
-
 var _helpers = require("./helpers");
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function initCreeveyClientApi() {
-  return _initCreeveyClientApi.apply(this, arguments);
-}
-
-function _initCreeveyClientApi() {
-  _initCreeveyClientApi = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var clientApiResolver, updateListeners, statusRequest, statusResolver, ws, send;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            send = function _send(request) {
-              ws.send(JSON.stringify(request));
-            };
-
-            clientApiResolver = _types.noop;
-            updateListeners = new Set();
-            statusRequest = null;
-            statusResolver = _types.noop;
-            ws = new WebSocket("ws://".concat((0, _helpers.getConnectionUrl)()));
-            ws.addEventListener('open', function () {
-              clientApiResolver({
-                start: function start(ids) {
-                  send({
-                    type: 'start',
-                    payload: ids
-                  });
-                },
-                stop: function stop() {
-                  send({
-                    type: 'stop'
-                  });
-                },
-                approve: function approve(id, retry, image) {
-                  send({
-                    type: 'approve',
-                    payload: {
-                      id: id,
-                      retry: retry,
-                      image: image
-                    }
-                  });
-                },
-                onUpdate: function onUpdate(fn) {
-                  updateListeners.add(fn);
-                  return function () {
-                    return updateListeners.delete(fn);
-                  };
-                },
-
-                get status() {
-                  if (statusRequest) return statusRequest;
-                  send({
-                    type: 'status'
-                  });
-                  return statusRequest = new Promise(function (resolve) {
-                    return statusResolver = resolve;
-                  });
-                }
-
-              });
-            });
-            ws.addEventListener('message', function (message) {
-              var data = JSON.parse(message.data);
-              if (data.type == 'update') updateListeners.forEach(function (fn) {
-                return fn(data.payload);
-              });
-
-              if (data.type == 'status') {
-                statusResolver(data.payload);
-                statusResolver = _types.noop;
-                statusRequest = null;
-              }
-            }); // TODO Reconnect
-
-            return _context.abrupt("return", new Promise(function (resolve) {
-              return clientApiResolver = resolve;
-            }));
-
-          case 9:
-          case "end":
-            return _context.stop();
-        }
+async function initCreeveyClientApi() {
+  let clientApiResolver = _types.noop;
+  const updateListeners = new Set();
+  let statusRequest = null;
+  let statusResolver = _types.noop;
+  const ws = new WebSocket(`ws://${(0, _helpers.getConnectionUrl)()}`);
+  function send(request) {
+    ws.send(JSON.stringify(request));
+  }
+  ws.addEventListener('open', () => {
+    clientApiResolver({
+      start(ids) {
+        send({
+          type: 'start',
+          payload: ids
+        });
+      },
+      stop() {
+        send({
+          type: 'stop'
+        });
+      },
+      approve(id, retry, image) {
+        send({
+          type: 'approve',
+          payload: {
+            id,
+            retry,
+            image
+          }
+        });
+      },
+      onUpdate(fn) {
+        updateListeners.add(fn);
+        return () => updateListeners.delete(fn);
+      },
+      get status() {
+        if (statusRequest) return statusRequest;
+        send({
+          type: 'status'
+        });
+        return statusRequest = new Promise(resolve => statusResolver = resolve);
       }
-    }, _callee);
-  }));
-  return _initCreeveyClientApi.apply(this, arguments);
+    });
+  });
+  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 = _types.noop;
+      statusRequest = null;
+    }
+  });
+  // TODO Reconnect
+
+  return new Promise(resolve => clientApiResolver = resolve);
 }