#149 - decorator on MEDI

Author: Stepami

src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingLexer.cs

@@ -1,11 +1,13 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using HydraScript.Domain.FrontEnd.Lexer;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace HydraScript.Infrastructure.Dumping;
 
 internal class DumpingLexer(
+    [FromKeyedServices(DecoratorKey.Value)]
     ILexer lexer,
     IFileSystem fileSystem,
     IOptions<InputFile> inputFile) : ILexer

src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingParser.cs

@@ -1,9 +1,12 @@
 using System.IO.Abstractions;
 using HydraScript.Domain.FrontEnd.Parser;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace HydraScript.Infrastructure.Dumping;
 
-internal class DumpingParser(IParser parser, IFileSystem fileSystem) : IParser
+internal class DumpingParser(
+    [FromKeyedServices(DecoratorKey.Value)] IParser parser, 
+    IFileSystem fileSystem) : IParser
 {
     public IAbstractSyntaxTree Parse(string text)
     {

src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingVirtualMachine.cs

@@ -1,10 +1,12 @@
 using System.IO.Abstractions;
 using HydraScript.Domain.BackEnd;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace HydraScript.Infrastructure.Dumping;
 
 internal class DumpingVirtualMachine(
+    [FromKeyedServices(DecoratorKey.Value)]
     IVirtualMachine virtualMachine,
     IFileSystem fileSystem,
     IOptions<InputFile> inputFile) : IVirtualMachine

src/Infrastructure/HydraScript.Infrastructure/ServiceCollectionExtensions.cs

@@ -48,11 +48,16 @@ public static void AddInfrastructure(
 
         if (dump)
         {
-            services.Decorate<ILexer, DumpingLexer>();
-            services.Decorate<IParser, DumpingParser>();
-            services.Decorate<IVirtualMachine, DumpingVirtualMachine>();
+            services.AddKeyedSingleton<ILexer, RegexLexer>(DecoratorKey.Value);
+            services.AddSingleton<ILexer, DumpingLexer>();
+
+            services.AddKeyedSingleton<IParser, TopDownParser>(DecoratorKey.Value);
+            services.AddSingleton<IParser, DumpingParser>();
+
+            services.AddKeyedSingleton<IVirtualMachine, VirtualMachine>(DecoratorKey.Value);
+            services.AddSingleton<IVirtualMachine, DumpingVirtualMachine>();
         }
 
         services.AddSingleton<Executor>();
     }
-} 
+}