Booleans now propogate across chains

westermo · Sep 11, 2024 · 5e4bfbd · 5e4bfbd
1 parent 2889a37
commit 5e4bfbd
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/FactoryGenerator.Attributes/IContainer.cs b/FactoryGenerator.Attributes/IContainer.cs
@@ -14,6 +14,7 @@ public interface ILifetimeScope : IDisposable
 
     bool IsRegistered(Type type);
     bool IsRegistered<T>();
+    bool GetBoolean(string key);
     public ILifetimeScope BeginLifetimeScope();
 }
 

diff --git a/FactoryGenerator/FactoryGenerator.cs b/FactoryGenerator/FactoryGenerator.cs
@@ -181,6 +181,7 @@ private IContainer GetTop()
     public IContainer? Inheritor {{ get; set; }}
     private object m_lock = new();
     private Dictionary<Type,Func<object>> m_lookup;
+    private Dictionary<string,bool> m_booleans;
     private readonly List<WeakReference<IDisposable>> resolvedInstances = new();
 
     public T Resolve<T>()
@@ -245,6 +246,10 @@ public bool IsRegistered(Type type)
         return m_lookup.ContainsKey(type) ? true : Base?.IsRegistered(type) == true;
     }}
     public bool IsRegistered<T>() => IsRegistered(typeof(T));
+    public bool GetBoolean(string key)
+    {{
+        return m_booleans.TryGetValue(key, out var value) ? value : false; 
+    }}
 }}";
 
             var booleans = dataInjections.Select(inj => inj.BooleanInjection).Where(b => b is not null)
@@ -424,7 +429,7 @@ public bool IsRegistered(Type type)
                                      dictSize, interfaceInjectors.Keys,
                                      localizedParameters, requested,
                                      constructorParameters, true, ClassName, lifetimeParameters,
-                                     resolvingConstructorAssignments: resolvedConstructorAssignments);
+                                     resolvingConstructorAssignments: resolvedConstructorAssignments, booleans: justBooleans);
             yield return Declarations(usingStatements, declarations, ClassName);
             yield return ArrayDeclarations(usingStatements, arrayDeclarations, ClassName);
             yield return $@"{usingStatements}
@@ -463,6 +468,7 @@ public ILifetimeScope BeginLifetimeScope()
     private object m_lock = new();
     private {ClassName} m_fallback;
     private Dictionary<Type,Func<object>> m_lookup;
+    private Dictionary<string,bool> m_booleans;
     private readonly List<WeakReference<IDisposable>> resolvedInstances = new();
 
     public T Resolve<T>()
@@ -527,14 +533,19 @@ public bool IsRegistered(Type type)
         return m_lookup.ContainsKey(type) ? true : Base?.IsRegistered(type) == true;
     }}
     public bool IsRegistered<T>() => IsRegistered(typeof(T));
+    
+    public bool GetBoolean(string key)
+    {{
+        return m_booleans.TryGetValue(key, out var value) ? value : false; 
+    }}
 }}
 ";
             yield return Constructor(usingStatements, constructorFields,
                                      lifetimeConstructor, constructorAssignments,
                                      dictSize, interfaceInjectors.Keys,
                                      localizedParameters, requested,
                                      constructorParameters, false, LifetimeName,
-                                     resolvingConstructorAssignments: resolvedConstructorAssignments, addMergingConstructor: false);
+                                     resolvingConstructorAssignments: resolvedConstructorAssignments, addMergingConstructor: false, booleans: justBooleans);
             yield return Declarations(usingStatements, scopedDeclarations, LifetimeName);
             yield return ArrayDeclarations(usingStatements, arrayDeclarations, LifetimeName);
         }
@@ -595,7 +606,7 @@ private static void CheckForCycles(ImmutableArray<Injection> dataInjections)
         private static string Constructor(string usingStatements, string constructorFields, string constructor, string constructorAssignments, int dictSize,
                                           IEnumerable<INamedTypeSymbol> interfaceInjectors, List<IParameterSymbol> localizedParameters, List<INamedTypeSymbol> requested,
                                           List<IParameterSymbol> constructorParameters, bool addLifetimeScopeFunction, string className, string? lifetimeParameters = null,
-                                          string? fromConstructor = null, string? resolvingConstructorAssignments = null, bool addMergingConstructor = true)
+                                          string? fromConstructor = null, string? resolvingConstructorAssignments = null, bool addMergingConstructor = true, List<string> booleans = null!)
         {
             var lifetimeScopeFunction = addLifetimeScopeFunction
                                             ? $@"
@@ -613,12 +624,17 @@ public ILifetimeScope BeginLifetimeScope()
     Base.Inheritor = this;  
     {resolvingConstructorAssignments}
     
+{string.Join("\n", booleans.Select(b => b.Split(' ').Last()).Select(b => $"\t this.{b} = Base.GetBoolean(\"{b}\");"))}
+    
     m_lookup = new({dictSize}) {{
 {MakeDictionary(interfaceInjectors)}
 {MakeDictionary(localizedParameters)}
 {MakeDictionary(requested)}
 {MakeDictionary(constructorParameters)}
     }};
+    m_booleans = new({booleans.Count}) {{
+{string.Join("\n", booleans.Select(b => b.Split(' ').Last()).Select(b => $"\t\t{{ \"{b}\", {b} }},"))}
+    }};
 }}" : string.Empty;
 
 
@@ -638,6 +654,10 @@ public partial class {className}
 {MakeDictionary(requested)}
 {MakeDictionary(constructorParameters)}
         }};
+        
+    m_booleans = new({booleans.Count}) {{
+{string.Join("\n", booleans.Select(b => b.Split(' ').Last()).Select(b => $"\t\t{{ \"{b}\", {b} }},"))}
+    }};
     }}
     {mergingConstructor}
     {lifetimeScopeFunction}

diff --git a/Tests/FactoryGenerator.Tests/InjectionDetectionTests.cs b/Tests/FactoryGenerator.Tests/InjectionDetectionTests.cs
@@ -239,6 +239,19 @@ public void HierarchicalContainersResolveUsesFallBackIfItCannotFindImplementatio
         var newContainer = new DependencyInjectionContainer(new DummyContainer());
         newContainer.Resolve<string>().ShouldBe(DummyContainer.DummyText);
     }
+
+    [Fact]
+    public void ContainerPropgatesRelevantBooleansCreateItself()
+    {
+        var baseContainer = new DependencyInjectionContainer(true, false, new());
+        baseContainer.GetBoolean("A").ShouldBeFalse();
+        baseContainer.GetBoolean("TestBool").ShouldBeTrue();
+
+        var newContainer = new DependencyInjectionContainer(baseContainer);
+
+        newContainer.GetBoolean("A").ShouldBeFalse();
+        newContainer.GetBoolean("TestBool").ShouldBeTrue();
+    }
     private class DummyContainer : IContainer
     {
         public const string DummyText = "I am a bit of text";
@@ -257,6 +270,11 @@ public void Dispose()
         {
         }
 
+        public bool GetBoolean(string key)
+        {
+            return false;
+        }
+
         public bool IsRegistered(System.Type type)
         {
             return true;