diff --git a/src/Propulsion/Propulsion.fsproj b/src/Propulsion/Propulsion.fsproj index 0e9819d8..df2ce906 100644 --- a/src/Propulsion/Propulsion.fsproj +++ b/src/Propulsion/Propulsion.fsproj @@ -6,7 +6,7 @@ net6.0 true - 3.0.0-rc.14.3 + diff --git a/src/Propulsion/StreamFilter.fs b/src/Propulsion/StreamFilter.fs index b9a4a7bf..376606df 100644 --- 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([] allowCats, [] denyCats, [] allowSns, [] denySns, +type StreamFilter<'EventBody>( + [] allowCats, [] denyCats, [] allowSns, [] denySns, [] allowEts, [] denyEts, [] ?includeSystem, [] ?log) = @@ -36,11 +37,11 @@ type StreamFilter([] allowCats, [] denyCats, [] 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)