Regenerating all services

core/src/Network/Google/Prelude.hs

@@ -23,6 +23,7 @@ module Network.Google.Prelude
     , module Network.Google.Prelude
     ) where
 
+import           Control.Applicative         as Export (pure, (<$>), (<*>))
 import           Control.Lens                as Export (Lens', lens, mapping,
                                                         (^.), _Just)
 import           Control.Lens                hiding (coerce)
@@ -32,7 +33,7 @@ import           Data.Data                   as Export (Data, Typeable)
 import           Data.Hashable               as Export
 import           Data.Int                    as Export (Int32, Int64)
 import           Data.Maybe                  as Export
-import           Data.Monoid
+import           Data.Monoid                 as Export (mempty, (<>))
 import           Data.Proxy                  as Export
 import           Data.Text                   as Export (Text)
 import qualified Data.Text                   as Text
@@ -44,6 +45,7 @@ import           Network.Google.Data.JSON    as Export
 import           Network.Google.Data.Numeric as Export
 -- import           Network.HTTP.Media
 import           Numeric.Natural             as Export (Natural)
+import           Prelude                     as Export hiding (product)
 import           Servant.API                 as Export
 import           Servant.Client              as Export
 import           Servant.Common.Req          as Export (Req, defReq)

gen/src/Gen/AST/Flatten.hs

@@ -27,6 +27,7 @@ import           Control.Error
 import           Control.Lens         hiding (lens)
 import           Control.Monad.Except
 import qualified Data.HashMap.Strict  as Map
+import qualified Data.HashSet         as Set
 import           Data.Maybe
 import           Data.Semigroup       ((<>))
 import qualified Data.Text            as Text
@@ -93,17 +94,22 @@ schema g ml (Fix f) = go (maybe g (reference g) ml) f >>= uncurry insert
     object p (Obj aps ps) =
         Obj Nothing <$> Map.traverseWithKey (localSchema p) ps
 
-    -- | Just x <- i ^. iId = pure x
-    -- | otherwise          = do
-
-    name i p xs = do
-        e <- uses schemas (Map.lookup p)
-        case (e, xs) of
-            (Nothing, _)    -> pure p
-            (Just _,  z:zs) -> name i (reference g z) zs
-            (Just x,  [])   -> throwError $
-                format ("Unable to generate name for: " % gid % ", " % shown % ", " % gid % "\n" % shown)
-                       g ml p x
+    name i p xs
+        | Just x <- i ^. iId = pure x
+        | otherwise          = do
+            r <- uses reserve (Set.member p)
+            e <- uses schemas (Map.lookup p)
+            case (r, e, xs) of
+                (False, Nothing, _)    -> pure p
+                (_,     _,       z:zs) -> name i (reference g z) zs
+
+                (_,     Just x,  [])   -> throwError $
+                    format ("Unable to generate name for: " % gid % ", " % shown % ", " % gid % "\n" % shown)
+                           g ml p x
+
+                (True,  _,       [])   -> throwError $
+                    format ("Unable to generate name for reserved schema: " % gid % ", " % shown % ", " % gid)
+                           g ml p
 
 globalParam :: Local -> Param (Fix Schema) -> AST (Param Global)
 globalParam l p = ($ p) $ case l of

gen/src/Gen/Syntax.hs

@@ -209,6 +209,10 @@ googleRequestDecl g n assoc alt p api url fields m pat prec =
             ++ maybeToList (go <$> pay)
           where
             go l = case Map.lookup l ps of
+                Just p | _pLocation p == Query
+                       , defaulted p
+                       , p ^. iRepeated -> v l
+
                 Just p | _pLocation p == Query
                        , not (required p)
                        , p ^. iRepeated -> infixApp (v l) "^." (var "_Default")
@@ -358,10 +362,11 @@ ctorDecl n p rs = sfun noLoc c ps (UnGuardedRhs rhs) noBinds
 fieldUpdate :: Prefix -> Local -> Solved -> FieldUpdate
 fieldUpdate p l s = FieldUpdate (UnQual (fname p l)) rhs
   where
