Merge pull request #41 from jamesmacaulay/0.19

Update to 2.0.0 for Elm 0.19

Author: jamesmacaulay

.travis.yml

@@ -11,17 +11,15 @@ cache:
 os:
   - linux
 
-env: ELM_VERSION=0.18.0
+env: ELM_VERSION=0.19.0
 
 before_install:
   - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
 
 install:
   - node --version
   - npm --version
-  - npm install -g elm@$ELM_VERSION elm-test
-  - git clone https://github.com/NoRedInk/elm-ops-tooling
-  - elm-ops-tooling/with_retry.rb elm package install --yes
+  - npm install -g elm@$ELM_VERSION [email protected]
   # Faster compile on Travis.
   - |
     if [ ! -d sysconfcpus/bin ];

elm-package.json

@@ -0,0 +1,23 @@
+{
+    "type": "package",
+    "name": "jamesmacaulay/elm-graphql",
+    "summary": "A GraphQL request builder and HTTP client",
+    "license": "BSD-3-Clause",
+    "version": "2.0.0",
+    "exposed-modules": [
+        "GraphQL.Client.Http",
+        "GraphQL.Request.Builder",
+        "GraphQL.Request.Builder.Arg",
+        "GraphQL.Request.Builder.Variable"
+    ],
+    "elm-version": "0.19.0 <= v < 0.20.0",
+    "dependencies": {
+        "elm/core": "1.0.0 <= v < 2.0.0",
+        "elm/http": "1.0.0 <= v < 2.0.0",
+        "elm/json": "1.0.0 <= v < 2.0.0",
+        "elm/url": "1.0.0 <= v < 2.0.0"
+    },
+    "test-dependencies": {
+        "elm-explorations/test": "1.0.0 <= v < 2.0.0"
+    }
+}

elm.json

@@ -21,7 +21,6 @@ import GraphQL.Client.Http.Util as Util
 import GraphQL.Request.Builder as Builder
 import Http
 import Task exposing (Task)
-import Time exposing (Time)
 
 
 {-| An error returned by the GraphQL server that indicates there was something wrong with the request.
@@ -93,7 +92,7 @@ type alias RequestOptions =
     { method : String
     , headers : List Http.Header
     , url : String
-    , timeout : Maybe Time
+    , timeout : Maybe Float
     , withCredentials : Bool
     }
 

src/GraphQL/Client/Http.elm

@@ -4,7 +4,7 @@ import GraphQL.Response as Response
 import Http
 import Json.Decode
 import Json.Encode
-import Time exposing (Time)
+import Url
 
 
 postBodyJson : String -> Maybe Json.Encode.Value -> Json.Encode.Value
@@ -36,13 +36,13 @@ parameterizedUrl url documentString variableValues =
                 "?"
 
         queryParam =
-            firstParamPrefix ++ "query=" ++ Http.encodeUri documentString
+            firstParamPrefix ++ "query=" ++ Url.percentEncode documentString
 
         variablesParam =
             variableValues
                 |> Maybe.map
                     (\obj ->
-                        "&variables=" ++ Http.encodeUri (Json.Encode.encode 0 obj)
+                        "&variables=" ++ Url.percentEncode (Json.Encode.encode 0 obj)
                     )
                 |> Maybe.withDefault ""
     in
@@ -53,7 +53,7 @@ type alias RequestOptions =
     { method : String
     , headers : List Http.Header
     , url : String
-    , timeout : Maybe Time
+    , timeout : Maybe Float
     , withCredentials : Bool
     }
 
@@ -81,7 +81,7 @@ type alias RequestConfig a =
     , url : String
     , body : Http.Body
     , expect : Http.Expect a
-    , timeout : Maybe Time
+    , timeout : Maybe Float
     , withCredentials : Bool
     }
 

src/GraphQL/Client/Http/Util.elm

@@ -344,23 +344,23 @@ request :
     vars
     -> Document operationType result vars
     -> Request operationType result
