Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions __tests__/lib/infer/type.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,28 @@ test('inferType', function() {
type: 'TypeApplication'
});

expect(evaluate('/** */' + "type V = {a:number,'b':string}").type).toEqual({
fields: [
{
key: 'a',
type: 'FieldType',
value: {
name: 'number',
type: 'NameExpression'
}
},
{
key: 'b',
type: 'FieldType',
value: {
name: 'string',
type: 'NameExpression'
}
}
],
type: 'RecordType'
});

expect(evaluate('/** */' + 'type V = Array<T>').type).toEqual({
applications: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/flow_doctrine.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function propertyToField(property) {
}
return {
type: 'FieldType',
key: property.key.name,
key: property.key.name || property.key.value,
value: type
};
}
Expand Down
4 changes: 2 additions & 2 deletions src/infer/params.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ function paramToDoc(
});
}
case 'ObjectProperty': {
return _.assign(paramToDoc(param.value, prefix + '.' + param.key.name), {
name: prefix + '.' + param.key.name
return _.assign(paramToDoc(param.value, prefix + '.' + param.key.name || param.key.value), {
name: prefix + '.' + param.key.name || param.key.value
});
}
case 'RestProperty': // (a, ...b)
Expand Down
3 changes: 2 additions & 1 deletion src/infer/properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ function prefixedName(name, prefix) {

function propertyToDoc(property, prefix): CommentTag {
var type = flowDoctrine(property.value);
var name = property.key.name || property.key.value
if (property.optional) {
type = {
type: 'OptionalType',
Expand All @@ -20,7 +21,7 @@ function propertyToDoc(property, prefix): CommentTag {
}
return {
title: 'property',
name: prefixedName(property.key.name, prefix),
name: prefixedName(name, prefix),
lineNumber: property.loc.start.line,
type
};
Expand Down