Issue / Refine Layers

docs/architecture/layer.md

@@ -22,12 +22,12 @@ For a consistent developer experience, follow below conventions when
 implementing a new layer;
 
 1. Place all layer related classes under the same folder named after layer,
-   e.g., `DependencyInjection/`
+   e.g., `Runtime/`
 1. Use `Layer` suffix in layer class name, e.g.,
-   `DependencyInjection/DependencyInjectionLayer.cs`
+   `Runtime/RuntimeLayer.cs`
 1. Provide extension methods in `Baked` namespace, e.g.,
-   `DependencyInjection/DependencyInjectionExtensions.cs`;
-   1. `Add` extension to `List<ILayer>`, e.g., `AddDependencyInjection()`
+   `Runtime/RuntimeExtensions.cs`;
+   1. `Add` extension to `List<ILayer>`, e.g., `AddRuntime()`
    1. `Get` extensions to `ApplicationContext`, e.g.,
       `GetWebApplicationBuilder()`, `GetWebApplication()`
    1. `Configure` extensions to `LayerConfigurator` per configuration

docs/layers/data-access.md

@@ -10,8 +10,8 @@ app.Layers.AddDataAccess();
 ## Configuration Targets
 
 This layer provides `PersistenceConfiguration`, `AutomappingConfiguration`
-`AutoPersistenceModel`, `InterceptorConfiguration` for configuring
-_NHibernate_ behavior.
+`AutoPersistenceModel`, `InterceptorConfiguration` and `FluentConfiguration` 
+for configuring _NHibernate_ behavior.
 
 ### `PersistenceConfiguration`
 
