Performance improvements

generator/review/elm.json

@@ -9,29 +9,32 @@
             "elm/core": "1.0.5",
             "elm/json": "1.1.3",
             "elm/project-metadata-utils": "1.0.2",
-            "jfmengels/elm-review": "2.9.0",
-            "jfmengels/elm-review-common": "1.3.0",
-            "jfmengels/elm-review-debug": "1.0.6",
-            "jfmengels/elm-review-unused": "1.1.26",
-            "sparksp/elm-review-imports": "1.0.1",
-            "stil4m/elm-syntax": "7.2.9"
+            "jfmengels/elm-review": "2.14.0",
+            "jfmengels/elm-review-common": "1.3.3",
+            "jfmengels/elm-review-debug": "1.0.8",
+            "jfmengels/elm-review-simplify": "2.1.4",
+            "jfmengels/elm-review-unused": "1.2.3",
+            "sparksp/elm-review-imports": "1.0.2",
+            "stil4m/elm-syntax": "7.3.2"
         },
         "indirect": {
+            "elm/bytes": "1.0.8",
             "elm/html": "1.0.0",
             "elm/parser": "1.1.0",
             "elm/random": "1.0.0",
+            "elm/regex": "1.0.0",
             "elm/time": "1.0.0",
             "elm/virtual-dom": "1.0.3",
-            "elm-community/list-extra": "8.6.0",
-            "elm-explorations/test": "1.2.2",
-            "miniBill/elm-unicode": "1.0.2",
+            "elm-explorations/test": "2.2.0",
+            "miniBill/elm-unicode": "1.1.1",
+            "pzp1997/assoc-list": "1.0.0",
             "rtfeldman/elm-hex": "1.0.0",
             "stil4m/structured-writer": "1.0.3"
         }
     },
     "test-dependencies": {
         "direct": {
-            "elm-explorations/test": "1.2.2"
+            "elm-explorations/test": "2.2.0"
         },
         "indirect": {}
     }

generator/review/src/ReviewConfig.elm

@@ -18,6 +18,7 @@ import NoImportingEverything
 import NoInconsistentAliases
 import NoMissingTypeAnnotation
 import NoModuleOnExposedNames
+import NoPrematureLetComputation
 import NoUnused.CustomTypeConstructorArgs
 import NoUnused.CustomTypeConstructors
 import NoUnused.Dependencies
@@ -26,6 +27,7 @@ import NoUnused.Modules
 import NoUnused.Parameters
 import NoUnused.Patterns
 import NoUnused.Variables
+import Simplify
 import Review.Rule exposing (Rule)
 
 
@@ -56,4 +58,6 @@ config =
     --    |> NoInconsistentAliases.noMissingAliases
     --    |> NoInconsistentAliases.rule
     , NoModuleOnExposedNames.rule
+    , Simplify.rule Simplify.defaults
+    , NoPrematureLetComputation.rule
     ]

generator/src/Graphql/Generator/Decoder.elm

@@ -31,15 +31,13 @@ generateDecoder context (Type.TypeReference referrableType isNullable) =
                     let
                         constructor =
                             context.apiSubmodule
