dillonkearns/elm-pages-v3-beta
1
1
Fork 0
mirror of https://github.com/dillonkearns/elm-pages-v3-beta.git synced 2024-12-25 04:43:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle splat route for generating variants.

Browse Source
This commit is contained in:
Dillon Kearns 2022-09-12 13:19:25 -07:00
parent fdefee7036
commit 2115b9be9d
2 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Pages/Internal/RoutePattern.elm
View File

@ -176,7 +176,14 @@ endingToVariantName ending =
( name ++ "__", Just ( decapitalize name, Elm.Annotation.maybe Elm.Annotation.string ) )
RequiredSplat ->
( "SPLAT_", Just ( "splat", Elm.Annotation.string ) )
( "SPLAT_"
, Just
( "splat"
, Elm.Annotation.tuple
Elm.Annotation.string
(Elm.Annotation.list Elm.Annotation.string)
)
)
OptionalSplat ->
( "SPLAT__", Just ( "splat", Elm.Annotation.string ) )

56
tests/Pages/RouteParamsTest.elm
View File

@ -2,7 +2,8 @@ module Pages.RouteParamsTest exposing (..)
import Elm
import Elm.Annotation
import Expect
import Elm.ToString
import Expect exposing (Expectation)
import Pages.Internal.RoutePattern as RoutePattern
import Test exposing (Test, describe, test)
@ -71,10 +72,9 @@ suite =
, describe "toRouteVariant"
[ test "root route" <|
\() ->
RoutePattern.fromModuleName []
|> Maybe.map RoutePattern.toVariant
|> Expect.equal
(Just (Elm.variant "Index"))
[]
|> expectRouteDefinition
(Elm.variant "Index")
, test "static-only route" <|
\() ->
RoutePattern.fromModuleName [ "About" ]
@ -83,16 +83,44 @@ suite =
(Just (Elm.variant "About"))
, test "dynamic param" <|
\() ->
RoutePattern.fromModuleName [ "User", "Id_" ]
|> Maybe.map RoutePattern.toVariant
|> Expect.equal
(Just
(Elm.variantWith "User__Id_"
[ Elm.Annotation.record
[ ( "id", Elm.Annotation.string )
]
[ "User", "Id_" ]
|> expectRouteDefinition
(Elm.variantWith "User__Id_"
[ Elm.Annotation.record
[ ( "id", Elm.Annotation.string )
]
)
]
)
, test "required splat" <|
\() ->
[ "Username_", "Repo_", "Blob", "SPLAT_" ]
|> expectRouteDefinition
(Elm.variantWith "Username___Repo___Blob__SPLAT_"
[ Elm.Annotation.record
[ ( "username", Elm.Annotation.string )
, ( "repo", Elm.Annotation.string )
, ( "splat"
, Elm.Annotation.tuple
Elm.Annotation.string
(Elm.Annotation.list Elm.Annotation.string)
)
]
]
)
]
]
expectRouteDefinition : Elm.Variant -> List String -> Expectation
expectRouteDefinition expected moduleName =
RoutePattern.fromModuleName moduleName
|> Maybe.map (RoutePattern.toVariant >> toString)
|> Maybe.withDefault "<ERROR>"
|> Expect.equal (expected |> toString)
toString : Elm.Variant -> String
toString variants =
Elm.customType "Route" [ variants ]
|> Elm.ToString.declaration
|> .body