@khanacademy/wonder-blocks-testing 6.1.0 → 7.0.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @khanacademy/wonder-blocks-testing
 
+## 7.0.2
+
+### Patch Changes
+
+-   aa7993a8: Make sure wrapper component is used when provided
+
+## 7.0.1
+
+### Patch Changes
+
+-   79a3bc8e: Export more types for the fixtures framework
+
+## 7.0.0
+
+### Major Changes
+
+-   d078f526: Simplify fixtures API to target only CSF/storybook
+
 ## 6.1.0
 
 ### Minor Changes

package/dist/es/index.js

@@ -1,208 +1,38 @@
-import _extends from '@babel/runtime/helpers/extends';
 import * as React from 'react';
 import { action } from '@storybook/addon-actions';
-import { clone } from '@khanacademy/wonder-stuff-core';
 import { InterceptRequests } from '@khanacademy/wonder-blocks-data';
 import { StaticRouter, MemoryRouter, Switch, Route } from 'react-router-dom';
+import _extends from '@babel/runtime/helpers/extends';
 
-class AdapterGroup {
-  constructor(closeGroupFn, _options) {
-    this.closeGroup = (adapterOptions = null) => {
-      if (this._closeGroupFn == null) {
-        throw new Error("Group already closed");
-      }
-
-      try {
-        return this._closeGroupFn(this._options, adapterOptions, this._fixtures);
-      } finally {
-        this._closeGroupFn = null;
-      }
-    };
-
-    this.declareFixture = options => {
-      if (typeof options !== "object" || options === null) {
-        throw new TypeError("options must be an object");
-      }
-
-      if (this._closeGroupFn == null) {
-        throw new Error("Cannot declare fixtures after closing the group");
-      }
-
-      this._fixtures.push(options);
-    };
-
-    if (typeof closeGroupFn !== "function") {
-      throw new TypeError("closeGroupFn must be a function");
-    }
-
-    if (typeof _options !== "object" || _options === null) {
-      throw new TypeError("options must be an object");
-    }
-
-    this._closeGroupFn = closeGroupFn;
-    this._options = _options;
-    this._fixtures = [];
-  }
-
-}
-
-class Adapter {
-  constructor(name, closeGroupFn) {
-    if (typeof name !== "string") {
-      throw new TypeError("name must be a string");
-    }
-
-    if (name.trim() === "") {
-      throw new Error("name must be a non-empty string");
-    }
-
-    if (typeof closeGroupFn !== "function") {
-      throw new TypeError("closeGroupFn must be a function");
-    }
-
-    this._name = name;
-    this._closeGroupFn = closeGroupFn;
-  }
-
-  get name() {
-    return this._name;
-  }
-
-  declareGroup(options) {
-    return new AdapterGroup(this._closeGroupFn, options);
-  }
-
-}
-
-const getAdapter = (MountingComponent = null) => new Adapter("storybook", ({
-  title,
-  description: groupDescription,
-  getDefaultTitle: _
-}, adapterOptions, declaredFixtures) => {
+const fixtures = Component => {
   const templateMap = new WeakMap();
+  let storyNumber = 1;
   const getPropsOptions = {
     log: (message, ...args) => action(message).apply(void 0, args),
     logHandler: action
   };
-  const exports = declaredFixtures.reduce((acc, {
-    description,
-    getProps,
-    component: Component
-  }, i) => {
-    const storyName = `${i + 1} ${description}`;
-    const exportName = storyName.replace(/\b\w/g, c => c.toUpperCase()).replace(/[^\w]+/g, "").replace(/[_]+/g, "");
-    let Template = templateMap.get(Component);
-
-    if (Template == null) {
-      Template = MountingComponent ? args => React.createElement(MountingComponent, {
-        component: Component,
-        props: args,
-        log: getPropsOptions.log
-      }) : args => React.createElement(Component, args);
-      templateMap.set(Component, Template);
-    }
-
-    acc[exportName] = Template.bind({});
-    acc[exportName].args = getProps(getPropsOptions);
-    acc[exportName].storyName = storyName;
-    return acc;
-  }, {
-    default: _extends({
-      title
-    }, adapterOptions)
-  });
-  return Object.freeze(exports);
-});
-
-var adapters$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    storybook: getAdapter
-});
-
-let _configuration = null;
-const setup = configuration => {
-  _configuration = configuration;
-};
-const getConfiguration = () => {
-  if (_configuration == null) {
-    throw new Error("Not configured");
-  }
 
-  return _configuration;
-};
+  const makeStory = (description, props, wrapper = null) => {
+    const storyName = `${storyNumber++} ${description}`;
 
-const combineTopLevel = (val1, val2) => {
-  const obj2Clone = clone(val2);
+    const getProps = options => typeof props === "function" ? props(options) : props;
 
-  if (val1 !== null && val2 !== null && typeof val1 === "object" && typeof val2 === "object") {
-    const val1IsArray = Array.isArray(val1);
-    const val2IsArray = Array.isArray(val2);
+    const RealComponent = wrapper || Component;
+    let Template = templateMap.get(RealComponent);
 
-    if (val1IsArray && val2IsArray) {
-      return Array.from(new Set([].concat(val1, obj2Clone)));
-    } else if (!val1IsArray && !val2IsArray) {
-      return _extends({}, val1, obj2Clone);
-    }
-  }
-
-  return obj2Clone;
-};
+    if (Template == null) {
+      Template = args => React.createElement(RealComponent, args);
 
-const combineOptions = (...toBeCombined) => {
-  const combined = toBeCombined.filter(Boolean).reduce((acc, cur) => {
-    for (const key of Object.keys(cur)) {
-      acc[key] = combineTopLevel(acc[key], cur[key]);
+      templateMap.set(RealComponent, Template);
     }
 
-    return acc;
-  }, {});
-  return combined;
-};
-
-const normalizeOptions = componentOrOptions => {
-  if (typeof componentOrOptions === "function" || typeof componentOrOptions.render === "function") {
-    return {
-      component: componentOrOptions
-    };
-  }
-
-  return componentOrOptions;
-};
-
-const fixtures = (componentOrOptions, fn) => {
-  var _additionalAdapterOpt;
-
-  const {
-    adapter,
-    defaultAdapterOptions
-  } = getConfiguration();
-  const {
-    title,
-    component,
-    description: groupDescription,
-    defaultWrapper,
-    additionalAdapterOptions
-  } = normalizeOptions(componentOrOptions);
-  const group = adapter.declareGroup({
-    title,
-    description: groupDescription,
-    getDefaultTitle: () => component.displayName || component.name || "Component"
-  });
-
-  const addFixture = (description, props, wrapper = null) => {
-    var _ref;
-
-    group.declareFixture({
-      description,
-      getProps: options => typeof props === "function" ? props(options) : props,
-      component: (_ref = wrapper != null ? wrapper : defaultWrapper) != null ? _ref : component
-    });
+    const story = Template.bind({});
+    story.args = getProps(getPropsOptions);
+    story.storyName = storyName;
+    return story;
   };
 
-  fn(addFixture);
-  const groupAdapterOverrides = (_additionalAdapterOpt = additionalAdapterOptions == null ? void 0 : additionalAdapterOptions[adapter.name]) != null ? _additionalAdapterOpt : {};
-  const combinedAdapterOptions = combineOptions(defaultAdapterOptions, groupAdapterOverrides);
-  return group.closeGroup(combinedAdapterOptions);
+  return makeStory;
 };
 
 const getHref = input => {
@@ -571,4 +401,4 @@ const hookHarness = makeHookHarness(DefaultAdapters, DefaultConfigs);
 
 const testHarness = makeTestHarness(DefaultAdapters, DefaultConfigs);
 
-export { RespondWith, adapters$1 as fixtureAdapters, fixtures, adapters as harnessAdapters, hookHarness, makeHookHarness, makeTestHarness, mockFetch, mockGqlFetch, setup as setupFixtures, testHarness };
+export { RespondWith, fixtures, adapters as harnessAdapters, hookHarness, makeHookHarness, makeTestHarness, mockFetch, mockGqlFetch, testHarness };