1 files changed, 11 insertions, 1 deletions

diff --git a/ddl/Language.hs b/ddl/Language.hs
index 989314a..afa87fa 100644
--- a/ddl/Language.hs
+++ b/ddl/Language.hs
@@ -83,7 +83,17 @@ data Type
 
 collectTypes :: AliasMap -> ModuleDef -> Set Type
 collectTypes aliasMap ModuleDef{..} = Set.fromList $ map (normalize aliasMap) $ concat
-  [Data dataName : [fieldType | ConstructorDef{..} <- constructors, Field{..} <- fields] | DataDef{..} <- definitions]
+  [Data dataName : concatMap flatType [fieldType | ConstructorDef{..} <- constructors, Field{..} <- fields] | DataDef{..} <- definitions]
+ where
+  flatType t = case t of
+    V2 a    -> [t,a]
+    V3 a    -> [t,a]
+    V4 a    -> [t,a]
+    Array a -> [t,a]
+    List a  -> [t,a]
+    Maybe a -> [t,a]
+    Map k v -> [t,k,v]
+    _ -> [t]
 
 parens :: String -> String
 parens a