creevey 0.8.0-beta.0 → 0.9.0-beta.0

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

@@ -56,14 +56,10 @@ function removeTestOrSuite(testOrSuite) {
 
 async function addTestsFromStories(rootSuite, config, {
   browser,
-  watch,
-  debug
+  ...options
 }) {
   const mochaTestsById = new Map();
-  const tests = await (0, _stories.loadTestsFromStories)([browser], listener => config.storiesProvider(config, {
-    watch,
-    debug
-  }, listener), testsDiff => Object.entries(testsDiff).forEach(([id, newTest]) => {
+  const tests = await (0, _stories.loadTestsFromStories)([browser], listener => config.storiesProvider(config, options, listener), testsDiff => Object.entries(testsDiff).forEach(([id, newTest]) => {
     const oldTest = mochaTestsById.get(id);
     mochaTestsById.delete(id);
     if (oldTest) removeTestOrSuite(oldTest);

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

@@ -72,6 +72,7 @@ async function worker(config, options) {
   let retries = 0;
   let images = {};
   let error = undefined;
+  const screenshots = [];
   const testScope = [];
 
   function runHandler(failures) {
@@ -201,13 +202,23 @@ async function worker(config, options) {
 
   _chai.default.use((0, _chaiImage.default)(getExpected, config.diffOptions));
 
+  if ((await (0, _selenium.getBrowser)(config, options.browser)) == null) return;
   await (0, _helpers.addTestsFromStories)(mocha.suite, config, {
     browser: options.browser,
     watch: options.ui,
-    debug: options.debug
+    debug: options.debug,
+    port: options.port
   });
-  const browserConfig = config.browsers[options.browser];
-  const browser = await (0, _selenium.getBrowser)(config, browserConfig);
+
+  try {
+    var _await$getBrowser;
+
+    await ((_await$getBrowser = await (0, _selenium.getBrowser)(config, options.browser)) === 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 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 => {
@@ -222,6 +233,7 @@ async function worker(config, options) {
     this.expect = _chai.default.expect;
     this.browserName = options.browser;
     this.testScope = testScope;
+    this.screenshots = screenshots;
   });
   mocha.suite.beforeEach(_selenium.switchStory);
   (0, _messages.subscribeOn)('test', message => {

package/lib/cjs/shared.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.denormalizeStoryParameters = exports.combineParameters = void 0;
+exports.deserializeStory = exports.deserializeRawStories = exports.serializeRawStories = exports.deserializeRegExp = exports.serializeRegExp = exports.isSerializedRegExp = exports.denormalizeStoryParameters = exports.combineParameters = void 0;
 
 var _lodash = require("lodash");
 
@@ -24,12 +24,84 @@ const denormalizeStoryParameters = ({
   stories
 }) => {
   return (0, _lodash.mapValues)(stories, storyData => {
-    var _kindParameters$story;
+    var _globalParameters$cre, _kindParameters$story, _kindParameters$story2;
 
-    return { ...storyData,
-      parameters: combineParameters(globalParameters, (_kindParameters$story = kindParameters[storyData.kind]) !== null && _kindParameters$story !== void 0 ? _kindParameters$story : {}, storyData.parameters)
-    };
+    storyData.parameters.creevey = combineParameters((_globalParameters$cre = globalParameters.creevey) !== null && _globalParameters$cre !== void 0 ? _globalParameters$cre : {}, (_kindParameters$story = (_kindParameters$story2 = kindParameters[storyData.kind]) === null || _kindParameters$story2 === void 0 ? void 0 : _kindParameters$story2.creevey) !== null && _kindParameters$story !== void 0 ? _kindParameters$story : {}, storyData.parameters.creevey);
+    return storyData;
   });
 };
 
-exports.denormalizeStoryParameters = denormalizeStoryParameters;
+exports.denormalizeStoryParameters = denormalizeStoryParameters;
+
+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 = ({
+  source,
+  flags
+}) => {
+  return new RegExp(source, flags);
+};
+
+exports.deserializeRegExp = deserializeRegExp;
+
+const serializeRawStories = stories => {
+  return (0, _lodash.mapValues)(stories, storyData => {
+    const creevey = storyData.parameters.creevey;
+
+    if ((creevey === null || creevey === void 0 ? void 0 : creevey.skip) !== undefined) {
+      creevey.skip = (0, _lodash.cloneDeepWith)(creevey.skip, value => {
+        if (value instanceof RegExp) {
+          return 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 ? void 0 : creevey.skip) !== undefined) {
+    creevey.skip = (0, _lodash.cloneDeepWith)(creevey.skip, value => {
+      if (isSerializedRegExp(value)) {
+        return deserializeRegExp(value);
+      }
+
+      return undefined;
+    });
+  }
+
+  return story;
+};
+
+exports.deserializeStory = deserializeStory;

package/lib/cjs/types.js

@@ -12,6 +12,7 @@ exports.isFunction = isFunction;
 exports.isImageError = isImageError;
 exports.isProcessMessage = isProcessMessage;
 exports.isWorkerMessage = isWorkerMessage;
+exports.isStoriesMessage = isStoriesMessage;
 exports.isTestMessage = isTestMessage;
 exports.isWebpackMessage = isWebpackMessage;
 exports.isDockerMessage = isDockerMessage;
@@ -56,6 +57,10 @@ function isWorkerMessage(message) {
   return isProcessMessage(message) && message.scope == 'worker';
 }
 
+function isStoriesMessage(message) {
+  return isProcessMessage(message) && message.scope == 'stories';
+}
+
 function isTestMessage(message) {
   return isProcessMessage(message) && message.scope == 'test';
 }

package/lib/esm/client/addon/Manager.js

@@ -230,7 +230,6 @@ export var CreeveyManager = /*#__PURE__*/function () {
     });
 
     _defineProperty(this, "onSetStories", function (data) {
-      // TODO: Send PR to storybook to fix this
       var stories = data.v ? denormalizeStoryParameters(data) : data.stories;
       _this.stories = stories;
     });

package/lib/esm/client/addon/preset.js

@@ -47,6 +47,7 @@ export function managerWebpack(config, options) {
         DefinePlugin = _ref$DefinePlugin === void 0 ? FallbackDefinePlugin : _ref$DefinePlugin;
 
     (_config$plugins = config.plugins) === null || _config$plugins === void 0 ? void 0 : _config$plugins.push(new DefinePlugin({
+      __CREEVEY_SERVER_HOST__: options.creeveyHost,
       __CREEVEY_SERVER_PORT__: (_options$creeveyPort = options.creeveyPort) !== null && _options$creeveyPort !== void 0 ? _options$creeveyPort : 3000,
       __CREEVEY_CLIENT_PORT__: options.clientPort
     }));

package/lib/esm/client/addon/readyForCapture.js

@@ -0,0 +1,5 @@
+export function readyForCapture() {
+  var _window$__CREEVEY_SET, _window;
+
+  (_window$__CREEVEY_SET = (_window = window).__CREEVEY_SET_READY_FOR_CAPTURE__) === null || _window$__CREEVEY_SET === void 0 ? void 0 : _window$__CREEVEY_SET.call(_window);
+}

package/lib/esm/client/addon/withCreevey.js

@@ -1,3 +1,23 @@
+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 _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; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 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); }); }; }
@@ -6,8 +26,11 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 
 import * as Events from '@storybook/core-events';
 import * as polyfill from 'event-source-polyfill';
+import { buildQueries, within } from '@storybook/testing-library';
 import { addons, makeDecorator } from '@storybook/addons';
 import { isObject, noop } from '../../types';
+import { denormalizeStoryParameters, serializeRawStories } from '../../shared';
+import { getConnectionUrl } from '../shared/helpers';
 
 if ((typeof process === "undefined" ? "undefined" : _typeof(process)) != 'object' || typeof process.version != 'string') {
   // NOTE If you don't use babel-polyfill or any other polyfills that add EventSource for IE11
@@ -27,10 +50,10 @@ function resetCurrentStory(_x) {
 }
 
 function _resetCurrentStory() {
-  _resetCurrentStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(channel) {
-    return regeneratorRuntime.wrap(function _callee3$(_context3) {
+  _resetCurrentStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(channel) {
+    return regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
             setTimeout(function () {
               return channel.emit(Events.SET_CURRENT_STORY, {
@@ -39,16 +62,16 @@ function _resetCurrentStory() {
                 kind: ''
               });
             }, 0);
-            return _context3.abrupt("return", new Promise(function (resolve) {
+            return _context4.abrupt("return", new Promise(function (resolve) {
               return channel.once(Events.STORY_MISSING, resolve);
             }));
 
           case 2:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return _resetCurrentStory.apply(this, arguments);
 }
@@ -122,9 +145,39 @@ function waitForFontsLoaded() {
   }
 }
 
+function waitForCaptureCall() {
+  return new Promise(function (resolve) {
+    return captureResolver = resolve;
+  });
+}
+
+function initCreeveyState() {
+  var _window$localStorage$;
+
+  var prevState = JSON.parse((_window$localStorage$ = window.localStorage.getItem('Creevey_Tests')) !== null && _window$localStorage$ !== void 0 ? _window$localStorage$ : '{}');
+  if (prevState.creeveyHost) window.__CREEVEY_SERVER_HOST__ = prevState.creeveyHost;
+  if (prevState.creeveyPort) window.__CREEVEY_SERVER_PORT__ = prevState.creeveyPort;
+  if (prevState.setStoriesCounter) setStoriesCounter = prevState.setStoriesCounter;
+  if (prevState.isTestBrowser) isTestBrowser = prevState.isTestBrowser;
+  window.addEventListener('beforeunload', function () {
+    window.localStorage.setItem('Creevey_Tests', JSON.stringify({
+      creeveyHost: window.__CREEVEY_SERVER_HOST__,
+      creeveyPort: window.__CREEVEY_SERVER_PORT__,
+      setStoriesCounter: setStoriesCounter,
+      isTestBrowser: isTestBrowser
+    }));
+  });
+}
+
+var isTestBrowser = false;
+var captureResolver;
+var waitForCreevey;
+var creeveyReady;
+var setStoriesCounter = 0;
 export function withCreevey() {
   var currentStory = '';
   var isAnimationDisabled = false;
+  initCreeveyState();
 
   function disableAnimation() {
     isAnimationDisabled = true;
@@ -135,42 +188,129 @@ export function withCreevey() {
     document.head.appendChild(style);
   }
 
+  function getStories() {
+    return _getStories.apply(this, arguments);
+  }
+
+  function _getStories() {
+    _getStories = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var _window$__STORYBOOK_S;
+
+      var storiesPromise, store;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              storiesPromise = new Promise(function (resolve) {
+                return addons.getChannel().once(Events.SET_STORIES, function (data) {
+                  return resolve(serializeRawStories(denormalizeStoryParameters(data)));
+                });
+              });
+              store = (_window$__STORYBOOK_S = window.__STORYBOOK_STORY_STORE__) !== null && _window$__STORYBOOK_S !== void 0 ? _window$__STORYBOOK_S : {}; // @ts-expect-error `pushToManager` exists only in Storybook 6.0 - 6.3
+
+              if (!store.pushToManager) {
+                _context.next = 6;
+                break;
+              }
+
+              // @ts-expect-error `pushToManager` exists only in Storybook 6.0 - 6.3
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+              store.pushToManager();
+              _context.next = 13;
+              break;
+
+            case 6:
+              if (!store.cacheAllCSFFiles) {
+                _context.next = 12;
+                break;
+              }
+
+              _context.next = 9;
+              return store.cacheAllCSFFiles();
+
+            case 9:
+              addons.getChannel().emit(Events.SET_STORIES, store.getSetStoriesPayload());
+              _context.next = 13;
+              break;
+
+            case 12:
+              return _context.abrupt("return");
+
+            case 13:
+              addons.getChannel().on(Events.SET_STORIES, function (data) {
+                // TODO Figure out how to get only updated stories
+                // TODO Subscribe on hmr? like use dummy-hmr
+                setStoriesCounter += 1;
+                var stories = serializeRawStories(denormalizeStoryParameters(data));
+                var storiesByFiles = new Map();
+                Object.values(stories).forEach(function (story) {
+                  var storiesFromFile = storiesByFiles.get(story.parameters.fileName);
+                  if (storiesFromFile) storiesFromFile.push(story);else storiesByFiles.set(story.parameters.fileName, [story]);
+                });
+                void fetch("http://".concat(getConnectionUrl(), "/stories"), {
+                  method: 'POST',
+                  headers: {
+                    'Content-Type': 'application/json'
+                  },
+                  body: JSON.stringify({
+                    setStoriesCounter: setStoriesCounter,
+                    stories: _toConsumableArray(storiesByFiles.entries())
+                  })
+                });
+              });
+              return _context.abrupt("return", storiesPromise);
+
+            case 15:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _getStories.apply(this, arguments);
+  }
+
   function selectStory(_x2, _x3, _x4, _x5, _x6) {
     return _selectStory.apply(this, arguments);
   }
 
   function _selectStory() {
-    _selectStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(storyId, kind, name, shouldWaitForReady, callback) {
-      var channel, waitForReady, renderPromise, errorPromise, _reason$stack, errorMessage;
+    _selectStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(storyId, kind, name, shouldWaitForReady, callback) {
+      var channel, waitForReady, isCaptureCalled, renderPromise, errorPromise, capturePromise, _reason$stack, errorMessage;
 
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (!isAnimationDisabled) disableAnimation();
+              isTestBrowser = true;
               channel = addons.getChannel();
               waitForReady = shouldWaitForReady ? new Promise(function (resolve) {
                 return window.__CREEVEY_SET_READY_FOR_CAPTURE__ = resolve;
               }) : Promise.resolve();
 
               if (!(storyId == currentStory)) {
-                _context2.next = 8;
+                _context3.next = 9;
                 break;
               }
 
-              _context2.next = 6;
+              _context3.next = 7;
               return resetCurrentStory(channel);
 
-            case 6:
-              _context2.next = 9;
+            case 7:
+              _context3.next = 10;
               break;
 
-            case 8:
+            case 9:
               currentStory = storyId;
 
-            case 9:
+            case 10:
+              isCaptureCalled = false;
               renderPromise = waitForStoryRendered(channel);
               errorPromise = catchRenderError(channel);
+              capturePromise = waitForCaptureCall().then(function () {
+                return isCaptureCalled = true;
+              });
               setTimeout(function () {
                 return channel.emit(Events.SET_CURRENT_STORY, {
                   storyId: storyId,
@@ -178,57 +318,57 @@ export function withCreevey() {
                   kind: kind
                 });
               }, 0);
-              _context2.prev = 12;
-              _context2.next = 15;
-              return Promise.race([_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-                return regeneratorRuntime.wrap(function _callee$(_context) {
+              _context3.prev = 15;
+              _context3.next = 18;
+              return Promise.race([_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+                return regeneratorRuntime.wrap(function _callee2$(_context2) {
                   while (1) {
-                    switch (_context.prev = _context.next) {
+                    switch (_context2.prev = _context2.next) {
                       case 0:
-                        _context.next = 2;
-                        return renderPromise;
+                        _context2.next = 2;
+                        return Promise.race([renderPromise, capturePromise]);
 
                       case 2:
-                        _context.next = 4;
+                        _context2.next = 4;
                         return waitForFontsLoaded();
 
                       case 4:
-                        _context.next = 6;
+                        _context2.next = 6;
                         return waitForReady;
 
                       case 6:
                       case "end":
-                        return _context.stop();
+                        return _context2.stop();
                     }
                   }
-                }, _callee);
+                }, _callee2);
               }))(), errorPromise]);
 
-            case 15:
-              callback();
-              _context2.next = 22;
+            case 18:
+              callback([null, isCaptureCalled]);
+              _context3.next = 25;
               break;
 
-            case 18:
-              _context2.prev = 18;
-              _context2.t0 = _context2["catch"](12);
+            case 21:
+              _context3.prev = 21;
+              _context3.t0 = _context3["catch"](15);
               // NOTE Event `STORY_THREW_EXCEPTION` triggered only in react and vue frameworks and return Error instance
               // NOTE Event `STORY_ERRORED` return error-like object without `name` field
-              errorMessage = _context2.t0 instanceof Error ? (_reason$stack = _context2.t0.stack) !== null && _reason$stack !== void 0 ? _reason$stack : _context2.t0.message : isObject(_context2.t0) ? "".concat(_context2.t0.message, "\n    ").concat(_context2.t0.stack) : _context2.t0;
-              callback(errorMessage);
+              errorMessage = _context3.t0 instanceof Error ? (_reason$stack = _context3.t0.stack) !== null && _reason$stack !== void 0 ? _reason$stack : _context3.t0.message : isObject(_context3.t0) ? "".concat(_context3.t0.message, "\n    ").concat(_context3.t0.stack) : _context3.t0;
+              callback([errorMessage]);
 
-            case 22:
-              _context2.prev = 22;
+            case 25:
+              _context3.prev = 25;
               renderPromise.cancel();
               errorPromise.cancel();
-              return _context2.finish(22);
+              return _context3.finish(25);
 
-            case 26:
+            case 29:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[12, 18, 22, 26]]);
+      }, _callee3, null, [[15, 21, 25, 29]]);
     }));
     return _selectStory.apply(this, arguments);
   }
@@ -255,16 +395,138 @@ export function withCreevey() {
     (_ignoreStyles$parentN = ignoreStyles.parentNode) === null || _ignoreStyles$parentN === void 0 ? void 0 : _ignoreStyles$parentN.removeChild(ignoreStyles);
   }
 
+  function hasPlayCompletedYet(callback) {
+    creeveyReady();
+    var isCaptureCalled = false;
+    var isPlayCompleted = false;
+    var channel = addons.getChannel();
+    void waitForStoryRendered(channel).then(function () {
+      if (isCaptureCalled) return;
+      isPlayCompleted = true;
+      callback(true);
+    });
+    void waitForCaptureCall().then(function () {
+      if (isPlayCompleted) return;
+      isCaptureCalled = true;
+      callback(false);
+    });
+  }
+
+  window.__CREEVEY_GET_STORIES__ = getStories;
   window.__CREEVEY_SELECT_STORY__ = selectStory;
   window.__CREEVEY_UPDATE_GLOBALS__ = updateGlobals;
   window.__CREEVEY_INSERT_IGNORE_STYLES__ = insertIgnoreStyles;
   window.__CREEVEY_REMOVE_IGNORE_STYLES__ = removeIgnoreStyles;
+  window.__CREEVEY_HAS_PLAY_COMPLETED_YET__ = hasPlayCompletedYet;
   window.__CREEVEY_SET_READY_FOR_CAPTURE__ = noop;
+
+  var queryAllByQuery = function queryAllByQuery(container, query) {
+    return _toConsumableArray(container.querySelectorAll(query)).filter(function (e) {
+      return e instanceof HTMLElement;
+    });
+  };
+
+  var getMultipleError = function getMultipleError(_, query) {
+    return "Found multiple elements by query: ".concat(query);
+  };
+
+  var getMissingError = function getMissingError(_, query) {
+    return "Unable to find an element by query: ".concat(query);
+  };
+
+  var _buildQueries = buildQueries(queryAllByQuery, getMultipleError, getMissingError),
+      _buildQueries2 = _slicedToArray(_buildQueries, 5),
+      queryByQuery = _buildQueries2[0],
+      getAllByQuery = _buildQueries2[1],
+      getByQuery = _buildQueries2[2],
+      findAllByQuery = _buildQueries2[3],
+      findByQuery = _buildQueries2[4];
+
+  var queries = {
+    queryByQuery: queryByQuery,
+    getAllByQuery: getAllByQuery,
+    getByQuery: getByQuery,
+    findAllByQuery: findAllByQuery,
+    findByQuery: findByQuery
+  };
   return makeDecorator({
     name: 'withCreevey',
     parameterName: 'creevey',
     wrapper: function wrapper(getStory, context) {
+      var _ref2;
+
+      // TODO Define proper types, like captureElement is a promise
+      var _context$parameters$c = context.parameters.creevey = (_ref2 = context.parameters.creevey) !== null && _ref2 !== void 0 ? _ref2 : {},
+          captureElement = _context$parameters$c.captureElement;
+
+      Object.defineProperty(context.parameters.creevey, 'captureElement', {
+        get: function get() {
+          switch (true) {
+            case captureElement === undefined:
+              return Promise.resolve(context.canvasElement);
+
+            case captureElement === null:
+              return Promise.resolve(document.documentElement);
+
+            case typeof captureElement == 'string':
+              return within(context.canvasElement, queries).findByQuery(captureElement);
+
+            case typeof captureElement == 'function':
+              // TODO Define type for it
+              return Promise.resolve(captureElement(context));
+          }
+        },
+        enumerable: true,
+        configurable: true
+      });
       return getStory(context);
     }
   });
+}
+export function capture(_x7) {
+  return _capture.apply(this, arguments);
+}
+
+function _capture() {
+  _capture = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(options) {
+    return regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            if (isTestBrowser) {
+              _context5.next = 2;
+              break;
+            }
+
+            return _context5.abrupt("return");
+
+          case 2:
+            captureResolver();
+            waitForCreevey = new Promise(function (resolve) {
+              return creeveyReady = resolve;
+            });
+            _context5.next = 6;
+            return fetch("http://".concat(getConnectionUrl(), "/capture"), {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json'
+              },
+              body: JSON.stringify({
+                workerId: window.__CREEVEY_WORKER_ID__,
+                options: options
+              })
+            });
+
+          case 6:
+            _context5.next = 8;
+            return waitForCreevey;
+
+          case 8:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+  return _capture.apply(this, arguments);
 }