feat: Added union proptypes

Author: KnisterPeter

Diff for: index.ts

@@ -1,6 +1,21 @@
 import * as fs from 'fs';
 import * as babylon from 'babylon';
 
+interface IASTNode {
+  type: string;
+  loc: Object;
+  [name: string]: any;
+}
+
+interface IProp {
+  type: string;
+  optional: boolean;
+}
+
+interface IPropTypes {
+  [name: string]: IProp;
+}
+
 export function cli(options: any): void {
   const stdinCode: string[] = [];
   process.stdin.on('readable', () => {
@@ -51,7 +66,7 @@ export function generate(name: string, code: string): string {
     walk(ast.program, {
       'ExportDefaultDeclaration': (node: any) => {
         let classname: string;
-        let propTypes: any = false;
+        let propTypes: IPropTypes = undefined;
         walk(node, {
           'ClassDeclaration': (node: any) => {
             classname = node.id.name;
@@ -80,7 +95,7 @@ export function generate(name: string, code: string): string {
   return writer.toString();
 }
 
-function walk(node: any, handlers: any): void {
+function walk(node: IASTNode, handlers: any): void {
   if (isNode(node)) {
     if (typeof handlers[node.type] == 'function') {
       handlers[node.type](node);
@@ -98,7 +113,7 @@ function walk(node: any, handlers: any): void {
   }
 }
 
-function isNode(obj: any): boolean {
+function isNode(obj: IASTNode): boolean {
   return obj && typeof obj.type != 'undefined' && typeof obj.loc != 'undefined';
 }
 
@@ -107,11 +122,20 @@ function getReactPropTypeFromExpression(node: any): any {
       && node.object.object.name == 'React' && node.object.property.name == 'PropTypes') {
     return node.property;
   } else if (node.type == 'CallExpression') {
-    if (getReactPropTypeFromExpression(node.callee).name == 'arrayOf') {
-      return {
-        name: 'array',
-        arrayType: getReactPropTypeFromExpression(node.arguments[0])
-      };
+    const callType: any = getReactPropTypeFromExpression(node.callee);
+    switch (callType.name) {
+      case 'arrayOf':
+        return {
+          name: 'array',
+          arrayType: getTypeFromPropType(node.arguments[0]).type
+        };
+      case 'oneOfType':
+        return {
+          name: 'union',
+          types: node.arguments[0].elements.map((element: IASTNode) => {
+            return getTypeFromPropType(element).type;
+          })
+        };
     }
   }
   return 'undefined';
@@ -125,12 +149,7 @@ function isRequiredPropType(node: any): any {
   };
 }
 
-interface IProperty {
-  type: string;
-  optional: boolean;
-}
-
-export function getTypeFromPropType(node: any): IProperty {
+export function getTypeFromPropType(node: IASTNode): IProp {
   const result: any = {
     type: 'any',
     optional: true
@@ -143,8 +162,7 @@ export function getTypeFromPropType(node: any): IProperty {
         result.type = 'any';
         break;
       case 'array':
-        let arrayType: any = type.arrayType || {name: 'any'};
-        result.type = arrayType.name + '[]';
+        result.type = (type.arrayType || 'any') + '[]';
         break;
       case 'bool':
         result.type = 'boolean';
@@ -167,6 +185,9 @@ export function getTypeFromPropType(node: any): IProperty {
       case 'element':
         result.type = 'React.ReactElement<any>';
         break;
+      case 'union':
+        result.type = type.types.map((unionType: string) => unionType).join('|');
+        break;
     }
   }
   return result;
@@ -217,7 +238,7 @@ export class Writer {
     this.interface(`${name}Props`, () => {
       this.prop('key', 'any', true);
       Object.keys(props).forEach((propName: any) => {
-        const prop: IProperty = props[propName];
+        const prop: IProp = props[propName];
         this.prop(propName, prop.type, prop.optional);
       });
     });

Diff for: tests/parse-prop-types-test.ts

@@ -12,7 +12,11 @@ describe('The PropType parser', () => {
       }
     };
   it('should return any on unknown PropTypes', () => {
-    assert.deepEqual(getTypeFromPropType({}), {type: 'any', optional: true});
+    const ast: any = {
+      type: '',
+      loc: {}
+    };
+    assert.deepEqual(getTypeFromPropType(ast), {type: 'any', optional: true});
   });
   it('should return any[] for generic array prop types', () => {
     const ast: any = {
@@ -148,4 +152,45 @@ describe('The PropType parser', () => {
     assert.equal(result.type, 'number[]');
     assert.equal(result.optional, true);
   });
+  it('should return number|string for oneOfType([React.PropTypes.number, React.PropTypes.string]) prop types', () => {
+    const ast: any = {
+      type: 'CallExpression',
+      loc: {},
+      callee: {
+        type: 'MemberExpression',
+        loc: {},
+        object: reactPropTypesMemberExpression,
+        property: {
+          name: 'oneOfType'
+        }
+      },
+      arguments: [
+        {
+          type: 'ArrayExpression',
+          loc: {},
+          elements: [
+            {
+              type: 'MemberExpression',
+              loc: {},
+              object: reactPropTypesMemberExpression,
+              property: {
+                name: 'number'
+              }
+            },
+            {
+              type: 'MemberExpression',
+              loc: {},
+              object: reactPropTypesMemberExpression,
+              property: {
+                name: 'string'
+              }
+            }
+          ]
+        }
+      ]
+    };
+    const result: any = getTypeFromPropType(ast);
+    assert.equal(result.type, 'number|string');
+    assert.equal(result.optional, true);
+  });
 });

Diff for: tests/simple-component.d.ts

@@ -12,9 +12,11 @@ declare module 'simple-component' {
 		optionalString?: string;
 		optionalNode?: React.ReactNode;
 		optionalElement?: React.ReactElement<any>;
+		optionalUnion?: string|number;
 		optionalArrayOf?: number[];
 		requiredFunc: (...args: any[]) => any;
 		requiredAny: any;
+		requiredUnion: any[]|boolean;
 		requiredArrayOf: string[];
 	}
 

Diff for: tests/simple-component.jsx

@@ -14,11 +14,10 @@ export default class SimpleComponent extends React.Component {
 		optionalElement: React.PropTypes.element,
 		//optionalMessage: React.PropTypes.instanceOf(Message),
 		//optionalEnum: React.PropTypes.oneOf(['News', 'Photos']),
-		//optionalUnion: React.PropTypes.oneOfType([
-		//	React.PropTypes.string,
-		//	React.PropTypes.number,
-		//	React.PropTypes.instanceOf(Message)
-		//]),
+		optionalUnion: React.PropTypes.oneOfType([
+			React.PropTypes.string,
+			React.PropTypes.number
+		]),
 		optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
 		//optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
 		//optionalObjectWithShape: React.PropTypes.shape({
@@ -27,7 +26,11 @@ export default class SimpleComponent extends React.Component {
 		//}),
 		requiredFunc: React.PropTypes.func.isRequired,
 		requiredAny: React.PropTypes.any.isRequired,
-    requiredArrayOf: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
+		requiredUnion: React.PropTypes.oneOfType([
+			React.PropTypes.array,
+			React.PropTypes.bool
+		]).isRequired,
+		requiredArrayOf: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
 	};
 
 	render() {

Diff for: tslint.json

@@ -65,7 +65,7 @@
       true,
       {
         "call-signature": "nospace",
-        "index-signature": "space",
+        "index-signature": "nospace",
         "parameter": "nospace",
         "property-declaration": "nospace",
         "variable-declaration": "nospace"