#171 - ZString (#182)

Stepami · web-flow · commit a8cbc3ee296c · 2025-09-26T17:08:01.000+03:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -15,5 +15,6 @@
     <PackageVersion Include="Visitor.NET" Version="4.2.0" />
     <PackageVersion Include="Visitor.NET.AutoVisitableGen" Version="1.5.2" />
     <PackageVersion Include="ZLogger" Version="2.5.10" />
+    <PackageVersion Include="ZString" Version="2.6.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Application/HydraScript.Application.StaticAnalysis/Exceptions/AmbiguousInvocation.cs b/src/Application/HydraScript.Application.StaticAnalysis/Exceptions/AmbiguousInvocation.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Cysharp.Text;
 using HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 namespace HydraScript.Application.StaticAnalysis.Exceptions;
@@ -9,4 +10,4 @@ public class AmbiguousInvocation(
     IReadOnlyCollection<FunctionSymbolId> candidates) :
     SemanticException(
         segment,
-        $"Ambiguous Invocation - Candidates are:\n{string.Join('\n', candidates)}");
+        $"Ambiguous Invocation - Candidates are:\n{ZString.Join('\n', candidates)}");
diff --git a/src/Domain/HydraScript.Domain.BackEnd/AddressedInstructions.cs b/src/Domain/HydraScript.Domain.BackEnd/AddressedInstructions.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using Cysharp.Text;
 using HydraScript.Domain.BackEnd.Impl.Addresses;
 
 namespace HydraScript.Domain.BackEnd;
@@ -79,4 +80,7 @@ public IEnumerator<IExecutableInstruction> GetEnumerator() =>
 
     IEnumerator IEnumerable.GetEnumerator() =>
         GetEnumerator();
+
+    public override string ToString() =>
+        ZString.Join<IExecutableInstruction>('\n', this);
 }
diff --git a/src/Domain/HydraScript.Domain.BackEnd/HydraScript.Domain.BackEnd.csproj b/src/Domain/HydraScript.Domain.BackEnd/HydraScript.Domain.BackEnd.csproj
@@ -1,3 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
-
+  <ItemGroup>
+    <PackageReference Include="ZString" />
+  </ItemGroup>
 </Project>
diff --git a/src/Domain/HydraScript.Domain.BackEnd/Impl/Addresses/HashAddress.cs b/src/Domain/HydraScript.Domain.BackEnd/Impl/Addresses/HashAddress.cs
@@ -1,3 +1,5 @@
+using Cysharp.Text;
+
 namespace HydraScript.Domain.BackEnd.Impl.Addresses;
 
 public class HashAddress(int seed) : IAddress
@@ -17,7 +19,7 @@ public string Name
             {
                 var baseName = $"{unchecked((uint)GetHashCode())}{_id:N}";
                 var nameArray = Random.Shared.GetItems(baseName.AsSpan(), 10);
-                _name = "_t" + new string(nameArray);
+                _name = ZString.Concat("_t", new string(nameArray));
             }
 
             return _name;
diff --git a/src/Domain/HydraScript.Domain.BackEnd/Impl/Instructions/WithAssignment/Simple.cs b/src/Domain/HydraScript.Domain.BackEnd/Impl/Instructions/WithAssignment/Simple.cs
@@ -1,3 +1,5 @@
+using Cysharp.Text;
+
 namespace HydraScript.Domain.BackEnd.Impl.Instructions.WithAssignment;
 
 public class Simple : Instruction
@@ -67,7 +69,7 @@ public override IAddress Execute(IExecuteParams executeParams)
             object? lValue = Right.left.Get(frame), rValue = Right.right!.Get(frame);
             frame[Left!] = _operator switch
             {
-                "+" when lValue is string => lValue.ToString() + rValue,
+                "+" when lValue is string => ZString.Concat(lValue, rValue),
                 "+" => Convert.ToDouble(lValue) + Convert.ToDouble(rValue),
                 "-" => Convert.ToDouble(lValue) - Convert.ToDouble(rValue),
                 "*" => Convert.ToDouble(lValue) * Convert.ToDouble(rValue),
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/HydraScript.Domain.FrontEnd.csproj b/src/Domain/HydraScript.Domain.FrontEnd/HydraScript.Domain.FrontEnd.csproj
@@ -3,6 +3,7 @@
     <ItemGroup>
         <PackageReference Include="Visitor.NET" />
         <PackageReference Include="Visitor.NET.AutoVisitableGen" PrivateAssets="all" />
+        <PackageReference Include="ZString" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Lexer/Impl/RegexLexer.cs b/src/Domain/HydraScript.Domain.FrontEnd/Lexer/Impl/RegexLexer.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
+using Cysharp.Text;
 
 namespace HydraScript.Domain.FrontEnd.Lexer.Impl;
 
@@ -47,6 +48,5 @@ public IEnumerator<Token> GetEnumerator()
     [ExcludeFromCodeCoverage]
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-    public override string ToString() =>
-        string.Join('\n', this);
+    public override string ToString() => ZString.Join<Token>('\n', this);
 }
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Lexer/Impl/Structure.cs b/src/Domain/HydraScript.Domain.FrontEnd/Lexer/Impl/Structure.cs
@@ -1,8 +1,8 @@
 using System.Collections;
 using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