@@ -60,3 +60,15 @@ configurator.ConfigureAutoPersistenceModel(autoPersistenceModel =>
     ...
 });
 ```
+
+### `FluentConfiguration`
+
+This target is provided in `AddServices` phase. To configure it in a
+feature;
+
+```csharp
+configurator.ConfigureFluentConfiguration(fluentConfiguration =>
+{
+    ...
+});
+```

docs/layers/runtime.md

@@ -0,0 +1,72 @@
+# Runtime
+
+This layer serves as foundation and provides common libraries for an 
+application. Baked uses .NET's standard libraries for providing an environment 
+based configuration mechanism, dependency injection container for inversion of 
+control and logging mechanism for monitoring and diagnostic purposes.
+
+
+```csharp
+app.Layers.AddRuntime();
+```
+
+## Configuration Targets
+
+`Runtime` layer provides `IConfigurationBuilder`, `ILoggingBuilder`, 
+`IServiceCollection` and `IServiceProvider` as configuration targets.
+
+### `IConfigurationBuilder`
+
+This target is provided in `BuildConfiguration` phase. To configure it in a
+feature;
+
+```csharp
+configurator.ConfigureConfigurationBuilder(configurationBuilder =>
+{
+    ...
+});
+```
+
+### `ILoggingBuilder`
+
+This target is provided in `CreateBuilder` phase. To configure it in a feature;
+
+```csharp
+configurator.ConfigureLoggingBuilder(logging =>
+{
+    ...
+});
+```
+
+### `IServiceCollection`
+
+This target is provided in `AddServices` phase. To configure it in a feature;
+
+```csharp
+configurator.ConfigureServiceCollection(services =>
+{
+    ...
+});
+```
+
+### `IServiceProvider`
+
+This target is provided in `PostBuild` phase. To configure it in a feature;
+
+```csharp
+configurator.ConfigureServiceProvider(sp =>
+{
+    ...
+});
+```
+
+## Phases
+
+This layer introduces following phases to the application it is added;
+
+- `BuildConfiguration`: This phase runs in the earliest stage to allow the usage
+  of `Settings` API from features
+- `AddServices`: This phase creates a `IServiceCollection` instance and places
+  it in the application context
+- `PostBuild`: This phase depends on a `IServiceProvider` instance to be added
+  to application context so that it can be provided from this layer

docs/recipes/service.md

@@ -19,14 +19,12 @@ Bake.New
 | Name                 | Run                | Test               |
 | -------------------- | ------------------ | ------------------ |
 | Code Generation      | :white_check_mark: | :white_check_mark: |
-| Configuration        | :white_check_mark: | :white_check_mark: |
 | Data Access          | :white_check_mark: | :white_check_mark: |
-| Dependency Injection | :white_check_mark: | :white_check_mark: |
 | Domain               | :white_check_mark: | :white_check_mark: |
 | HTTP Client          | :white_check_mark: | :no_entry:         |
 | HTTP Server          | :white_check_mark: | :no_entry:         |
-| Monitoring           | :white_check_mark: | :white_check_mark: |
 | Rest API             | :white_check_mark: | :no_entry:         |
+| Runtime              | :white_check_mark: | :white_check_mark: |
 | Testing              | :no_entry:         | :white_check_mark: |
 
 ## Features

samples/event-scheduler/src/Mouseless.EventScheduler.Application/ConfigurationOverrider/ConfigurationOverriderExtensions.cs

@@ -0,0 +1,10 @@
+using Baked.Architecture;
+using Mouseless.EventScheduler.Application.ConfigurationOverrider;
+
+namespace Baked;
+
+public static class ConfigurationOverriderExtensions
+{
+    public static void AddConfigurationOverrider(this List<IFeature> features) =>
+        features.Add(new ConfigurationOverriderFeature());
+}

samples/event-scheduler/src/Mouseless.EventScheduler.Application/ConfigurationOverrider/ConfigurationOverriderFeature.cs

@@ -0,0 +1,14 @@
+using Baked.Architecture;
+
+namespace Mouseless.EventScheduler.Application.ConfigurationOverrider;
+
+public class ConfigurationOverriderFeature : IFeature
+{
+    public void Configure(LayerConfigurator configurator)
+    {
+        configurator.ConfigureApiModelConventions(api =>
+        {
+            api.OverrideAction<DeleteMeetingContact>(routeParts: ["meeting", "contact"]);
+        });
+    }
+}

samples/event-scheduler/src/Mouseless.EventScheduler.Application/Program.cs

@@ -1,6 +1,7 @@
 Bake.New
     .Service(
         business: c => c.DomainAssemblies([typeof(Contact).Assembly]),
-        database: c => c.Sqlite("Mouseless.EventScheduler.Application.db")
+        database: c => c.Sqlite("Mouseless.EventScheduler.Application.db"),
+        configure: app => app.Features.AddConfigurationOverrider()
     )
     .Run();

samples/event-scheduler/src/Mouseless.EventScheduler/DeleteMeetingContact.cs

@@ -0,0 +1,32 @@
+using Baked.Business;
+
+namespace Mouseless.EventScheduler;
+
+public class DeleteMeetingContact(MeetingContacts _meetingContacts)
+{
+    Meeting _meeting = default!;
+
+    internal DeleteMeetingContact With(Meeting meeting)
+    {
+        _meeting = meeting;
+
+        return this;
+    }
+
+    public void Execute(Contact contact)
+    {
+        var result = _meetingContacts.SingleBy(_meeting, contact);
+
+        result?.Delete();
+    }
+
+    public static implicit operator DeleteMeetingContact(Meeting meeting) =>
+            meeting.Cast().To<DeleteMeetingContact>();
+}
+
+public class DeleteMeetingContacts(Func<DeleteMeetingContact> _newDeleteMeetingContact)
+    : ICasts<Meeting, DeleteMeetingContact>
+{
+    DeleteMeetingContact ICasts<Meeting, DeleteMeetingContact>.To(Meeting from) =>
+        _newDeleteMeetingContact().With(from);
+}

samples/event-scheduler/src/Mouseless.EventScheduler/MeetingContact.cs

@@ -28,4 +28,7 @@ public class MeetingContacts(IQueryContext<MeetingContact> _context)
 {
     internal List<MeetingContact> ByMeeting(Meeting meeting) =>
         _context.By(mc => mc.Meeting == meeting);
+
+    internal MeetingContact? SingleBy(Meeting meeting, Contact contact) =>
+        _context.SingleBy(mc => mc.Meeting == meeting && mc.Contact == contact);
 }

src/recipe/Baked.Recipe.Service.Application/BakeExtensions.cs

@@ -45,14 +45,12 @@ public static Application Service(this Bake bake,
         return bake.Application(app =>
         {
             app.Layers.AddCodeGeneration();
-            app.Layers.AddConfiguration();
             app.Layers.AddDataAccess();
-            app.Layers.AddDependencyInjection();
             app.Layers.AddDomain();
             app.Layers.AddHttpClient();
             app.Layers.AddHttpServer();
-            app.Layers.AddMonitoring();
             app.Layers.AddRestApi();
+            app.Layers.AddRuntime();
 
             app.Features.AddAuthentications(authentications);
             app.Features.AddAuthorization(authorization);

src/recipe/Baked.Recipe.Service.Application/Business/BusinessExtensions.cs

@@ -35,7 +35,7 @@ public static IServiceCollection AddTransientWithFactory<TService, TImplementati
         where TService : class
         where TImplementation : class, TService
     => services
-        .AddSingleton<Func<TService>>(sp => () => sp.GetRequiredServiceUsingRequestServices<TService>())
+        .AddSingleton<Func<TService>>(sp => () => sp.UsingCurrentScope().GetRequiredService<TService>())
         .AddTransient<TService, TImplementation>();
 
     public static IServiceCollection AddScopedWithFactory(this IServiceCollection services, Type service) =>
@@ -51,7 +51,7 @@ public static IServiceCollection AddScopedWithFactory<TService, TImplementation>
         where TService : class
         where TImplementation : class, TService
     => services
-        .AddSingleton<Func<TService>>(sp => () => sp.GetRequiredServiceUsingRequestServices<TService>())
+        .AddSingleton<Func<TService>>(sp => () => sp.UsingCurrentScope().GetRequiredService<TService>())
         .AddScoped<TService, TImplementation>();
 
     public static IServiceCollection AddSingleton<TService, TImplementation>(this IServiceCollection services, bool forward)
@@ -63,7 +63,7 @@ public static IServiceCollection AddSingleton(this IServiceCollection services,
     {
         if (!forward) { return services.AddSingleton(service, implementation); }
 
-        return services.AddSingleton(service, sp => sp.GetRequiredServiceUsingRequestServices(implementation));
+        return services.AddSingleton(service, sp => sp.UsingCurrentScope().GetRequiredService(implementation));
     }
 
     public static bool TryGetMappedMethod(this ApiDescription apiDescription, [NotNullWhen(true)] out MappedMethodAttribute? result)

src/recipe/Baked.Recipe.Service.Application/Business/DomainAssemblies/DomainAssembliesBusinessFeature.cs

@@ -148,7 +148,7 @@ c.Method.DefaultOverload.BaseDefinition.DeclaringType is not null &&
                 {
                     type.Apply(t => @interface.Apply(i =>
                     {
-                        Caster.Add(i.GenericTypeArguments[0], i.GenericTypeArguments[1], sp => sp.GetRequiredServiceUsingRequestServices(t));
+                        Caster.Add(i.GenericTypeArguments[0], i.GenericTypeArguments[1], sp => sp.UsingCurrentScope().GetRequiredService(t));
                     }));
                 }
             }

src/recipe/Baked.Recipe.Service.Application/CodeGeneration/GeneratedAssemblyCollection.cs

@@ -1,3 +1,3 @@
 namespace Baked.CodeGeneration;
 
-public class GeneratedAssemblyCollection : List<GeneratedAssemblyDescriptor>, IGeneratedAssemblyCollection { }
+public class GeneratedAssemblyCollection : List<GeneratedAssemblyDescriptor>, IGeneratedAssemblyCollection;

src/recipe/Baked.Recipe.Service.Application/CodeGeneration/IGeneratedAssemblyCollection.cs

@@ -1,3 +1,3 @@
 namespace Baked.CodeGeneration;
 
-public interface IGeneratedAssemblyCollection : IList<GeneratedAssemblyDescriptor> { }
+public interface IGeneratedAssemblyCollection : IList<GeneratedAssemblyDescriptor>;

src/recipe/Baked.Recipe.Service.Application/CodingStyle/RichEntity/RichEntityCodingStyleFeature.cs

@@ -1,6 +1,7 @@
 using Baked.Architecture;
 using Baked.Business;
 using Baked.Orm;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Baked.CodingStyle.RichEntity;
 
@@ -52,7 +53,7 @@ public void Configure(LayerConfigurator configurator)
         {
             interceptor.Instantiator = (ctx, id) =>
             {
-                var result = ctx.ApplicationServices.GetRequiredServiceUsingRequestServices(ctx.MetaData.MappedClass);
+                var result = ctx.ApplicationServices.UsingCurrentScope().GetRequiredService(ctx.MetaData.MappedClass);
 
                 ctx.MetaData.SetIdentifier(result, id);