Renaming and minor fixes

readme/EnumDetails.md

@@ -103,15 +103,15 @@ partial class Enum
   [MethodImpl((MethodImplOptions)0x100)]
   public partial Benchmarks.Model.CompositionRoot TestPureDIByCR()
   {
-    [MethodImpl((MethodImplOptions)0x200)]
-    IEnumerable<Benchmarks.Model.IService3> Local_perBlock10_IEnumerable()
+    [MethodImpl((MethodImplOptions)0x100)]
+    IEnumerable<Benchmarks.Model.IService3> EnumerationOf_perBlock10_IEnumerable()
     {
         yield return new Benchmarks.Model.Service3(new Benchmarks.Model.Service4(), new Benchmarks.Model.Service4());
         yield return new Benchmarks.Model.Service3v2(new Benchmarks.Model.Service4(), new Benchmarks.Model.Service4());
         yield return new Benchmarks.Model.Service3v3(new Benchmarks.Model.Service4(), new Benchmarks.Model.Service4());
         yield return new Benchmarks.Model.Service3v4(new Benchmarks.Model.Service4(), new Benchmarks.Model.Service4());
     }
-    IEnumerable<Benchmarks.Model.IService3> perBlock10_IEnumerable = Local_perBlock10_IEnumerable();
+    IEnumerable<Benchmarks.Model.IService3> perBlock10_IEnumerable = EnumerationOf_perBlock10_IEnumerable();
     return new Benchmarks.Model.CompositionRoot(new Benchmarks.Model.Service1(new Benchmarks.Model.Service2Enum(perBlock10_IEnumerable)), new Benchmarks.Model.Service2Enum(perBlock10_IEnumerable), new Benchmarks.Model.Service2Enum(perBlock10_IEnumerable), new Benchmarks.Model.Service2Enum(perBlock10_IEnumerable), new Benchmarks.Model.Service3(new Benchmarks.Model.Service4(), new Benchmarks.Model.Service4()), new Benchmarks.Model.Service4(), new Benchmarks.Model.Service4());
   }
 

readme/SingletonDetails.md

@@ -70,8 +70,8 @@ classDiagram
 partial class Singleton
 {
   private readonly Singleton _root;
-  private Benchmarks.Model.Service1 _scoped37_Service1;
-  private Benchmarks.Model.Service4 _scoped40_Service4;
+  private Benchmarks.Model.Service1? _scoped37_Service1;
+  private Benchmarks.Model.Service4? _scoped40_Service4;
 
   public Singleton()
   {
@@ -92,9 +92,9 @@ partial class Singleton
     }
     if (_scoped37_Service1 == null)
     {
-        _scoped37_Service1 = new Benchmarks.Model.Service1(new Benchmarks.Model.Service2(new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4)));
+        _scoped37_Service1 = new Benchmarks.Model.Service1(new Benchmarks.Model.Service2(new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!)));
     }
-    return new Benchmarks.Model.CompositionRoot(_scoped37_Service1, new Benchmarks.Model.Service2(new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4)), new Benchmarks.Model.Service2(new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4)), new Benchmarks.Model.Service2(new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4)), new Benchmarks.Model.Service3(_scoped40_Service4, _scoped40_Service4), _scoped40_Service4, _scoped40_Service4);
+    return new Benchmarks.Model.CompositionRoot(_scoped37_Service1!, new Benchmarks.Model.Service2(new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!)), new Benchmarks.Model.Service2(new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!)), new Benchmarks.Model.Service2(new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!)), new Benchmarks.Model.Service3(_scoped40_Service4!, _scoped40_Service4!), _scoped40_Service4!, _scoped40_Service4!);
   }
 
   [MethodImpl((MethodImplOptions)0x100)]

readme/accumulators.md

@@ -92,7 +92,7 @@ partial class Composition
 {
   private readonly Composition _root;
   private readonly object _lock;
-  private XyzDependency _singleton38_XyzDependency;
+  private XyzDependency? _singleton38_XyzDependency;
 
   public Composition()
   {
@@ -123,8 +123,7 @@ partial class Composition
                   _singleton38_XyzDependencyTemp = new XyzDependency();
                   accumulator42.Add(_singleton38_XyzDependencyTemp);
                   Thread.MemoryBarrier();
-                  _singleton38_XyzDependency = _singleton38_XyzDependencyTemp;
-                  _root._singleton38_XyzDependency = _singleton38_XyzDependency;
+                  _root._singleton38_XyzDependency = _singleton38_XyzDependencyTemp;
               }
           }
       }
