graphql 1.5.0.0 → 1.5.0.1

raw patch · 12 files changed

+30/−25 lines, 12 filesdep ~QuickCheckPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: QuickCheck

API changes (from Hackage documentation)

Files

• CHANGELOG.md +6/−0
• graphql.cabal +4/−4
• src/Language/GraphQL/AST.hs +1/−0
• src/Language/GraphQL/AST/DirectiveLocation.hs +1/−0
• src/Language/GraphQL/AST/Document.hs +1/−0
• src/Language/GraphQL/AST/Encoder.hs +1/−0
• src/Language/GraphQL/AST/Lexer.hs +2/−0
• src/Language/GraphQL/AST/Parser.hs +2/−0
• src/Language/GraphQL/Execute.hs +10/−11
• src/Language/GraphQL/Type/Definition.hs +1/−0
• src/Language/GraphQL/Type/In.hs +1/−0
• src/Language/GraphQL/Validate/Rules.hs +0/−10

@@ -6,6 +6,11 @@ and this project adheres to [Haskell Package Versioning Policy](https://pvp.haskell.org/). +## [1.5.0.1] - 2025-06-19+### Fixed+- Allow any 2.x QuickCheck version.+- Make the lexer and parser safe.+ ## [1.5.0.0] - 2024-12-03 ### Removed - Remove deprecated 'gql' quasi quoter.@@ -546,6 +551,7 @@ ### Added - Data types for the GraphQL language. +[1.5.0.1]: https://git.caraus.tech/OSS/graphql/compare/v1.5.0.0...v1.5.0.1 [1.5.0.0]: https://git.caraus.tech/OSS/graphql/compare/v1.4.0.0...v1.5.0.0 [1.4.0.0]: https://git.caraus.tech/OSS/graphql/compare/v1.3.0.0...v1.4.0.0 [1.3.0.0]: https://git.caraus.tech/OSS/graphql/compare/v1.2.0.3...v1.3.0.0

@@ -1,7 +1,7 @@ cabal-version: 3.0  name:           graphql-version:        1.5.0.0+version:        1.5.0.1 synopsis:       Haskell GraphQL implementation description:    Haskell <https://spec.graphql.org/June2018/ GraphQL> implementation. category:       Language@@ -11,7 +11,7 @@                 Matthías Páll Gissurarson <mpg@mpg.is>,                 Sólrún Halla Einarsdóttir <she@mpg.is> maintainer:     belka@caraus.de-copyright:      (c) 2019-2024 Eugen Wissner,+copyright:      (c) 2019-2025 Eugen Wissner,                 (c) 2015-2017 J. Daniel Navarro license:        MPL-2.0 AND BSD-3-Clause license-files:  LICENSE,@@ -21,7 +21,7 @@   CHANGELOG.md   README.md tested-with:-  GHC == 9.8.2+  GHC == 9.10.1  source-repository head   type: git@@ -90,7 +90,7 @@   ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall    build-depends:-    QuickCheck >= 2.14 && < 2.16,+    QuickCheck >= 2.14 && < 3,     base,     conduit,     exceptions,

@@ -1,3 +1,4 @@+{-# LANGUAGE NoGeneralizedNewtypeDeriving #-} {-# LANGUAGE Safe #-}  -- | Target AST for parser.

@@ -1,3 +1,4 @@+{-# LANGUAGE NoGeneralizedNewtypeDeriving #-} {-# LANGUAGE Safe #-}  -- | Various parts of a GraphQL document can be annotated with directives.

@@ -3,6 +3,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE NoGeneralizedNewtypeDeriving #-} {-# LANGUAGE Safe #-}  -- | This module defines an abstract syntax tree for the @GraphQL@ language. It

@@ -2,6 +2,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE NoGeneralizedNewtypeDeriving #-} {-# LANGUAGE Safe #-}  -- | This module defines a minifier and a printer for the @GraphQL@ language.

@@ -1,5 +1,7 @@ {-# LANGUAGE ExplicitForAll #-} {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE NoGeneralizedNewtypeDeriving #-}+{-# LANGUAGE Safe #-}  -- | This module defines a bunch of small parsers used to parse individual --   lexemes.

@@ -2,6 +2,8 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE NoGeneralizedNewtypeDeriving #-}+{-# LANGUAGE Safe #-}  -- | @GraphQL@ document parser. module Language.GraphQL.AST.Parser

@@ -189,6 +189,8 @@     | CoercionError Full.VariableDefinition     | UnknownInputType Full.VariableDefinition +type ExecuteHandler m a e = e -> ExecutorT m a+ tell :: Monad m => Seq Error -> ExecutorT m () tell = ExecutorT . lift . Writer.tell @@ -313,8 +315,7 @@     pure $ Response data' errors  handleException :: (MonadCatch m, Serialize a)-    => FieldException-    -> ExecutorT m a+    => ExecuteHandler m a FieldException handleException (FieldException fieldLocation errorPath next) =     let newError = constructError next fieldLocation errorPath      in tell (Seq.singleton newError) >> pure null@@ -390,30 +391,28 @@     fieldErrorPath = fieldsSegment fields : errorPath     inputCoercionHandler :: (MonadCatch m, Serialize a)         => Full.Location-        -> InputCoercionException-        -> ExecutorT m a+        -> ExecuteHandler m a InputCoercionException     inputCoercionHandler _ e@(InputCoercionException _ _ (Just valueNode)) =         let argumentLocation = getField @"location" valueNode          in exceptionHandler argumentLocation e     inputCoercionHandler fieldLocation e = exceptionHandler fieldLocation e     resultHandler :: (MonadCatch m, Serialize a)         => Full.Location-        -> ResultException-        -> ExecutorT m a+        -> ExecuteHandler m a ResultException     resultHandler = exceptionHandler     resolverHandler :: (MonadCatch m, Serialize a)         => Full.Location-        -> ResolverException-        -> ExecutorT m a+        -> ExecuteHandler m a ResolverException     resolverHandler = exceptionHandler-    nullResultHandler :: (MonadCatch m, Serialize a)-        => FieldException-        -> ExecutorT m a+    nullResultHandler :: (MonadCatch m, Serialize a) => ExecuteHandler m a FieldException     nullResultHandler e@(FieldException fieldLocation errorPath' next) =         let newError = constructError next fieldLocation errorPath'          in if Out.isNonNullType fieldType              then throwM e              else returnError newError+    exceptionHandler :: (Exception e, MonadCatch m, Serialize a)+        => Full.Location+        -> ExecuteHandler m a e     exceptionHandler errorLocation e =         let newError = constructError e errorLocation fieldErrorPath          in if Out.isNonNullType fieldType

@@ -3,6 +3,7 @@    obtain one at https://mozilla.org/MPL/2.0/. -}  {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE NoGeneralizedNewtypeDeriving #-} {-# LANGUAGE Safe #-}  -- | Types that can be used as both input and output types.

@@ -3,6 +3,7 @@    obtain one at https://mozilla.org/MPL/2.0/. -}  {-# LANGUAGE PatternSynonyms #-}+{-# LANGUAGE NoGeneralizedNewtypeDeriving #-} {-# LANGUAGE Safe #-} {-# LANGUAGE ViewPatterns #-} 

@@ -1067,18 +1067,12 @@     go selectionSet selectionType = do         fieldTuples <- evalStateT (collectFields selectionType selectionSet) HashSet.empty         fieldsInSetCanMerge fieldTuples-    fieldsInSetCanMerge :: forall m-        . HashMap Full.Name (NonEmpty (Full.Field, Type.CompositeType m))-        -> ReaderT (Validation m) Seq Error     fieldsInSetCanMerge fieldTuples = do         validation <- ask         let (lonely, paired) = flattenPairs fieldTuples         let reader = flip runReaderT validation         lift $ foldMap (reader . visitLonelyFields) lonely             <> foldMap (reader . forEachFieldTuple) paired-    forEachFieldTuple :: forall m-        . (FieldInfo m, FieldInfo m)-        -> ReaderT (Validation m) Seq Error     forEachFieldTuple (fieldA, fieldB) =         case (parent fieldA, parent fieldB) of             (parentA@Type.CompositeObjectType{}, parentB@Type.CompositeObjectType{})@@ -1105,10 +1099,6 @@         let Full.Field _ _ _ _ subSelections _ = node             compositeFieldType = Type.outToComposite type'          in maybe (lift Seq.empty) (go subSelections) compositeFieldType-    sameResponseShape :: forall m-        . FieldInfo m-        -> FieldInfo m-        -> ReaderT (Validation m) Seq Error     sameResponseShape fieldA fieldB =         let Full.Field _ _ _ _ selectionsA _ = node fieldA             Full.Field _ _ _ _ selectionsB _ = node fieldB