configureServices with default effect interpreter (#113)

Co-authored-by: Radu Popovici <[email protected]>

src/Application/NBB.Application.MediatR.Effects/DependencyInjectionExtensions.cs

@@ -4,9 +4,10 @@ namespace NBB.Application.MediatR.Effects
 {
     public static class DependencyInjectionExtensions
     {
-        public static void AddMediatorEffects(this IServiceCollection services)
+        public static IServiceCollection AddMediatorEffects(this IServiceCollection services)
         {
             services.AddSingleton(typeof(MediatorSendQuery.Handler<>));
+            return services;
         }
     }
 }

src/Core/NBB.Core.Effects.FSharp/Interpreter.fs

@@ -1,5 +1,8 @@
 namespace NBB.Core.Effects.FSharp
 
+open Microsoft.Extensions.DependencyInjection
+
 
 module Interpreter =
-    let createInterpreter = NBB.Core.Effects.Interpreter.CreateDefault
+    let createInterpreter () = NBB.Core.Effects.Interpreter.CreateDefault(null)
+    let createInterpreterWith (configureServices:IServiceCollection -> unit) = NBB.Core.Effects.Interpreter.CreateDefault(System.Action<IServiceCollection>(configureServices))

src/Core/NBB.Core.Effects/DependencyInjectionExtensions.cs

@@ -7,13 +7,14 @@ namespace NBB.Core.Effects
 {
     public static class DependencyInjectionExtensions
     {
-        public static void AddEffects(this IServiceCollection services)
+        public static IServiceCollection AddEffects(this IServiceCollection services)
         {
             services.AddSingleton(typeof(Thunk.Handler<>));
             services.AddSingleton(typeof(Parallel.Handler<,>));
             services.AddSingleton(typeof(Sequenced.Handler<>));
             services.AddScoped<ISideEffectBroker, SideEffectBroker>();
             services.AddScoped<IInterpreter, Interpreter>();
+            return services;
         }
 
         public static IServiceCollection AddSideEffectHandler<TOutput>(this IServiceCollection services, ISideEffectHandler<ISideEffect<TOutput>, TOutput> handler)

src/Core/NBB.Core.Effects/Interpreter.cs

@@ -48,8 +48,8 @@ public async Task<T> Interpret<T>(Effect<T> effect, CancellationToken cancellati
             return result;
         }
 
-        public static DisposableInterpreter CreateDefault()
-            => new();
+        public static DisposableInterpreter CreateDefault(Action<IServiceCollection> configureServices = null)
+            => new(configureServices);
     }
 
 
@@ -58,10 +58,11 @@ public class DisposableInterpreter : IInterpreter, IDisposable, IAsyncDisposable
     {
         private readonly ServiceProvider _sp;
         private readonly IInterpreter _interpreter;
-        public DisposableInterpreter()
+        public DisposableInterpreter(Action<IServiceCollection> configureServices = null)
         {
             var services = new ServiceCollection();
             services.AddEffects();
+            configureServices?.Invoke(services);
             _sp = services.BuildServiceProvider();
             _interpreter = _sp.GetRequiredService<IInterpreter>();
         }

src/Http/NBB.Http.Effects/DependencyInjectionExtensions.cs

@@ -6,10 +6,11 @@ namespace NBB.Http.Effects
 {
     public static class DependencyInjectionExtensions
     {
-        public static void AddHttpEffects(this IServiceCollection services)
+        public static IServiceCollection AddHttpEffects(this IServiceCollection services)
         {
             services.AddHttpClient();
             services.AddSingleton<ISideEffectHandler<HttpGet.SideEffect, HttpResponseMessage>, HttpGet.Handler>();
+            return services;
         }
     }
 }

src/Messaging/NBB.Messaging.Effects/DependencyInjectionExtensions.cs

@@ -5,9 +5,10 @@ namespace NBB.Messaging.Effects
 {
     public static class DependencyInjectionExtensions
     {
-        public static void AddMessagingEffects(this IServiceCollection services)
+        public static IServiceCollection AddMessagingEffects(this IServiceCollection services)
         {
             services.AddSingleton<ISideEffectHandler<PublishMessage.SideEffect, Unit>, PublishMessage.Handler>();
+            return services;
         }
     }
 }

test/UnitTests/Core/NBB.Core.Effects.Tests/EffectCompositionTests.cs

@@ -49,7 +49,7 @@ public async Task Composition_of_pure_effects_should_have_no_side_effects_3()
                     Effect.Pure(6).Then(Double))
                 .Then(((int first, int second) t) => t.first + t.second);
 
-            await using var interpreter = Interpreter.CreateDefault();
+            await using var interpreter = Interpreter.CreateDefault(services=> services.AddEffects());
 
             var actual = await interpreter.Interpret(effect);
             actual.Should().Be(Add1(5)+Double(6));