minor: better filter support

lucasteles · Dec 26, 2023 · 27bf4d2 · 27bf4d2
1 parent 901bc8d
commit 27bf4d2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/BasicApi/Program.fs b/BasicApi/Program.fs
@@ -108,7 +108,7 @@ let routes =
                     | None -> return !! NotFound()
                 })
 
-            routeGroup "profile" {
+            withGroup "profile" {
                 allowAnonymous
 
                 post

diff --git a/FSharp.MinimalApi/Builder/Builders.fs b/FSharp.MinimalApi/Builder/Builders.fs
@@ -7,4 +7,4 @@ let inline private implicit (x: ^a) : ^b =
 let inline (!!) v = implicit v
 
 let endpoints = EndpointsBuilder()
-let routeGroup groupName = EndpointsBuilder groupName
+let withGroup groupName = EndpointsBuilder groupName
diff --git a/FSharp.MinimalApi/Builder/EndpointsBuilder.fs b/FSharp.MinimalApi/Builder/EndpointsBuilder.fs
@@ -117,11 +117,16 @@ type EndpointsBuilder(?groupName: string) =
         { state with
             MapFn = state.MapFn >> (fun e -> e.RequireAuthorization(policy)) }
 
-    [<CustomOperation("addFilter")>]
-    member _.AddFilter<'f when 'f :> IEndpointFilter>(state) =
+    [<CustomOperation("filter")>]
+    member _.Filter<'args, 'f when 'f :> IEndpointFilter>(state, ctor: 'args -> 'f) =
         { state with
             MapFn = state.MapFn >> (fun e -> e.AddEndpointFilter<'f>()) }
 
+    [<CustomOperation("filter")>]
+    member _.Filter<'f when 'f :> IEndpointFilter>(state, filter: 'f) =
+        { state with
+            MapFn = state.MapFn >> (fun e -> e.AddEndpointFilter(filter)) }
+
     [<CustomOperation("filter")>]
     member _.Filter
         (

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -8,6 +8,5 @@ no-bump-message: "^(none|skip):"
 
 branches:
     master:
-        tag: beta
         is-mainline: true
         source-branches: []
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ let routes =
                 })
 
             // group mappping
-            routeGroup "profile" {
+            withGroup "profile" {
                 allowAnonymous
 
                 post