Address review comments

Author: tmcw

declarations/comment.js

@@ -1,4 +1,4 @@
-declare type DocumentationConfig = {
+type DocumentationConfig = {
   polyglot?: boolean,
   inferPrivate?: boolean,
   noPackage?: boolean,
@@ -12,25 +12,25 @@ declare type DocumentationConfig = {
   parseExtension: Array<string>
 };
 
-declare type InputsConfig = {
+type InputsConfig = {
   inputs: Array<SourceFile>,
   config: DocumentationConfig
 };
 
-declare type CommentError = {
+type CommentError = {
   message: string,
   commentLineNumber?: number
 };
 
-declare type DoctrineType = {
+type DoctrineType = {
   elements?: Array<DoctrineType>,
   expression?: DoctrineType,
   applications?: Array<DoctrineType>,
   type: string,
   name?: string
 };
 
-declare type CommentLoc = {
+type CommentLoc = {
   start: {
     line: number
   },
@@ -39,12 +39,12 @@ declare type CommentLoc = {
   }
 };
 
-declare type SourceFile = {
+type SourceFile = {
   source?: string,
   file: string
 };
 
-declare type CommentContext = {
+type CommentContext = {
   sortKey: string,
   file: string,
   ast: Object,
@@ -53,16 +53,16 @@ declare type CommentContext = {
   github?: CommentContextGitHub
 };
 
-declare type CommentContextGitHub = {
+type CommentContextGitHub = {
   path: string,
   url: string
 };
 
-declare type CommentTagBase = {
+type CommentTagBase = {
   title: string
 };
 
-declare type CommentTag = CommentTagBase & {
+type CommentTag = CommentTagBase & {
   name?: string,
   title: string,
   description?: Object,
@@ -72,7 +72,7 @@ declare type CommentTag = CommentTagBase & {
   properties?: Array<CommentTag>
 };
 
-declare type CommentTagNamed = CommentTag & {
+type CommentTagNamed = CommentTag & {
   name?: string,
   title: string,
   description?: Object,
@@ -82,27 +82,27 @@ declare type CommentTagNamed = CommentTag & {
   properties?: Array<CommentTag>
 };
 
-declare type CommentMembers = {
+type CommentMembers = {
   static: Array<Comment>,
   instance: Array<Comment>,
   events: Array<Comment>,
   global: Array<Comment>,
   inner: Array<Comment>
 };
 
-declare type CommentExample = {
+type CommentExample = {
   caption?: string,
   description?: Object
 };
 
-declare type Remark = {
+type Remark = {
   type: string,
   children: Array<Object>
 };
 
-declare type Access = 'private' | 'public' | 'protected';
-declare type Scope = 'instance' | 'static' | 'inner' | 'global';
-declare type Kind =
+type Access = 'private' | 'public' | 'protected';
+type Scope = 'instance' | 'static' | 'inner' | 'global';
+type Kind =
   | 'class'
   | 'constant'
   | 'event'
@@ -116,7 +116,7 @@ declare type Kind =
   | 'typedef'
   | 'interface';
 
-declare type Comment = {
+type Comment = {
   errors: Array<CommentError>,
   tags: Array<CommentTag>,
 
@@ -163,7 +163,7 @@ declare type Comment = {
   }>
 };
 
-declare type ReducedComment = {
+type ReducedComment = {
   name: string,
   kind: ?Kind,
   scope?: ?Scope

lib/infer/params.js

@@ -9,7 +9,6 @@ const flowDoctrine = require('../flow_doctrine');
 const util = require('util');
 const debuglog = util.debuglog('infer');
 
-// TODO: use a constant
 const PATH_SPLIT_CAPTURING = /(\[])?(\.)/g;
 
 function addPrefix(doc /*: CommentTagNamed */, prefix) {

lib/nest.js

@@ -5,7 +5,7 @@ var _ = require('lodash');
 
 const PATH_SPLIT = /(?:\[])?\./g;
 
-function rejectUnnamedTags(
+function removeUnnamedTags(
   tags /*: Array<CommentTag> */
 ) /*: Array<CommentTagNamed> */ {
   return tags.filter(tag => typeof tag.name === 'string');
@@ -42,7 +42,7 @@ var nestTag = (
   // Use lodash here both for brevity and also because, unlike JavaScript's
   // sort, it's stable.
 ) =>
-  _.sortBy(rejectUnnamedTags(tags), tagDepth).reduce(
+  _.sortBy(removeUnnamedTags(tags), tagDepth).reduce(
     (memo, tag) => {
       function insertTag(node, parts) {
         // The 'done' case: we're at parts.length === 1,

test/lib/infer/params.js

@@ -130,6 +130,37 @@ test('inferParams', function(t) {
     [{ lineNumber: 3, name: 'x', title: 'param' }]
   );
 
+  t.deepEqual(
+    evaluate(`/** Test */function f({ x, ...xs }) {};`).params,
+    [
+      {
+        title: 'param',
+        name: '$0',
+        anonymous: true,
+        type: {
+          type: 'NameExpression',
+          name: 'Object'
+        },
+        properties: [
+          {
+            title: 'param',
+            name: '$0.x',
+            lineNumber: 1
+          },
+          {
+            title: 'param',
+            name: '$0.xs',
+            lineNumber: 1,
+            type: {
+              type: 'RestType'
+            }
+          }
+        ]
+      }
+    ],
+    'object spread property'
+  );
+
   t.deepEqual(
     evaluate(function() {
       /**