-using System.Text;
 using System.Text.RegularExpressions;
+using Cysharp.Text;
 using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
 
 namespace HydraScript.Domain.FrontEnd.Lexer.Impl;
@@ -19,10 +19,7 @@ public class Structure<TContainer>(ITokenTypesProvider provider) : IStructure
     public TokenType FindByTag(string tag) =>
         Types[tag];
 
-    public override string ToString() =>
-        new StringBuilder()
-            .AppendJoin('\n', this)
-            .ToString();
+    public override string ToString() => ZString.Join<TokenType>('\n', this);
 
     // ReSharper disable once NotDisposedResourceIsReturned
     public IEnumerator<TokenType> GetEnumerator() =>
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/AbstractSyntaxTree.cs b/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/AbstractSyntaxTree.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using Cysharp.Text;
 
 namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast;
 
@@ -8,18 +8,20 @@ internal class AbstractSyntaxTree(IAbstractSyntaxTreeNode root) : IAbstractSynta
 
     public override string ToString()
     {
-        var tree = new StringBuilder("digraph ast {\n");
+        using var tree = ZString.CreateStringBuilder();
+        tree.Append("digraph ast {\n");
         var nodes = Root.GetAllNodes();
         for (var i = 0; i < nodes.Count; i++)
         {
             var node = nodes[i];
-            tree.Append('\t').Append(node).Append('\n');
+            tree.AppendFormat("\t{0}\n", node);
             for (var j = 0; j < node.Count; j++)
             {
                 var child = node[j];
-                tree.Append($"\t{node.GetHashCode()}->{child.GetHashCode()}\n");
+                tree.AppendFormat("\t{0}->{1}\n", node.GetHashCode(), child.GetHashCode());
             }
         }
-        return tree.Append("}\n").ToString();
+        tree.Append("}\n");
+        return tree.ToString();
     }
 }
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Declarations/AfterTypesAreLoaded/FunctionDeclaration.cs b/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Declarations/AfterTypesAreLoaded/FunctionDeclaration.cs
@@ -1,3 +1,4 @@
+using Cysharp.Text;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Statements;
 
@@ -56,5 +57,5 @@ public bool HasReturnStatement() =>
     public IReadOnlyCollection<ReturnStatement> ReturnStatements { get; }
 
     protected override string NodeRepresentation() =>
-        "function " + Name;
+        ZString.Concat("function", ' ', Name);
 }
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Declarations/TypeValue.cs b/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Declarations/TypeValue.cs
@@ -1,3 +1,4 @@
+using Cysharp.Text;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
 
 namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations;
@@ -39,5 +40,5 @@ public partial record ObjectTypeValue(
     IEnumerable<PropertyTypeValue> Properties) : TypeValue
 {
     public override string ToString() =>
-        $"{{{string.Join(';', Properties)}}}";
+        $"{{{ZString.Join(';', Properties)}}}";
 }
diff --git a/src/Domain/HydraScript.Domain.IR/HydraScript.Domain.IR.csproj b/src/Domain/HydraScript.Domain.IR/HydraScript.Domain.IR.csproj
@@ -1,3 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
-
+  <ItemGroup>
+    <PackageReference Include="ZString" />
+  </ItemGroup>
 </Project>
diff --git a/src/Domain/HydraScript.Domain.IR/Impl/Symbols/FunctionSymbol.cs b/src/Domain/HydraScript.Domain.IR/Impl/Symbols/FunctionSymbol.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Text;
+using Cysharp.Text;
 using HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 namespace HydraScript.Domain.IR.Impl.Symbols;
@@ -26,11 +26,14 @@ public void DefineReturnType(Type returnType) =>
         _returnType = returnType;
 
     [ExcludeFromCodeCoverage]
-    public override string ToString() =>
-        new StringBuilder($"function {Name}(")
-            .AppendJoin(',', Parameters)
-            .Append($") => {Type}")
-            .ToString();
+    public override string ToString()
+    {
+        using var zsb = ZString.CreateStringBuilder();
+        zsb.AppendFormat("function {0}(", Name);
+        zsb.AppendJoin(',', Parameters);
+        zsb.AppendFormat(") => {0}", Type);
+        return zsb.ToString();
+    }
 
     public static bool operator <(FunctionSymbol left, FunctionSymbol right) =>
         left.Parameters.Count < right.Parameters.Count;
