fix: handle references for shapes correctly (#262)

Author: KnisterPeter

src/types.ts

@@ -86,7 +86,7 @@ function getComplexType(ast: AstQuery, propertyAst: any,
       const enumEntries = getEnumValues(ast, typeAst.arguments[0]);
       return getTypeDeclaration(dom.create.union(enumEntries as dom.Type[]), !required);
     case 'shape':
-      const entries = typeAst.arguments[0].properties.map((entry: any) => {
+      const entries = getShapeProperties(ast, typeAst.arguments[0]).map((entry: any) => {
         const typeDecl = get(ast, entry.value, propTypesName);
         return dom.create.property(entry.key.name, typeDecl.type,
           typeDecl.optional ? dom.DeclarationFlags.Optional : dom.DeclarationFlags.None);
@@ -151,3 +151,16 @@ function getEnumValues(ast: AstQuery, oneOfTypes: any): any[] {
     return 'any';
   });
 }
+
+function getShapeProperties(ast: AstQuery, input: any): any[] {
+  if (input.type === 'Identifier') {
+    const res = ast.query(`
+      //VariableDeclarator[
+        /:id Identifier[@name == '${input.name}']
+      ]
+      /:init *
+    `);
+    return res[0].properties;
+  }
+  return input.properties;
+}

tests/references-in-proptypes.d.ts

@@ -2,6 +2,9 @@ declare module 'component' {
     import * as React from 'react';
     export interface SomeComponentProps {
         someEnum?: 'foo' | 'bar';
+        someShape?: {
+            string?: string;
+        };
     }
     export default class SomeComponent extends React.Component<SomeComponentProps, any>{
     }

tests/references-in-proptypes.jsx

@@ -1,9 +1,11 @@
 import React from 'react';
 
 const fooOrBar = ['foo', 'bar'];
+const shape = { string: React.PropTypes.string };
 
 export default class SomeComponent extends React.Component {
    static propTypes = {
-     someEnum: React.PropTypes.oneOf(fooOrBar)
+     someEnum: React.PropTypes.oneOf(fooOrBar),
+     someShape: React.PropTypes.shape(shape)
    };
 }