Merge pull request #17 from falcoframework/task/rc_7

Task/rc 7

Author: SpiralOSS

src/Falco.Datastar/Ds.fs

@@ -10,7 +10,7 @@ open StarFederation.Datastar.FSharp
 [<AbstractClass; Sealed; RequireQualifiedAccess>]
 type Ds =
     static member cdnSrc =
-        @"https://cdn.jsdelivr.net/gh/starfederation/datastar@1.0.0-RC.6/bundles/datastar.js"
+        @"https://cdn.jsdelivr.net/gh/starfederation/datastar@1.0.0-RC.7/bundles/datastar.js"
 
     /// <summary>
     /// Shorthand for `Elem.script [ Attr.type' "module"; Attr.src cdnSrc ] []`
@@ -215,7 +215,7 @@ type Ds =
     /// <param name="terse">Single line output</param>
     static member jsonSignalsOptions (?signalsFilter:SignalsFilter, ?terse:bool) =
         let addSignalsFilter signalsFilter dsAttr =
-            if signalsFilter = SignalsFilter.None
+            if signalsFilter <> SignalsFilter.None
             then dsAttr |> DsAttr.addValue (signalsFilter |> SignalsFilter.Serialize)
             else dsAttr
         DsAttr.start "json-signals"

src/Falco.Datastar/Falco.Datastar.fsproj

@@ -18,8 +18,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
     <!-- NuGet config -->
-    <PackageId>Falco.Datastar</PackageId>
-    <PackageVersion>1.2.0</PackageVersion>
+    <PackageId>SpiralOSS.Falco.Datastar</PackageId>
+    <PackageVersion>1.2.1</PackageVersion>
     <PackageTags>fsharp;web;falco;falco-sharp;data-star</PackageTags>
     <PackageProjectUrl>https://github.com/falcoframework/Falco.Datastar</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

src/Falco.Datastar/Types.fs

@@ -25,15 +25,13 @@ type SignalsFilter =
             StringBuilder()
             |> _.Append("{ ")
             |> (fun sb ->
-                let _ =
-                    match signalFilter.IncludePattern with
-                    | ValueSome includeExp -> sb.Append($"include: /{includeExp}/")
-                    | _ -> sb
-                let _ =
-                    match signalFilter.ExcludePattern with
-                    | ValueSome excludeExp -> sb.Append($"exclude: /{excludeExp}/")
-                    | _ -> sb
-                sb
+                let filters = seq {
+                    if (signalFilter.IncludePattern <> ValueNone) then
+                        signalFilter.IncludePattern |> ValueOption.get |> (fun incStr -> $"include: /{incStr}/")
+                    if (signalFilter.ExcludePattern <> ValueNone) then
+                        signalFilter.ExcludePattern |> ValueOption.get |> (fun excStr -> $"exclude: /{excStr}/")
+                    }
+                sb.AppendJoin(',', filters)
                 )
             |> _.Append(" }")
             |> _.ToString()

test/Falco.Datastar.Tests/DsTests.fs

@@ -7,27 +7,56 @@ open Xunit
 
 [<AutoOpen>]
 module private Common =
-    let testElem attr =
-        Elem.div attr [ Text.raw "div" ]
+    let renderAttr attr =
+        Elem.div [ attr ] [ ]
         |> renderNode
 
 module DsTests =
     [<Fact>]
     let ``Ds.bind should create an attribute`` () =
-        testElem [ Ds.bind "signalPath" ]
-        |> should equal """<div data-bind:signal-path>div</div>"""
+        renderAttr (Ds.bind "signalPath")
+        |> should equal """<div data-bind:signal-path></div>"""
 
     [<Fact>]
     let ``Ds.post`` () =
         Ds.post "/channel"
         |> should equal """@post('/channel')"""
 
     [<Fact>]
-    let ``Ds.post with Form `` () =
+    let ``Ds.post with Form`` () =
         Ds.post ("/channel", { RequestOptions.Defaults with ContentType = Form })
         |> should equal """@post('/channel',{&quot;contentType&quot;:&quot;form&quot;})"""
 
     [<Fact>]
-    let ``Ds.post with SelectedForm `` () =
+    let ``Ds.post with SelectedForm`` () =
         Ds.post ("/channel", { RequestOptions.Defaults with ContentType = (SelectedForm "myForm") })
         |> should equal """@post('/channel',{&quot;contentType&quot;:&quot;form&quot;,&quot;selector&quot;:&quot;myForm&quot;})"""
+
+    [<Fact>]
+    let ``Ds.jsonSignalsOptions Exclude`` () =
+        let filterFiles : SignalsFilter = { IncludePattern = ValueNone; ExcludePattern = ValueSome "files" }
+        renderAttr (Ds.jsonSignalsOptions filterFiles)
+        |> should equal """<div data-json-signals="{ exclude: /files/ }"></div>"""
+
+    [<Fact>]
+    let ``Ds.jsonSignalsOptions Include`` () =
+        let filterFiles : SignalsFilter = { IncludePattern = ValueSome "files"; ExcludePattern = ValueNone }
+        renderAttr (Ds.jsonSignalsOptions filterFiles)
+        |> should equal """<div data-json-signals="{ include: /files/ }"></div>"""
+
+    [<Fact>]
+    let ``Ds.jsonSignalsOptions Both`` () =
+        let filterFiles : SignalsFilter = { IncludePattern = ValueSome "files$"; ExcludePattern = ValueSome "^files" }
+        renderAttr (Ds.jsonSignalsOptions filterFiles)
+        |> should equal """<div data-json-signals="{ include: /files$/,exclude: /^files/ }"></div>"""
+
+    [<Fact>]
+    let ``Ds.jsonSignalsOptions Terse`` () =
+        renderAttr (Ds.jsonSignalsOptions (terse = true))
+        |> should equal """<div data-json-signals__terse></div>"""
+
+    [<Fact>]
+    let ``Ds.jsonSignalsOptions Terse and Both Filters`` () =
+        let filterFiles : SignalsFilter = { IncludePattern = ValueSome "files$"; ExcludePattern = ValueSome "^files" }
+        renderAttr (Ds.jsonSignalsOptions (filterFiles, terse = true))
+        |> should equal """<div data-json-signals__terse="{ include: /files$/,exclude: /^files/ }"></div>"""