-request vars ((Document { operation, ast, serialized }) as document) =
+request vars ((Document { operation, ast, serialized }) as doc) =
     Request
         { documentAST = ast
         , documentString = serialized
         , variableValues =
-            (documentVariables document
+            (documentVariables doc
                 |> Variable.extractValuesFrom vars
             )
-        , responseDataDecoder = documentResponseDecoder document
+        , responseDataDecoder = documentResponseDecoder doc
         }
 
 
 {-| Get the serialized document body of a `Request`.
 -}
 requestBody : Request operationType result -> String
-requestBody (Request { documentString }) =
-    documentString
+requestBody (Request requestRecord) =
+    requestRecord.documentString
 
 
 variableValuesToJson : List ( String, AST.ConstantValue ) -> Maybe Encode.Value
@@ -384,8 +384,8 @@ jsonVariableValues (Request { variableValues }) =
 {-| Get a JSON decoder that can be used to decode the data contained in a successful response to a `Request`. If you're working with a conventional GraphQL response over HTTP, the returned `Decoder` works on the data found under the `"data"` key of the response.
 -}
 responseDataDecoder : Request operationType result -> Decoder result
-responseDataDecoder (Request { responseDataDecoder }) =
-    responseDataDecoder
+responseDataDecoder (Request requestRecord) =
+    requestRecord.responseDataDecoder
 
 
 fragmentDefinitionsFromOperation : Operation operationType result vars -> List AST.FragmentDefinitionInfo
@@ -878,7 +878,7 @@ Meanwhile, the selection set of `userSpec` itself would look like this wherever
 fragmentSpread :
     Fragment result vars
     -> SelectionSpec FragmentSpread (Maybe result) vars
-fragmentSpread ((Fragment { name, spec }) as fragment) =
+fragmentSpread ((Fragment { name, spec }) as fragmentRecord) =
     let
         astFragmentSpreadInfo =
             { name = name
@@ -891,8 +891,8 @@ fragmentSpread ((Fragment { name, spec }) as fragment) =
         SelectionSpec
             (AST.FragmentSpread astFragmentSpreadInfo)
             (Decode.maybe << decoder)
-            (fragmentVariables fragment)
-            (mergeFragments [ fragmentAST fragment ] nestedFragments)
+            (fragmentVariables fragmentRecord)
+            (mergeFragments [ fragmentAST fragmentRecord ] nestedFragments)
 
 
 {-| Constructs a `SelectionSpec` for an object with a single inline fragment. Takes an optional `TypeCondition`, a list of optional directives, and a `ValueSpec` representing the selection set of the inline fragment. The directives are tuples whose first element is the name of the directive, and whose second element is a list of key-value tuples representing the directive arguments. Argument values are constructed using functions from [`GraphQL.Request.Builder.Value`](GraphQL-Request-Builder-Value).
@@ -1019,7 +1019,7 @@ enum : List ( String, result ) -> ValueSpec NonNull EnumType result vars
 enum =
     enumWithFallback
         (\label ->
-            Decode.fail ("Unexpected enum value " ++ toString label)
+            Decode.fail ("Unexpected enum value " ++ Encode.encode 0 (Encode.string label))
         )
 
 
@@ -1124,7 +1124,7 @@ decoderFromEnumLabel :
 decoderFromEnumLabel fallbackDecoder labelledValues =
     let
         valueFromLabel =
-            flip Dict.get (Dict.fromList labelledValues)
+            (\key -> Dict.get key (Dict.fromList labelledValues))
 
         decoder enumString =
             case valueFromLabel enumString of
@@ -1168,7 +1168,7 @@ nullable (ValueSpec sourceType decoder vars fragments) =
     case sourceType of
         SpecifiedType typeInfo ->
             ValueSpec
-                (SpecifiedType { typeInfo | nullability = nullableFlag })
+                (SpecifiedType (SpecifiedTypeInfo nullableFlag typeInfo.coreType typeInfo.join typeInfo.selectionSet))
                 (Decode.nullable << decoder)
                 vars
                 fragments
@@ -1474,5 +1474,5 @@ mergeFragments fragmentsA fragmentsB =
     fragmentsA
         ++ (fragmentsB
                 |> List.filter
-                    (\fragment -> not (List.any ((==) fragment) fragmentsA))
+                    (\fragmentItem -> not (List.any ((==) fragmentItem) fragmentsA))
            )

src/GraphQL/Request/Builder.elm

@@ -66,17 +66,17 @@ type Field source
 {-| Construct a `Variable` that has no default value, and therefore must extract its value from a `source`. The first argument is the name of the variable that appears in the GraphQL request document, and must be unique for that document. It should _not_ include any leading dollar sign (`$`). The second argument is a function that extracts a value of the required type from a `source`. The third argument is a `VariableSpec` that describes the type of the variable.
 -}
 required : String -> (source -> a) -> VariableSpec nullability a -> Variable source
-required name extract (VariableSpec _ typeRef convert) =
-    RequiredVariable name typeRef (extract >> convert)
+required variableName extract (VariableSpec _ typeRef convert) =
+    RequiredVariable variableName typeRef (extract >> convert)
 
 
 {-| Construct a `Variable` that has a default value, and therefore its `source` may or may not provide a value for it. The first three arguments are the same as for the `required` function, except that the function to extract a value from `source` must return a `Maybe` of the type expected by the `VariableSpec`. The last argument is a default value for the variable.
 
 Note that the `VariableSpec` may be either `Nullable` or `NonNull`, but in both cases the variable definition is serialized _without_ a Non-Null modifier in the GraphQL request document, because optional variables may not be Non-Null in GraphQL. If you pass a `NonNull` `VariableSpec` into this function, it just means that you won't be able to represent an explicit `null` for the variable's value. If instead you pass a `Nullable` `VariableSpec` into this function, you will be able to represent an explicit `null` value for the variable, but you'll also have to deal with double-wrapped `Maybe` values – a missing value is then represented as a `Nothing` returned from your extraction function, and a `null` value is represented as `Just Nothing`. For this reason, it is recommended that you stick to `NonNull` `VariableSpec` values here unless you really need to be able to pass `null` explictly to the GraphQL server.
 -}
 optional : String -> (source -> Maybe a) -> VariableSpec nullability a -> a -> Variable source
-optional name extractMaybe (VariableSpec nullability typeRef convert) defaultValue =
-    OptionalVariable name (TypeRef.nullable typeRef) (extractMaybe >> Maybe.map convert) (convert defaultValue)
+optional variableName extractMaybe (VariableSpec nullability typeRef convert) defaultValue =
+    OptionalVariable variableName (TypeRef.nullable typeRef) (extractMaybe >> Maybe.map convert) (convert defaultValue)
 
 
 {-| A `VariableSpec` for the GraphQL `Int` type that extracts its value from an Elm `Int`.
@@ -190,8 +190,8 @@ field :
     -> (objVariableSource -> fieldVariableSource)
     -> VariableSpec nullability fieldVariableSource
     -> Field objVariableSource
-field name extract (VariableSpec _ typeRef convert) =
-    Field name typeRef (extract >> convert >> Just)
+field fieldName extract (VariableSpec _ typeRef convert) =
+    Field fieldName typeRef (extract >> convert >> Just)
 
 
 {-| Like `field`, except the extractor function must return a `Maybe` value. When the extracted value is `Nothing`, the field is not included in the object sent to the server at all. This works in a very similar way to the `optional` function, except that `optional` is used for entire optional variables while `optionalField` is used for optional fields of variable input objects.
@@ -222,14 +222,14 @@ optionalField :
     -> (objVariableSource -> Maybe fieldVariableSource)
     -> VariableSpec nullability fieldVariableSource
     -> Field objVariableSource
-optionalField name extract (VariableSpec _ typeRef convert) =
-    Field name typeRef (extract >> Maybe.map convert)
+optionalField fieldName extract (VariableSpec _ typeRef convert) =
+    Field fieldName typeRef (extract >> Maybe.map convert)
 
 
 fieldTuple : source -> Field source -> Maybe ( String, AST.ConstantValue )
-fieldTuple source (Field name _ convert) =
+fieldTuple source (Field fieldName _ convert) =
     convert source
-        |> Maybe.map (\value -> ( name, value ))
+        |> Maybe.map (\value -> ( fieldName, value ))
 
 
 valueFromSource : source -> Variable source -> Maybe ( String, AST.ConstantValue )
@@ -252,28 +252,28 @@ valueFromSource source var =
 name : Variable source -> String
 name var =
     case var of
-        RequiredVariable name _ _ ->
-            name
+        RequiredVariable variableName _ _ ->
+            variableName
 
-        OptionalVariable name _ _ _ ->
-            name
+        OptionalVariable variableName _ _ _ ->
+            variableName
 
 
 {-| Returns the AST (abstract syntax tree) representation of a `Variable`.
 -}
 toDefinitionAST : Variable source -> AST.VariableDefinition
 toDefinitionAST var =
     case var of
-        RequiredVariable name typeRef _ ->
+        RequiredVariable variableName typeRef _ ->
             AST.VariableDefinition
-                { name = name
+                { name = variableName
                 , variableType = typeRef
                 , defaultValue = Nothing
                 }
 
-        OptionalVariable name typeRef _ defaultValue ->
+        OptionalVariable variableName typeRef _ defaultValue ->
             AST.VariableDefinition
-                { name = name
+                { name = variableName
                 , variableType = typeRef
                 , defaultValue = Just defaultValue
                 }

src/GraphQL/Request/Builder/Variable.elm

@@ -5,6 +5,7 @@ module GraphQL.Request.Document.AST.Serialize
 
 import GraphQL.Request.Document.AST as AST
 import String
+import Json.Encode as Encode
 
 
 serializeDocument : AST.Document -> String
@@ -118,13 +119,13 @@ serializeValue value =
             "$" ++ name
 
         AST.IntValue int ->
-            toString int
+            String.fromInt int
 
         AST.FloatValue float ->
-            toString float
+            String.fromFloat float
 
         AST.StringValue string ->
-            toString string
+            Encode.encode 0 (Encode.string string)
 
         AST.BooleanValue True ->
             "true"

src/GraphQL/Request/Document/AST/Serialize.elm

@@ -30,7 +30,7 @@ encode value =
             Json.string string
 
         AST.ListValue values ->
-            Json.list (List.map encode values)
+            Json.list encode values
 
         AST.ObjectValue kvPairs ->
             Json.object (List.map (Tuple.mapSecond encode) kvPairs)

src/GraphQL/Request/Document/AST/Value/Json/Encode.elm

@@ -12,6 +12,7 @@ module GraphQL.Schema.Decode
         )
 
 import Json.Decode as Decode exposing (Decoder, field, string, bool, null, list)
+import Json.Encode as Encode
 import GraphQL.Schema as Schema exposing (Schema)
 import Dict exposing (Dict)
 
@@ -158,13 +159,13 @@ namedTypeDecoder =
                         inputObjectTypeDecoder
 
                     _ ->
-                        Decode.fail ("unexpected kind for named type " ++ toString kind)
+                        Decode.fail ("unexpected kind for named type " ++ Encode.encode 0 (Encode.string kind))
             )
 
 
 namedTypeTupleDecoder : Decoder ( String, Schema.NamedType )
 namedTypeTupleDecoder =
-    construct (,)
+    construct (\a b -> ( a, b ))
         |> with (field "name" string)
         |> with namedTypeDecoder
 
@@ -197,7 +198,7 @@ decoderFromDirectiveLocation loc =
             Decode.succeed Schema.InlineFragmentLocation
 
         _ ->
-            Decode.fail ("unexpected DirectiveLocation " ++ toString loc)
+            Decode.fail ("unexpected DirectiveLocation " ++ Encode.encode 0 (Encode.string loc))
 
 
 directiveLocationDecoder : Decoder Schema.DirectiveLocation