Merge pull request #193 from hadashiA/ku/expose-container-default

Make sure IObjectResolver is registered by default
hadashiA · Apr 23, 2021 · 21897be · 21897be · vercel · Apr 23, 2021
2 parents cb7f3da + 099e0eb
commit 21897be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/ContainerBuilder.cs b/VContainer/Assets/VContainer/Runtime/ContainerBuilder.cs
@@ -10,7 +10,6 @@ namespace VContainer
     public interface IContainerBuilder
     {
         object ApplicationOrigin { get; set; }
-        bool ContainerExposed { get; set; }
 
         RegistrationBuilder Register(Type type, Lifetime lifetime);
         RegistrationBuilder RegisterInstance(object instance);
@@ -46,7 +45,6 @@ public IScopedObjectResolver BuildScope()
     public class ContainerBuilder : IContainerBuilder
     {
         public object ApplicationOrigin { get; set; }
-        public bool ContainerExposed { get; set; }
 
         readonly IList<RegistrationBuilder> registrationBuilders = new List<RegistrationBuilder>();
         List<Action<IObjectResolver>> buildCallbacks;
@@ -94,7 +92,7 @@ public virtual IObjectResolver Build()
 
         protected (IReadOnlyList<IRegistration>, IReadOnlyList<(IRegistration, Action<IRegistration, IObjectResolver>)>) BuildRegistrations()
         {
-            var registrations = new IRegistration[registrationBuilders.Count + (ContainerExposed ? 1 : 0)];
+            var registrations = new IRegistration[registrationBuilders.Count + 1];
             var callbacks = new List<(IRegistration, Action<IRegistration, IObjectResolver>)>(registrations.Length);
 
 #if VCONTAINER_PARALLEL_CONTAINER_BUILD
@@ -122,10 +120,7 @@ public virtual IObjectResolver Build()
                 }
             }
 #endif
-            if (ContainerExposed)
-            {
-                registrations[registrations.Length - 1] = ContainerRegistration.Default;
-            }
+            registrations[registrations.Length - 1] = ContainerRegistration.Default;
 
 #if VCONTAINER_PARALLEL_CONTAINER_BUILD
             Parallel.For(0, registrations.Count, i =>

diff --git a/VContainer/Assets/VContainer/Runtime/ContainerBuilderExtensions.cs b/VContainer/Assets/VContainer/Runtime/ContainerBuilderExtensions.cs
@@ -117,7 +117,9 @@ public static RegistrationBuilder RegisterFactory<TParam1, TParam2, TParam3, TPa
             return registrationBuilder;
         }
 
+        [Obsolete("IObjectResolver is registered by default. This method does nothing.")]
         public static void RegisterContainer(this IContainerBuilder builder)
-            => builder.ContainerExposed = true;
+        {
+        }
     }
 }
diff --git a/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs b/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs
@@ -236,7 +236,6 @@ void InstallTo(IContainerBuilder builder)
             extraInstallerStatic?.Install(builder);
 
             builder.RegisterInstance<LifetimeScope>(this).AsSelf();
-            builder.RegisterContainer();
         }
 
         LifetimeScope GetRuntimeParent()