creevey 0.9.0-beta.0 → 0.9.0-beta.2

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

@@ -10,8 +10,6 @@ var Events = _interopRequireWildcard(require("@storybook/core-events"));
 
 var polyfill = _interopRequireWildcard(require("event-source-polyfill"));
 
-var _testingLibrary = require("@storybook/testing-library");
-
 var _addons = require("@storybook/addons");
 
 var _types = require("../../types");
@@ -24,14 +22,6 @@ 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; }
 
-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."); }
@@ -441,37 +431,23 @@ function withCreevey() {
   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__ = _types.noop;
+  window.__CREEVEY_SET_READY_FOR_CAPTURE__ = _types.noop; // const queryAllByQuery = (container: HTMLElement, query: string): HTMLElement[] =>
+  //   [...container.querySelectorAll(query)].filter((e) => e instanceof HTMLElement) as HTMLElement[];
+  // const getMultipleError = (_: Element | null, query: string): string => `Found multiple elements by query: ${query}`;
+  // const getMissingError = (_: Element | null, query: string): string => `Unable to find an element by query: ${query}`;
+  // const [queryByQuery, getAllByQuery, getByQuery, findAllByQuery, findByQuery] = buildQueries(
+  //   queryAllByQuery,
+  //   getMultipleError,
+  //   getMissingError,
+  // );
+  // const queries = {
+  //   queryByQuery,
+  //   getAllByQuery,
+  //   getByQuery,
+  //   findAllByQuery,
+  //   findByQuery,
+  // };
 
-  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 = (0, _testingLibrary.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 (0, _addons.makeDecorator)({
     name: 'withCreevey',
     parameterName: 'creevey',
@@ -490,9 +466,8 @@ function withCreevey() {
 
             case captureElement === null:
               return Promise.resolve(document.documentElement);
-
-            case typeof captureElement == 'string':
-              return (0, _testingLibrary.within)(context.canvasElement, queries).findByQuery(captureElement);
+            // case typeof captureElement == 'string':
+            //   return within<typeof queries>(context.canvasElement, queries).findByQuery(captureElement as string);
 
             case typeof captureElement == 'function':
               // TODO Define type for it

package/lib/cjs/index.js

@@ -47,7 +47,7 @@ var _nodejs = require("./server/storybook/providers/nodejs");
 
 var _hybrid = require("./server/storybook/providers/hybrid");
 
-var _parser = require("./server/parser");
+var _parser = require("./server/testsFiles/parser");
 
 Object.keys(_parser).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/cjs/server/config.js

@@ -47,7 +47,7 @@ const defaultConfig = {
   },
   hooks: {},
   babelOptions: _ => _,
-  testRegex: /.creevey.(t|j)s$/
+  testsRegex: /\.creevey\.(t|j)s$/
 };
 exports.defaultConfig = defaultConfig;
 

package/lib/cjs/server/selenium/browser.js

@@ -433,7 +433,7 @@ async function resolveCreeveyHost(browser, port) {
       return new Promise(function (resolve, reject) {
         setTimeout(reject, 10000); // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 
-        fetch('http://' + host + ':' + port + '/ping').then(resolve).catch(reject);
+        fetch('//' + host + ':' + port + '/ping').then(resolve).catch(reject);
       }).then(function (response) {
         return response.text();
       }).then(function (pong) {

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

@@ -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,6 +19,10 @@ 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); }
+
+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 loadStories(_config, {
   port
 }, storiesListener) {
@@ -54,16 +58,17 @@ async function loadStories(_config, {
   return stories;
 }
 
-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/{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,48 @@
+"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'], ['babel-plugin-tsconfig-paths', {
+      tsconfig: tsConfigPath
+    }]]
+  }));
+  (await Promise.resolve().then(() => _interopRequireWildcard(require('ts-node')))).register({
+    project: tsConfigPath,
+    transpileOnly: true
+  });
+}

package/lib/cjs/shared.js

@@ -7,23 +7,37 @@ exports.deserializeStory = exports.deserializeRawStories = exports.serializeRawS
 
 var _lodash = require("lodash");
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+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; }
+
+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); }
+
 // NOTE: Copy-paste from storybook/api
