Generic filter

jet · Sep 6, 2024 · 464bfba · 464bfba
1 parent 42ab64e
commit 464bfba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Propulsion/Propulsion.fsproj b/src/Propulsion/Propulsion.fsproj
@@ -6,7 +6,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <!-- NOTE FSharp.Core dep is implies by what `FSharp.Control.TaskSeq` dictates; see below -->
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-    <PackageValidationBaselineVersion>3.0.0-rc.14.3</PackageValidationBaselineVersion>
+<!--    <PackageValidationBaselineVersion>3.0.0-rc.14.3</PackageValidationBaselineVersion>-->
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Propulsion/StreamFilter.fs b/src/Propulsion/StreamFilter.fs
@@ -3,7 +3,8 @@ namespace Propulsion
 open Propulsion.Internal
 open System.Runtime.InteropServices
 
-type StreamFilter([<Optional>] allowCats, [<Optional>] denyCats, [<Optional>] allowSns, [<Optional>] denySns,
+type StreamFilter<'EventBody>(
+                  [<Optional>] allowCats, [<Optional>] denyCats, [<Optional>] allowSns, [<Optional>] denySns,
                   [<Optional>] allowEts, [<Optional>] denyEts,
                   [<Optional; DefaultParameterValue(false)>] ?includeSystem,
                   [<Optional; DefaultParameterValue(null)>] ?log) =
@@ -36,11 +37,11 @@ type StreamFilter([<Optional>] allowCats, [<Optional>] denyCats, [<Optional>] al
         let denyCats = if includeSystem_ then denyCats else Array.append denyCats [| "^\$" |]
         let allowSns, denySns = match allowSns, denySns with [||], [||] -> [|".*"|], [||] | x -> x
         let allowEts, denyEts = match allowEts, denyEts with [||], [||] -> [|".*"|], [||] | x -> x
-        log.Value.Information("Categories ☑️ {@allowCats} 🚫{@denyCats} Streams ☑️ {@allowStreams} 🚫{denyStreams} Events ☑️ {allowEts} 🚫{@denyEts}",
+        log.Value.Information("Categories ✅{@allowCats} 🚫{@denyCats} Streams ✅{@allowStreams} 🚫{denyStreams} Events ✅{allowEts} 🚫{@denyEts}",
                               asRe allowCats, asRe denyCats, asRe allowSns, asRe denySns, asRe allowEts, asRe denyEts)
         fun sn ->
             validCat sn
             && validStream sn
             && (includeSystem || isTransactionalStream sn)
 
-    member val EventFilter = filter (fun (x: Propulsion.Sinks.Event) -> x.EventType) (allowEts, denyEts)
+    member val EventFilter = filter (fun (x: FsCodec.ITimelineEvent<'EventBody>) -> x.EventType) (allowEts, denyEts)