added support for flow property initializers

Author: Keyan Zhang

transforms/__testfixtures__/class-flow5.input.js

@@ -0,0 +1,35 @@
+/* @flow */
+
+var React = require('react');
+
+var Component = React.createClass({
+  statics: {
+    notTyped: true,
+    numberOrBool: (true: number | boolean),
+    logger: (x: any): void => { console.log(x); },
+    logger2: function(x: any): void {
+      console.log(x);
+    },
+  },
+
+  notTyped: true,
+  foo: (12: number),
+  bar: ('2000': string),
+  handleClick: (null: ?(evt: any) => void),
+
+  doStuff: function(x: number, y: boolean): boolean {
+    return y && (x > 0);
+  },
+
+  componentDidMount: function() {
+    this.handleClick = function(e) {
+      console.log(e);
+    };
+  },
+
+  render: function() {
+    return (
+      <div onClick={this.handleClick}>{this.foo}</div>
+    );
+  },
+});

transforms/__testfixtures__/class-flow5.output.js

@@ -0,0 +1,34 @@
+/* @flow */
+
+var React = require('react');
+
+class Component extends React.Component {
+  static notTyped = true;
+  static numberOrBool: number | boolean = true;
+  static logger = (x: any): void => { console.log(x); };
+
+  static logger2(x: any): void {
+    console.log(x);
+  }
+
+  notTyped = true;
+  foo: number = 12;
+  bar: string = '2000';
+  handleClick: ?(evt: any) => void = null;
+
+  doStuff = (x: number, y: boolean): boolean => {
+    return y && (x > 0);
+  };
+
+  componentDidMount() {
+    this.handleClick = function(e) {
+      console.log(e);
+    };
+  }
+
+  render() {
+    return (
+      <div onClick={this.handleClick}>{this.foo}</div>
+    );
+  }
+}

transforms/__tests__/class-test.js

@@ -27,3 +27,4 @@ defineTest(__dirname, 'class', { flow: true }, 'class-flow1');
 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');

transforms/class.js

@@ -107,6 +107,7 @@ module.exports = (file, api, options) => {
         !filterGetInitialStateField(prop) &&
         !isFunctionExpression(prop) &&
         !isPrimProperty(prop) &&
+        !isPrimPropertyWithTypeAnnotation(prop) &&
         MIXIN_KEY != prop.key.name
       )
     ));
@@ -174,8 +175,16 @@ module.exports = (file, api, options) => {
     isPrimExpression(prop.value)
   );
 
+  const isPrimPropertyWithTypeAnnotation = prop => (
+    prop.key &&
+    prop.key.type === 'Identifier' &&
+    prop.value &&
+    prop.value.type === 'TypeCastExpression' &&
+    isPrimExpression(prop.value.expression)
+  );
+
   const isPrimExpression = node => (
-    node.type === 'Literal' || ( // TODO this might change in babylon v6
+    node.type === 'Literal' || ( // NOTE this might change in babylon v6
       node.type === 'Identifier' &&
       node.name === 'undefined'
   ));
@@ -204,7 +213,11 @@ module.exports = (file, api, options) => {
     .filter(prop =>
       !(filterDefaultPropsField(prop) || filterGetInitialStateField(prop))
     )
-    .filter(prop => isFunctionExpression(prop) || isPrimProperty(prop));
+    .filter(prop =>
+      isFunctionExpression(prop) ||
+      isPrimPropertyWithTypeAnnotation(prop) ||
+      isPrimProperty(prop)
+    );
 
   const findRequirePathAndBinding = (moduleName) => {
     let result = null;
@@ -407,6 +420,14 @@ module.exports = (file, api, options) => {
       false
     ), prop);
 
+  const createClassPropertyWithType = prop =>
+    withComments(j.classProperty(
+      j.identifier(prop.key.name),
+      prop.value.expression,
+      prop.value.typeAnnotation,
+      false
+    ), prop);
+
   // ---------------------------------------------------------------------------
   // Flow!
 
@@ -626,7 +647,9 @@ module.exports = (file, api, options) => {
     }
 
     const propertiesAndMethods = rawProperties.map(prop => {
-      if (isPrimProperty(prop)) {
+      if (isPrimPropertyWithTypeAnnotation(prop)) {
+        return createClassPropertyWithType(prop);
+      } else if (isPrimProperty(prop)) {
         return createClassProperty(prop);
       } else if (AUTOBIND_IGNORE_KEYS[prop.key.name]) {
         return createMethodDefinition(prop);
@@ -670,6 +693,15 @@ module.exports = (file, api, options) => {
       ), staticProperty);
     }
 
+    if (staticProperty.value.type === 'TypeCastExpression') {
+      return withComments(j.classProperty(
+        j.identifier(staticProperty.key.name),
+        staticProperty.value.expression,
+        staticProperty.value.typeAnnotation,
+        true
+      ), staticProperty);
+    }
+
     return withComments(j.classProperty(
       j.identifier(staticProperty.key.name),
       staticProperty.value,