-const combineParameters = (...parameterSets) => // 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
+var combineParameters = function combineParameters() {
+  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
+    _lodash.mergeWith.apply(void 0, [{}].concat(parameterSets, [function (_, srcValue) {
+      // Treat arrays as scalars:
+      if (Array.isArray(srcValue)) return srcValue;
+      return undefined;
+    }]))
+  );
+}; // NOTE: Copy-paste from storybook/api
 
 
 exports.combineParameters = combineParameters;
 
-const denormalizeStoryParameters = ({
-  globalParameters,
-  kindParameters,
-  stories
-}) => {
-  return (0, _lodash.mapValues)(stories, storyData => {
+var denormalizeStoryParameters = function denormalizeStoryParameters(_ref) {
+  var globalParameters = _ref.globalParameters,
+      kindParameters = _ref.kindParameters,
+      stories = _ref.stories;
+  return (0, _lodash.mapValues)(stories, function (storyData) {
     var _globalParameters$cre, _kindParameters$story, _kindParameters$story2;
 
     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);
@@ -33,41 +47,38 @@ const denormalizeStoryParameters = ({
 
 exports.denormalizeStoryParameters = denormalizeStoryParameters;
 
-const isSerializedRegExp = exp => {
-  return typeof exp === 'object' && exp !== null && Reflect.get(exp, '__regexp') === true;
+var isSerializedRegExp = function isSerializedRegExp(exp) {
+  return _typeof(exp) === 'object' && exp !== null && Reflect.get(exp, '__regexp') === true;
 };
 
 exports.isSerializedRegExp = isSerializedRegExp;
 
-const serializeRegExp = exp => {
-  const {
-    source,
-    flags
-  } = exp;
+var serializeRegExp = function serializeRegExp(exp) {
+  var source = exp.source,
+      flags = exp.flags;
   return {
     __regexp: true,
-    source,
-    flags
+    source: source,
+    flags: flags
   };
 };
 
 exports.serializeRegExp = serializeRegExp;
 
-const deserializeRegExp = ({
-  source,
-  flags
-}) => {
+var deserializeRegExp = function deserializeRegExp(_ref2) {
+  var source = _ref2.source,
+      flags = _ref2.flags;
   return new RegExp(source, flags);
 };
 
 exports.deserializeRegExp = deserializeRegExp;
 
-const serializeRawStories = stories => {
-  return (0, _lodash.mapValues)(stories, storyData => {
-    const creevey = storyData.parameters.creevey;
+var serializeRawStories = function serializeRawStories(stories) {
+  return (0, _lodash.mapValues)(stories, function (storyData) {
+    var creevey = storyData.parameters.creevey;
 
-    if ((creevey === null || creevey === void 0 ? void 0 : creevey.skip) !== undefined) {
-      creevey.skip = (0, _lodash.cloneDeepWith)(creevey.skip, value => {
+    if (creevey !== null && creevey !== void 0 && creevey.skip) {
+      creevey.skip = (0, _lodash.cloneDeepWith)(creevey.skip, function (value) {
         if (value instanceof RegExp) {
           return serializeRegExp(value);
         }
@@ -82,22 +93,28 @@ const serializeRawStories = stories => {
 
 exports.serializeRawStories = serializeRawStories;
 
-const deserializeRawStories = stories => {
+var deserializeRawStories = function 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;
+var deserializeStory = function deserializeStory(story) {
+  var creevey = story.parameters.creevey;
+
+  if (creevey !== null && creevey !== void 0 && creevey.skip) {
+    return _objectSpread(_objectSpread({}, story), {}, {
+      parameters: _objectSpread(_objectSpread({}, story.parameters), {}, {
+        creevey: _objectSpread(_objectSpread({}, creevey), {}, {
+          skip: (0, _lodash.cloneDeepWith)(creevey.skip, function (value) {
+            if (isSerializedRegExp(value)) {
+              return deserializeRegExp(value);
+            }
+
+            return undefined;
+          })
+        })
+      })
     });
   }
 

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

@@ -1,11 +1,3 @@
-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."); }
@@ -26,7 +18,7 @@ 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 { buildQueries, within } from '@storybook/testing-library';
 import { addons, makeDecorator } from '@storybook/addons';
 import { isObject, noop } from '../../types';
 import { denormalizeStoryParameters, serializeRawStories } from '../../shared';
@@ -418,37 +410,23 @@ export function withCreevey() {
   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;
+  window.__CREEVEY_SET_READY_FOR_CAPTURE__ = noop; // const queryAllByQuery = (container: HTMLElement, query: string): HTMLElement[] =>
+  //   [...container.querySelectorAll(query)].filter((e) => e instanceof HTMLElement) as HTMLElement[];
+  // const getMultipleError = (_: Element | null, query: string): string => `Found multiple elements by query: ${query}`;
+  // const getMissingError = (_: Element | null, query: string): string => `Unable to find an element by query: ${query}`;
+  // const [queryByQuery, getAllByQuery, getByQuery, findAllByQuery, findByQuery] = buildQueries(
+  //   queryAllByQuery,
+  //   getMultipleError,
+  //   getMissingError,
+  // );
+  // const queries = {
+  //   queryByQuery,
+  //   getAllByQuery,
+  //   getByQuery,
+  //   findAllByQuery,
+  //   findByQuery,
+  // };
 
-  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',
@@ -467,9 +445,8 @@ export function withCreevey() {
 
             case captureElement === null:
               return Promise.resolve(document.documentElement);
-
-            case typeof captureElement == 'string':
-              return within(context.canvasElement, queries).findByQuery(captureElement);
+            // case typeof captureElement == 'string':
+            //   return within<typeof queries>(context.canvasElement, queries).findByQuery(captureElement as string);
 
             case typeof captureElement == 'function':
               // TODO Define type for it

package/lib/esm/index.js

@@ -4,4 +4,4 @@ export * from './types'; // export * from './client/addon/withCreevey';
 export { loadStories as browserStoriesProvider } from './server/storybook/providers/browser';
 export { loadStories as nodejsStoriesProvider } from './server/storybook/providers/nodejs';
 export { loadStories as hybridStoriesProvider } from './server/storybook/providers/hybrid';
-export * from './server/parser';
+export * from './server/testsFiles/parser';

package/lib/esm/server/config.js

@@ -26,7 +26,7 @@ export const defaultConfig = {
   },
   hooks: {},
   babelOptions: _ => _,
-  testRegex: /.creevey.(t|j)s$/
+  testsRegex: /\.creevey\.(t|j)s$/
 };
 
 function normalizeBrowserConfig(name, config) {

package/lib/esm/server/selenium/browser.js

@@ -405,7 +405,7 @@ async function resolveCreeveyHost(browser, port) {
       return new Promise(function (resolve, reject) {
         setTimeout(reject, 10000); // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 
-        fetch('http://' + host + ':' + port + '/ping').then(resolve).catch(reject);
+        fetch('//' + host + ':' + port + '/ping').then(resolve).catch(reject);
       }).then(function (response) {
         return response.text();
       }).then(function (pong) {

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

@@ -1,7 +1,7 @@
 import chokidar from 'chokidar';
 import { loadStories as browserProvider } from './browser';
 import { logger } from '../../logger';
-import parse from '../../parser';
+import parse from '../../testsFiles/parser';
 import { readDirRecursive } from '../../../server/utils';
 import { combineParameters } from '../../../shared';
 export async function loadStories(_config, {
@@ -39,16 +39,17 @@ export async function loadStories(_config, {
   return stories;
 }
 
-function parseParams(config, listener) {
-  if (!config.testDir) {
+async function parseParams(config, listener) {
+  if (!config.testsDir) {
     return Promise.resolve({});
   }
 
-  const testFiles = readDirRecursive(config.testDir).filter(file => {
-    var _config$testRegex;
+  const testFiles = 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 import('../../testsFiles/register')).default(config);
 
   if (listener) {
     chokidar.watch(testFiles).on('change', filePath => {

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

@@ -1,19 +1,6 @@
 import { toId, storyNameFromExport } from '@storybook/csf';
 export default async function parse(files) {
-  result = {}; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-
-  (await import('@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 => import(file)));
   return result;
 }

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

@@ -0,0 +1,35 @@
+import { addHook } from 'pirates';
+import { getTsconfig } from 'get-tsconfig';
+export default async function register(config) {
+  addHook(() => '', {
+    exts: ['.jpg', '.jpeg', '.png', '.gif', '.eot', '.otf', '.svg', '.ttf', '.woff', '.woff2', '.css', '.less', '.scss', '.styl'],
+    ignoreNodeModules: false
+  });
+  const {
+    path: tsConfigPath
+  } = getTsconfig(config.tsConfig) || {}; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+
+  (await import('@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'], ['babel-plugin-tsconfig-paths', {
+      tsconfig: tsConfigPath
+    }]]
+  }));
+  (await import('ts-node')).register({
+    project: tsConfigPath,
+    transpileOnly: true
+  });
+}

package/lib/esm/shared.js

@@ -1,50 +1,61 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+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; }
+
+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); }
+
 import { mapValues, mergeWith, cloneDeepWith } from 'lodash';
 // NOTE: Copy-paste from storybook/api
-export const combineParameters = (...parameterSets) => // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-mergeWith({}, ...parameterSets, (_, srcValue) => {
-  // Treat arrays as scalars:
-  if (Array.isArray(srcValue)) return srcValue;
-  return undefined;
-}); // NOTE: Copy-paste from storybook/api
+export var combineParameters = function combineParameters() {
+  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
+    mergeWith.apply(void 0, [{}].concat(parameterSets, [function (_, srcValue) {
+      // Treat arrays as scalars:
+      if (Array.isArray(srcValue)) return srcValue;
+      return undefined;
+    }]))
+  );
+}; // NOTE: Copy-paste from storybook/api
 
-export const denormalizeStoryParameters = ({
-  globalParameters,
-  kindParameters,
-  stories
-}) => {
-  return mapValues(stories, storyData => {
+export var denormalizeStoryParameters = function denormalizeStoryParameters(_ref) {
+  var globalParameters = _ref.globalParameters,
+      kindParameters = _ref.kindParameters,
+      stories = _ref.stories;
+  return mapValues(stories, function (storyData) {
     var _globalParameters$cre, _kindParameters$story, _kindParameters$story2;
 
     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;
   });
 };
-export const isSerializedRegExp = exp => {
-  return typeof exp === 'object' && exp !== null && Reflect.get(exp, '__regexp') === true;
+export var isSerializedRegExp = function isSerializedRegExp(exp) {
+  return _typeof(exp) === 'object' && exp !== null && Reflect.get(exp, '__regexp') === true;
 };
-export const serializeRegExp = exp => {
-  const {
-    source,
-    flags
-  } = exp;
+export var serializeRegExp = function serializeRegExp(exp) {
+  var source = exp.source,
+      flags = exp.flags;
   return {
     __regexp: true,
-    source,
-    flags
+    source: source,
+    flags: flags
   };
 };
-export const deserializeRegExp = ({
-  source,
-  flags
-}) => {
+export var deserializeRegExp = function deserializeRegExp(_ref2) {
+  var source = _ref2.source,
+      flags = _ref2.flags;
   return new RegExp(source, flags);
 };
-export const serializeRawStories = stories => {
-  return mapValues(stories, storyData => {
-    const creevey = storyData.parameters.creevey;
+export var serializeRawStories = function serializeRawStories(stories) {
+  return mapValues(stories, function (storyData) {
+    var creevey = storyData.parameters.creevey;
 
-    if ((creevey === null || creevey === void 0 ? void 0 : creevey.skip) !== undefined) {
-      creevey.skip = cloneDeepWith(creevey.skip, value => {
+    if (creevey !== null && creevey !== void 0 && creevey.skip) {
+      creevey.skip = cloneDeepWith(creevey.skip, function (value) {
         if (value instanceof RegExp) {
           return serializeRegExp(value);
         }
@@ -56,19 +67,25 @@ export const serializeRawStories = stories => {
     return storyData;
   });
 };
-export const deserializeRawStories = stories => {
+export var deserializeRawStories = function deserializeRawStories(stories) {
   return mapValues(stories, deserializeStory);
 };
-export const deserializeStory = story => {
-  const creevey = story.parameters.creevey;
+export var deserializeStory = function deserializeStory(story) {
+  var creevey = story.parameters.creevey;
 
-  if ((creevey === null || creevey === void 0 ? void 0 : creevey.skip) !== undefined) {
-    creevey.skip = cloneDeepWith(creevey.skip, value => {
-      if (isSerializedRegExp(value)) {
-        return deserializeRegExp(value);
-      }
+  if (creevey !== null && creevey !== void 0 && creevey.skip) {
+    return _objectSpread(_objectSpread({}, story), {}, {
+      parameters: _objectSpread(_objectSpread({}, story.parameters), {}, {
+        creevey: _objectSpread(_objectSpread({}, creevey), {}, {
+          skip: cloneDeepWith(creevey.skip, function (value) {
+            if (isSerializedRegExp(value)) {
+              return deserializeRegExp(value);
+            }
 
-      return undefined;
+            return undefined;
+          })
+        })
+      })
     });
   }
 

package/lib/types/index.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="../../types/chai" />
 export * from './types';
 // export * from './client/addon/withCreevey';
-export * from './server/parser';

package/lib/types/server/config.d.ts

@@ -1,4 +1,4 @@
 import { Config, Options } from '../types';
 export declare const defaultBrowser = "chrome";
-export declare const defaultConfig: Omit<Config, 'gridUrl' | 'storiesProvider' | 'testDir'>;
+export declare const defaultConfig: Omit<Config, 'gridUrl' | 'storiesProvider' | 'testsDir' | 'tsConfig'>;
 export declare function readConfig(options: Options): Promise<Config>;

package/lib/types/server/messages.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="webpack-env" />
 /// <reference types="node" />
 import cluster from 'cluster';
 import { WorkerMessage, StoriesMessage, TestMessage, WebpackMessage, DockerMessage, WorkerHandler, StoriesHandler, TestHandler, WebpackHandler, DockerHandler, ShutdownHandler } from '../types';

package/lib/types/server/{parser.d.ts → testsFiles/parser.d.ts}

@@ -1,4 +1,4 @@
-import { CreeveyStoryParams, CreeveyTestFunction } from '../types';
+import { CreeveyStoryParams, CreeveyTestFunction } from '../../types';
 export declare type CreeveyParamsByStoryId = {
     [storyId: string]: CreeveyStoryParams;
 };

package/lib/types/server/testsFiles/register.d.ts

@@ -0,0 +1,2 @@
+import { Config } from '../../types';
+export default function register(config: Config): Promise<void>;

package/lib/types/types.d.ts

@@ -246,8 +246,9 @@ export interface Config {
      * Specify platform for docker images
      */
     dockerImagePlatform: string;
-    testRegex?: RegExp;
-    testDir?: string;
+    testsRegex?: RegExp;
+    testsDir?: string;
+    tsConfig?: string;
 }
 export declare type CreeveyConfig = Partial<Config>;
 export interface Options {

package/package.json

@@ -13,7 +13,7 @@
     "addon",
     "test"
   ],
-  "version": "0.9.0-beta.0",
+  "version": "0.9.0-beta.2",
   "bin": {
     "creevey": "./lib/cjs/cli.js"
   },
@@ -75,6 +75,7 @@
     "@babel/parser": "^7.15.3",
     "@babel/plugin-transform-runtime": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
+    "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime-corejs3": "^7.15.3",
     "@babel/traverse": "^7.15.0",
@@ -88,6 +89,7 @@
     "@types/chai": "^4.2.15",
     "@types/selenium-webdriver": "^4.0.12",
     "airbnb-js-shims": "^2.2.1",
+    "babel-plugin-tsconfig-paths": "^1.0.3",
     "chai": "^4.3.4",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.1",
@@ -95,6 +97,7 @@
     "dockerode": "^3.2.1",
     "event-source-polyfill": "1.0.25",
     "find-cache-dir": "^3.3.1",
+    "get-tsconfig": "^4.2.0",
     "global-jsdom": "8.3.0",
     "jsdom": "^16.5.2",
     "koa": "^2.13.1",
@@ -120,6 +123,7 @@
     "schema-utils": "^3.0.0",
     "selenium-webdriver": "^4.0.0-beta.3",
     "shelljs": "^0.8.4",
+    "ts-node": "^10.9.1",
     "tsconfig-paths": "^3.11.0",
     "webpack-node-externals": "^3.0.0",
     "ws": "^7.4.6"
@@ -129,7 +133,6 @@
     "@babel/core": "^7.15.0",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/preset-react": "^7.13.13",
-    "@babel/preset-typescript": "^7.15.0",
     "@mdx-js/mdx": "^1.6.22",
     "@storybook/addon-essentials": "^6.4.19",
     "@storybook/addon-postcss": "^2.0.0",