Handle components exported in an object

src/__tests__/data/ExportObject.tsx

@@ -0,0 +1,13 @@
+import * as React from 'react';
+
+/** Bar description */
+const Bar: React.FC<{ foo: string }> = () => <div />;
+/** FooBar description */
+const FooBar: React.FC<{ foobar: string }> = props => <div />;
+
+/** Baz description */
+function Baz(props: { baz: string }) {
+  return <div />;
+}
+
+export { Bar, Baz, FooBar };

src/__tests__/parser.ts

@@ -341,6 +341,20 @@ describe('parser', () => {
     });
   });
 
+  it('should component where last line is a comment', () => {
+    check('ExportObject', {
+      Baz: {
+        baz: { description: '', type: 'string' }
+      },
+      Bar: {
+        foo: { description: '', type: 'string' }
+      },
+      FooBar: {
+        foobar: { description: '', type: 'string' }
+      }
+    });
+  });
+
   it('should parse react stateless component with intersection props', () => {
     check('StatelessIntersectionProps', {
       StatelessIntersectionProps: {
@@ -612,7 +626,7 @@ describe('parser', () => {
       'FunctionalComponentAsConstAsNamedExport',
       {
         // in this case the component name is taken from the file name
-        FunctionalComponentAsConstAsNamedExport: {
+        Jumbotron: {
           prop1: { type: 'string', required: true }
         }
       },
@@ -626,7 +640,7 @@ describe('parser', () => {
       'ReactSFCAsConstAsNamedExport',
       {
         // in this case the component name is taken from the file name
-        ReactSFCAsConstAsNamedExport: {
+        Jumbotron: {
           prop1: { type: 'string', required: true }
         }
       },

src/parser.ts

@@ -231,9 +231,10 @@ export class Parser {
     );
     let commentSource = exp;
     const typeSymbol = type.symbol || type.aliasSymbol;
+    const originalName = exp.getName();
 
     if (!exp.valueDeclaration) {
-      if (exp.getName() === 'default' && !typeSymbol) {
+      if (originalName === 'default' && !typeSymbol) {
         commentSource = this.checker.getAliasedSymbol(commentSource);
       } else if (!typeSymbol) {
         return null;
@@ -242,6 +243,7 @@ export class Parser {
         const expName = exp.getName();
 
         if (
+          expName === '__function' ||
           expName === 'StatelessComponent' ||
           expName === 'Stateless' ||
           expName === 'StyledComponentClass' ||
@@ -268,9 +270,10 @@ export class Parser {
       this.extractPropsFromTypeIfStatelessComponent(type) ||
       this.extractPropsFromTypeIfStatefulComponent(type);
 
-    const resolvedComponentName = componentNameResolver(exp, source);
+    const nameSource = originalName === 'default' ? exp : commentSource;
+    const resolvedComponentName = componentNameResolver(nameSource, source);
     const displayName =
-      resolvedComponentName || computeComponentName(exp, source);
+      resolvedComponentName || computeComponentName(nameSource, source);
     const description = this.findDocComment(commentSource).fullComment;
     const methods = this.getMethodsInfo(type);