Add support for spread with ReadOnlyArray

Summary: The new support for ReadOnlyArray needs to call this new function for spreads too. Reviewed By: JoshuaGross Differential Revision: D16823796 fbshipit-source-id: 9de94b41cdead7ce5238c77a9e39b5daf760dfe2
davidbiedenbach · Aug 15, 2019 · 6c3b01d · 6c3b01d
1 parent c8b9a3f
commit 6c3b01d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 3 deletions.
diff --git a/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js
@@ -490,6 +490,8 @@ export type ModuleProps = $ReadOnly<{|
   localType: $ReadOnly<{|
     ...PropsInFile
   |}>
+
+  localArr: $ReadOnlyArray<PropsInFile>
 |}>;
 
 export default (codegenNativeComponent<ModuleProps>(

diff --git a/...codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap b/...codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
@@ -5515,6 +5515,42 @@ Object {
                 "type": "ObjectTypeAnnotation",
               },
             },
+            Object {
+              "name": "localArr",
+              "optional": false,
+              "typeAnnotation": Object {
+                "elementType": Object {
+                  "properties": Array [
+                    Object {
+                      "name": "otherStringProp",
+                      "optional": false,
+                      "typeAnnotation": Object {
+                        "default": null,
+                        "type": "StringTypeAnnotation",
+                      },
+                    },
+                    Object {
+                      "name": "isEnabled",
+                      "optional": false,
+                      "typeAnnotation": Object {
+                        "default": false,
+                        "type": "BooleanTypeAnnotation",
+                      },
+                    },
+                    Object {
+                      "name": "label",
+                      "optional": false,
+                      "typeAnnotation": Object {
+                        "default": null,
+                        "type": "StringTypeAnnotation",
+                      },
+                    },
+                  ],
+                  "type": "ObjectTypeAnnotation",
+                },
+                "type": "ArrayTypeAnnotation",
+              },
+            },
           ],
         },
       },

diff --git a/packages/react-native-codegen/src/parsers/flow/components/props.js b/packages/react-native-codegen/src/parsers/flow/components/props.js
@@ -50,9 +50,12 @@ function getTypeAnnotationForArray(name, typeAnnotation, defaultValue, types) {
     if (objectType.id.name === '$ReadOnly') {
       return {
         type: 'ObjectTypeAnnotation',
-        properties: objectType.typeParameters.params[0].properties.map(prop =>
-          buildPropSchema(prop, types),
-        ),
+        properties: flattenProperties(
+          objectType.typeParameters.params[0].properties,
+          types,
+        )
+          .map(prop => buildPropSchema(prop, types))
+          .filter(Boolean),
       };
     }
   }