Merge pull request #38 from GetShopTV/fix-unused-#37

Stop producing unused definitions

CHANGELOG.md

@@ -1,11 +1,12 @@
-* Minor changes:
+* Minor changes (see [#36](https://github.com/GetShopTV/swagger2/pull/36)):
   * Change default `ToSchema` instance for unit data types (i.e. types with one nullable constructor like `data Unit = Unit`):
     now these types are treated like sum types with only one alternative;
   * Add generic `ToParamSchema` instance for unit data types;
   * Add `items: []` to schema for `()` (making it a valid schema).
 
 * Fixes:
-    * `items: []` is not omitted from `Schema` JSON.
+    * Do not omit `items: []` from `Schema` JSON;
+    * Do not generate unused definitions for nested `newtype`s (see [#38](https://github.com/GetShopTV/swagger2/pull/38)).
 
 1.1.1
 ---

src/Data/Swagger/Internal/Schema.hs

@@ -448,12 +448,14 @@ instance {-# OVERLAPPING #-} Constructor c => GToSchema (C1 c U1) where
 instance (Selector s, GToSchema f) => GToSchema (C1 c (S1 s f)) where
   gdeclareNamedSchema opts _ s
     | unwrapUnaryRecords opts = fieldSchema
-    | otherwise = do
-        (_, schema) <- recordSchema
+    | otherwise =
         case schema ^. schemaItems of
           Just (SwaggerItemsArray [_]) -> fieldSchema
-          _ -> pure (unnamed schema)
+          _ -> do
+            declare defs
+            return (unnamed schema)
     where
+      (defs, (_, schema)) = runDeclare recordSchema mempty
       recordSchema = gdeclareNamedSchema opts (Proxy :: Proxy (S1 s f)) s
       fieldSchema  = gdeclareNamedSchema opts (Proxy :: Proxy f) s
 

test/Data/Swagger/SchemaSpec.hs

@@ -83,6 +83,7 @@ spec = do
     context "Character" $ checkDefs (Proxy :: Proxy Character) ["Player", "Point"]
     context "MyRoseTree" $ checkDefs (Proxy :: Proxy MyRoseTree) ["RoseTree"]
     context "[Set (Unit, Maybe Color)]" $ checkDefs (Proxy :: Proxy [Set (Unit, Maybe Color)]) ["Unit", "Color"]
+    context "ResourceId" $ checkDefs (Proxy :: Proxy ResourceId) []
   describe "Inlining Schemas" $ do
     context "Paint" $ checkInlinedSchema (Proxy :: Proxy Paint) paintInlinedSchemaJSON
     context "Character" $ checkInlinedSchema (Proxy :: Proxy Character) characterInlinedSchemaJSON
@@ -573,3 +574,10 @@ lightInlinedSchemaJSON = [aesonQQ|
 }
 |]
 
+-- ========================================================================
+-- ResourceId (series of newtypes)
+-- ========================================================================
+
+newtype Id = Id String deriving (Generic, ToSchema)
+
+newtype ResourceId = ResourceId Id deriving (Generic, ToSchema)