Refactor: Move SBType to ClientAPI

addons/docs/src/frameworks/common/inferControls.ts

@@ -1,7 +1,7 @@
 import mapValues from 'lodash/mapValues';
 import { ArgTypes, ArgType } from '@storybook/addons';
 import { Control } from '@storybook/components';
-import { SBEnumType } from '../../lib/sbtypes';
+import { SBEnumType } from '@storybook/client-api';
 
 const inferControl = (argType: ArgType): Control => {
   const { type } = argType;

addons/docs/src/frameworks/common/normalizeArgTypes.ts

@@ -1,6 +1,6 @@
 import mapValues from 'lodash/mapValues';
 import { ArgTypes } from '@storybook/api';
-import { SBType } from '../../lib/sbtypes';
+import { SBType } from '@storybook/client-api';
 
 const normalizeType = (type: SBType | string) => (typeof type === 'string' ? { name: type } : type);
 

addons/docs/src/frameworks/react/react-argtypes.stories.tsx

@@ -60,7 +60,7 @@ const typescriptFixtures = [
 const typescriptStories = storiesOf('ArgTypes/TypeScript', module);
 typescriptFixtures.forEach((fixture) => {
   // eslint-disable-next-line import/no-dynamic-require, global-require, no-shadow
-  const { Component } = require(`../../lib/sbtypes/__testfixtures__/typescript/${fixture}`);
+  const { Component } = require(`../../lib/convert/__testfixtures__/typescript/${fixture}`);
   typescriptStories.add(fixture, () => <ArgsStory component={Component} />);
 });
 
@@ -69,7 +69,7 @@ const proptypesFixtures = ['arrays', 'enums', 'misc', 'objects', 'react', 'scala
 const proptypesStories = storiesOf('ArgTypes/PropTypes', module);
 proptypesFixtures.forEach((fixture) => {
   // eslint-disable-next-line import/no-dynamic-require, global-require, no-shadow
-  const { Component } = require(`../../lib/sbtypes/__testfixtures__/proptypes/${fixture}`);
+  const { Component } = require(`../../lib/convert/__testfixtures__/proptypes/${fixture}`);
   proptypesStories.add(fixture, () => <ArgsStory component={Component} />);
 });
 

addons/docs/src/frameworks/vue/extractArgTypes.ts

@@ -1,7 +1,7 @@
 import { ArgTypes } from '@storybook/api';
 import { ArgTypesExtractor, hasDocgen, extractComponentProps } from '../../lib/docgen';
-import { convert } from '../../lib/sbtypes';
+import { convert } from '../../lib/convert';
-import { trimQuotes } from '../../lib/sbtypes/utils';
+import { trimQuotes } from '../../lib/convert/utils';
 
 const SECTIONS = ['props', 'events', 'slots'];
 

addons/docs/src/lib/convert/convert.test.ts

@@ -4,7 +4,7 @@ import { transformSync } from '@babel/core';
 import requireFromString from 'require-from-string';
 import fs from 'fs';
 
-import { convert } from './convert';
+import { convert } from './index';
 import { normalizeNewlines } from '../utils';
 
 expect.addSnapshotSerializer({

addons/docs/src/lib/convert/proptypes/convert.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-case-declarations */
 import mapValues from 'lodash/mapValues';
+import { SBType } from '@storybook/client-api';
 import { PTType } from './types';
-import { SBType } from '../types';
 import { trimQuotes } from '../utils';
 
 const SIGNATURE_REGEXP = /^\(.*\) => /;

addons/docs/src/lib/convert/typescript/convert.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-case-declarations */
+import { SBType } from '@storybook/client-api';
 import { TSType, TSSigType } from './types';
-import { SBType } from '../types';
 
 const convertSig = (type: TSSigType) => {
   switch (type.type) {

addons/docs/src/lib/docgen/createPropDef.ts

@@ -5,7 +5,7 @@ import { createSummaryValue } from '../utils';
 import { createFlowPropDef } from './flow/createPropDef';
 import { isDefaultValueBlacklisted } from './utils/defaultValue';
 import { createTsPropDef } from './typeScript/createPropDef';
-import { convert } from '../sbtypes';
+import { convert } from '../convert';
 
 export type PropDefFactory = (
   propName: string,

addons/docs/src/lib/sbtypes/types.ts

@@ -1,42 +0,0 @@
-interface SBBaseType {
-  required?: boolean;
-  raw?: string;
-}
-
-export type SBScalarType = SBBaseType & {
-  name: 'boolean' | 'string' | 'number' | 'function';
-};
-
-export type SBArrayType = SBBaseType & {
-  name: 'array';
-  value: SBType;
-};
-export type SBObjectType = SBBaseType & {
-  name: 'object';
-  value: Record<string, SBType>;
-};
-export type SBEnumType = SBBaseType & {
-  name: 'enum';
-  value: (string | number)[];
-};
-export type SBIntersectionType = SBBaseType & {
-  name: 'intersection';
-  value: SBType[];
-};
-export type SBUnionType = SBBaseType & {
-  name: 'union';
-  value: SBType[];
-};
-export type SBOtherType = SBBaseType & {
-  name: 'other';
-  value: string;
-};
-
-export type SBType =
-  | SBScalarType
-  | SBEnumType
-  | SBArrayType
-  | SBObjectType
-  | SBIntersectionType
-  | SBUnionType
-  | SBOtherType;

addons/docs/src/lib/sbtypes/typescript/index.ts

@@ -1,2 +0,0 @@
-export * from './convert';
-export * from './types';

lib/client-api/src/inferArgTypes.ts

@@ -1,12 +1,7 @@
 import mapValues from 'lodash/mapValues';
-import { ArgTypesEnhancer } from './types';
+import { SBType, ArgTypesEnhancer } from './types';
 import { combineParameters } from './parameters';
 
-type SBType = {
-  name: string;
-  value?: string | SBType | SBType[] | Record<string, SBType>;
-};
-
 const inferType = (value?: any): SBType => {
   const type = typeof value;
   switch (type) {

lib/client-api/src/types.ts

@@ -104,3 +104,46 @@ export type RenderContext = StoreItem & {
   showError: (error: { title: string; description: string }) => void;
   showException: (err: Error) => void;
 };
+
+interface SBBaseType {
+  required?: boolean;
+  raw?: string;
+}
+
+export type SBScalarType = SBBaseType & {
+  name: 'boolean' | 'string' | 'number' | 'function';
+};
+
+export type SBArrayType = SBBaseType & {
+  name: 'array';
+  value: SBType;
+};
+export type SBObjectType = SBBaseType & {
+  name: 'object';
+  value: Record<string, SBType>;
+};
+export type SBEnumType = SBBaseType & {
+  name: 'enum';
+  value: (string | number)[];
+};
+export type SBIntersectionType = SBBaseType & {
+  name: 'intersection';
+  value: SBType[];
+};
+export type SBUnionType = SBBaseType & {
+  name: 'union';
+  value: SBType[];
+};
+export type SBOtherType = SBBaseType & {
+  name: 'other';
+  value: string;
+};
+
+export type SBType =
+  | SBScalarType
+  | SBEnumType
+  | SBArrayType
+  | SBObjectType
+  | SBIntersectionType
+  | SBUnionType
+  | SBOtherType;