@@ -133,7 +132,7 @@ partial class Composition
       {
           accumulator42.Add(transient3_AbcDependency);
       }
-      Service transient1_Service = new Service(transient3_AbcDependency, _root._singleton38_XyzDependency, perBlock4_AbcDependency);
+      Service transient1_Service = new Service(transient3_AbcDependency, _root._singleton38_XyzDependency!, perBlock4_AbcDependency);
       lock (_lock)
       {
           accumulator42.Add(transient1_Service);

readme/advanced-interception.md

@@ -31,9 +31,9 @@ class Service(IDependency dependency) : IService
 
 internal partial class Composition: IInterceptor
 {
-    private readonly List<string> _log;
+    private readonly List<string> _log = new();
     private static readonly IProxyBuilder ProxyBuilder = new DefaultProxyBuilder();
-    private readonly IInterceptor[] _interceptors;
+    private readonly IInterceptor[] _interceptors = [];
 
     public Composition(List<string> log)
         : this()

readme/async-disposable-scope.md

@@ -140,7 +140,7 @@ partial class Composition: IDisposable, IAsyncDisposable
   private readonly object _lock;
   private object[] _disposables;
   private int _disposeIndex;
-  private Dependency _scoped36_Dependency;
+  private Dependency? _scoped36_Dependency;
 
   public Composition()
   {
@@ -172,7 +172,7 @@ partial class Composition: IDisposable, IAsyncDisposable
               }
           }
       }
-      return new Service(_scoped36_Dependency);
+      return new Service(_scoped36_Dependency!);
     }
   }
 
@@ -190,7 +190,7 @@ partial class Composition: IDisposable, IAsyncDisposable
           var value_1 = new Session(transient2_Composition);
           return value_1;
       });
-      return new Program(perResolve43_Func);
+      return new Program(perResolve43_Func!);
     }
   }
 

readme/async-disposable-singleton.md

@@ -93,7 +93,7 @@ partial class Composition: IDisposable, IAsyncDisposable
   private readonly object _lock;
   private object[] _disposables;
   private int _disposeIndex;
-  private Dependency _singleton36_Dependency;
+  private Dependency? _singleton36_Dependency;
 
   public Composition()
   {
@@ -106,6 +106,7 @@ partial class Composition: IDisposable, IAsyncDisposable
   {
     _root = parentScope._root;
     _lock = _root._lock;
+    _disposables = parentScope._disposables;
   }
 
   public IService Root
@@ -119,13 +120,12 @@ partial class Composition: IDisposable, IAsyncDisposable
           {
               if (_root._singleton36_Dependency == null)
               {
-                  _singleton36_Dependency = new Dependency();
-                  _root._singleton36_Dependency = _singleton36_Dependency;
-                  _root._disposables[_root._disposeIndex++] = _singleton36_Dependency;
+                  _root._singleton36_Dependency = new Dependency();
+                  _root._disposables[_root._disposeIndex++] = _root._singleton36_Dependency;
               }
           }
       }
-      return new Service(_root._singleton36_Dependency);
+      return new Service(_root._singleton36_Dependency!);
     }
   }
 

readme/async-enumerable.md

@@ -107,13 +107,14 @@ partial class Composition
     [MethodImpl((MethodImplOptions)0x100)]
     get
     {
-      [MethodImpl((MethodImplOptions)0x200)]
-      async IAsyncEnumerable<IDependency> Local_transient1_IAsyncEnumerable()
+      [MethodImpl((MethodImplOptions)0x100)]
+      async IAsyncEnumerable<IDependency> EnumerationOf_transient1_IAsyncEnumerable()
       {
           yield return new AbcDependency();
           yield return new XyzDependency();
+          await Task.CompletedTask;
       }
-      IAsyncEnumerable<IDependency> transient1_IAsyncEnumerable = Local_transient1_IAsyncEnumerable();
+      IAsyncEnumerable<IDependency> transient1_IAsyncEnumerable = EnumerationOf_transient1_IAsyncEnumerable();
       return new Service(transient1_IAsyncEnumerable);
     }
   }

