#201 - переменные среды (#214)

* #201 - install env package

* #201 - integrate env into vm

* #201 - fix env di + testing

* #201 - update lex

* #201 - parser refactor

* #201 - refactoring

* #201 - rename tests

* #201 - fix

* #201 - rm dead code

* #201 - literal refactoring

* #201 - env var node parsing

* #201 - parsing tests

* #201 - refactoring + tests

* #201 - fix

* add src props

* update pull_request_template.md

* #201 - fix after merge

* #201 - remove env from ExecuteParams.cs

* #201 - add IFrame abstraction

* #201 - add EnvFrame.cs

* #201 - move envframe to impl

* #201 - frame context && CurrentFrame.cs

* fix

* #201 - frame refactoring

* IDefaultValueForTypeCalculator

* DefaultValueForTypeCalculator restore

* #201 - fix ImplicitLiteral.cs

* #201 - codegen + static analysis

* #201 - return not null if no env is present

* restore test

* #201 - fix + tests

* small refac

* #201 - refac IValueFactory.cs

Author: Stepami

Directory.Packages.props

@@ -1,6 +1,7 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
+    <PackageVersion Include="EnvironmentAbstractions" Version="5.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

ExtendedJavaScriptSubset.slnx

@@ -1,6 +1,6 @@
 <Solution>
   <Folder Name="/Benchmarks/">
-    <Project Path="benchmarks\HydraScript.Benchmarks\HydraScript.Benchmarks.csproj" Type="C#" />
+    <Project Path="benchmarks\HydraScript.Benchmarks\HydraScript.Benchmarks.csproj" />
     <File Path="benchmarks\Readme.md" />
   </Folder>
   <Folder Name="/SolutionItems/">
@@ -28,6 +28,7 @@
     <File Path=".github/workflows/release.yml" />
   </Folder>
   <Folder Name="/Src/">
+    <File Path="src/Directory.Build.props" />
     <Project Path="src/HydraScript/HydraScript.csproj" />
   </Folder>
   <Folder Name="/Src/Application/">

src/Application/HydraScript.Application.CodeGeneration/IValueDtoConverter.cs

@@ -0,0 +1,14 @@
+using HydraScript.Domain.BackEnd;
+using HydraScript.Domain.BackEnd.Impl.Values;
+using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
+
+namespace HydraScript.Application.CodeGeneration;
+
+public interface IValueFactory
+{
+    public IValue Create(ValueDto dto);
+
+    public Name CreateName(IdentifierReference id);
+
+    public Name CreateName(string id);
+}

src/Application/HydraScript.Application.CodeGeneration/IValueFactory.cs

@@ -0,0 +1,42 @@
+using HydraScript.Domain.BackEnd;
+using HydraScript.Domain.BackEnd.Impl.Frames;
+using HydraScript.Domain.BackEnd.Impl.Values;
+using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
+
+namespace HydraScript.Application.CodeGeneration.Impl;
+
+internal class ValueFactory(
+    IFrameContext frameContext,
+    IEnvironmentVariableProvider provider) : IValueFactory
+{
+    public IValue Create(ValueDto dto) =>
+        dto switch
+        {
+            { Type: ValueDtoType.Constant, Label: not null } =>
+                new Constant(dto.Value, dto.Label),
+            { Type: ValueDtoType.Name, Name: not null } =>
+                new Name(dto.Name, CurrentFrame),
+            { Type: ValueDtoType.Env, Name: not null } =>
+                new EnvName(dto.Name, EnvFrame),
+            _ => throw new ArgumentOutOfRangeException(nameof(dto))
+        };
+
+    public Name CreateName(IdentifierReference id)
+    {
+        var dto = id.ToValueDto();
+        return dto switch
+        {
+            { Type: ValueDtoType.Name, Name: not null } =>
+                new Name(dto.Name, CurrentFrame),
+            { Type: ValueDtoType.Env, Name: not null } =>
+                new EnvName(dto.Name, EnvFrame),
+            _ => throw new ArgumentOutOfRangeException(nameof(dto))
+        };
+    }
+
+    public Name CreateName(string id) => new(id, CurrentFrame);
+
+    private CurrentFrame CurrentFrame { get; } = new(frameContext);
+
+    private EnvFrame EnvFrame { get; } = new(provider);
+}

src/Application/HydraScript.Application.CodeGeneration/Impl/ValueDtoConverter.cs

