Renamed lib2 to lib

addons/docs/src/blocks/Description.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent } from 'react';
 import { Description, DescriptionProps as PureDescriptionProps } from '@storybook/components';
 import { DocsContext, DocsContextProps } from './DocsContext';
 import { Component, CURRENT_SELECTION } from './shared';
-import { str } from '../lib2/docgen/utils';
+import { str } from '../lib/docgen/utils';
 
 export enum DescriptionType {
   INFO = 'info',

addons/docs/src/blocks/Props.tsx

@@ -3,7 +3,7 @@ import { PropsTable, PropsTableError, PropsTableProps } from '@storybook/compone
 import { DocsContext, DocsContextProps } from './DocsContext';
 import { Component, CURRENT_SELECTION } from './shared';
 
-import { PropsExtractor } from '../lib/docgenUtils';
+import { PropsExtractor } from '../lib/docgen/types';
 import { extractProps as reactExtractProps } from '../frameworks/react/extractProps';
 import { extractProps as vueExtractProps } from '../frameworks/vue/extractProps';
 

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

@@ -1 +1 @@
-export * from '../../lib/docgenUtils';
+export * from '../../lib/docgen';

addons/docs/src/frameworks/react/config.ts

@@ -2,7 +2,7 @@
 import { addParameters } from '@storybook/client-api';
 import { StoryFn } from '@storybook/addons';
 import { extractProps } from './extractProps';
-import { extractComponentDescription } from '../../lib2/docgen/utils';
+import { extractComponentDescription } from '../../lib/docgen';
 
 addParameters({
   docs: {

addons/docs/src/frameworks/react/extractProps.ts

@@ -1,9 +1,7 @@
 import PropTypes from 'prop-types';
 import { isForwardRef, isMemo } from 'react-is';
 import { PropDef } from '@storybook/components';
-import { hasDocgen } from '../../lib2/docgen/utils';
+import { hasDocgen, extractPropsFromDocgen, PropsExtractor, TypeSystem } from '../../lib/docgen';
-import { extractPropsFromDocgen } from '../../lib2/docgen/extractDocgenProps';
-import { PropsExtractor, TypeSystem } from '../../lib2/docgen/types';
 import { Component } from '../../blocks/shared';
 import { enhancePropTypesProp } from './propTypes/handleProp';
 

addons/docs/src/frameworks/react/propTypes/createDefaultValue.ts

@@ -36,7 +36,7 @@ function createSummaryValue(summary: string, detail: string): PropSummaryValue {
   return { summary, detail };
 }
 
-function renderObject({ ast }: InspectionResult): PropDefaultValue {
+function generateObject({ ast }: InspectionResult): PropDefaultValue {
   let prettyCaption = generateCode(ast, true);
 
   // Cannot get escodegen to add a space before the last } with the compact mode settings.
@@ -50,12 +50,11 @@ function renderObject({ ast }: InspectionResult): PropDefaultValue {
     : createSummaryValue(OBJECT_CAPTION, generateCode(ast));
 }
 
-function renderFunc({ inferedType, ast }: InspectionResult): PropDefaultValue {
+function generateFunc({ inferedType, ast }: InspectionResult): PropDefaultValue {
   const { identifier } = inferedType as InspectionFunction;
 
   if (!isNil(identifier)) {
     return createSummaryValue(getPrettyIdentifier(inferedType), generateCode(ast));
-    // return createPropText(getPrettyIdentifier(inferedType), { title: generateCode(ast) });
   }
 
   const prettyCaption = generateCode(ast, true);
@@ -63,15 +62,14 @@ function renderFunc({ inferedType, ast }: InspectionResult): PropDefaultValue {
   return !isTooLongForDefaultValue(prettyCaption)
     ? prettyCaption
     : createSummaryValue(FUNCTION_CAPTION, generateCode(ast));
-
-  // return !isTooLongForDefaultValue(prettyCaption)
-  //   ? createPropText(prettyCaption)
-  //   : createPropText(FUNCTION_CAPTION, { title: generateCode(ast) });
 }
 
 // All elements are JSX elements.
 // JSX elements cannot are not supported by escodegen.
-function renderElement(defaultValue: string, inspectionResult: InspectionResult): PropDefaultValue {
+function generateElement(
+  defaultValue: string,
+  inspectionResult: InspectionResult
+): PropDefaultValue {
   const { inferedType } = inspectionResult;
   const { identifier } = inferedType as InspectionElement;
 
@@ -85,46 +83,34 @@ function renderElement(defaultValue: string, inspectionResult: InspectionResult)
         prettyIdentifier,
         prettyIdentifier !== defaultValue ? defaultValue : undefined
       );
-
-      // return createPropText(prettyIdentifier, {
-      //   title: prettyIdentifier !== defaultValue ? defaultValue : undefined,
-      // });
     }
   }
 
   return !isTooLongForDefaultValue(defaultValue)
     ? defaultValue
     : createSummaryValue(ELEMENT_CAPTION, defaultValue);
-
-  // return !isTooLongForDefaultValue(defaultValue)
-  //   ? createPropText(defaultValue)
-  //   : createPropText(ELEMENT_CAPTION, { title: defaultValue });
 }
 
-function renderArray({ ast }: InspectionResult): PropDefaultValue {
+function generateArray({ ast }: InspectionResult): PropDefaultValue {
   const prettyCaption = generateCode(ast, true);
 
   return !isTooLongForDefaultValue(prettyCaption)
     ? prettyCaption
     : createSummaryValue(ARRAY_CAPTION, generateCode(ast));
-
-  // return !isTooLongForDefaultValue(prettyCaption)
-  //   ? createPropText(prettyCaption)
-  //   : createPropText(ARRAY_CAPTION, { title: generateCode(ast) });
 }
 
-export function renderDefaultValue(defaultValue: string): PropDefaultValue {
+export function createDefaultValue(defaultValue: string): PropDefaultValue {
   const inspectionResult = inspectValue(defaultValue);
 
   switch (inspectionResult.inferedType.type) {
     case InspectionType.OBJECT:
-      return renderObject(inspectionResult);
+      return generateObject(inspectionResult);
     case InspectionType.FUNCTION:
-      return renderFunc(inspectionResult);
+      return generateFunc(inspectionResult);
     case InspectionType.ELEMENT:
-      return renderElement(defaultValue, inspectionResult);
+      return generateElement(defaultValue, inspectionResult);
     case InspectionType.ARRAY:
-      return renderArray(inspectionResult);
+      return generateArray(inspectionResult);
     default:
       return null;
   }

addons/docs/src/frameworks/react/propTypes/createType.ts

@@ -1,7 +1,6 @@
 import { isNil } from 'lodash';
 import { PropSummaryValue, PropType } from '@storybook/components';
-import { ExtractedProp } from '../../../lib2/docgen/extractDocgenProps';
+import { ExtractedProp, DocgenPropType } from '../../../lib/docgen';
-import { DocgenPropType } from '../../../lib2/docgen/types';
 import { inspectValue } from '../inspection/inspectValue';
 import { generateCode } from './generateCode';
 import { generateFuncSignature } from './generateFuncSignature';
@@ -41,8 +40,6 @@ interface EnumValue {
 interface TypeDef {
   name: string;
   value: PropSummaryValue;
-  // caption: string;
-  // value: string;
   inferedType?: InspectionType;
 }
 
@@ -339,7 +336,7 @@ function generateType(type: DocgenPropType, extractedProp: ExtractedProp): TypeD
   return createTypeDef({ name: 'unknown', summary: 'unknown' });
 }
 
-export function renderType(extractedProp: ExtractedProp): PropType {
+export function createType(extractedProp: ExtractedProp): PropType {
   const { type } = extractedProp.docgenInfo;
 
   switch (type.name) {

addons/docs/src/frameworks/react/propTypes/generateFuncSignature.test.ts

@@ -1,5 +1,5 @@
 import { generateFuncSignature } from './generateFuncSignature';
-import { parseJsDoc } from '../../../lib2/jsdocParser';
+import { parseJsDoc } from '../../../lib/jsdocParser';
 
 it('should return an empty string with there is no @params and @returns tags', () => {
   const result = generateFuncSignature(null, null);

addons/docs/src/frameworks/react/propTypes/generateFuncSignature.ts

@@ -1,5 +1,5 @@
 import { isNil } from 'lodash';
-import { ExtractedJsDocParam, ExtractedJsDocReturns } from '../../../lib2/jsdocParser';
+import { ExtractedJsDocParam, ExtractedJsDocReturns } from '../../../lib/jsdocParser';
 
 export function generateFuncSignature(
   params: ExtractedJsDocParam[],

addons/docs/src/frameworks/react/propTypes/handleProp.ts

@@ -1,20 +1,20 @@
 import { isNil } from 'lodash';
 import { PropDef } from '@storybook/components';
-import { ExtractedProp } from '../../../lib2/docgen/extractDocgenProps';
+import { ExtractedProp } from '../../../lib/docgen';
-import { renderType } from './renderType';
+import { createType } from './createType';
-import { renderDefaultValue } from './renderDefaultValue';
+import { createDefaultValue } from './createDefaultValue';
 
 export function enhancePropTypesProp(extractedProp: ExtractedProp): PropDef {
   const { propDef } = extractedProp;
 
-  const newtype = renderType(extractedProp);
+  const newtype = createType(extractedProp);
   if (!isNil(newtype)) {
     propDef.type = newtype;
   }
 
   const { defaultValue } = extractedProp.docgenInfo;
   if (!isNil(defaultValue)) {
-    const newDefaultValue = renderDefaultValue(defaultValue.value);
+    const newDefaultValue = createDefaultValue(defaultValue.value);
     if (!isNil(newDefaultValue)) {
       propDef.defaultValue = newDefaultValue;
     }

addons/docs/src/frameworks/vue/config.tsx

@@ -4,7 +4,7 @@ import toReact from '@egoist/vue-to-react';
 import { StoryFn } from '@storybook/addons';
 import { addParameters } from '@storybook/client-api';
 import { extractProps } from './extractProps';
-import { extractComponentDescription } from '../../lib2/docgen/utils';
+import { extractComponentDescription } from '../../lib/docgen/utils';
 
 addParameters({
   docs: {

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

@@ -1,5 +1,5 @@
 import { PropDef } from '@storybook/components';
-import { PropsExtractor, extractPropsFromDocgen, hasDocgen } from '../../lib/docgenUtils';
+import { PropsExtractor, hasDocgen, extractPropsFromDocgen } from '../../lib/docgen';
 
 const SECTIONS = ['props', 'events', 'slots'];
 
@@ -9,7 +9,7 @@ export const extractProps: PropsExtractor = component => {
   }
   const sections: Record<string, PropDef[]> = {};
   SECTIONS.forEach(section => {
-    sections[section] = extractPropsFromDocgen(component, section);
+    sections[section] = extractPropsFromDocgen(component, section).map(x => x.propDef);
   });
   return { sections };
 };

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

@@ -8,7 +8,7 @@ function isDefaultValueBlacklisted(value: string) {
   return BLACKLIST.some(x => x === value);
 }
 
-export function renderDefaultValue(defaultValue: DocgenPropDefaultValue): PropDefaultValue {
+export function createDefaultValue(defaultValue: DocgenPropDefaultValue): PropDefaultValue {
   if (!isNil(defaultValue)) {
     const { value } = defaultValue;
 

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

@@ -2,7 +2,7 @@ import { isNil } from 'lodash';
 import { PropDef } from '@storybook/components';
 import { TypeSystem, DocgenInfo, DocgenType } from './types';
 import { JsDocParsingResult } from '../jsdocParser';
-import { renderDefaultValue } from './renderDefaultValue';
+import { createDefaultValue } from './createDefaultValue';
 
 export type PropDefFactory = (
   propName: string,
@@ -18,7 +18,7 @@ function createBasicPropDef(name: string, type: DocgenType, docgenInfo: DocgenIn
     type: type.name,
     required,
     description,
-    defaultValue: renderDefaultValue(defaultValue),
+    defaultValue: createDefaultValue(defaultValue),
   };
 }
 

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

@@ -0,0 +1,3 @@
+export * from './types';
+export * from './utils';
+export * from './extractDocgenProps';

addons/docs/src/lib/docgenUtils.ts

@@ -1,13 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-import { PropDef, PropsTableProps } from '@storybook/components';
-import { Component } from '../blocks/shared';
-
-export type PropsExtractor = (component: Component) => PropsTableProps | null;
-
-export type PropDefGetter = (component: Component, section: string) => PropDef[];
-
-export const hasDocgen = (component: Component) => !!component.__docgenInfo;
-
-export const extractPropsFromDocgen: PropDefGetter = (component, section) => {
-  return [];
-};