[StrawberryShake] AddScopedXClient

src/StrawberryShake/Client/src/Core/IClientBuilder.cs

@@ -5,18 +5,8 @@ namespace StrawberryShake;
 /// <summary>
 /// Represents a builder that can be used to configure a client
 /// </summary>
-public interface IClientBuilder<T> where T : IStoreAccessor
+public interface IClientBuilder<T> : IScopedClientBuilder<T> where T : IStoreAccessor
 {
-    /// <summary>
-    /// The name of the client
-    /// </summary>
-    public string ClientName { get; }
-
-    /// <summary>
-    /// The <see cref="IServiceCollection"/> this client was registered to
-    /// </summary>
-    public IServiceCollection Services { get; }
-
     /// <summary>
     /// The <see cref="IServiceCollection"/> of the client
     /// </summary>

src/StrawberryShake/Client/src/Core/IScopedClientBuilder.cs

@@ -0,0 +1,19 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace StrawberryShake;
+
+/// <summary>
+/// Represents a builder that can be used to configure a client
+/// </summary>
+public interface IScopedClientBuilder<T> where T : IStoreAccessor
+{
+    /// <summary>
+    /// The name of the client
+    /// </summary>
+    public string ClientName { get; }
+
+    /// <summary>
+    /// The <see cref="IServiceCollection"/> this client was registered to
+    /// </summary>
+    public IServiceCollection Services { get; }
+}

src/StrawberryShake/Client/src/Core/ScopedClientBuilder.cs

@@ -0,0 +1,27 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace StrawberryShake;
+
+/// <inheritdoc />
+/// <summary>
+/// Initializes a new instance of a <see cref="ScopedClientBuilder{T}"/>
+/// </summary>
+/// <param name="clientName">
+/// The name of the client
+/// </param>
+/// <param name="services">
+/// The service collection this client was registered to
+/// </param>
+public class ScopedClientBuilder<T>(
+    string clientName,
+    IServiceCollection services)
+    : IScopedClientBuilder<T>
+    where T : IStoreAccessor
+{
+
+    /// <inheritdoc />
+    public string ClientName { get; } = clientName;
+
+    /// <inheritdoc />
+    public IServiceCollection Services { get; } = services;
+}

src/StrawberryShake/Client/src/Transport.Http/HttpClientBuilderExtensions.cs

@@ -33,6 +33,56 @@ public static IClientBuilder<T> ConfigureHttpClient<T>(
         Action<HttpClient> configureClient,
         Action<IHttpClientBuilder>? configureClientBuilder = null)
         where T : IStoreAccessor
+    {
+        ConfigureHttpClient((IScopedClientBuilder<T>)clientBuilder, configureClient, configureClientBuilder);
+        return clientBuilder;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="IHttpClientFactory"/> and related services to the
+    /// <see cref="IServiceCollection"/> and configures a <see cref="HttpClient"/>
+    /// with the correct name
+    /// </summary>
+    /// <param name="clientBuilder">
+    /// The <see cref="IClientBuilder{T}"/>
+    /// </param>
+    /// <param name="configureClient">
+    /// A delegate that is used to configure an <see cref="HttpClient"/>.
+    /// </param>
+    /// <param name="configureClientBuilder">
+    /// A delegate that is used to additionally configure the <see cref="HttpClient"/>
+    /// with a <see cref="IHttpClientBuilder"/>
+    /// </param>
+    public static IClientBuilder<T> ConfigureHttpClient<T>(
+        this IClientBuilder<T> clientBuilder,
+        Action<IServiceProvider, HttpClient> configureClient,
+        Action<IHttpClientBuilder>? configureClientBuilder = null)
+        where T : IStoreAccessor
+    {
+        ConfigureHttpClient((IScopedClientBuilder<T>)clientBuilder, configureClient, configureClientBuilder);
+        return clientBuilder;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="IHttpClientFactory"/> and related services to the
+    /// <see cref="IServiceCollection"/> and configures a <see cref="HttpClient"/>
+    /// with the correct name
+    /// </summary>
+    /// <param name="clientBuilder">
+    /// The <see cref="IScopedClientBuilder{T}"/>
+    /// </param>
+    /// <param name="configureClient">
+    /// A delegate that is used to configure an <see cref="HttpClient"/>.
+    /// </param>
+    /// <param name="configureClientBuilder">
+    /// A delegate that is used to additionally configure the <see cref="HttpClient"/>
+    /// with a <see cref="IHttpClientBuilder"/>
+    /// </param>
+    public static IScopedClientBuilder<T> ConfigureHttpClient<T>(
+        this IScopedClientBuilder<T> clientBuilder,
+        Action<HttpClient> configureClient,
+        Action<IHttpClientBuilder>? configureClientBuilder = null)
+        where T : IStoreAccessor
     {
         if (clientBuilder == null)
         {
@@ -68,7 +118,7 @@ public static IClientBuilder<T> ConfigureHttpClient<T>(
     /// with the correct name
     /// </summary>
     /// <param name="clientBuilder">
-    /// The <see cref="IClientBuilder{T}"/>
+    /// The <see cref="IScopedClientBuilder{T}"/>
     /// </param>
     /// <param name="configureClient">
     /// A delegate that is used to configure an <see cref="HttpClient"/>.
@@ -77,8 +127,8 @@ public static IClientBuilder<T> ConfigureHttpClient<T>(
     /// A delegate that is used to additionally configure the <see cref="HttpClient"/>
     /// with a <see cref="IHttpClientBuilder"/>
     /// </param>
-    public static IClientBuilder<T> ConfigureHttpClient<T>(
-        this IClientBuilder<T> clientBuilder,
+    public static IScopedClientBuilder<T> ConfigureHttpClient<T>(
+        this IScopedClientBuilder<T> clientBuilder,
         Action<IServiceProvider, HttpClient> configureClient,
         Action<IHttpClientBuilder>? configureClientBuilder = null)
         where T : IStoreAccessor

src/StrawberryShake/Client/src/Transport.WebSockets/DependencyInjection/WebSocketClientBuilderExtensions.cs

@@ -29,6 +29,58 @@ public static IClientBuilder<T> ConfigureWebSocketClient<T>(
         Action<IWebSocketClient> configureClient,
         Action<IWebSocketClientBuilder>? configureClientBuilder = null)
         where T : IStoreAccessor
+    {
+        ConfigureWebSocketClient((IScopedClientBuilder<T>)clientBuilder, configureClient, configureClientBuilder);
+
+        return clientBuilder;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="ISocketClientFactory"/> and related services to the
+    /// <see cref="IServiceCollection"/> and configures a <see cref="WebSocketClient"/>
+    /// with the correct name
+    /// </summary>
+    /// <param name="clientBuilder">
+    /// The <see cref="IClientBuilder{T}"/>
+    /// </param>
+    /// <param name="configureClient">
+    /// A delegate that is used to configure an <see cref="WebSocketClient"/>.
+    /// </param>
+    /// <param name="configureClientBuilder">
+    /// A delegate that is used to additionally configure the <see cref="IWebSocketClient"/>
+    /// with a <see cref="IWebSocketClientBuilder"/>
+    /// </param>
+    public static IClientBuilder<T> ConfigureWebSocketClient<T>(
+        this IClientBuilder<T> clientBuilder,
+        Action<IServiceProvider, IWebSocketClient> configureClient,
+        Action<IWebSocketClientBuilder>? configureClientBuilder = null)
+        where T : IStoreAccessor
+    {
+        ConfigureWebSocketClient((IScopedClientBuilder<T>)clientBuilder, configureClient, configureClientBuilder);
+
+        return clientBuilder;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="ISocketClientFactory"/> and related services to the
+    /// <see cref="IServiceCollection"/> and configures a <see cref="WebSocketClient"/>
+    /// with the correct name
+    /// </summary>
+    /// <param name="clientBuilder">
+    /// The <see cref="IScopedClientBuilder{T}"/>
+    /// </param>
+    /// <param name="configureClient">
+    /// A delegate that is used to configure an <see cref="WebSocketClient"/>.
+    /// </param>
+    /// <param name="configureClientBuilder">
+    /// A delegate that is used to additionally configure the <see cref="IWebSocketClient"/>
+    /// with a <see cref="IWebSocketClientBuilder"/>
+    /// </param>
+    public static IScopedClientBuilder<T> ConfigureWebSocketClient<T>(
+        this IScopedClientBuilder<T> clientBuilder,
+        Action<IWebSocketClient> configureClient,
+        Action<IWebSocketClientBuilder>? configureClientBuilder = null)
+        where T : IStoreAccessor
     {
         if (clientBuilder == null)
         {
@@ -54,7 +106,7 @@ public static IClientBuilder<T> ConfigureWebSocketClient<T>(
     /// with the correct name
     /// </summary>
     /// <param name="clientBuilder">
-    /// The <see cref="IClientBuilder{T}"/>
+    /// The <see cref="IScopedClientBuilder{T}"/>
     /// </param>
     /// <param name="configureClient">
     /// A delegate that is used to configure an <see cref="WebSocketClient"/>.
@@ -63,8 +115,8 @@ public static IClientBuilder<T> ConfigureWebSocketClient<T>(
     /// A delegate that is used to additionally configure the <see cref="IWebSocketClient"/>
     /// with a <see cref="IWebSocketClientBuilder"/>
     /// </param>
-    public static IClientBuilder<T> ConfigureWebSocketClient<T>(
-        this IClientBuilder<T> clientBuilder,
+    public static IScopedClientBuilder<T> ConfigureWebSocketClient<T>(
+        this IScopedClientBuilder<T> clientBuilder,
         Action<IServiceProvider, IWebSocketClient> configureClient,
         Action<IWebSocketClientBuilder>? configureClientBuilder = null)
         where T : IStoreAccessor

src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Extensions/MethodBuilderExtensions.cs

@@ -56,4 +56,17 @@ public static CodeBlockBuilder AddBody(this MethodBuilder method)
         method.AddCode(code);
         return code;
     }
+
+    public static MethodBuilder If(
+        this MethodBuilder builder,
+        bool condition,
+        Action<MethodBuilder> configure)
+    {
+        if (condition)
+        {
+            configure(builder);
+        }
+
+        return builder;
+    }
 }