#149 - удаление Scrutor (#159)

Stepami · web-flow · commit b99703f649fc · 2025-04-02T11:18:42.000+03:00
* #149 - remove Scrutor package * #149 - DI key * #149 - decorator on MEDI
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -9,7 +9,6 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.3" />
-    <PackageVersion Include="Scrutor" Version="6.0.1" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24126.1" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.12" />
     <PackageVersion Include="Visitor.NET" Version="4.1.2" />
diff --git a/src/Infrastructure/HydraScript.Infrastructure/Dumping/DecoratorKey.cs b/src/Infrastructure/HydraScript.Infrastructure/Dumping/DecoratorKey.cs
@@ -0,0 +1,6 @@
+namespace HydraScript.Infrastructure.Dumping;
+
+public static class DecoratorKey
+{
+    public const string Value = "domain";
+}
diff --git a/src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingLexer.cs b/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
diff --git a/src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingParser.cs b/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)
     {
diff --git a/src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingVirtualMachine.cs b/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
diff --git a/src/Infrastructure/HydraScript.Infrastructure/HydraScript.Infrastructure.csproj b/src/Infrastructure/HydraScript.Infrastructure/HydraScript.Infrastructure.csproj
@@ -15,7 +15,6 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
         <PackageReference Include="Microsoft.Extensions.Options" />
-        <PackageReference Include="Scrutor" />
         <PackageReference Include="System.IO.Abstractions" />
     </ItemGroup>
 
diff --git a/src/Infrastructure/HydraScript.Infrastructure/ServiceCollectionExtensions.cs b/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>();
     }
-} 
+}

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,12 @@`
`1`	`1`	`using System.IO.Abstractions;`
`2`	`2`	`using HydraScript.Domain.FrontEnd.Parser;`
	`3`	`+using Microsoft.Extensions.DependencyInjection;`
`3`	`4`
`4`	`5`	`namespace HydraScript.Infrastructure.Dumping;`
`5`	`6`
`6`		`-internal class DumpingParser(IParser parser, IFileSystem fileSystem) : IParser`
	`7`	`+internal class DumpingParser(`
	`8`	`+ [FromKeyedServices(DecoratorKey.Value)] IParser parser,`
	`9`	`+ IFileSystem fileSystem) : IParser`
`7`	`10`	`{`
`8`	`11`	`public IAbstractSyntaxTree Parse(string text)`
`9`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,16 @@ public static void AddInfrastructure(`
`48`	`48`
`49`	`49`	`if (dump)`
`50`	`50`	`{`
`51`		`- services.Decorate<ILexer, DumpingLexer>();`
`52`		`- services.Decorate<IParser, DumpingParser>();`
`53`		`- services.Decorate<IVirtualMachine, DumpingVirtualMachine>();`
	`51`	`+ services.AddKeyedSingleton<ILexer, RegexLexer>(DecoratorKey.Value);`
	`52`	`+ services.AddSingleton<ILexer, DumpingLexer>();`
	`53`	`+`
	`54`	`+ services.AddKeyedSingleton<IParser, TopDownParser>(DecoratorKey.Value);`
	`55`	`+ services.AddSingleton<IParser, DumpingParser>();`
	`56`	`+`
	`57`	`+ services.AddKeyedSingleton<IVirtualMachine, VirtualMachine>(DecoratorKey.Value);`
	`58`	`+ services.AddSingleton<IVirtualMachine, DumpingVirtualMachine>();`
`54`	`59`	`}`
`55`	`60`
`56`	`61`	`services.AddSingleton<Executor>();`
`57`	`62`	`}`
`58`		`-}`
	`63`	`+}`