Refactor/remove extra builders (#314)

* lined with convention breaking changes

* Moved extensions around

* Updated conventions

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: david-driscoll

Packages.props

@@ -29,10 +29,10 @@
   <ItemGroup>
     <PackageReference Update="Autofac" Version="5.2.0" />
     <PackageReference Update="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Update="Rocket.Surgery.Conventions" Version="10.0.0-beta.16" />
-    <PackageReference Update="Rocket.Surgery.Conventions.Abstractions" Version="10.0.0-beta.16" />
-    <PackageReference Update="Rocket.Surgery.Hosting" Version="10.0.0-beta.16" />
-    <PackageReference Update="Rocket.Surgery.WebAssembly.Hosting" Version="10.0.0-beta.16" />
+    <PackageReference Update="Rocket.Surgery.Conventions" Version="10.0.0-beta.17" />
+    <PackageReference Update="Rocket.Surgery.Conventions.Abstractions" Version="10.0.0-beta.17" />
+    <PackageReference Update="Rocket.Surgery.Hosting" Version="10.0.0-beta.17" />
+    <PackageReference Update="Rocket.Surgery.WebAssembly.Hosting" Version="10.0.0-beta.17" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="Bogus" Version="30.0.4" />

src/Conventions.Autofac/AutofacBuilder.cs

@@ -1,8 +1,15 @@
-namespace Rocket.Surgery.Conventions.Autofac
+using Autofac;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Rocket.Surgery.Conventions.Autofac
 {
     /// <summary>
     /// Delegate ServiceConventionAction
     /// </summary>
-    /// <param name="context">The context.</param>
-    public delegate void AutofacConventionDelegate(IAutofacConventionContext context);
+    /// <param name="conventionContext"></param>
+    /// <param name="configuration"></param>
+    /// <param name="services"></param>
+    /// <param name="container"></param>
+    public delegate void AutofacConvention(IConventionContext conventionContext, IConfiguration configuration, IServiceCollection services, ContainerBuilder container);
 }

src/Conventions.Autofac/AutofacConventionDelegate.cs

@@ -0,0 +1,44 @@
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+
+namespace Rocket.Surgery.Conventions.Autofac
+{
+    class AutofacConventionServiceProviderFactory : IServiceProviderFactory<ContainerBuilder>
+    {
+        private readonly IConventionContext _conventionContext;
+        private readonly ContainerBuilder _container;
+
+        public AutofacConventionServiceProviderFactory(IConventionContext conventionContext, ContainerBuilder? container = null)
+        {
+            _conventionContext = conventionContext;
+            _container = container ?? new ContainerBuilder();
+        }
+
+        public ContainerBuilder CreateBuilder(IServiceCollection services)
+        {
+            var container = _container;
+
+            var configuration = _conventionContext.Get<IConfiguration>() ?? throw new ArgumentException("Configuration was not found in context");
+            foreach (var item in _conventionContext.Conventions.Get<IAutofacConvention, AutofacConvention>())
+            {
+                if (item.Convention is IAutofacConvention convention)
+                {
+                    convention.Register(_conventionContext, configuration, services, _container);
+                }
+                else if (item.Delegate is AutofacConvention @delegate)
+                {
+                    @delegate(_conventionContext, configuration, services, _container);
+                }
+            }
+
+            container.Populate(services);
+
+            return container;
+        }
+
+        public IServiceProvider CreateServiceProvider(ContainerBuilder containerBuilder) => containerBuilder.Build().Resolve<IServiceProvider>();
+    }
+}

src/Conventions.Autofac/AutofacConventionServiceProviderFactory.cs

@@ -0,0 +1,88 @@
+using System;
+using Autofac;
+using JetBrains.Annotations;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Rocket.Surgery.Conventions.Autofac;
+
+// ReSharper disable once CheckNamespace
+namespace Rocket.Surgery.Conventions
+{
+    /// <summary>
+    /// Class AutofacRocketHostExtensions.
+    /// </summary>
+    [PublicAPI]
+    public static class AutofacConventionRocketHostExtensions
+    {
+        /// <summary>
+        /// Uses the Autofac.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="delegate">The container.</param>
+        /// <returns>IHostBuilder.</returns>
+        public static ConventionContextBuilder ConfigureAutofac([NotNull] this ConventionContextBuilder builder, AutofacConvention @delegate)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AppendDelegate(@delegate);
+            return builder;
+        }
+
+        /// <summary>
+        /// Uses the Autofac.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="delegate">The container.</param>
+        /// <returns>IHostBuilder.</returns>
+        public static ConventionContextBuilder ConfigureAutofac(
+            [NotNull] this ConventionContextBuilder builder,
+            Action<IConfiguration, IServiceCollection, ContainerBuilder> @delegate
+        )
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AppendDelegate(new AutofacConvention((context, configuration, services, container) => @delegate(configuration, services, container)));
+            return builder;
+        }
+
+        /// <summary>
+        /// Uses the Autofac.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="delegate">The container.</param>
+        /// <returns>IHostBuilder.</returns>
+        public static ConventionContextBuilder ConfigureAutofac([NotNull] this ConventionContextBuilder builder, Action<IServiceCollection, ContainerBuilder> @delegate)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AppendDelegate(new AutofacConvention((context, configuration, services, container) => @delegate(services, container)));
+            return builder;
+        }
+
+        /// <summary>
+        /// Uses the Autofac.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="delegate">The container.</param>
+        /// <returns>IHostBuilder.</returns>
+        public static ConventionContextBuilder ConfigureAutofac([NotNull] this ConventionContextBuilder builder, Action<ContainerBuilder> @delegate)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AppendDelegate(new AutofacConvention((context, configuration, services, container) => @delegate(container)));
+            return builder;
+        }
+    }
+}