language-thrift 0.6.0.0 → 0.6.0.1

raw patch · 6 files changed

+601/−587 lines, 6 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• CHANGES.md +6/−0
• Language/Thrift/Internal/Types.hs +582/−0
• Language/Thrift/Pretty/PrettyInc.hs +6/−5
• Language/Thrift/Types.hs +4/−579
• examples/reformatIDL.hs +1/−2
• language-thrift.cabal +2/−1

@@ -1,3 +1,9 @@+0.6.0.1+=======++-   Export `Pretty` instances from `Language.Thrift.Types` instead of requiring+    a separate import of the corresponding `Pretty` module.+ 0.6.0.0 ======= 

@@ -0,0 +1,582 @@+{-# LANGUAGE DeriveDataTypeable     #-}+{-# LANGUAGE DeriveGeneric          #-}+{-# LANGUAGE FlexibleInstances      #-}+{-# LANGUAGE FunctionalDependencies #-}+{-# LANGUAGE MultiParamTypeClasses  #-}+{-# LANGUAGE TemplateHaskell        #-}+module Language.Thrift.Internal.Types+    ( Program(..)++    , Header(..)+    , _Include+    , _Namespace++    , Include(..)+    , Namespace(..)++    , Definition(..)+    , _Const+    , _Service+    , _Type++    , Const(..)+    , Service(..)++    , Type(..)+    , _Typedef+    , _Enum+    , _Struct+    , _Union+    , _Exception+    , _Senum++    , Typedef(..)+    , Enum(..)+    , Struct(..)+    , Union(..)+    , Exception(..)+    , Senum(..)++    , FieldRequiredness(..)+    , _Required+    , _Optional++    , Field(..)+    , EnumDef(..)++    , ConstValue(..)+    , _ConstInt+    , _ConstFloat+    , _ConstLiteral+    , _ConstIdentifier+    , _ConstList+    , _ConstMap++    , TypeReference(..)+    , _DefinedType+    , _StringType+    , _BinaryType+    , _SListType+    , _BoolType+    , _ByteType+    , _I16Type+    , _I32Type+    , _I64Type+    , _DoubleType+    , _MapType+    , _SetType+    , _ListType++    , Function(..)+    , TypeAnnotation(..)+    , Docstring++    , HasAnnotations(..)+    , HasDefaultValue(..)+    , HasDefinitions(..)+    , HasDocstring(..)+    , HasExceptions(..)+    , HasExtends(..)+    , HasFields(..)+    , HasFunctions(..)+    , HasHeaders(..)+    , HasIdentifier(..)+    , HasLanguage(..)+    , HasName(..)+    , HasOneWay(..)+    , HasParameters(..)+    , HasPath(..)+    , HasRequiredness(..)+    , HasReturnType(..)+    , HasSrcAnnot(..)+    , HasTargetType(..)+    , HasValue(..)+    , HasValues(..)+    , HasValueType(..)+    ) where++import Data.Data    (Data, Typeable)+import Data.Text    (Text)+import GHC.Generics (Generic)+import Prelude      hiding (Enum)++import qualified Control.Lens as L+++-- | Type annoations may be added in various places in the form,+--+-- > (foo = "bar", baz, qux = "quux")+--+-- These do not usually affect code generation but allow for custom logic if+-- writing your own code generator.+data TypeAnnotation = TypeAnnotation+    { typeAnnotationName  :: Text+    -- ^ Name of the annotation.+    , typeAnnotationValue :: Maybe Text+    -- ^ Value for the annotation.+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''TypeAnnotation+++-- | Docstrings are Javadoc-style comments attached various defined objects.+--+-- > /**+-- >  * Fetches an item.+-- >  */+-- > Item getItem()+type Docstring = Maybe Text+++-- | A constant literal value in the IDL. Only a few basic types, lists, and+-- maps can be presented in Thrift files as literals.+--+-- Constants are used for IDL-level constants and default values for fields.+data ConstValue srcAnnot+    = ConstInt Integer+    -- ^ An integer. @42@+    | ConstFloat Double+    -- ^ A float. @4.2@+    | ConstLiteral Text+    -- ^ A literal string. @"hello"@+    | ConstIdentifier Text srcAnnot+    -- ^ A reference to another constant. @Foo.bar@+    | ConstList [ConstValue srcAnnot]+    -- ^ A literal list containing other constant values. @[42]@+    | ConstMap [(ConstValue srcAnnot, ConstValue srcAnnot)]+    -- ^ A literal list containing other constant values.+    -- @{"hellO": 1, "world": 2}@+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makePrisms ''ConstValue+++-- | A reference to a type.+data TypeReference srcAnnot+    = DefinedType Text srcAnnot+    -- ^ A custom defined type referred to by name.++    | StringType [TypeAnnotation]+    -- ^ @string@ and annotations.+    | BinaryType [TypeAnnotation]+    -- ^ @binary@ and annotations.+    | SListType [TypeAnnotation]+    -- ^ @slist@ and annotations.+    | BoolType [TypeAnnotation]+    -- ^ @bool@ and annotations.+    | ByteType [TypeAnnotation]+    -- ^ @byte@ and annotations.+    | I16Type [TypeAnnotation]+    -- ^ @i16@ and annotations.+    | I32Type [TypeAnnotation]+    -- ^ @i32@ and annotations.+    | I64Type [TypeAnnotation]+    -- ^ @i64@ and annotations.+    | DoubleType [TypeAnnotation]+    -- ^ @double@ and annotations.++    -- Container types+    | MapType+        (TypeReference srcAnnot)+        (TypeReference srcAnnot)+        [TypeAnnotation]+    -- ^ @map\<foo, bar\>@ and annotations.+    | SetType (TypeReference srcAnnot) [TypeAnnotation]+    -- ^ @set\<baz\>@ and annotations.+    | ListType (TypeReference srcAnnot) [TypeAnnotation]+    -- ^ @list\<qux\>@ and annotations.+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makePrisms ''TypeReference+++-- | Whether a field is required or optional.+data FieldRequiredness+    = Required -- ^ The field is @required@.+    | Optional -- ^ The field is @optional@.+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makePrisms ''FieldRequiredness++-- | A field inside a struct, exception, or function parameters list.+data Field srcAnnot = Field+    { fieldIdentifier   :: Maybe Integer+    -- ^ Position of the field.+    --+    -- While this is optional, it is recommended that Thrift files always+    -- contain specific field IDs.+    , fieldRequiredness :: Maybe FieldRequiredness+    -- ^ Whether this field is required or not.+    --+    -- Behavior may differ between languages if requiredness is not specified.+    -- Therefore it's recommended that requiredness for a field is always+    -- specified.+    , fieldValueType    :: TypeReference srcAnnot+    -- ^ Type of value the field holds.+    , fieldName         :: Text+    -- ^ Name of the field.+    , fieldDefaultValue :: Maybe (ConstValue srcAnnot)+    -- ^ Default value of the field, if any.+    , fieldAnnotations  :: [TypeAnnotation]+    -- ^ Field annotations.+    , fieldDocstring    :: Docstring+    -- ^ Documentation.+    , fieldSrcAnnot     :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Field+++-- | A function defined inside a service.+data Function srcAnnot = Function+    { functionOneWay      :: Bool+    -- ^ Whether the function is @oneway@. If it's one way, it cannot receive+    -- repsonses.+    , functionReturnType  :: Maybe (TypeReference srcAnnot)+    -- ^ Return type of the function, or @Nothing@ if it's @void@ or @oneway@.+    , functionName        :: Text+    -- ^ Name of the function.+    , functionParameters  :: [Field srcAnnot]+    -- ^ Parameters accepted by the function.+    , functionExceptions  :: Maybe [Field srcAnnot]+    -- ^ Exceptions raised by the function, if any.+    , functionAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to the function.+    , functionDocstring   :: Docstring+    -- ^ Documentation.+    , functionSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Function+++-- | A service definition.+--+-- > service MyService {+-- >     // ...+-- > }+data Service srcAnnot = Service+    { serviceName        :: Text+    -- ^ Name of the service.+    , serviceExtends     :: Maybe Text+    -- ^ Name of the service this service extends.+    , serviceFunctions   :: [Function srcAnnot]+    -- ^ All the functions defined for the service.+    , serviceAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to the service.+    , serviceDocstring   :: Docstring+    -- ^ Documentation.+    , serviceSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Service++-- | A declared constant.+--+-- > const i32 code = 1;+data Const srcAnnot = Const+    { constValueType :: TypeReference srcAnnot+    -- ^ Type of the constant.+    , constName      :: Text+    -- ^ Name of the constant.+    , constValue     :: ConstValue srcAnnot+    -- ^ Value of the constant.+    , constDocstring :: Docstring+    -- ^ Documentation.+    , constSrcAnnot  :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Const+++-- | A typedef is just an alias for another type.+--+-- > typedef common.Foo Bar+data Typedef srcAnnot = Typedef+    { typedefTargetType  :: TypeReference srcAnnot+    -- ^ The aliased type.+    , typedefName        :: Text+    -- ^ Name of the new type.+    , typedefAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to the typedef.+    , typedefDocstring   :: Docstring+    -- ^ Documentation.+    , typedefSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Typedef+++-- | A named value inside an enum.+data EnumDef srcAnnot = EnumDef+    { enumDefName        :: Text+    -- ^ Name of the value.+    , enumDefValue       :: Maybe Integer+    -- ^ Value attached to the enum for that name.+    , enumDefAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to this enum field.+    , enumDefDocstring   :: Docstring+    -- ^ Documentation+    , enumDefSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''EnumDef+++-- | Enums are sets of named integer values.+--+-- > enum Role {+-- >     User = 1, Admin = 2+-- > }+data Enum srcAnnot = Enum+    { enumName        :: Text+    -- ^ Name of the enum type.+    , enumValues      :: [EnumDef srcAnnot]+    -- ^ Values defined in the enum.+    , enumAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to the enum.+    , enumDocstring   :: Docstring+    -- ^ Documentation.+    , enumSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Enum+++-- | A struct definition+--+-- > struct User {+-- >     1: Role role = Role.User;+-- > }+data Struct srcAnnot = Struct+    { structName        :: Text+    -- ^ Name of the struct.+    , structFields      :: [Field srcAnnot]+    -- ^ Fields defined in the struct.+    , structAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to the struct.+    , structDocstring   :: Docstring+    -- ^ Documentation.+    , structSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Struct+++-- | A union of other types.+--+-- > union Value {+-- >     1: string stringValue;+-- >     2: i32 intValue;+-- > }+data Union srcAnnot = Union+    { unionName        :: Text+    -- ^ Name of the union.+    , unionFields      :: [Field srcAnnot]+    -- ^ Fields defined in the union.+    , unionAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to the union.+    , unionDocstring   :: Docstring+    -- ^ Documentation.+    , unionSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Union+++-- | Exception types.+--+-- > exception UserDoesNotExist {+-- >     1: optional string message+-- >     2: required string username+-- > }+data Exception srcAnnot = Exception+    { exceptionName        :: Text+    -- ^ Name of the exception.+    , exceptionFields      :: [Field srcAnnot]+    -- ^ Fields defined in the exception.+    , exceptionAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to the exception.+    , exceptionDocstring   :: Docstring+    -- ^ Documentation.+    , exceptionSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Exception+++-- | An string-only enum. These are a deprecated feature of Thrift and+-- shouldn't be used.+data Senum srcAnnot = Senum+    { senumName        :: Text+    , senumValues      :: [Text]+    , senumAnnotations :: [TypeAnnotation]+    -- ^ Annotations added to the senum.+    , senumDocstring   :: Docstring+    -- ^ Documentation.+    , senumSrcAnnot    :: srcAnnot+    }+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Senum+++-- | Defines the various types that can be declared in Thrift.+data Type srcAnnot+    = -- | @typedef@+      TypedefType (Typedef srcAnnot)+    | -- | @enum@+      EnumType (Enum srcAnnot)+    | -- | @struct@+      StructType (Struct srcAnnot)+    | -- | @union@+      UnionType (Union srcAnnot)+    | -- | @exception@+      ExceptionType (Exception srcAnnot)+    | -- | @senum@+      SenumType (Senum srcAnnot)+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++_Typedef :: L.Prism' (Type ann) (Typedef ann)+_Typedef = L.prism' TypedefType $ \t ->+    case t of+        TypedefType a -> Just a+        _             -> Nothing++_Enum :: L.Prism' (Type ann) (Enum ann)+_Enum = L.prism' EnumType $ \t ->+    case t of+        EnumType a -> Just a+        _          -> Nothing++_Struct :: L.Prism' (Type ann) (Struct ann)+_Struct = L.prism' StructType $ \t ->+    case t of+        StructType a -> Just a+        _            -> Nothing++_Union :: L.Prism' (Type ann) (Union ann)+_Union = L.prism' UnionType $ \t ->+    case t of+        UnionType a -> Just a+        _           -> Nothing++_Exception :: L.Prism' (Type ann) (Exception ann)+_Exception = L.prism' ExceptionType $ \t ->+    case t of+        ExceptionType a -> Just a+        _               -> Nothing++_Senum :: L.Prism' (Type ann) (Senum ann)+_Senum = L.prism' SenumType $ \t ->+    case t of+        SenumType a -> Just a+        _           -> Nothing+++-- | A definition either consists of new constants, new types, or new+-- services.+data Definition srcAnnot+    = -- | A declared constant.+      ConstDefinition (Const srcAnnot)+    | -- | A custom type.+      TypeDefinition (Type srcAnnot)+    | -- | A service definition.+      ServiceDefinition (Service srcAnnot)+  deriving (Show, Ord, Eq, Data, Typeable, Generic)++_Const :: L.Prism' (Definition ann) (Const ann)+_Const = L.prism' ConstDefinition $ \def ->+    case def of+        ConstDefinition c -> Just c+        _                 -> Nothing++_Type :: L.Prism' (Definition ann) (Type ann)+_Type = L.prism' TypeDefinition $ \def ->+    case def of+        TypeDefinition c -> Just c+        _                 -> Nothing++_Service :: L.Prism' (Definition ann) (Service ann)+_Service = L.prism' ServiceDefinition $ \def ->+    case def of+        ServiceDefinition c -> Just c+        _                 -> Nothing+++-- | Namespace directives allows control of the namespace or package+-- name used by the generated code for certain languages.+--+-- > namespace py my_service.generated+data Namespace srcAnnot = Namespace+    { namespaceLanguage :: Text+    -- ^ The language for which the namespace is being specified. This may+    -- be @*@ to refer to all languages.+    , namespaceName     :: Text+    -- ^ Namespace or package path to use in the generated code for that+    -- language.+    , namespaceSrcAnnot :: srcAnnot+    }+    deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Namespace+++-- | The IDL includes another Thrift file.+--+-- > include "common.thrift"+-- >+-- > typedef common.Foo Bar+--+data Include srcAnnot = Include+    { includePath     :: Text+    -- ^ Path to the included file.+    , includeSrcAnnot :: srcAnnot+    }+    deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Include+++-- | Headers for a program.+data Header srcAnnot+    = -- | Request to include another Thrift file.+      HeaderInclude (Include srcAnnot)+    | -- | A @namespace@ specifier.+      HeaderNamespace (Namespace srcAnnot)+    deriving (Show, Ord, Eq, Data, Typeable, Generic)++_Include :: L.Prism' (Header ann) (Include ann)+_Include = L.prism' HeaderInclude $ \h ->+    case h of+        HeaderInclude inc -> Just inc+        _                 -> Nothing++_Namespace :: L.Prism' (Header ann) (Namespace ann)+_Namespace = L.prism' HeaderNamespace $ \h ->+    case h of+        HeaderNamespace ns -> Just ns+        _                  -> Nothing+++-- | A program represents a single Thrift document.+data Program srcAnnot = Program+    { programHeaders     :: [Header srcAnnot]+    -- ^ Headers in a document define includes and namespaces.+    , programDefinitions :: [Definition srcAnnot]+    -- ^ Types and services defined in the document.+    }+    deriving (Show, Ord, Eq, Data, Typeable, Generic)++L.makeFields ''Program

@@ -2,13 +2,14 @@ -- ansi-wl-pprint in scope.  #if __GLASGOW_HASKELL__ >= 709-import Prelude hiding ((<$>))+import Prelude hiding ((<$>), lines)+#else+import Prelude hiding (lines) #endif -import Data.Text               (Text, unpack)+import Data.Text (Text, unpack, lines, strip) -import qualified Data.Text               as Text-import qualified Language.Thrift.Types   as T+import qualified Language.Thrift.Internal.Types as T  import Language.Thrift.Pretty.Types @@ -283,7 +284,7 @@  ($$) :: T.Docstring -> Doc -> Doc ($$) Nothing y = y-($$) (Just t) y = case Text.lines (Text.strip t) of+($$) (Just t) y = case lines (strip t) of   [] -> y   ls -> wrapComments ls <$> y   where

@@ -1,9 +1,3 @@-{-# LANGUAGE DeriveDataTypeable     #-}-{-# LANGUAGE DeriveGeneric          #-}-{-# LANGUAGE FlexibleInstances      #-}-{-# LANGUAGE FunctionalDependencies #-}-{-# LANGUAGE MultiParamTypeClasses  #-}-{-# LANGUAGE TemplateHaskell        #-} -- | -- Module      :  Language.Thrift.Types -- Copyright   :  (c) Abhinav Gupta 2015@@ -20,578 +14,9 @@ -- @()@ as the parameter. -- module Language.Thrift.Types-    ( Program(..)--    , Header(..)-    , _Include-    , _Namespace--    , Include(..)-    , Namespace(..)--    , Definition(..)-    , _Const-    , _Service-    , _Type--    , Const(..)-    , Service(..)--    , Type(..)-    , _Typedef-    , _Enum-    , _Struct-    , _Union-    , _Exception-    , _Senum--    , Typedef(..)-    , Enum(..)-    , Struct(..)-    , Union(..)-    , Exception(..)-    , Senum(..)--    , FieldRequiredness(..)-    , _Required-    , _Optional--    , Field(..)-    , EnumDef(..)--    , ConstValue(..)-    , _ConstInt-    , _ConstFloat-    , _ConstLiteral-    , _ConstIdentifier-    , _ConstList-    , _ConstMap--    , TypeReference(..)-    , _DefinedType-    , _StringType-    , _BinaryType-    , _SListType-    , _BoolType-    , _ByteType-    , _I16Type-    , _I32Type-    , _I64Type-    , _DoubleType-    , _MapType-    , _SetType-    , _ListType--    , Function(..)-    , TypeAnnotation(..)-    , Docstring--    , HasAnnotations(..)-    , HasDefaultValue(..)-    , HasDefinitions(..)-    , HasDocstring(..)-    , HasExceptions(..)-    , HasExtends(..)-    , HasFields(..)-    , HasFunctions(..)-    , HasHeaders(..)-    , HasIdentifier(..)-    , HasLanguage(..)-    , HasName(..)-    , HasOneWay(..)-    , HasParameters(..)-    , HasPath(..)-    , HasRequiredness(..)-    , HasReturnType(..)-    , HasSrcAnnot(..)-    , HasTargetType(..)-    , HasValue(..)-    , HasValues(..)-    , HasValueType(..)+    ( module Language.Thrift.Internal.Types     ) where -import Data.Data    (Data, Typeable)-import Data.Text    (Text)-import GHC.Generics (Generic)-import Prelude      hiding (Enum)--import qualified Control.Lens as L----- | Type annoations may be added in various places in the form,------ > (foo = "bar", baz, qux = "quux")------ These do not usually affect code generation but allow for custom logic if--- writing your own code generator.-data TypeAnnotation = TypeAnnotation-    { typeAnnotationName  :: Text-    -- ^ Name of the annotation.-    , typeAnnotationValue :: Maybe Text-    -- ^ Value for the annotation.-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''TypeAnnotation----- | Docstrings are Javadoc-style comments attached various defined objects.------ > /**--- >  * Fetches an item.--- >  */--- > Item getItem()-type Docstring = Maybe Text----- | A constant literal value in the IDL. Only a few basic types, lists, and--- maps can be presented in Thrift files as literals.------ Constants are used for IDL-level constants and default values for fields.-data ConstValue srcAnnot-    = ConstInt Integer-    -- ^ An integer. @42@-    | ConstFloat Double-    -- ^ A float. @4.2@-    | ConstLiteral Text-    -- ^ A literal string. @"hello"@-    | ConstIdentifier Text srcAnnot-    -- ^ A reference to another constant. @Foo.bar@-    | ConstList [ConstValue srcAnnot]-    -- ^ A literal list containing other constant values. @[42]@-    | ConstMap [(ConstValue srcAnnot, ConstValue srcAnnot)]-    -- ^ A literal list containing other constant values.-    -- @{"hellO": 1, "world": 2}@-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makePrisms ''ConstValue----- | A reference to a type.-data TypeReference srcAnnot-    = DefinedType Text srcAnnot-    -- ^ A custom defined type referred to by name.--    | StringType [TypeAnnotation]-    -- ^ @string@ and annotations.-    | BinaryType [TypeAnnotation]-    -- ^ @binary@ and annotations.-    | SListType [TypeAnnotation]-    -- ^ @slist@ and annotations.-    | BoolType [TypeAnnotation]-    -- ^ @bool@ and annotations.-    | ByteType [TypeAnnotation]-    -- ^ @byte@ and annotations.-    | I16Type [TypeAnnotation]-    -- ^ @i16@ and annotations.-    | I32Type [TypeAnnotation]-    -- ^ @i32@ and annotations.-    | I64Type [TypeAnnotation]-    -- ^ @i64@ and annotations.-    | DoubleType [TypeAnnotation]-    -- ^ @double@ and annotations.--    -- Container types-    | MapType-        (TypeReference srcAnnot)-        (TypeReference srcAnnot)-        [TypeAnnotation]-    -- ^ @map\<foo, bar\>@ and annotations.-    | SetType (TypeReference srcAnnot) [TypeAnnotation]-    -- ^ @set\<baz\>@ and annotations.-    | ListType (TypeReference srcAnnot) [TypeAnnotation]-    -- ^ @list\<qux\>@ and annotations.-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makePrisms ''TypeReference----- | Whether a field is required or optional.-data FieldRequiredness-    = Required -- ^ The field is @required@.-    | Optional -- ^ The field is @optional@.-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makePrisms ''FieldRequiredness---- | A field inside a struct, exception, or function parameters list.-data Field srcAnnot = Field-    { fieldIdentifier   :: Maybe Integer-    -- ^ Position of the field.-    ---    -- While this is optional, it is recommended that Thrift files always-    -- contain specific field IDs.-    , fieldRequiredness :: Maybe FieldRequiredness-    -- ^ Whether this field is required or not.-    ---    -- Behavior may differ between languages if requiredness is not specified.-    -- Therefore it's recommended that requiredness for a field is always-    -- specified.-    , fieldValueType    :: TypeReference srcAnnot-    -- ^ Type of value the field holds.-    , fieldName         :: Text-    -- ^ Name of the field.-    , fieldDefaultValue :: Maybe (ConstValue srcAnnot)-    -- ^ Default value of the field, if any.-    , fieldAnnotations  :: [TypeAnnotation]-    -- ^ Field annotations.-    , fieldDocstring    :: Docstring-    -- ^ Documentation.-    , fieldSrcAnnot     :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Field----- | A function defined inside a service.-data Function srcAnnot = Function-    { functionOneWay      :: Bool-    -- ^ Whether the function is @oneway@. If it's one way, it cannot receive-    -- repsonses.-    , functionReturnType  :: Maybe (TypeReference srcAnnot)-    -- ^ Return type of the function, or @Nothing@ if it's @void@ or @oneway@.-    , functionName        :: Text-    -- ^ Name of the function.-    , functionParameters  :: [Field srcAnnot]-    -- ^ Parameters accepted by the function.-    , functionExceptions  :: Maybe [Field srcAnnot]-    -- ^ Exceptions raised by the function, if any.-    , functionAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to the function.-    , functionDocstring   :: Docstring-    -- ^ Documentation.-    , functionSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Function----- | A service definition.------ > service MyService {--- >     // ...--- > }-data Service srcAnnot = Service-    { serviceName        :: Text-    -- ^ Name of the service.-    , serviceExtends     :: Maybe Text-    -- ^ Name of the service this service extends.-    , serviceFunctions   :: [Function srcAnnot]-    -- ^ All the functions defined for the service.-    , serviceAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to the service.-    , serviceDocstring   :: Docstring-    -- ^ Documentation.-    , serviceSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Service---- | A declared constant.------ > const i32 code = 1;-data Const srcAnnot = Const-    { constValueType :: TypeReference srcAnnot-    -- ^ Type of the constant.-    , constName      :: Text-    -- ^ Name of the constant.-    , constValue     :: ConstValue srcAnnot-    -- ^ Value of the constant.-    , constDocstring :: Docstring-    -- ^ Documentation.-    , constSrcAnnot  :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Const----- | A typedef is just an alias for another type.------ > typedef common.Foo Bar-data Typedef srcAnnot = Typedef-    { typedefTargetType  :: TypeReference srcAnnot-    -- ^ The aliased type.-    , typedefName        :: Text-    -- ^ Name of the new type.-    , typedefAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to the typedef.-    , typedefDocstring   :: Docstring-    -- ^ Documentation.-    , typedefSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Typedef----- | A named value inside an enum.-data EnumDef srcAnnot = EnumDef-    { enumDefName        :: Text-    -- ^ Name of the value.-    , enumDefValue       :: Maybe Integer-    -- ^ Value attached to the enum for that name.-    , enumDefAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to this enum field.-    , enumDefDocstring   :: Docstring-    -- ^ Documentation-    , enumDefSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''EnumDef----- | Enums are sets of named integer values.------ > enum Role {--- >     User = 1, Admin = 2--- > }-data Enum srcAnnot = Enum-    { enumName        :: Text-    -- ^ Name of the enum type.-    , enumValues      :: [EnumDef srcAnnot]-    -- ^ Values defined in the enum.-    , enumAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to the enum.-    , enumDocstring   :: Docstring-    -- ^ Documentation.-    , enumSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Enum----- | A struct definition------ > struct User {--- >     1: Role role = Role.User;--- > }-data Struct srcAnnot = Struct-    { structName        :: Text-    -- ^ Name of the struct.-    , structFields      :: [Field srcAnnot]-    -- ^ Fields defined in the struct.-    , structAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to the struct.-    , structDocstring   :: Docstring-    -- ^ Documentation.-    , structSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Struct----- | A union of other types.------ > union Value {--- >     1: string stringValue;--- >     2: i32 intValue;--- > }-data Union srcAnnot = Union-    { unionName        :: Text-    -- ^ Name of the union.-    , unionFields      :: [Field srcAnnot]-    -- ^ Fields defined in the union.-    , unionAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to the union.-    , unionDocstring   :: Docstring-    -- ^ Documentation.-    , unionSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Union----- | Exception types.------ > exception UserDoesNotExist {--- >     1: optional string message--- >     2: required string username--- > }-data Exception srcAnnot = Exception-    { exceptionName        :: Text-    -- ^ Name of the exception.-    , exceptionFields      :: [Field srcAnnot]-    -- ^ Fields defined in the exception.-    , exceptionAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to the exception.-    , exceptionDocstring   :: Docstring-    -- ^ Documentation.-    , exceptionSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Exception----- | An string-only enum. These are a deprecated feature of Thrift and--- shouldn't be used.-data Senum srcAnnot = Senum-    { senumName        :: Text-    , senumValues      :: [Text]-    , senumAnnotations :: [TypeAnnotation]-    -- ^ Annotations added to the senum.-    , senumDocstring   :: Docstring-    -- ^ Documentation.-    , senumSrcAnnot    :: srcAnnot-    }-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Senum----- | Defines the various types that can be declared in Thrift.-data Type srcAnnot-    = -- | @typedef@-      TypedefType (Typedef srcAnnot)-    | -- | @enum@-      EnumType (Enum srcAnnot)-    | -- | @struct@-      StructType (Struct srcAnnot)-    | -- | @union@-      UnionType (Union srcAnnot)-    | -- | @exception@-      ExceptionType (Exception srcAnnot)-    | -- | @senum@-      SenumType (Senum srcAnnot)-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--_Typedef :: L.Prism' (Type ann) (Typedef ann)-_Typedef = L.prism' TypedefType $ \t ->-    case t of-        TypedefType a -> Just a-        _             -> Nothing--_Enum :: L.Prism' (Type ann) (Enum ann)-_Enum = L.prism' EnumType $ \t ->-    case t of-        EnumType a -> Just a-        _          -> Nothing--_Struct :: L.Prism' (Type ann) (Struct ann)-_Struct = L.prism' StructType $ \t ->-    case t of-        StructType a -> Just a-        _            -> Nothing--_Union :: L.Prism' (Type ann) (Union ann)-_Union = L.prism' UnionType $ \t ->-    case t of-        UnionType a -> Just a-        _           -> Nothing--_Exception :: L.Prism' (Type ann) (Exception ann)-_Exception = L.prism' ExceptionType $ \t ->-    case t of-        ExceptionType a -> Just a-        _               -> Nothing--_Senum :: L.Prism' (Type ann) (Senum ann)-_Senum = L.prism' SenumType $ \t ->-    case t of-        SenumType a -> Just a-        _           -> Nothing----- | A definition either consists of new constants, new types, or new--- services.-data Definition srcAnnot-    = -- | A declared constant.-      ConstDefinition (Const srcAnnot)-    | -- | A custom type.-      TypeDefinition (Type srcAnnot)-    | -- | A service definition.-      ServiceDefinition (Service srcAnnot)-  deriving (Show, Ord, Eq, Data, Typeable, Generic)--_Const :: L.Prism' (Definition ann) (Const ann)-_Const = L.prism' ConstDefinition $ \def ->-    case def of-        ConstDefinition c -> Just c-        _                 -> Nothing--_Type :: L.Prism' (Definition ann) (Type ann)-_Type = L.prism' TypeDefinition $ \def ->-    case def of-        TypeDefinition c -> Just c-        _                 -> Nothing--_Service :: L.Prism' (Definition ann) (Service ann)-_Service = L.prism' ServiceDefinition $ \def ->-    case def of-        ServiceDefinition c -> Just c-        _                 -> Nothing----- | Namespace directives allows control of the namespace or package--- name used by the generated code for certain languages.------ > namespace py my_service.generated-data Namespace srcAnnot = Namespace-    { namespaceLanguage :: Text-    -- ^ The language for which the namespace is being specified. This may-    -- be @*@ to refer to all languages.-    , namespaceName     :: Text-    -- ^ Namespace or package path to use in the generated code for that-    -- language.-    , namespaceSrcAnnot :: srcAnnot-    }-    deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Namespace----- | The IDL includes another Thrift file.------ > include "common.thrift"--- >--- > typedef common.Foo Bar----data Include srcAnnot = Include-    { includePath     :: Text-    -- ^ Path to the included file.-    , includeSrcAnnot :: srcAnnot-    }-    deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Include----- | Headers for a program.-data Header srcAnnot-    = -- | Request to include another Thrift file.-      HeaderInclude (Include srcAnnot)-    | -- | A @namespace@ specifier.-      HeaderNamespace (Namespace srcAnnot)-    deriving (Show, Ord, Eq, Data, Typeable, Generic)--_Include :: L.Prism' (Header ann) (Include ann)-_Include = L.prism' HeaderInclude $ \h ->-    case h of-        HeaderInclude inc -> Just inc-        _                 -> Nothing--_Namespace :: L.Prism' (Header ann) (Namespace ann)-_Namespace = L.prism' HeaderNamespace $ \h ->-    case h of-        HeaderNamespace ns -> Just ns-        _                  -> Nothing----- | A program represents a single Thrift document.-data Program srcAnnot = Program-    { programHeaders     :: [Header srcAnnot]-    -- ^ Headers in a document define includes and namespaces.-    , programDefinitions :: [Definition srcAnnot]-    -- ^ Types and services defined in the document.-    }-    deriving (Show, Ord, Eq, Data, Typeable, Generic)--L.makeFields ''Program+import Language.Thrift.Internal.Types+import Language.Thrift.Pretty         ()+import Language.Thrift.Pretty.ANSI    ()

@@ -13,12 +13,11 @@ import qualified Text.PrettyPrint.ANSI.Leijen as PP  import Language.Thrift.Parser.Trifecta (thriftIDL)-import Language.Thrift.Pretty.ANSI     (prettyPrint)  main :: IO () main = do     result <-         parseString thriftIDL (Directed "stdin" 0 0 0 0) `fmap` getContents     case result of-        Success p   -> PP.putDoc (prettyPrint p) >> putStrLn ""+        Success p   -> PP.putDoc (PP.pretty p) >> putStrLn ""         Failure doc -> PP.displayIO stderr $ PP.renderPretty 0.8 80 doc

@@ -1,5 +1,5 @@ name: language-thrift-version: 0.6.0.0+version: 0.6.0.1 cabal-version: >=1.10 build-type: Simple license: BSD3@@ -41,6 +41,7 @@     default-language: Haskell2010     other-modules:         Language.Thrift.Pretty.Types+        Language.Thrift.Internal.Types     ghc-options: -Wall  test-suite spec