Update handlers to work with class definitions

This also removes the delegation from propTypehandler to
propTypeCompositionHandler.

Author: fkling

src/handlers/__tests__/componentDocblockHandler-test.js

@@ -8,77 +8,95 @@
  *
  */
 
-"use strict";
+/*global jest, describe, beforeEach, it, expect*/
 
 jest.autoMockOff();
 jest.mock('../../Documentation');
 
 describe('componentDocblockHandler', () => {
-  var utils;
+  var parse;
   var documentation;
   var componentDocblockHandler;
 
-  function parse(src) {
-    var programPath = utils.parse(src);
+  function lastStatement(src) {
+    var programPath = parse(src);
     return programPath.get(
       'body',
-      programPath.node.body.length - 1,
-      'declarations',
-      0,
-      'init',
-      'arguments',
-      0
+      programPath.node.body.length - 1
     );
   }
 
   beforeEach(() => {
-    utils = require('../../../tests/utils');
+    ({parse} = require('../../../tests/utils'));
     documentation = new (require('../../Documentation'));
     componentDocblockHandler = require('../componentDocblockHandler');
   });
 
-  it('finds docblocks for component definitions', () => {
-    var definition = parse([
-      '/**',
-      ' * Component description',
-      ' */',
-      'var Component = React.createClass({});',
-    ].join('\n'));
+  function test(definitionSrc, parse) { // eslint-disable-line no-shadow
+    it('finds docblocks for component definitions', () => {
+      var definition = parse(`
+        /**
+         * Component description
+         */
+        ${definitionSrc}
+      `);
 
-    componentDocblockHandler(documentation, definition);
-    expect(documentation.description).toBe('Component description');
-  });
+      componentDocblockHandler(documentation, definition);
+      expect(documentation.description).toBe('Component description');
+    });
+
+    it('ignores other types of comments', () => {
+      var definition = parse(`
+        /*
+         * This is not a docblock',
+         */
+        ${definitionSrc}
+      `);
+
+      componentDocblockHandler(documentation, definition);
+      expect(documentation.description).toBe('');
+
+      definition = parse(`
+        // Inline comment'
+        ${definitionSrc}
+      `);
+
+      componentDocblockHandler(documentation, definition);
+      expect(documentation.description).toBe('');
+    });
 
-  it('ignores other types of comments', () => {
-    var definition = parse([
-      '/*',
-      ' * This is not a docblock',
-      ' */',
-      'var Component = React.createClass({});',
-    ].join('\n'));
+    it('only considers the docblock directly above the definition', () => {
+      var definition = parse(`
+        /**
+         * This is the wrong docblock
+         */
+        var something_else = "foo";
+        ${definitionSrc}
+      `);
 
-    componentDocblockHandler(documentation, definition);
-    expect(documentation.description).toBe('');
+      componentDocblockHandler(documentation, definition);
+      expect(documentation.description).toBe('');
+    });
+  }
 
-    definition = parse([
-      '// Inline comment',
-      'var Component = React.createClass({});',
-    ].join('\n'));
+  describe('React.createClass', () => {
+    test(
+      'var Component = React.createClass({})',
+      src => lastStatement(src).get('declarations', 0, 'init', 'arguments', 0)
+    );
+  });
 
-    componentDocblockHandler(documentation, definition);
-    expect(documentation.description).toBe('');
+  describe('ClassDeclaration', () => {
+    test(
+      'class Component {}',
+      src => lastStatement(src)
+    );
   });
 
-  it('only considers the docblock directly above the definition', () => {
-    var definition = parse([
-      '/**',
-      ' * This is the wrong docblock',
-      ' */',
-      'var something_else = "foo";',
-      'var Component = React.createClass({});',
-    ].join('\n'));
-
-    componentDocblockHandler(documentation, definition);
-    expect(documentation.description).toBe('');
+  describe('ClassExpression', () => {
+    test(
+      'var Compoent = class {};',
+      src => lastStatement(src).get('declarations', 0, 'init')
+    );
   });
 });

src/handlers/__tests__/defaultPropsHandler-test.js

@@ -8,66 +8,99 @@
  *
  */
 
-"use strict";
+/*global jest, describe, beforeEach, it, expect*/
 
 jest.autoMockOff();
 jest.mock('../../Documentation');
 
 describe('defaultPropsHandler', () => {
-  var utils;
   var documentation;
-  var defaultValueHandler;
-
-  function parse(src) {
-    return utils.parse(src).get('body', 0, 'expression');
-  }
+  var defaultPropsHandler;
+  var parse;
 
   beforeEach(() => {
-    utils = require('../../../tests/utils');
+    ({parse} = require('../../../tests/utils'));
     documentation = new (require('../../Documentation'));
     defaultPropsHandler = require('../defaultPropsHandler');
   });
 
-  it ('should find prop default values that are literals', () => {
-    var definition = parse([
-      '({',
-      '  getDefaultProps: function() {',
-      '    return {',
-      '      foo: "bar",',
-      '      bar: 42,',
-      '      baz: ["foo", "bar"],',
-      '      abc: {xyz: abc.def, 123: 42}',
-      '    };',
-      '  }',
-      '});'
-    ].join('\n'));
-
+  function test(definition) {
     defaultPropsHandler(documentation, definition);
     expect(documentation.descriptors).toEqual({
       foo: {
         defaultValue: {
           value: '"bar"',
-          computed: false
-        }
+          computed: false,
+        },
       },
       bar: {
         defaultValue: {
           value: '42',
-          computed: false
-        }
+          computed: false,
+        },
       },
       baz: {
         defaultValue: {
           value: '["foo", "bar"]',
-          computed: false
-        }
+          computed: false,
+        },
       },
       abc: {
         defaultValue: {
           value: '{xyz: abc.def, 123: 42}',
-          computed: false
+          computed: false,
+        },
+      },
+    });
+  }
+
+  describe('ObjectExpression', () => {
+    it('should find prop default values that are literals', () => {
+      var src = `
+        ({
+          getDefaultProps: function() {
+            return {
+              foo: "bar",
+              bar: 42,
+              baz: ["foo", "bar"],
+              abc: {xyz: abc.def, 123: 42}
+            };
+          }
+        })
+      `;
+      test(parse(src).get('body', 0, 'expression'));
+    });
+  });
+
+  describe('ClassDeclaration with static defaultProps', () => {
+    it.only('should find prop default values that are literals', () => {
+      var src = `
+        class Foo {
+          static defaultProps = {
+            foo: "bar",
+            bar: 42,
+            baz: ["foo", "bar"],
+            abc: {xyz: abc.def, 123: 42}
+          };
         }
-      }
+      `;
+      test(parse(src).get('body', 0));
     });
   });
+
+  describe('ClassExpression with static defaultProps', () => {
+    it('should find prop default values that are literals', () => {
+      var src = `
+        var Bar = class {
+          static defaultProps = {
+            foo: "bar",
+            bar: 42,
+            baz: ["foo", "bar"],
+            abc: {xyz: abc.def, 123: 42}
+          };
+      }`;
+      test(parse(src).get('body', 0, 'declarations', 0, 'init'));
+    });
+  });
+
 });