From 7fc6ca8f73113f9f1d9309b878a12c3bc9ac589b Mon Sep 17 00:00:00 2001 From: Martin Broder Date: Thu, 14 Sep 2017 17:27:24 +0200 Subject: [PATCH] fix: special property names in flowtypes --- src/flow_doctrine.js | 2 +- src/infer/params.js | 4 ++-- src/infer/properties.js | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/flow_doctrine.js b/src/flow_doctrine.js index 25f18f756..208df57d8 100644 --- a/src/flow_doctrine.js +++ b/src/flow_doctrine.js @@ -27,7 +27,7 @@ function propertyToField(property) { } return { type: 'FieldType', - key: property.key.name, + key: property.key.name || property.key.value, value: type }; } diff --git a/src/infer/params.js b/src/infer/params.js index 17f8ad543..ba99d707f 100644 --- a/src/infer/params.js +++ b/src/infer/params.js @@ -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) diff --git a/src/infer/properties.js b/src/infer/properties.js index 19b63dd95..12d9639ee 100644 --- a/src/infer/properties.js +++ b/src/infer/properties.js @@ -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', @@ -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 };