Merge pull request #596 from hariroshan/better-serialize

Better serialization on graphql queries and refactoring

Author: dillonkearns

elm.json

@@ -22,7 +22,6 @@
         "elm/http": "2.0.0 <= v < 3.0.0",
         "elm/json": "1.1.1 <= v < 2.0.0",
         "elm/url": "1.0.0 <= v < 2.0.0",
-        "elm-community/list-extra": "8.0.0 <= v < 9.0.0",
         "j-maas/elm-ordered-containers": "1.0.0 <= v < 2.0.0",
         "lukewestby/elm-string-interpolate": "1.0.4 <= v < 2.0.0"
     },

src/Graphql/Document/Field.elm

@@ -3,7 +3,7 @@ module Graphql.Document.Field exposing (hashedAliasName, serializeChildren)
 import Graphql.Document.Argument as Argument
 import Graphql.Document.Hash exposing (hashString)
 import Graphql.Document.Indent as Indent
-import Graphql.RawField exposing (RawField(..))
+import Graphql.RawField exposing (RawField(..), name)
 import OrderedDict as Dict
 
 
@@ -15,7 +15,7 @@ hashedAliasName : RawField -> String
 hashedAliasName field =
     field
         |> alias
-        |> Maybe.withDefault (Graphql.RawField.name field)
+        |> Maybe.withDefault (name field)
 
 
 maybeAliasHash : RawField -> Maybe Int
@@ -52,7 +52,7 @@ alias : RawField -> Maybe String
 alias field =
     field
         |> maybeAliasHash
-        |> Maybe.map (\aliasHash -> Graphql.RawField.name field ++ String.fromInt aliasHash)
+        |> Maybe.map (\aliasHash -> name field ++ String.fromInt aliasHash)
 
 
 serialize : Maybe String -> Maybe Int -> RawField -> Maybe String
@@ -112,9 +112,10 @@ serializeChildren indentationLevel children =
     children
         |> mergedFields
         |> nonemptyChildren
+        |> canAllowHashing
         |> List.map
-            (\field ->
-                serialize (alias field) (indentationLevel |> Maybe.map ((+) 1)) field
+            (\( field, maybeAlias ) ->
+                serialize maybeAlias (indentationLevel |> Maybe.map ((+) 1)) field
             )
         |> List.filterMap identity
         |> String.join
@@ -127,6 +128,42 @@ serializeChildren indentationLevel children =
             )
 
 
+canAllowHashing : List RawField -> List ( RawField, Maybe String )
+canAllowHashing rawFields =
+    let
+        fieldCounts =
+            rawFields
+                |> List.map name
+                |> List.foldl
+                    (\fld acc ->
+                        acc
+                            |> Dict.update fld
+                                (\val ->
+                                    Just
+                                        (case val of
+                                            Nothing ->
+                                                0
+
+                                            Just count ->
+                                                count + 1
+                                        )
+                                )
+                    )
+                    Dict.empty
+    in
+    rawFields
+        |> List.map
+            (\field ->
+                ( field
+                , if (fieldCounts |> Dict.get (name field) |> Maybe.withDefault 0) == 0 then
+                    Nothing
+
+                  else
+                    alias field
+                )
+            )
+
+
 mergedFields : List RawField -> List RawField
 mergedFields children =
     Dict.values (mergeFields children)

src/Graphql/Http/QueryHelper.elm

@@ -2,7 +2,7 @@ module Graphql.Http.QueryHelper exposing (HttpMethod(..), build)
 
 import Graphql.Document as Document
 import Graphql.Http.QueryParams as QueryParams
-import Graphql.Operation exposing (RootMutation, RootQuery)
+import Graphql.Operation exposing (RootQuery)
 import Graphql.SelectionSet as SelectionSet exposing (SelectionSet)
 import Http
 import Json.Encode
@@ -44,7 +44,7 @@ build forceMethod url queryParams maybeOperationName queryDocument =
 
         urlForGetRequest =
             QueryParams.urlWithQueryParams
-                (queryParams ++ [ ( "query", serializedQueryForGetRequest ) ] ++ operationNameParamForGetRequest)
+                (queryParams ++ ( "query", serializedQueryForGetRequest ) :: operationNameParamForGetRequest)
                 url
     in
     if forceMethod == Just Post || (String.length urlForGetRequest >= maxLength && forceMethod /= Just Get) then
@@ -64,8 +64,8 @@ build forceMethod url queryParams maybeOperationName queryDocument =
         , body =
             Http.jsonBody <|
                 Json.Encode.object <|
-                    [ ( "query", Json.Encode.string serializedQuery ) ]
-                        ++ operationNameParamForPostRequest
+                    ( "query", Json.Encode.string serializedQuery )
+                        :: operationNameParamForPostRequest
         }
 
     else

src/Graphql/Internal/Builder/Object.elm

@@ -29,12 +29,11 @@ scalarDecoder =
         , Decode.bool
             |> Decode.map
                 (\bool ->
-                    case bool of
-                        True ->
-                            "true"
+                    if bool then
+                        "true"
 
-                        False ->
-                            "false"
+                    else
+                        "false"
                 )
         ]
 
@@ -48,9 +47,10 @@ selectionForField typeString fieldName args decoder =
             leaf { typeString = typeString, fieldName = fieldName } args
     in
     SelectionSet [ newLeaf ]
-        (Decode.field
-            (Graphql.Document.Field.hashedAliasName newLeaf)
-            decoder
+        (Decode.oneOf
+            [ Decode.field fieldName decoder
+            , Decode.field (Graphql.Document.Field.hashedAliasName newLeaf) decoder
+            ]
         )
 
 
@@ -64,9 +64,12 @@ selectionForCompositeField :
     -> SelectionSet b lockedTo
 selectionForCompositeField fieldName args (SelectionSet fields decoder) decoderTransform =
     SelectionSet [ composite fieldName args fields ]
-        (Decode.field
-            (Graphql.Document.Field.hashedAliasName (composite fieldName args fields))
-            (decoderTransform decoder)
+        (Decode.oneOf
+            [ Decode.field fieldName (decoderTransform decoder)
+            , Decode.field
+                (Graphql.Document.Field.hashedAliasName (composite fieldName args fields))
+                (decoderTransform decoder)
+            ]
         )
 
 

src/Graphql/Internal/Encode.elm

@@ -51,12 +51,11 @@ maybeObject maybeValues =
     maybeValues
         |> List.filterMap
             (\( key, value ) ->
-                case value of
-                    Just actualValue ->
-                        Just ( key, actualValue )
-
-                    Nothing ->
-                        Nothing
+                value
+                    |> Maybe.andThen
+                        (\actualValue ->
+                            Just ( key, actualValue )
+                        )
             )
         |> Object
 

src/Graphql/SelectionSet.elm

@@ -277,10 +277,8 @@ take a look at the
 -}
 
 import Dict exposing (Dict)
-import Graphql.Document.Field
 import Graphql.RawField as RawField exposing (RawField)
 import Json.Decode as Decode exposing (Decoder)
-import List.Extra
 
 
 {-| SelectionSet type
@@ -829,11 +827,7 @@ combineMaybeList : List (Maybe a) -> Maybe (List a)
 combineMaybeList listOfMaybes =
     let
         step maybeElement accumulator =
-            case maybeElement of
-                Nothing ->
-                    Nothing
-
-                Just element ->
-                    Maybe.map ((::) element) accumulator
+            maybeElement
+                |> Maybe.andThen (\element -> Maybe.map ((::) element) accumulator)
     in
     List.foldr step (Just []) listOfMaybes