readme/auto-scoped.md

@@ -108,7 +108,7 @@ partial class Composition
 {
   private readonly Composition _root;
   private readonly object _lock;
-  private Dependency _scoped36_Dependency;
+  private Dependency? _scoped36_Dependency;
 
   public Composition()
   {
@@ -137,7 +137,7 @@ partial class Composition
               }
           }
       }
-      return new Service(_scoped36_Dependency);
+      return new Service(_scoped36_Dependency!);
     }
   }
 
@@ -162,7 +162,7 @@ partial class Composition
           var value_1 = transient1_IService;
           return value_1;
       });
-      return new Program(perResolve43_Func);
+      return new Program(perResolve43_Func!);
     }
   }
 

readme/default-lifetime.md

@@ -79,8 +79,8 @@ partial class Composition
 {
   private readonly Composition _root;
   private readonly object _lock;
-  private Service _singleton37_Service;
-  private Dependency _singleton36_Dependency;
+  private Service? _singleton37_Service;
+  private Dependency? _singleton36_Dependency;
 
   public Composition()
   {
@@ -107,15 +107,13 @@ partial class Composition
               {
                   if (_root._singleton36_Dependency == null)
                   {
-                      _singleton36_Dependency = new Dependency();
-                      _root._singleton36_Dependency = _singleton36_Dependency;
+                      _root._singleton36_Dependency = new Dependency();
                   }
-                  _singleton37_Service = new Service(_singleton36_Dependency, _root._singleton36_Dependency);
-                  _root._singleton37_Service = _singleton37_Service;
+                  _root._singleton37_Service = new Service(_root._singleton36_Dependency!, _root._singleton36_Dependency!);
               }
           }
       }
-      return _root._singleton37_Service;
+      return _root._singleton37_Service!;
     }
   }
 

readme/disposable-singleton.md

@@ -86,7 +86,7 @@ partial class Composition: IDisposable
   private readonly object _lock;
   private object[] _disposables;
   private int _disposeIndex;
-  private Dependency _singleton36_Dependency;
+  private Dependency? _singleton36_Dependency;
 
   public Composition()
   {
@@ -99,6 +99,7 @@ partial class Composition: IDisposable
   {
     _root = parentScope._root;
     _lock = _root._lock;
+    _disposables = parentScope._disposables;
   }
 
   public IService Root
@@ -112,13 +113,12 @@ partial class Composition: IDisposable
           {
               if (_root._singleton36_Dependency == null)
               {
-                  _singleton36_Dependency = new Dependency();
-                  _root._singleton36_Dependency = _singleton36_Dependency;
-                  _root._disposables[_root._disposeIndex++] = _singleton36_Dependency;
+                  _root._singleton36_Dependency = new Dependency();
+                  _root._disposables[_root._disposeIndex++] = _root._singleton36_Dependency;
               }
           }
       }
-      return new Service(_root._singleton36_Dependency);
+      return new Service(_root._singleton36_Dependency!);
     }
   }
 

readme/enumerable-generics.md

@@ -128,13 +128,13 @@ partial class Composition
     [MethodImpl((MethodImplOptions)0x100)]
     get
     {
-      [MethodImpl((MethodImplOptions)0x200)]
-      IEnumerable<IDependency<int>> Local_perBlock1_IEnumerable()
+      [MethodImpl((MethodImplOptions)0x100)]
+      IEnumerable<IDependency<int>> EnumerationOf_perBlock1_IEnumerable()
       {
           yield return new AbcDependency<int>();
           yield return new XyzDependency<int>();
       }
-      IEnumerable<IDependency<int>> perBlock1_IEnumerable = Local_perBlock1_IEnumerable();
+      IEnumerable<IDependency<int>> perBlock1_IEnumerable = EnumerationOf_perBlock1_IEnumerable();
       return new Service<int>(perBlock1_IEnumerable);
     }
   }
