feat: implement shape propType (#219)

KnisterPeter · Nov 4, 2016 · 6876062 · 6876062
1 parent d6d7d1e
commit 6876062
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -59,6 +59,13 @@ export function get(astq: astqts.ASTQ, propertyAst: any, propTypesName: string|u
       // FIXME: This should better be a real enum
       const enumEntries = getEnumValues(typeAst.arguments[0].elements);
       return getTypeDeclaration(dom.create.union(enumEntries as dom.Type[]), !required);
+    case 'shape':
+      const entries = typeAst.arguments[0].properties.map((entry: any) => {
+        const typeDecl = get(astq, entry.value, propTypesName);
+        return dom.create.property(entry.key.name, typeDecl.type,
+          typeDecl.optional ? dom.DeclarationFlags.Optional : dom.DeclarationFlags.None);
+      });
+      return getTypeDeclaration(dom.create.objectType(entries), !required);
   }
 
   return {

diff --git a/tests/es6-class.d.ts b/tests/es6-class.d.ts
@@ -18,6 +18,10 @@ declare module 'component' {
         optionalEnum?: 'News' | 'Photos' | 1 | 2;
         optionalUnion?: string | number;
         optionalArrayOf?: number[];
+        optionalObjectWithShape?: {
+            color?: string;
+            fontSize?: number;
+        };
         requiredFunc: (...args: any[])=>any;
         requiredAny: any;
         requiredUnion: any[] | boolean;

diff --git a/tests/es6-class.jsx b/tests/es6-class.jsx
@@ -30,10 +30,10 @@ Component.propTypes = {
 	]),
 	optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
 	//optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
-	//optionalObjectWithShape: React.PropTypes.shape({
-	//	color: React.PropTypes.string,
-	//	fontSize: React.PropTypes.number
-	//}),
+	optionalObjectWithShape: React.PropTypes.shape({
+		color: React.PropTypes.string,
+		fontSize: React.PropTypes.number
+	}),
 	requiredFunc: React.PropTypes.func.isRequired,
 	requiredAny: React.PropTypes.any.isRequired,
 	requiredUnion: React.PropTypes.oneOfType([