Expose properties for Inject and Config

Author: MattEdwardsWaggleBee

src/Hyperbee.Expressions/ConfigurationExpression.cs

@@ -7,20 +7,19 @@ namespace Hyperbee.Expressions;
 public class ConfigurationExpression : Expression, IDependencyInjectionExpression
 {
     private IConfiguration _configuration;
-    private readonly string _key;
     private readonly Type _type;
 
     public ConfigurationExpression( Type type, string key )
     {
         _type = type;
-        _key = key;
+        Key = key;
     }
 
     public ConfigurationExpression( Type type, IConfiguration configuration, string key )
     {
         _type = type;
         _configuration = configuration;
-        _key = key;
+        Key = key;
     }
 
     public void SetServiceProvider( IServiceProvider serviceProvider )
@@ -30,6 +29,7 @@ public void SetServiceProvider( IServiceProvider serviceProvider )
 
     public override ExpressionType NodeType => ExpressionType.Extension;
     public override Type Type => _type;
+    public string Key { get; init; }
     public override bool CanReduce => true;
 
     private MethodInfo GetValueMethodInfo => typeof( ConfigurationBinder )
@@ -46,7 +46,7 @@ public override Expression Reduce()
         return Call(
             null,
             GetValueMethodInfo,
-            [Constant( _configuration ), Constant( _key )] );
+            [Constant( _configuration ), Constant( Key )] );
     }
 
     protected override Expression VisitChildren( ExpressionVisitor visitor )

src/Hyperbee.Expressions/InjectExpression.cs

@@ -7,16 +7,14 @@ namespace Hyperbee.Expressions;
 public class InjectExpression : Expression, IDependencyInjectionExpression
 {
     private IServiceProvider _serviceProvider;
-    private readonly string _key;
-    private readonly Expression _defaultValue;
     private readonly Type _type;
 
     public InjectExpression( Type type, IServiceProvider serviceProvider, string key, Expression defaultValue )
     {
         _type = type;
         _serviceProvider = serviceProvider;
-        _key = key;
-        _defaultValue = defaultValue;
+        Key = key;
+        DefaultValue = defaultValue;
     }
 
     public void SetServiceProvider( IServiceProvider serviceProvider )
@@ -26,6 +24,8 @@ public void SetServiceProvider( IServiceProvider serviceProvider )
 
     public override ExpressionType NodeType => ExpressionType.Extension;
     public override Type Type => _type;
+    public string Key { get; init; }
+    public Expression DefaultValue { get; init; }
     public override bool CanReduce => true;
 
     private MethodInfo GetServiceMethodInfo => typeof( ServiceProviderServiceExtensions )
@@ -45,7 +45,7 @@ public override Expression Reduce()
 
         var serviceValue = Variable( _type, "serviceValue" );
 
-        var callExpression = _key == null
+        var callExpression = Key == null
             ? Call(
                 null,
                 GetServiceMethodInfo,
@@ -54,10 +54,10 @@ public override Expression Reduce()
             : Call(
                 null,
                 GetKeyedServiceMethodInfo,
-                [Constant( _serviceProvider ), Constant( _key )]
+                [Constant( _serviceProvider ), Constant( Key )]
             );
 
-        var defaultExpression = _defaultValue ??
+        var defaultExpression = DefaultValue ??
                                 Throw( New( ExceptionHelper.ConstructorInfo, Constant( "Service is not available." ) ), _type );
 
         return Block(