#165 - refactoring

Author: Stepami

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

@@ -1,27 +1,21 @@
 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<FileInfo> inputFile) : ILexer
+    IDumpingService dumpingService) : ILexer
 {
     [ExcludeFromCodeCoverage]
     public IStructure Structure => lexer.Structure;
 
     public List<Token> GetTokens(string text)
     {
         var tokens = lexer.GetTokens(text);
-        var fileName = inputFile.Value.Name.Split(".js")[0];
-        fileSystem.File.WriteAllText(
-            $"{fileName}.tokens",
-            lexer.ToString());
+        dumpingService.Dump(lexer.ToString(), "tokens");
         return tokens;
     }
 }

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

@@ -1,17 +1,16 @@
-using System.IO.Abstractions;
 using HydraScript.Domain.FrontEnd.Parser;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace HydraScript.Infrastructure.Dumping;
 
 internal class DumpingParser(
     [FromKeyedServices(DecoratorKey.Value)] IParser parser, 
-    IFileSystem fileSystem) : IParser
+    IDumpingService dumpingService) : IParser
 {
     public IAbstractSyntaxTree Parse(string text)
     {
         var ast = parser.Parse(text);
-        fileSystem.File.WriteAllText("ast.dot", ast.ToString());
+        dumpingService.Dump(ast.ToString(), "dot");
         return ast;
     }
 }

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

@@ -1,23 +1,18 @@
-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<FileInfo> inputFile) : IVirtualMachine
+    IDumpingService dumpingService) : IVirtualMachine
 {
     public IExecuteParams ExecuteParams => virtualMachine.ExecuteParams;
 
     public void Run(AddressedInstructions instructions)
     {
-        var fileName = inputFile.Value.Name.Split(".js")[0];
-        fileSystem.File.WriteAllText($"{fileName}.tac", instructions.ToString());
-
+        dumpingService.Dump(instructions.ToString(), "tac");
         virtualMachine.Run(instructions);
     }
 }

src/Infrastructure/HydraScript.Infrastructure/ServiceCollectionExtensions.cs

@@ -37,15 +37,16 @@ public static IServiceCollection AddApplication(this IServiceCollection services
     public static IServiceCollection AddInfrastructure(
         this IServiceCollection services,
         bool dump,
-        FileInfo inputFileInfo)
+        FileInfo fileInfo)
     {
         services.AddSingleton<IFileSystem, FileSystem>();
-        services.AddSingleton(Options.Create(inputFileInfo));
+        services.AddSingleton(Options.Create(fileInfo));
 
         services.AddSingleton<IStaticAnalyzer, StaticAnalyzer>();
         services.AddSingleton<ICodeGenerator, CodeGenerator>();
 
         services.AddSingleton<ISourceCodeProvider, SourceCodeProvider>();
+        services.AddSingleton<IDumpingService, DumpingService>();
 
         if (dump)
         {

tests/HydraScript.IntegrationTests/DumpOptionTests.cs

@@ -24,15 +24,15 @@ public void Invoke_DumpOptionPassed_FilesCreated()
         runner.Invoke();
         fileSystemMock.File.Received(1)
             .WriteAllText(
-                TestHostFixture.ScriptFileName + ".tokens",
+                Arg.Is<string>(s => s.EndsWith(TestHostFixture.ScriptFileName + ".tokens")),
                 Arg.Any<string>());
         fileSystemMock.File.Received(1)
             .WriteAllText(
-                "ast.dot",
+                Arg.Is<string>(s => s.EndsWith(TestHostFixture.ScriptFileName + ".dot")),
                 Arg.Any<string>());
         fileSystemMock.File.Received(1)
             .WriteAllText(
-                TestHostFixture.ScriptFileName + ".tac",
+                Arg.Is<string>(s => s.EndsWith(TestHostFixture.ScriptFileName + ".tac")),
                 Arg.Any<string>());
     }
 }