fix #1034 Parse empty string in inferred routing

dotnet-websharper · Oct 30, 2018 · 16c643c · 16c643c
1 parent 1f1c37a
commit 16c643c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/sitelets/WebSharper.Sitelets/InferredRouter.fs b/src/sitelets/WebSharper.Sitelets/InferredRouter.fs
@@ -181,11 +181,12 @@ module internal ServerInferredOperators =
                         path.Segments <- t
                         Some (box s)
                     | _ -> None
-                | _ -> None
+                | [] -> 
+                    Some (box "")
             IWrite = fun (w, value) ->
                 if isNull value then 
                     w.NextSegment().Append("null") |> ignore
-                else
+                elif unbox value <> "" then
                     w.NextSegment().Append(StringEncoding.write (unbox value)) |> ignore
             IExplicitMethods = Set.empty
         }

diff --git a/src/sitelets/WebSharper.Sitelets/Router.fs b/src/sitelets/WebSharper.Sitelets/Router.fs
@@ -1222,7 +1222,8 @@ module RouterOperators =
                     | Some s ->
                         Seq.singleton ({ path with Segments = t }, s)
                     | _ -> Seq.empty
-                | _ -> Seq.empty
+                | [] ->
+                    Seq.singleton (path, "")
             Write = fun value ->
                 Some (Seq.singleton (Route.Segment (if isNull value then "null" else StringEncoding.write value)))
         }

diff --git a/tests/WebSharper.Web.Tests/Routers.fs b/tests/WebSharper.Web.Tests/Routers.fs
@@ -107,6 +107,7 @@ module PerformanceTests =
             URoot
             USubAction Sub1
             USubAction (Sub2 "x")
+            UString ""
             UString "hello"
             UString """{} ## @!~~ +++ fe öüóőúéáű /\ `$%^&*  ->%20<- .,;"""
             UQuery "hello"
@@ -155,6 +156,7 @@ module PerformanceTests =
 
     let ExtraTestValues =
         [
+            UString "", "/string"
             UString "xx", "/stringtoo/xx"
             UCSharp (new CSharpEndPointRoot()), "/csharp/home"
             UCSharp (new CSharpEndPointRoot.Sub1(X = 42)), "/csharp/sub1full/42"