diff --git a/src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/FunctionSymbolId.cs b/src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/FunctionSymbolId.cs
@@ -1,11 +1,13 @@
+using Cysharp.Text;
+
 namespace HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 public class FunctionSymbolId(
     string name,
     IEnumerable<Type> parameters) : SymbolId<FunctionSymbol>
 {
     protected override string Value { get; } =
-        $"function {name}({string.Join(", ", parameters)})";
+        $"function {name}({ZString.Join(", ", parameters)})";
 
     public bool HasName(string askedName) => name == askedName;
 }
diff --git a/src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/TypeSymbolId.cs b/src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/TypeSymbolId.cs
@@ -1,6 +1,8 @@
+using Cysharp.Text;
+
 namespace HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 public class TypeSymbolId(string name) : SymbolId<TypeSymbol>
 {
-    protected override string Value { get; } = "type " + name;
+    protected override string Value { get; } = ZString.Concat("type", ' ', name);
 }
diff --git a/src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/VariableSymbolId.cs b/src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/VariableSymbolId.cs
@@ -1,6 +1,8 @@
+using Cysharp.Text;
+
 namespace HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 public class VariableSymbolId(string name) : SymbolId<VariableSymbol>
 {
-    protected override string Value { get; } = "var " + name;
+    protected override string Value { get; } = ZString.Concat("var", ' ', name);
 }
diff --git a/src/Domain/HydraScript.Domain.IR/Types/ObjectType.cs b/src/Domain/HydraScript.Domain.IR/Types/ObjectType.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using Cysharp.Text;
 using HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 namespace HydraScript.Domain.IR.Types;
@@ -141,7 +141,8 @@ public string PrintObjectType(ObjectType objectType)
             if (!objectType.Equals(_reference))
                 _visited.Add(objectType);
 
-            var sb = new StringBuilder("{");
+            using var zsb = ZString.CreateStringBuilder();
+            zsb.Append('{');
             foreach (var key in objectType._properties.Keys)
             {
                 var type = objectType[key];
@@ -157,30 +158,33 @@ public string PrintObjectType(ObjectType objectType)
                         : printedType;
                 }
 
-                sb.Append(prop).Append(';');
+                zsb.AppendFormat("{0};", prop);
             }
+            zsb.Append('}');
 
-            return sb.Append('}').ToString();
+            return zsb.ToString();
         }
 
         private string PrintArrayType(ArrayType arrayType)
         {
-            var sb = new StringBuilder();
-            sb.Append(arrayType.Type.Equals(_reference)
+            using var zsb = ZString.CreateStringBuilder();
+            zsb.Append(arrayType.Type.Equals(_reference)
                 ? "@this"
                 : Print(arrayType.Type));
+            zsb.Append("[]");
 
-            return sb.Append("[]").ToString();
+            return zsb.ToString();
         }
 
         private string PrintNullableType(NullableType nullableType)
         {
-            var sb = new StringBuilder();
-            sb.Append(nullableType.Type.Equals(_reference)
+            using var zsb = ZString.CreateStringBuilder();
+            zsb.Append(nullableType.Type.Equals(_reference)
                 ? "@this"
                 : Print(nullableType.Type));
+            zsb.Append('?');
 
-            return sb.Append('?').ToString();
+            return zsb.ToString();
         }
     }
 }
diff --git a/src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingParser.cs b/src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingParser.cs
@@ -11,8 +11,7 @@ internal class DumpingParser(
     public IAbstractSyntaxTree Parse(string text)
     {
         var ast = parser.Parse(text);
-        var astDot = ast.ToString();
-        fileSystem.File.WriteAllText("ast.dot", astDot);
+        fileSystem.File.WriteAllText("ast.dot", ast.ToString());
         return ast;
     }
 }
