Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a bug that UseEntryPoints() does not register the dispatcher #209

Merged
merged 1 commit into from
May 2, 2021
Merged

Fix a bug that UseEntryPoints() does not register the dispatcher #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions VContainer/Assets/VContainer/Runtime/Unity/ContainerBuilderUnityExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ namespace VContainer.Unity
{
public readonly struct EntryPointsBuilder
{
public static void EnsureDispatcherRegistered(IContainerBuilder containerBuilder)
{
if (!containerBuilder.Exists(typeof(EntryPointDispatcher), false))
{
containerBuilder.Register<EntryPointDispatcher>(Lifetime.Scoped);
containerBuilder.RegisterBuildCallback(container =>
{
container.Resolve<EntryPointDispatcher>().Dispatch();
});
}
}

readonly IContainerBuilder containerBuilder;
readonly Lifetime lifetime;

Expand Down Expand Up @@ -64,6 +76,7 @@ public static void UseEntryPoints(
Lifetime lifetime,
Action<EntryPointsBuilder> configuration)
{
EntryPointsBuilder.EnsureDispatcherRegistered(builder);
configuration(new EntryPointsBuilder(builder, lifetime));
}

Expand All @@ -82,14 +95,7 @@ public static void UseComponents(

public static RegistrationBuilder RegisterEntryPoint<T>(this IContainerBuilder builder, Lifetime lifetime = Lifetime.Singleton)
{
if (!builder.Exists(typeof(EntryPointDispatcher), false))
{
builder.Register<EntryPointDispatcher>(Lifetime.Scoped);
builder.RegisterBuildCallback(container =>
{
container.Resolve<EntryPointDispatcher>().Dispatch();
});
}
EntryPointsBuilder.EnsureDispatcherRegistered(builder);
return builder.Register<T>(lifetime).AsImplementedInterfaces();
}

Expand Down