Continue to close the gap with flow (#520)

* Adds test support for flow difference
* New support for FunctionTypeAnnotation
* New support for ObjectTypeAnnotation
* New support for MixedTypeAnnotation

Author: tmcw

lib/flow_doctrine.js

@@ -1,12 +1,12 @@
 var namedTypes = {
   'NumberTypeAnnotation': 'number',
   'BooleanTypeAnnotation': 'boolean',
-  'ObjectTypeAnnotation': 'Object',
   'StringTypeAnnotation': 'string'
 };
 
 var oneToOne = {
   'AnyTypeAnnotation': 'AllLiteral',
+  'MixedTypeAnnotation': 'AllLiteral',
   'NullLiteralTypeAnnotation': 'NullLiteral',
   'VoidTypeAnnotation': 'VoidLiteral'
 };
@@ -17,6 +17,14 @@ var literalTypes = {
   'StringLiteralTypeAnnotation': 'StringLiteral'
 };
 
+function propertyToField(property) {
+  return {
+    type: 'FieldType',
+    key: property.key.name,
+    value: flowDoctrine(property.value)
+  };
+}
+
 /**
  * Babel parses Flow annotations in JavaScript into AST nodes. documentation.js uses
  * Babel to parse JavaScript. This method restructures those Babel-generated
@@ -71,6 +79,20 @@ function flowDoctrine(type) {
       applications: [flowDoctrine(type.elementType)]
     };
 
+  // (y: number) => bool
+  case 'FunctionTypeAnnotation':
+    return {
+      type: 'FunctionType',
+      params: type.params.map(function (param) {
+        return {
+          type: 'ParameterType',
+          name: param.name.name,
+          expression: flowDoctrine(param.typeAnnotation)
+        };
+      }),
+      result: flowDoctrine(type.returnType)
+    };
+
   case 'GenericTypeAnnotation':
     if (type.typeParameters) {
       return {
@@ -83,6 +105,19 @@ function flowDoctrine(type) {
       };
     }
 
+    return {
+      type: 'NameExpression',
+      name: type.id.name
+    };
+
+  case 'ObjectTypeAnnotation':
+    if (type.properties) {
+      return {
+        type: 'RecordType',
+        fields: type.properties.map(propertyToField)
+      };
+    }
+
     return {
       type: 'NameExpression',
       name: type.id.name

test/fixture/sync/flow-types.input.js

@@ -52,3 +52,11 @@ function veryImportantTransform(
  * Function with optional parameter.
  */
 function optionalFunc(x: number = 42) {}
+
+/**
+ * Function with object parameter.
+ */
+function objectParamFn(x: { a: number }) {}
+
+/** hi */
+function objectParamFn(x: (y:Foo) => Bar) {}