covered more flow edge cases

Author: Keyan Zhang

transforms/__testfixtures__/class-flow6.input.js

@@ -0,0 +1,39 @@
+/* @flow */
+
+var React = require('react');
+
+const justNeedKeys = {
+  a: 12,
+  b: 23,
+};
+
+var Component = React.createClass({
+  propTypes: {
+    optionalMessage: React.PropTypes.instanceOf(Message),
+    optionalMessageOops: React.PropTypes.instanceOf(foo()),
+    optionalEnum: React.PropTypes.oneOf(Object.keys(justNeedKeys)),
+    optionalEnumOops: React.PropTypes.oneOf(bar),
+    optionalUnion: React.PropTypes.oneOfType([
+      React.PropTypes.string,
+      React.PropTypes.number,
+      React.PropTypes.instanceOf(Message),
+    ]),
+    optionalUnionOops: React.PropTypes.oneOfType(foo()),
+    optionalUnionOops2: React.PropTypes.oneOfType(Bar),
+    optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
+    optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
+    optionalObjectWithShape: React.PropTypes.shape({
+      color: React.PropTypes.string,
+      fontSize: foo,
+      name: bla(),
+    }),
+    optionalObjectWithShapeOops: React.PropTypes.shape(foo()),
+    optionalObjectWithShapeOops2: React.PropTypes.shape(bla),
+  },
+
+  render: function() {
+    return (
+      <div>type safety</div>
+    );
+  },
+});

transforms/__testfixtures__/class-flow6.output.js

@@ -0,0 +1,58 @@
+/* @flow */
+
+var React = require('react');
+
+const justNeedKeys = {
+  a: 12,
+  b: 23,
+};
+
+class Component extends React.Component {
+  props: {
+    optionalMessage?: Message,
+    optionalMessageOops?: any,
+    optionalEnum?: any,
+    optionalEnumOops?: any,
+    optionalUnion?: string | number | Message,
+    optionalUnionOops?: any,
+    optionalUnionOops2?: any,
+    optionalArrayOf?: Array<number>,
+    optionalObjectOf?: {[key: string]: number,},
+    optionalObjectWithShape?: {
+      color?: string,
+      fontSize?: any,
+      name?: any,
+    },
+    optionalObjectWithShapeOops?: any,
+    optionalObjectWithShapeOops2?: any,
+  };
+
+  static propTypes = {
+    optionalMessage: React.PropTypes.instanceOf(Message),
+    optionalMessageOops: React.PropTypes.instanceOf(foo()),
+    optionalEnum: React.PropTypes.oneOf(Object.keys(justNeedKeys)),
+    optionalEnumOops: React.PropTypes.oneOf(bar),
+    optionalUnion: React.PropTypes.oneOfType([
+      React.PropTypes.string,
+      React.PropTypes.number,
+      React.PropTypes.instanceOf(Message),
+    ]),
+    optionalUnionOops: React.PropTypes.oneOfType(foo()),
+    optionalUnionOops2: React.PropTypes.oneOfType(Bar),
+    optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
+    optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
+    optionalObjectWithShape: React.PropTypes.shape({
+      color: React.PropTypes.string,
+      fontSize: foo,
+      name: bla(),
+    }),
+    optionalObjectWithShapeOops: React.PropTypes.shape(foo()),
+    optionalObjectWithShapeOops2: React.PropTypes.shape(bla),
+  };
+
+  render() {
+    return (
+      <div>type safety</div>
+    );
+  }
+}

transforms/__tests__/class-test.js

@@ -29,3 +29,4 @@ defineTest(__dirname, 'class', {flow: true}, 'class-flow2');
 defineTest(__dirname, 'class', {flow: true}, 'class-flow3');
 defineTest(__dirname, 'class', {flow: true}, 'class-flow4');
 defineTest(__dirname, 'class', {flow: true}, 'class-flow5');
+defineTest(__dirname, 'class', {flow: true}, 'class-flow6');

transforms/class.js

@@ -684,7 +684,7 @@ module.exports = (file, api, options) => {
         }
         case 'oneOf': {
           const argList = cursor.arguments[0].elements;
-          if (!argList.every(node => node.type === 'Literal')) {
+          if (!argList || !argList.every(node => node.type === 'Literal')) {
             typeResult = flowAnyType;
           } else {
             typeResult = constructor(
@@ -695,25 +695,33 @@ module.exports = (file, api, options) => {
         }
         case 'oneOfType': {
           const argList = cursor.arguments[0].elements;
-          typeResult = constructor(
-            argList.map(arg => propTypeToFlowAnnotation(arg)[0])
-          );
+          if (!argList) {
+            typeResult = flowAnyType;
+          } else {
+            typeResult = constructor(
+              argList.map(arg => propTypeToFlowAnnotation(arg)[0])
+            );
+          }
           break;
         }
         case 'shape': {
           const rawPropList = cursor.arguments[0].properties;
-          const flowPropList = [];
-          rawPropList.forEach(typeProp => {
-            const name = typeProp.key.name;
-            const [valueType, isOptional] = propTypeToFlowAnnotation(typeProp.value);
-            flowPropList.push(j.objectTypeProperty(
-              j.identifier(name),
-              valueType,
-              isOptional
-            ));
-          });
-
-          typeResult = constructor(flowPropList);
+          if (!rawPropList) {
+            typeResult = flowAnyType;
+          } else {
+            const flowPropList = [];
+            rawPropList.forEach(typeProp => {
+              const name = typeProp.key.name;
+              const [valueType, isOptional] = propTypeToFlowAnnotation(typeProp.value);
+              flowPropList.push(j.objectTypeProperty(
+                j.identifier(name),
+                valueType,
+                isOptional
+              ));
+            });
+
+            typeResult = constructor(flowPropList);
+          }
           break;
         }
       }