-                                ++ [ "Scalar" ]
-                                ++ [ ClassCaseName.normalized customScalarName ]
+                                ++ [ "Scalar", ClassCaseName.normalized customScalarName ]
                                 |> String.join "."
                     in
                     [ (context.scalarCodecsModule |> Maybe.withDefault (ModuleName.fromList (context.apiSubmodule ++ [ "ScalarCodecs" ])))
                         |> ModuleName.append "codecs"
                     , context.apiSubmodule
-                        ++ [ "Scalar" ]
-                        ++ [ "unwrapCodecs" ]
+                        ++ [ "Scalar", "unwrapCodecs" ]
                         |> String.join "."
                     , ".codec"
                         ++ ClassCaseName.normalized customScalarName

generator/src/Graphql/Generator/Group.elm

@@ -46,7 +46,7 @@ interfaceImplementorsDict : List TypeDefinition -> Dict String (List TypeDefinit
 interfaceImplementorsDict typeDefs =
     let
         ( interfaceTypes, objectTypes ) =
-            Tuple.pair typeDefs typeDefs
+            ( typeDefs, typeDefs )
                 |> Tuple.mapBoth (List.filter Type.isInterfaceType) (List.filter Type.isObjectType)
 
         interfaceImplementations : String -> List TypeDefinition -> List TypeDefinition
@@ -56,7 +56,7 @@ interfaceImplementorsDict typeDefs =
                 (\objectOrInterface ->
                     Type.interfacesImplemented objectOrInterface
                         |> List.map ClassCaseName.raw
-                        |> List.any ((==) interfaceName)
+                        |> List.member interfaceName
                 )
                 objectsAndInterfaces
 

generator/src/Graphql/Generator/InputObjectFile.elm

@@ -32,10 +32,6 @@ generateFileContents context typeDefinitions =
         typesToGenerate =
             typeDefinitions
                 |> List.filterMap (isInputObject typeDefinitions)
-
-        fields =
-            typesToGenerate
-                |> List.concatMap .fields
     in
     if typesToGenerate == [] then
         interpolate
@@ -59,7 +55,9 @@ placeholder =
 {2}
 """
             [ moduleName context |> String.join "."
-            , generateImports context fields
+            , typesToGenerate
+                |> List.concatMap .fields
+                |> generateImports context
             , typesToGenerate
                 |> List.map (generateEncoderAndAlias context)
                 |> String.join "\n\n\n"

generator/src/Graphql/Generator/InputObjectLoops.elm

@@ -28,34 +28,32 @@ fieldIsCircular typeDefs inputObjectName fieldTypeRef =
 
 
 fieldIsCircular_ : List ClassCaseName -> List TypeDefinition -> ClassCaseName -> TypeReference -> Bool
-fieldIsCircular_ visitedNames typeDefs inputObjectName fieldTypeRef =
-    let
-        alreadyVisitedThis =
-            visitedNames
-                |> List.map ClassCaseName.raw
-                |> List.Extra.allDifferent
-    in
-    case fieldTypeRef of
-        TypeReference referrableType isNullable ->
-            case referrableType of
-                InputObjectRef inputObjectRefName ->
-                    case lookupInputObject typeDefs inputObjectRefName of
-                        Just ( name, fields ) ->
-                            not alreadyVisitedThis
-                                || isRecursive inputObjectName fields
-                                || List.any
-                                    (fieldIsCircular_ (inputObjectName :: visitedNames) typeDefs name)
-                                    (fields |> List.map .typeRef)
-
-                        Nothing ->
-                            False
-
-                Type.List listTypeRef ->
-                    fieldIsCircular_ visitedNames typeDefs inputObjectName listTypeRef
-
-                _ ->
+fieldIsCircular_ visitedNames typeDefs inputObjectName (TypeReference referrableType isNullable) =
+    case referrableType of
+        InputObjectRef inputObjectRefName ->
+            case lookupInputObject typeDefs inputObjectRefName of
+                Just ( name, fields ) ->
+                    let
+                        alreadyVisitedThis =
+                            visitedNames
+                                |> List.map ClassCaseName.raw
+                                |> List.Extra.allDifferent
+                    in
+                    not alreadyVisitedThis
+                        || isRecursive inputObjectName fields
+                        || List.any
+                            (fieldIsCircular_ (inputObjectName :: visitedNames) typeDefs name)
+                            (fields |> List.map .typeRef)
+
+                Nothing ->
                     False
 
+        Type.List listTypeRef ->
+            fieldIsCircular_ visitedNames typeDefs inputObjectName listTypeRef
+
+        _ ->
+            False
+
 
 lookupInputObject : List TypeDefinition -> ClassCaseName -> Maybe ( ClassCaseName, List Field )
 lookupInputObject typeDefs inputObjectName =
@@ -94,10 +92,8 @@ hasRecursiveRef inputObjectName referrableType =
         InputObjectRef referredInputObjectName ->
             inputObjectName == referredInputObjectName
 
-        Type.List listTypeRef ->
-            case listTypeRef of
-                Type.TypeReference listType isNullable ->
-                    hasRecursiveRef inputObjectName listType
+        Type.List (Type.TypeReference listType isNullable) ->
+            hasRecursiveRef inputObjectName listType
 
         Type.Scalar _ ->
             False

generator/src/Graphql/Generator/Let.elm

@@ -15,13 +15,8 @@ generate letBindings =
                 """        {0} =
             {1}"""
                 [ name, value ]
-
-        letString =
-            letBindings
-                |> List.map toLetString
-                |> String.join "\n\n"
     in
-    if letBindings == [] then
+    if List.isEmpty letBindings then
         ""
 
     else
@@ -30,4 +25,7 @@ generate letBindings =
     let
 {0}
     in"""
-            [ letString ]
+            [ letBindings
+                |> List.map toLetString
+                |> String.join "\n\n"
+            ]

generator/src/Graphql/Parser/ClassCaseName.elm

@@ -24,8 +24,4 @@ normalized (ClassCaseName rawName) =
 
 isBuiltIn : ClassCaseName -> Bool
 isBuiltIn (ClassCaseName rawName) =
-    if String.startsWith "__" rawName then
-        True
-
-    else
-        False
+    String.startsWith "__" rawName

generator/tests/Parser/DecodeTests.elm

@@ -513,7 +513,7 @@ all =
                     |> Result.map Group.interfaceImplementorsDict
                     |> Expect.equal
                         (Ok
-                            [ typeDefinition "Character"
+                            ([ typeDefinition "Character"
                                 (InterfaceType
                                     [ { name = CamelCaseName.build "id"
                                       , description = Just "The id of the character."
@@ -525,7 +525,7 @@ all =
                                     []
                                 )
                                 Nothing
-                            , typeDefinition "Biological"
+                             , typeDefinition "Biological"
                                 (InterfaceType
                                     [ { name = CamelCaseName.build "id"
                                       , description = Just "The id of the character."
@@ -537,7 +537,7 @@ all =
                                     [ ClassCaseName.build "Character" ]
                                 )
                                 Nothing
-                            , typeDefinition "Human"
+                             , typeDefinition "Human"
                                 (ObjectType
                                     [ { name = CamelCaseName.build "id"
                                       , description = Just "The id of the character."
@@ -548,7 +548,8 @@ all =
                                     [ ClassCaseName.build "Biological", ClassCaseName.build "Character" ]
                                 )
                                 Nothing
-                            ]
-                            |> Result.map Group.interfaceImplementorsDict
+                             ]
+                                |> Group.interfaceImplementorsDict
+                            )
                         )
         ]