Fix generated code for routes with variable name conflicting with elm…

… reserved keywords

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+Bug fixes:
+  * Fix generated code for routes with variable name conflicting with elm reserved keywords
+
 ## 1.1.3
 
 Bug fixes:

src/Elm.elm

@@ -2,6 +2,7 @@ module Elm exposing
     ( Module(..), Function(..), Arg(..), Expr(..)
     , Version(..), renderElmModule
     , normalizeModuleName, normalizeFunctionName
+    , keywords
     )
 
 {-| Module defining a simplified AST of elm code along with a render to string function.
@@ -21,6 +22,11 @@ module Elm exposing
 
 @docs normalizeModuleName, normalizeFunctionName
 
+
+# Misc
+
+@docs keywords
+
 -}
 
 import Char exposing (isAlpha)
@@ -273,3 +279,10 @@ replaceMatches predicate replacement =
                     c
             )
         >> String.fromList
+
+
+{-| List of reserved elm keywords.
+-}
+keywords : List String
+keywords =
+    [ "if", "then", "else", "case", "of", "let", "in", "type", "module", "where", "import", "exposing", "as", "port" ]

src/Routing/Parser.elm

@@ -7,6 +7,7 @@ module Routing.Parser exposing (parseRoutingContent)
 -}
 
 import Char
+import Elm
 import Parser exposing (..)
 import Parser.Extra exposing (chomp)
 import Routing.Data exposing (ArgumentType(..), Path(..), Routing)
@@ -52,7 +53,15 @@ path =
 -}
 variable : Parser String
 variable =
-    succeed identity
+    let
+        buildVariable varName =
+            if List.member varName Elm.keywords then
+                varName ++ "_"
+
+            else
+                varName
+    in
+    succeed buildVariable
         |. symbol "{"
         |= (getChompedString <|
                 succeed ()

src/Translation/Parser.elm

@@ -7,6 +7,7 @@ module Translation.Parser exposing (parseTranslationContent)
 -}
 
 import Char
+import Elm
 import Hex
 import Parser exposing (..)
 import Parser.Extra exposing (chomp, oneOfBacktrackable)
@@ -237,7 +238,7 @@ variable =
             if varName == "count" then
                 VariableCount
 
-            else if List.member varName [ "if", "then", "else", "case", "of", "let", "in", "type", "module", "where", "import", "exposing", "as", "port" ] then
+            else if List.member varName Elm.keywords then
                 Variable (varName ++ "_")
 
             else

tests/Routing/TranspilerTest.elm

@@ -345,6 +345,42 @@ suite =
                                     """
                         in
                         Expect.equal expected (transpileToElm input)
+                , test "Handles variable name conflicting with reserved elm keywords" <|
+                    \_ ->
+                        let
+                            input =
+                                { urlPrefix = ""
+                                , content =
+                                    unindent """
+                                        {
+                                            "app_rest_user_type": {
+                                                "path": "/user/types/{type}",
+                                                "requirements": {
+                                                    "type": ""
+                                                }
+                                            }
+                                        }
+                                    """
+                                , version = Elm_0_19
+                                }
+
+                            expected =
+                                Ok <|
+                                    unindent """
+                                    module Routing exposing (..)
+
+
+                                    fromInt : Int -> String
+                                    fromInt int =
+                                        String.fromInt int
+
+
+                                    app_rest_user_type : { type_ : String } -> String
+                                    app_rest_user_type params_ =
+                                        "" ++ "/user/types/" ++ params_.type_
+                                    """
+                        in
+                        Expect.equal expected (transpileToElm input)
                 ]
             ]
         ]