@@ -10,7 +10,7 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddCodeGeneration(this IServiceCollection services)
     {
-        services.AddSingleton<IValueDtoConverter, ValueDtoConverter>();
+        services.AddSingleton<IValueFactory, ValueFactory>();
         services.AddKeyedSingleton<
             IVisitor<IAbstractSyntaxTreeNode, AddressedInstructions>,
             InstructionProvider>(CodeGeneratorType.General);

src/Application/HydraScript.Application.CodeGeneration/Impl/ValueFactory.cs

@@ -32,21 +32,21 @@ internal class ExpressionInstructionProvider : VisitorBase<IAbstractSyntaxTreeNo
     IVisitor<IndexAccess, AddressedInstructions>,
     IVisitor<CallExpression, AddressedInstructions>
 {
-    private readonly IValueDtoConverter _valueDtoConverter;
+    private readonly IValueFactory _valueFactory;
 
-    public ExpressionInstructionProvider(IValueDtoConverter valueDtoConverter) =>
-        _valueDtoConverter = valueDtoConverter;
+    public ExpressionInstructionProvider(IValueFactory valueFactory) =>
+        _valueFactory = valueFactory;
 
     public override AddressedInstructions Visit(IAbstractSyntaxTreeNode visitable) => [];
 
     public AddressedInstructions Visit(PrimaryExpression visitable) =>
-        [new Simple(_valueDtoConverter.Convert(visitable.ToValueDto()))];
+        [new Simple(_valueFactory.Create(visitable.ToValueDto()))];
 
     public AddressedInstructions Visit(ArrayLiteral visitable)
     {
         var arraySize = visitable.Expressions.Count;
 
-        var arrayName = new Name(visitable.Id);
+        var arrayName = _valueFactory.CreateName(visitable.Id);
         var createArray = new CreateArray(arrayName, arraySize);
 
         var result = new AddressedInstructions { createArray };
@@ -60,7 +60,7 @@ public AddressedInstructions Visit(ArrayLiteral visitable)
                 result.Add(new IndexAssignment(
                     arrayName,
                     index,
-                    _valueDtoConverter.Convert(primary.ToValueDto())));
+                    _valueFactory.Create(primary.ToValueDto())));
             else
             {
                 result.AddRange(expression.Accept(This));
@@ -74,8 +74,8 @@ public AddressedInstructions Visit(ArrayLiteral visitable)
 
     public AddressedInstructions Visit(ObjectLiteral visitable)
     {
-        var objectId = visitable.Id;
-        var createObject = new CreateObject(new Name(objectId));
+        var objectId = _valueFactory.CreateName(visitable.Id);
+        var createObject = new CreateObject(objectId);
 
         var result = new AddressedInstructions { createObject };
 
@@ -89,7 +89,7 @@ public AddressedInstructions Visit(ObjectLiteral visitable)
 
     public AddressedInstructions Visit(Property visitable)
     {
-        var objectId = new Name(visitable.Object.Id);
+        var objectId = _valueFactory.CreateName(visitable.Object.Id);
 
         var (id, expression) = visitable;
         var propertyId = new Constant(id);
@@ -98,7 +98,7 @@ public AddressedInstructions Visit(Property visitable)
             return [new DotAssignment(
                 objectId,
                 propertyId,
-                _valueDtoConverter.Convert(primary.ToValueDto()))];
+                _valueFactory.Create(primary.ToValueDto()))];
 
         var instructions = expression.Accept(This);
         var last = instructions.OfType<Simple>().Last().Left!;
@@ -110,7 +110,7 @@ public AddressedInstructions Visit(Property visitable)
     public AddressedInstructions Visit(UnaryExpression visitable)
     {
         if (visitable.Expression is PrimaryExpression primary)
-            return [new Simple(visitable.Operator, _valueDtoConverter.Convert(primary.ToValueDto()))];
+            return [new Simple(visitable.Operator, _valueFactory.Create(primary.ToValueDto()))];
 
         var result = visitable.Expression.Accept(This);
         var last = result.OfType<Simple>().Last().Left!;
@@ -122,21 +122,21 @@ public AddressedInstructions Visit(UnaryExpression visitable)
     public AddressedInstructions Visit(BinaryExpression visitable)
     {
         if (visitable is { Left: IdentifierReference arr, Right: PrimaryExpression primary, Operator: "::" })
-            return [new RemoveFromArray(new Name(arr), index: _valueDtoConverter.Convert(primary.ToValueDto()))];
+            return [new RemoveFromArray(_valueFactory.CreateName(arr), index: _valueFactory.Create(primary.ToValueDto()))];
 
         var result = new AddressedInstructions();
         IValue left, right;
 
         if (visitable.Left is PrimaryExpression primaryLeft)
-            left = _valueDtoConverter.Convert(primaryLeft.ToValueDto());
+            left = _valueFactory.Create(primaryLeft.ToValueDto());
         else
         {
             result.AddRange(visitable.Left.Accept(This));
             left = result.OfType<Simple>().Last().Left!;
         }
 
         if (visitable.Right is PrimaryExpression primaryRight)
-            right = _valueDtoConverter.Convert(primaryRight.ToValueDto());
+            right = _valueFactory.Create(primaryRight.ToValueDto());
         else
         {
             result.AddRange(visitable.Right.Accept(This));
@@ -151,7 +151,7 @@ public AddressedInstructions Visit(BinaryExpression visitable)
     public AddressedInstructions Visit(CastAsExpression visitable)
     {
         if (visitable.Expression is PrimaryExpression primary)
-            return [new AsString(_valueDtoConverter.Convert(primary.ToValueDto()))];
+            return [new AsString(_valueFactory.Create(primary.ToValueDto()))];
 
         var result = visitable.Expression.Accept(This);
         var last = result.OfType<Simple>().Last().Left!;
@@ -162,7 +162,7 @@ public AddressedInstructions Visit(CastAsExpression visitable)
 
     public AddressedInstructions Visit(WithExpression visitable)
     {
-        var objectId = new Name(visitable.ObjectLiteral.Id);
+        var objectId = _valueFactory.CreateName(visitable.ObjectLiteral.Id);
         var createObject = new CreateObject(objectId);
 
         var result = new AddressedInstructions { createObject };
@@ -187,15 +187,15 @@ public AddressedInstructions Visit(WithExpression visitable)
         result.AddRange(visitable.Expression is PrimaryExpression ? [] : visitable.Expression.Accept(This));
 
         var copyFrom = visitable.Expression is IdentifierReference objectIdent
-            ? new Name(objectIdent)
+            ? _valueFactory.CreateName(objectIdent)
             : result.OfType<Simple>().Last().Left!;
 
         for (var i = 0; i < visitable.ComputedCopiedProperties.Count; i++)
         {
             var property = new Constant(visitable.ComputedCopiedProperties[i]);
             result.Add(new DotRead(copyFrom, property));
             var read = result[result.End].Address.Name;
-            result.Add(new DotAssignment(objectId, property, new Name(read)));
+            result.Add(new DotAssignment(objectId, property, _valueFactory.CreateName(read)));
         }
 
         return result;
@@ -210,7 +210,7 @@ public AddressedInstructions Visit(ConditionalExpression visitable)
         var result = new AddressedInstructions();
 
         if (visitable.Test is PrimaryExpression primary)
-            result.Add(new IfNotGoto(test: _valueDtoConverter.Convert(primary.ToValueDto()), startBlockLabel));
+            result.Add(new IfNotGoto(test: _valueFactory.Create(primary.ToValueDto()), startBlockLabel));
         else
         {
             result.AddRange(visitable.Test.Accept(This));
@@ -245,7 +245,7 @@ public AddressedInstructions Visit(AssignmentExpression visitable)
         }
 
         if (visitable.Destination.Empty())
-            result.OfType<Simple>().Last().Left = new Name(visitable.Destination.Id);
+            result.OfType<Simple>().Last().Left = _valueFactory.CreateName(visitable.Destination.Id);
         else
         {
             var last = result.OfType<Simple>().Last().Left!;
@@ -267,7 +267,7 @@ public AddressedInstructions Visit(DotAccess visitable)
         var right = new Constant(visitable.Property.Name);
 
         if (!visitable.HasPrev() && visitable.Parent is LeftHandSideExpression lhs)
-            return [new DotRead(new Name(lhs.Id), right)];
+            return [new DotRead(_valueFactory.CreateName(lhs.Id), right)];
 
         var result = visitable.Prev?.Accept(This) ?? [];
         var left = result.OfType<Simple>().Last().Left!;
@@ -283,15 +283,15 @@ public AddressedInstructions Visit(IndexAccess visitable)
         IValue right;
 
         if (visitable.Index is PrimaryExpression primary)
-            right = _valueDtoConverter.Convert(primary.ToValueDto());
+            right = _valueFactory.Create(primary.ToValueDto());
         else
         {
             result.AddRange(visitable.Index.Accept(This));
             right = result.OfType<Simple>().Last().Left!;
         }
 
         if (!visitable.HasPrev() && visitable.Parent is LeftHandSideExpression lhs)
-            result.Add(new IndexRead(new Name(lhs.Id), right));
+            result.Add(new IndexRead(_valueFactory.CreateName(lhs.Id), right));
         else
         {
             result.AddRange(visitable.Prev?.Accept(This) ?? []);
@@ -320,15 +320,17 @@ public AddressedInstructions Visit(CallExpression visitable)
 
         if (methodCall)
         {
-            var caller = result.Count > 0 ? result.OfType<Simple>().Last().Left! : new Name(visitable.Id);
+            var caller = result.Count > 0
+                ? result.OfType<Simple>().Last().Left!
+                : _valueFactory.CreateName(visitable.Id);
             result.Add(new PushParameter(caller));
         }
 
         for (var i = 0; i < visitable.Parameters.Count; i++)
         {
             var expr = visitable.Parameters[i];
             if (expr is PrimaryExpression primary)
-                result.Add(new PushParameter(_valueDtoConverter.Convert(primary.ToValueDto())));
+                result.Add(new PushParameter(_valueFactory.Create(primary.ToValueDto())));
             else
             {
                 result.AddRange(expr.Accept(This));