@@ -144,13 +144,13 @@ partial class Composition
     [MethodImpl((MethodImplOptions)0x100)]
     get
     {
-      [MethodImpl((MethodImplOptions)0x200)]
-      IEnumerable<IDependency<string>> Local_perBlock1_IEnumerable()
+      [MethodImpl((MethodImplOptions)0x100)]
+      IEnumerable<IDependency<string>> EnumerationOf_perBlock1_IEnumerable()
       {
           yield return new AbcDependency<string>();
           yield return new XyzDependency<string>();
       }
-      IEnumerable<IDependency<string>> perBlock1_IEnumerable = Local_perBlock1_IEnumerable();
+      IEnumerable<IDependency<string>> perBlock1_IEnumerable = EnumerationOf_perBlock1_IEnumerable();
       return new Service<string>(perBlock1_IEnumerable);
     }
   }

readme/enumerable.md

@@ -99,13 +99,13 @@ partial class Composition
     [MethodImpl((MethodImplOptions)0x100)]
     get
     {
-      [MethodImpl((MethodImplOptions)0x200)]
-      IEnumerable<IDependency> Local_perBlock1_IEnumerable()
+      [MethodImpl((MethodImplOptions)0x100)]
+      IEnumerable<IDependency> EnumerationOf_perBlock1_IEnumerable()
       {
           yield return new AbcDependency();
           yield return new XyzDependency();
       }
-      IEnumerable<IDependency> perBlock1_IEnumerable = Local_perBlock1_IEnumerable();
+      IEnumerable<IDependency> perBlock1_IEnumerable = EnumerationOf_perBlock1_IEnumerable();
       return new Service(perBlock1_IEnumerable);
     }
   }

readme/func-with-arguments.md

@@ -113,7 +113,7 @@ partial class Composition
 {
   private readonly Composition _root;
   private readonly object _lock;
-  private Clock _singleton36_Clock;
+  private Clock? _singleton36_Clock;
 
   public Composition()
   {
@@ -141,12 +141,11 @@ partial class Composition
               {
                   if (_root._singleton36_Clock == null)
                   {
-                      _singleton36_Clock = new Clock();
-                      _root._singleton36_Clock = _singleton36_Clock;
+                      _root._singleton36_Clock = new Clock();
                   }
               }
           }
-          var dependency_1 = new Dependency(_root._singleton36_Clock, transient3_Int32);
+          var dependency_1 = new Dependency(_root._singleton36_Clock!, transient3_Int32);
           return dependency_1;
       };
       return new Service(transient1_Func);

readme/func-with-tag.md

@@ -103,7 +103,7 @@ partial class Composition
           var value_1 = new Dependency();
           return value_1;
       });
-      return new Service(perResolve39_Func);
+      return new Service(perResolve39_Func!);
     }
   }
 

readme/func.md

@@ -106,7 +106,7 @@ partial class Composition
           var value_1 = new Dependency();
           return value_1;
       });
-      return new Service(perResolve39_Func);
+      return new Service(perResolve39_Func!);
     }
   }
 

readme/keyed-service-provider.md

@@ -86,7 +86,7 @@ partial class Composition
 {
   private readonly Composition _root;
   private readonly object _lock;
-  private Dependency _singleton36_Dependency;
+  private Dependency? _singleton36_Dependency;
 
   public Composition()
   {
@@ -111,12 +111,11 @@ partial class Composition
           {
               if (_root._singleton36_Dependency == null)
               {
-                  _singleton36_Dependency = new Dependency();
-                  _root._singleton36_Dependency = _singleton36_Dependency;
+                  _root._singleton36_Dependency = new Dependency();
               }
           }
       }
-      return _root._singleton36_Dependency;
+      return _root._singleton36_Dependency!;
     }
   }
 
@@ -131,12 +130,11 @@ partial class Composition
           {
               if (_root._singleton36_Dependency == null)
               {
-                  _singleton36_Dependency = new Dependency();
-                  _root._singleton36_Dependency = _singleton36_Dependency;
+                  _root._singleton36_Dependency = new Dependency();
               }
           }
       }
-      return new Service(_root._singleton36_Dependency);
+      return new Service(_root._singleton36_Dependency!);
     }
   }
 

readme/lazy.md

@@ -101,7 +101,7 @@ partial class Composition
       });
       Lazy<IDependency> transient1_Lazy;
       {
-          var factory_2 = perResolve40_Func;
+          var factory_2 = perResolve40_Func!;
           transient1_Lazy = new Lazy<IDependency>(factory_2, true);
       }
       return new Service(transient1_Lazy);