diff --git a/src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingVirtualMachine.cs b/src/Infrastructure/HydraScript.Infrastructure/Dumping/DumpingVirtualMachine.cs
@@ -16,9 +16,7 @@ internal class DumpingVirtualMachine(
     public void Run(AddressedInstructions instructions)
     {
         var fileName = inputFile.Value.Name.Split(".js")[0];
-        fileSystem.File.WriteAllLines(
-            $"{fileName}.tac",
-            instructions.Select(i => i.ToString()!));
+        fileSystem.File.WriteAllText($"{fileName}.tac", instructions.ToString());
 
         virtualMachine.Run(instructions);
     }
diff --git a/tests/HydraScript.IntegrationTests/DumpOptionTests.cs b/tests/HydraScript.IntegrationTests/DumpOptionTests.cs
@@ -1,4 +1,5 @@
 using System.IO.Abstractions;
+using HydraScript.Domain.BackEnd;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 
@@ -9,10 +10,18 @@ public class DumpOptionTests(TestHostFixture fixture) : IClassFixture<TestHostFi
     [Fact]
     public void Invoke_DumpOptionPassed_FilesCreated()
     {
-        using var runner = fixture.GetRunner(new TestHostFixture.Options(Dump: true));
-        runner.Invoke();
-
+        using var runner = fixture.GetRunner(new TestHostFixture.Options(Dump: true, InMemoryScript: ">>>[]"));
+        var outputWriter = runner.ServiceProvider.GetRequiredService<IOutputWriter>();
         var fileSystemMock = runner.ServiceProvider.GetRequiredService<IFileSystem>();
+        fileSystemMock.File
+            .WhenForAnyArgs(x => x.WriteAllText(Arg.Any<string>(), Arg.Any<string>()))
+            .Do(x =>
+            {
+                outputWriter.WriteLine(x.ArgAt<string>(0));
+                outputWriter.WriteLine(x.ArgAt<string>(1));
+            });
+
+        runner.Invoke();
         fileSystemMock.File.Received(1)
             .WriteAllText(
                 TestHostFixture.ScriptFileName + ".tokens",
@@ -22,8 +31,8 @@ public void Invoke_DumpOptionPassed_FilesCreated()
                 "ast.dot",
                 Arg.Any<string>());
         fileSystemMock.File.Received(1)
-            .WriteAllLines(
+            .WriteAllText(
                 TestHostFixture.ScriptFileName + ".tac",
-                Arg.Any<IEnumerable<string>>());
+                Arg.Any<string>());
     }
 }
diff --git a/tests/HydraScript.IntegrationTests/TestHostFixture.cs b/tests/HydraScript.IntegrationTests/TestHostFixture.cs
@@ -37,7 +37,7 @@ public Runner GetRunner(Options options, Action<IServiceCollection>? configureTe
             .AddDomain()
             .AddApplication()
             .AddInfrastructure(options.Dump, new FileInfo(options.FileName));
-        const string serilogTemplate = "[{Timestamp:HH:mm:ss} {Level:u} [{SourceContext}]] {Message:lj} {Exception}";
+        const string serilogTemplate = "[{Timestamp:HH:mm:ss} {Level:u} [{SourceContext}]]{NewLine}{Message:lj} {Exception}";
         services.AddLogging(x => x.ClearProviders()
             .AddSerilog(new LoggerConfiguration().WriteTo.XUnit3TestOutput(serilogTemplate).CreateLogger())
             .AddFakeLogging(fakeLogOptions =>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using Cysharp.Text;`
	`2`	`+`
`1`	`3`	`namespace HydraScript.Domain.BackEnd.Impl.Addresses;`
`2`	`4`
`3`	`5`	`public class HashAddress(int seed) : IAddress`
`@@ -17,7 +19,7 @@ public string Name`
`17`	`19`	`{`
`18`	`20`	`var baseName = $"{unchecked((uint)GetHashCode())}{_id:N}";`
`19`	`21`	`var nameArray = Random.Shared.GetItems(baseName.AsSpan(), 10);`
`20`		`- _name = "_t" + new string(nameArray);`
	`22`	`+ _name = ZString.Concat("_t", new string(nameArray));`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`return _name;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Text;`
	`1`	`+using Cysharp.Text;`
`2`	`2`
`3`	`3`	`namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast;`
`4`	`4`
`@@ -8,18 +8,20 @@ internal class AbstractSyntaxTree(IAbstractSyntaxTreeNode root) : IAbstractSynta`
`8`	`8`
`9`	`9`	`public override string ToString()`
`10`	`10`	`{`
`11`		`- var tree = new StringBuilder("digraph ast {\n");`
	`11`	`+ using var tree = ZString.CreateStringBuilder();`
	`12`	`+ tree.Append("digraph ast {\n");`
`12`	`13`	`var nodes = Root.GetAllNodes();`
`13`	`14`	`for (var i = 0; i < nodes.Count; i++)`
`14`	`15`	`{`
`15`	`16`	`var node = nodes[i];`
`16`		`- tree.Append('\t').Append(node).Append('\n');`
	`17`	`+ tree.AppendFormat("\t{0}\n", node);`
`17`	`18`	`for (var j = 0; j < node.Count; j++)`
`18`	`19`	`{`
`19`	`20`	`var child = node[j];`
`20`		`- tree.Append($"\t{node.GetHashCode()}->{child.GetHashCode()}\n");`
	`21`	`+ tree.AppendFormat("\t{0}->{1}\n", node.GetHashCode(), child.GetHashCode());`
`21`	`22`	`}`
`22`	`23`	`}`
`23`		`- return tree.Append("}\n").ToString();`
	`24`	`+ tree.Append("}\n");`
	`25`	`+ return tree.ToString();`
`24`	`26`	`}`
`25`	`27`	`}`