fix: Handle ObjectTypeSpreadProperties which are not resolvable

reactjs · May 28, 2022 · 4b8b721 · 4b8b721
1 parent 3e6ed53
commit 4b8b721
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 8 deletions.
diff --git a/src/utils/__tests__/__snapshots__/getFlowType-test.ts.snap b/src/utils/__tests__/__snapshots__/getFlowType-test.ts.snap
@@ -120,3 +120,29 @@ Object {
   "type": "object",
 }
 `;
+
+exports[`getFlowType handles unresolved ObjectTypeSpreadProperty 1`] = `
+Object {
+  "name": "signature",
+  "raw": "{| apple: string, banana: string, ...MyType |}",
+  "signature": Object {
+    "properties": Array [
+      Object {
+        "key": "apple",
+        "value": Object {
+          "name": "string",
+          "required": true,
+        },
+      },
+      Object {
+        "key": "banana",
+        "value": Object {
+          "name": "string",
+          "required": true,
+        },
+      },
+    ],
+  },
+  "type": "object",
+}
+`;
diff --git a/src/utils/__tests__/getFlowType-test.ts b/src/utils/__tests__/getFlowType-test.ts
@@ -1296,6 +1296,18 @@ describe('getFlowType', () => {
     expect(getFlowType(typePath, null, mockImporter)).toMatchSnapshot();
   });
 
+  it('handles unresolved ObjectTypeSpreadProperty', () => {
+    const typePath = statement(`
+      var x: {| apple: string, banana: string, ...MyType |} = 2;
+    `)
+      .get('declarations', 0)
+      .get('id')
+      .get('typeAnnotation')
+      .get('typeAnnotation');
+
+    expect(getFlowType(typePath, null, mockImporter)).toMatchSnapshot();
+  });
+
   it('handles nested ObjectTypeSpreadProperty', () => {
     const typePath = statement(`
       var x: {| apple: string, banana: string, ...BreakfastFruits |} = 2;

diff --git a/src/utils/getFlowType.ts b/src/utils/getFlowType.ts
@@ -221,18 +221,21 @@ function handleObjectTypeAnnotation(
       });
     } else if (t.ObjectTypeSpreadProperty.check(param.node)) {
       let spreadObject = resolveToValue(param.get('argument'), importer);
-      if (t.GenericTypeAnnotation.check(spreadObject.value)) {
+      if (t.GenericTypeAnnotation.check(spreadObject.node)) {
         const typeAlias = resolveToValue(spreadObject.get('id'), importer);
-        if (t.ObjectTypeAnnotation.check(typeAlias.get('right').value)) {
+        if (t.ObjectTypeAnnotation.check(typeAlias.get('right').node)) {
           spreadObject = resolveToValue(typeAlias.get('right'), importer);
         }
       }
-      const props = handleObjectTypeAnnotation(
-        spreadObject,
-        typeParams,
-        importer,
-      ) as ObjectSignatureType;
-      type.signature.properties.push(...props.signature.properties);
+
+      if (t.ObjectTypeAnnotation.check(spreadObject.node)) {
+        const props = handleObjectTypeAnnotation(
+          spreadObject,
+          typeParams,
+          importer,
+        ) as ObjectSignatureType;
+        type.signature.properties.push(...props.signature.properties);
+      }
     }
   });