-    rhs | required s              = v
-        | Just x <- def s         = x
-        | Just x <- iso (_type s) = infixApp x "#" v
-        | otherwise               = var (name "Nothing")
+    rhs | required s                      = v
+        | Just x <- def s, s ^. iRepeated = listE [x]
+        | Just x <- def s                 = x
+        | Just x <- iso (_type s)         = infixApp x "#" v
+        | otherwise                       = var (name "Nothing")
 
     v = var (pname p l)
 

gen/src/Gen/Text.hs

@@ -124,6 +124,12 @@ renameReserved x
         , "read"
         , "Read"
         , "request"
+        , "Get"
+        , "Post"
+        , "Delete"
+        , "Head"
+        , "Patch"
+        , "Put"
         ] ++ map Text.pack (reservedNames haskellDef)
 
 camelAcronym :: Text -> Text

gen/src/Gen/Types.hs

@@ -40,19 +40,18 @@ import           Control.Monad.State.Strict
 import           Data.Aeson                 hiding (Array, Bool, String)
 import           Data.CaseInsensitive       (CI)
 import qualified Data.CaseInsensitive       as CI
-import           Data.Char
 import           Data.Function              (on)
 import qualified Data.HashMap.Strict        as Map
 import qualified Data.HashSet               as Set
 import           Data.List                  (sort)
+import           Data.Maybe
 import           Data.Ord
 import           Data.Semigroup             ((<>))
 import           Data.Text                  (Text)
 import qualified Data.Text                  as Text
 import qualified Data.Text.Lazy             as LText
 import qualified Data.Text.Lazy.Builder     as Build
 import           Data.Text.Manipulate
-import           Debug.Trace
 import qualified Filesystem.Path.CurrentOS  as Path
 import           Formatting
 import           Gen.Orphans                ()
@@ -263,15 +262,19 @@ data Memo = Memo
     { _context  :: Service (Fix Schema)
     , _typed    :: Map Global TType
     , _derived  :: Map Global [Derive]
+    , _reserve  :: Set Global
     , _schemas  :: Map Global (Schema Global)
     , _prefixed :: Map Global Prefix
     , _branches :: Seen
     , _fields   :: Seen
     }
 
 initial :: Service (Fix Schema) -> Memo
-initial s = Memo s mempty mempty core mempty mempty mempty
+initial s = Memo s mempty mempty res core mempty mempty mempty
   where
+    -- Top-level schema definitions with ids.
+    res = Set.fromList . mapMaybe (view iId) $ Map.elems (s ^. dSchemas)
+
     -- Types available in Network.Google.Prelude.
     core = Map.fromList
         [ ("Body", SLit requiredInfo Body)

gogol-adexchange-buyer/gen/Network/Google/AdExchangeBuyer.hs

@@ -1,5 +1,6 @@
-{-# LANGUAGE DataKinds     #-}
-{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE TypeOperators     #-}
 
 {-# OPTIONS_GHC -fno-warn-unused-imports    #-}
 {-# OPTIONS_GHC -fno-warn-duplicate-exports #-}

gogol-adexchange-buyer/gen/Network/Google/AdExchangeBuyer/Types.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}

gogol-adexchange-buyer/gen/Network/Google/AdExchangeBuyer/Types/Product.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 

gogol-adexchange-buyer/gen/Network/Google/AdExchangeBuyer/Types/Sum.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE LambdaCase         #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Accounts/Get.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Accounts/List.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Accounts/Patch.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Accounts/Update.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/BillingInfo/Get.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/BillingInfo/List.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Budget/Get.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Budget/Patch.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Budget/Update.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/ClientAccess/Delete.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/ClientAccess/Get.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/ClientAccess/Insert.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/ClientAccess/List.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/ClientAccess/Patch.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/ClientAccess/Update.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Creatives/Get.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Creatives/Insert.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Creatives/List.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/Deals/Get.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/MarketplaceDeals/Delete.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/MarketplaceDeals/Insert.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/MarketplaceDeals/List.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/MarketplaceDeals/Update.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/MarketplaceNotes/Insert.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/MarketplaceNotes/List.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/MarketplaceOffers/Get.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}

gogol-adexchange-buyer/gen/Network/Google/Resource/AdExchangeBuyer/MarketplaceOffers/Search.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TypeFamilies       #-}