fix(displayName): Get displayName from variable if nothing else found

Author: danez

src/__tests__/__snapshots__/main-test.js.snap

@@ -47,6 +47,7 @@ Object {
 exports[`main fixtures processes component "component_3.js" without errors 1`] = `
 Object {
   "description": "",
+  "displayName": "Test",
   "methods": Array [],
   "props": Object {
     "style": Object {
@@ -102,6 +103,7 @@ Object {
 exports[`main fixtures processes component "component_5.js" without errors 1`] = `
 Object {
   "description": "",
+  "displayName": "Button",
   "methods": Array [],
   "props": Object {
     "children": Object {
@@ -136,6 +138,7 @@ Object {
 exports[`main fixtures processes component "component_6.js" without errors 1`] = `
 Object {
   "description": "",
+  "displayName": "Button",
   "methods": Array [],
   "props": Object {
     "children": Object {

src/handlers/__tests__/displayNameHandler-test.js

@@ -115,7 +115,68 @@ describe('defaultPropsHandler', () => {
       expect(() => displayNameHandler(documentation, definition)).not.toThrow();
       expect(documentation.displayName).toBe('bar');
     });
+  });
+
+  describe('FunctionDeclaration', () => {
+    it('considers the function name', () => {
+      const definition = statement('function Foo () {}');
+      expect(() => displayNameHandler(documentation, definition)).not.toThrow();
+      expect(documentation.displayName).toBe('Foo');
+    });
+
+    it('considers a static displayName object property', () => {
+      const definition = statement(`
+        function Foo () {}
+        Foo.displayName = 'Bar';
+      `);
+      expect(() => displayNameHandler(documentation, definition)).not.toThrow();
+      expect(documentation.displayName).toBe('Bar');
+    });
+  });
+
+  describe('FunctionExpression', () => {
+    it('considers the variable name', () => {
+      const definition = statement('var Foo = function () {};').get('declarations', 0, 'init');
+      expect(() => displayNameHandler(documentation, definition)).not.toThrow();
+      expect(documentation.displayName).toBe('Foo');
+    });
+
+    it('considers the variable name on assign', () => {
+      const definition = statement('Foo = function () {};').get('expression', 'right');
+      expect(() => displayNameHandler(documentation, definition)).not.toThrow();
+      expect(documentation.displayName).toBe('Foo');
+    });
 
+    it('considers a static displayName object property over variable name', () => {
+      const definition = statement(`
+        var Foo = function () {};
+        Foo.displayName = 'Bar';
+      `);
+      expect(() => displayNameHandler(documentation, definition)).not.toThrow();
+      expect(documentation.displayName).toBe('Bar');
+    });
   });
 
+  describe('ArrowFunctionExpression', () => {
+    it('considers the variable name', () => {
+      const definition = statement('var Foo = () => {};').get('declarations', 0, 'init');
+      expect(() => displayNameHandler(documentation, definition)).not.toThrow();
+      expect(documentation.displayName).toBe('Foo');
+    });
+
+    it('considers the variable name on assign', () => {
+      const definition = statement('Foo = () => {};').get('expression', 'right');
+      expect(() => displayNameHandler(documentation, definition)).not.toThrow();
+      expect(documentation.displayName).toBe('Foo');
+    });
+
+    it('considers a static displayName object property over variable name', () => {
+      const definition = statement(`
+        var Foo = () => {};
+        Foo.displayName = 'Bar';
+      `);
+      expect(() => displayNameHandler(documentation, definition)).not.toThrow();
+      expect(documentation.displayName).toBe('Bar');
+    });
+  });
 });

src/handlers/displayNameHandler.js

@@ -33,6 +33,15 @@ export default function displayNameHandler(
       types.FunctionDeclaration.check(path.node)
     ) {
       documentation.set('displayName', getNameOrValue(path.get('id')));
+    } else if (
+      types.ArrowFunctionExpression.check(path.node) ||
+      types.FunctionExpression.check(path.node)
+    ) {
+      if (types.VariableDeclarator.check(path.parentPath.node)) {
+        documentation.set('displayName', getNameOrValue(path.parentPath.get('id')));
+      } else if (types.AssignmentExpression.check(path.parentPath.node)) {
+        documentation.set('displayName', getNameOrValue(path.parentPath.get('left')));
+      }
     }
     return;
   }

src/utils/__tests__/getFlowType-test.js

@@ -76,7 +76,7 @@ describe('getFlowType', () => {
 
   it('detects array type shorthand optional type', () => {
     var typePath = expression('x: (?number)[]').get('typeAnnotation').get('typeAnnotation');
-    expect(getFlowType(typePath)).toEqual({ name: 'Array', elements: [{ name: 'number', nullable: true }], raw: 'number[]' });
+    expect(getFlowType(typePath)).toEqual({ name: 'Array', elements: [{ name: 'number', nullable: true }], raw: '(?number)[]' });
   });
 
   it('detects array type shorthand', () => {