Update babylon to latest beta and fix detection of comments (#222)

Author: danez

package.json

@@ -35,7 +35,7 @@
   "dependencies": {
     "async": "^2.1.4",
     "babel-runtime": "^6.9.2",
-    "babylon": "v7.0.0-beta.20",
+    "babylon": "7.0.0-beta.29",
     "commander": "^2.9.0",
     "doctrine": "^2.0.0",
     "node-dir": "^0.1.10",

src/handlers/componentDocblockHandler.js

@@ -31,35 +31,27 @@ export default function componentDocblockHandler(
   path: NodePath
 ) {
   var description = null;
-  // Find parent statement (e.g. var Component = React.createClass(<path>);)
-  var searchPath = path;
-  while (searchPath && !types.Statement.check(searchPath.node)) {
-    searchPath = searchPath.parent;
-  }
-  if (searchPath) {
-    // If the parent is an export statement, we have to traverse one more up
-    if (types.ExportNamedDeclaration.check(searchPath.parentPath.node) ||
-        types.ExportDefaultDeclaration.check(searchPath.parentPath.node)) {
-      searchPath = searchPath.parentPath;
-    }
-    description = getDocblock(searchPath);
-  }
-  if (description == null && isClassDefinition(path)) {
+
+  if (isClassDefinition(path)) {
     // If we have a class declaration or expression, then the comment might be
-    // attached to the first decorator instead.
+    // attached to the last decorator instead as trailing comment.
     if (path.node.decorators && path.node.decorators.length > 0) {
-      description = getDocblock(path.get('decorators', 0));
+      description = getDocblock(path.get('decorators', path.node.decorators.length - 1), true);
     }
   }
   if (description == null) {
-    // If this is the first statement in the module body, the comment is attached
-    // to the program node
-    var programPath = searchPath;
-    while (programPath && !types.Program.check(programPath.node)) {
-      programPath = programPath.parent;
+    // Find parent statement (e.g. var Component = React.createClass(<path>);)
+    var searchPath = path;
+    while (searchPath && !types.Statement.check(searchPath.node)) {
+      searchPath = searchPath.parent;
     }
-    if (programPath.get('body', 0) === searchPath) {
-      description = getDocblock(programPath);
+    if (searchPath) {
+      // If the parent is an export statement, we have to traverse one more up
+      if (types.ExportNamedDeclaration.check(searchPath.parentPath.node) ||
+          types.ExportDefaultDeclaration.check(searchPath.parentPath.node)) {
+        searchPath = searchPath.parentPath;
+      }
+      description = getDocblock(searchPath);
     }
   }
   documentation.set('description', description || '');

src/utils/docblock.js

@@ -29,9 +29,14 @@ let DOCBLOCK_HEADER = /^\*\s/;
  * Given a path, this function returns the closest preceding docblock if it
  * exists.
  */
-export function getDocblock(path: NodePath): ?string {
+export function getDocblock(path: NodePath, trailing: boolean = false): ?string {
   var comments = [];
-  if (path.node.leadingComments) {
+  if (trailing && path.node.trailingComments) {
+    comments = path.node.trailingComments.filter(
+      comment => comment.type === 'CommentBlock' &&
+        DOCBLOCK_HEADER.test(comment.value)
+    );
+  } else if (path.node.leadingComments) {
     comments = path.node.leadingComments.filter(
       comment => comment.type === 'CommentBlock' &&
         DOCBLOCK_HEADER.test(comment.value)

yarn.lock

@@ -748,14 +748,14 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
+[email protected]:
+  version "7.0.0-beta.29"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.29.tgz#6a3e0e6287390385a36f5511e7f94db8618574ae"
+
 babylon@^6.17.0, babylon@^6.17.2, babylon@^6.17.4:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
-[email protected]:
-  version "7.0.0-beta.20"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.20.tgz#7dbc70cc88de13334066fe5200e0efaa30c0490e"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"