include immediate parents for containers...

...and exclude grandparents. The immediate parents are needed to make
sure that we don't miss them when computing closures. The grandparents
are not needed -- we'll get them through the immediate parents.

Author: bitonic

src/Data/Aeson/TypeScript/Instances.hs

@@ -45,7 +45,7 @@ instance TypeScript Char where
 
 instance {-# OVERLAPPABLE #-} (TypeScript a) => TypeScript [a] where
   getTypeScriptType _ = (getTypeScriptType (Proxy :: Proxy a)) ++ "[]"
-  getParentTypes _ = (TSType (Proxy :: Proxy a)) : (getParentTypes (Proxy :: Proxy a))
+  getParentTypes _ = [TSType (Proxy :: Proxy a)]
 
 instance {-# OVERLAPPING #-} TypeScript [Char] where
   getTypeScriptType _ = "string"
@@ -56,37 +56,30 @@ instance (TypeScript a, TypeScript b) => TypeScript (Either a b) where
                                , TSInterfaceDeclaration "Left" ["T"] [TSField False "Left" "T"]
                                , TSInterfaceDeclaration "Right" ["T"] [TSField False "Right" "T"]
                                ]
-  getParentTypes _ = L.nub ((TSType (Proxy :: Proxy a))
-                            : (TSType (Proxy :: Proxy b))
-                            : (getParentTypes (Proxy :: Proxy a))
-                            <> (getParentTypes (Proxy :: Proxy b)))
+  getParentTypes _ = L.nub [ (TSType (Proxy :: Proxy a))
+                           , (TSType (Proxy :: Proxy b))
+                           ]
 
 instance (TypeScript a, TypeScript b) => TypeScript (a, b) where
   getTypeScriptType _ = [i|[#{getTypeScriptType (Proxy :: Proxy a)}, #{getTypeScriptType (Proxy :: Proxy b)}]|]
-  getParentTypes _ = L.nub ((TSType (Proxy :: Proxy a))
-                            : (TSType (Proxy :: Proxy b))
-                            : (getParentTypes (Proxy :: Proxy a))
-                            <> (getParentTypes (Proxy :: Proxy b)))
+  getParentTypes _ = L.nub [ (TSType (Proxy :: Proxy a))
+                           , (TSType (Proxy :: Proxy b))
+                           ]
 
 instance (TypeScript a, TypeScript b, TypeScript c) => TypeScript (a, b, c) where
   getTypeScriptType _ = [i|[#{getTypeScriptType (Proxy :: Proxy a)}, #{getTypeScriptType (Proxy :: Proxy b)}, #{getTypeScriptType (Proxy :: Proxy c)}]|]
-  getParentTypes _ = L.nub ((TSType (Proxy :: Proxy a))
-                            : (TSType (Proxy :: Proxy b))
-                            : (TSType (Proxy :: Proxy c))
-                            : (getParentTypes (Proxy :: Proxy a))
-                            <> (getParentTypes (Proxy :: Proxy b))
-                            <> (getParentTypes (Proxy :: Proxy c)))
+  getParentTypes _ = L.nub [ (TSType (Proxy :: Proxy a))
+                           , (TSType (Proxy :: Proxy b))
+                           , (TSType (Proxy :: Proxy c))
+                           ]
 
 instance (TypeScript a, TypeScript b, TypeScript c, TypeScript d) => TypeScript (a, b, c, d) where
   getTypeScriptType _ = [i|[#{getTypeScriptType (Proxy :: Proxy a)}, #{getTypeScriptType (Proxy :: Proxy b)}, #{getTypeScriptType (Proxy :: Proxy c)}, #{getTypeScriptType (Proxy :: Proxy d)}]|]
-  getParentTypes _ = L.nub ((TSType (Proxy :: Proxy a))
-                            : (TSType (Proxy :: Proxy b))
-                            : (TSType (Proxy :: Proxy c))
-                            : (TSType (Proxy :: Proxy d))
-                            : (getParentTypes (Proxy :: Proxy a))
-                            <> (getParentTypes (Proxy :: Proxy b))
-                            <> (getParentTypes (Proxy :: Proxy c))
-                            <> (getParentTypes (Proxy :: Proxy d)))
+  getParentTypes _ = L.nub [ (TSType (Proxy :: Proxy a))
+                           , (TSType (Proxy :: Proxy b))
+                           , (TSType (Proxy :: Proxy c))
+                           , (TSType (Proxy :: Proxy d))
+                           ]
 
 instance (TypeScript a) => TypeScript (Maybe a) where
   getTypeScriptType _ = getTypeScriptType (Proxy :: Proxy a)
@@ -98,9 +91,8 @@ instance TypeScript A.Value where
 
 instance (TypeScript a, TypeScript b) => TypeScript (HashMap a b) where
   getTypeScriptType _ = [i|{[k: #{getTypeScriptType (Proxy :: Proxy a)}]: #{getTypeScriptType (Proxy :: Proxy b)}}|]
-  getParentTypes _ = L.nub ((getParentTypes (Proxy :: Proxy a))
-                            <> (getParentTypes (Proxy :: Proxy b)))
+  getParentTypes _ = L.nub [TSType (Proxy :: Proxy a), TSType (Proxy :: Proxy b)]
 
 instance (TypeScript a) => TypeScript (Set a) where
   getTypeScriptType _ = getTypeScriptType (Proxy :: Proxy a) <> "[]";
-  getParentTypes _ = L.nub (getParentTypes (Proxy :: Proxy a))
+  getParentTypes _ = L.nub [TSType (Proxy :: Proxy a)]