Support for multiple hints

DevTeam · Jan 20, 2025 · 0d9689d · 0d9689d
1 parent 75f362e
commit 0d9689d
Show file tree

Hide file tree

Showing 30 changed files with 79 additions and 167 deletions.
diff --git a/readme/BlazorServerApp.md b/readme/BlazorServerApp.md
@@ -14,13 +14,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // View Models
         .Bind().To<ClockViewModel>()
             // Provides the composition root for Clock view model

diff --git a/readme/BlazorServerAppPageTemplate.md b/readme/BlazorServerAppPageTemplate.md
@@ -14,13 +14,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // View Models
         .Bind().To<ClockViewModel>()
             // Provides the composition root for Clock view model

diff --git a/readme/BlazorWebAssemblyApp.md b/readme/BlazorWebAssemblyApp.md
@@ -16,13 +16,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // View Models
         .Bind().As(Singleton).To<ClockViewModel>()
             // Provides the composition root for Clock view model

diff --git a/readme/BlazorWebAssemblyAppPageTemplate.md b/readme/BlazorWebAssemblyAppPageTemplate.md
@@ -16,13 +16,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // View Models
         .Bind().As(Singleton).To<ClockViewModel>()
             // Provides the composition root for Clock view model

diff --git a/readme/GrpcService.md b/readme/GrpcService.md
@@ -14,13 +14,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // Provides the composition root for Greeter service
         .Root<GreeterService>();
 }

diff --git a/readme/GrpcServicePageTemplate.md b/readme/GrpcServicePageTemplate.md
@@ -14,13 +14,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // Provides the composition root for Greeter service
         .Root<GreeterService>();
 }

diff --git a/readme/MinimalWebAPI.md b/readme/MinimalWebAPI.md
@@ -14,16 +14,9 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         .Bind().As(Singleton).To<WeatherForecastService>()
             .Root<IWeatherForecastService>()
-        
+
         // Application composition root
         .Root<Program>("Root");
 }

diff --git a/readme/MinimalWebAPIPageTemplate.md b/readme/MinimalWebAPIPageTemplate.md
@@ -14,16 +14,9 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         .Bind().As(Singleton).To<WeatherForecastService>()
             .Root<IWeatherForecastService>()
-        
+
         // Application composition root
         .Root<Program>("Root");
 }

diff --git a/readme/WebAPI.md b/readme/WebAPI.md
@@ -14,13 +14,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         .Bind().As(Singleton).To<WeatherForecastService>()
         // Provides the composition root for Weather Forecast controller
         .Root<WeatherForecastController>();

diff --git a/readme/WebAPIPageTemplate.md b/readme/WebAPIPageTemplate.md
@@ -14,13 +14,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         .Bind().As(Singleton).To<WeatherForecastService>()
         // Provides the composition root for Weather Forecast controller
         .Root<WeatherForecastController>();

diff --git a/readme/WebApp.md b/readme/WebApp.md
@@ -14,13 +14,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         .Bind().As(Singleton).To<WeatherForecastService>()
         // Provides the composition root for Home controller
         .Root<HomeController>();

diff --git a/readme/WebAppPageTemplate.md b/readme/WebAppPageTemplate.md
@@ -14,13 +14,6 @@ internal partial class Composition: ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         .Bind().As(Singleton).To<WeatherForecastService>()
         // Provides the composition root for Home controller
         .Root<HomeController>();

diff --git a/readme/ondependencyinjection-wildcard-hint.md b/readme/ondependencyinjection-wildcard-hint.md
@@ -14,6 +14,7 @@ using static Pure.DI.Hint;
 // OnDependencyInjection = On
 DI.Setup(nameof(Composition))
     .Hint(OnDependencyInjectionContractTypeNameWildcard, "*IDependency")
+    .Hint(OnDependencyInjectionContractTypeNameWildcard, "*IService")
     .RootArg<int>("id")
     .Bind().To<Dependency>()
     .Bind().To<Service>()
@@ -23,7 +24,9 @@ var log = new List<string>();
 var composition = new Composition(log);
 var service = composition.GetRoot(33);
 
-log.ShouldBe(["Dependency injected"]);
+log.ShouldBe([
+    "Dependency injected",
+    "Service injected"]);
 
 interface IDependency;
 
@@ -108,7 +111,7 @@ partial class Composition
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
   public IService GetRoot(int id)
   {
-    return new Service(OnDependencyInjection<IDependency>(new Dependency(id), null, Lifetime.Transient));
+    return OnDependencyInjection<IService>(new Service(OnDependencyInjection<IDependency>(new Dependency(id), null, Lifetime.Transient)), null, Lifetime.Transient);
   }
 
 

diff --git a/readme/onnewinstance-wildcard-hint.md b/readme/onnewinstance-wildcard-hint.md
@@ -13,6 +13,7 @@ using static Pure.DI.Hint;
 
 DI.Setup(nameof(Composition))
     .Hint(OnNewInstance, "On")
+    .Hint(OnNewInstanceImplementationTypeNameWildcard, "*Dependency")
     .Hint(OnNewInstanceImplementationTypeNameWildcard, "*Service")
     .Bind().As(Lifetime.Singleton).To<Dependency>()
     .Bind().To<Service>()
@@ -24,6 +25,7 @@ var service1 = composition.Root;
 var service2 = composition.Root;
 
 log.ShouldBe([
+    "Dependency created",
     "Service created",
     "Service created"]);
 
@@ -125,7 +127,11 @@ partial class Composition
         {
           if (_root._singletonDependency43 is null)
           {
-            _root._singletonDependency43 = new Dependency();
+            Dependency _singletonDependency43Temp;
+            _singletonDependency43Temp = new Dependency();
+            OnNewInstance<Dependency>(ref _singletonDependency43Temp, null, Lifetime.Singleton);
+            Thread.MemoryBarrier();
+            _root._singletonDependency43 = _singletonDependency43Temp;
           }
         }
       }

diff --git a/samples/BlazorServerApp/Composition.cs b/samples/BlazorServerApp/Composition.cs
@@ -16,13 +16,6 @@ internal partial class Composition : ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // View Models
         .Bind().To<ClockViewModel>()
         // Provides the composition root for Clock view model

diff --git a/samples/BlazorWebAssemblyApp/Composition.cs b/samples/BlazorWebAssemblyApp/Composition.cs
@@ -15,13 +15,6 @@ internal partial class Composition : ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // View Models
         .Bind().As(Singleton).To<ClockViewModel>()
         // Provides the composition root for Clock view model

diff --git a/samples/GrpcService/Composition.cs b/samples/GrpcService/Composition.cs
@@ -12,13 +12,6 @@ internal partial class Composition : ServiceProviderFactory<Composition>
 {
     static void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
-
         // Provides the composition root for Greeter service
         .Root<GreeterService>();
 }
diff --git a/samples/MinimalWebAPI/Composition.cs b/samples/MinimalWebAPI/Composition.cs
@@ -13,12 +13,6 @@ internal partial class Composition : ServiceProviderFactory<Composition>
 {
     void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
         .Bind().As(Singleton).To<WeatherForecastService>()
         .Root<IWeatherForecastService>()
 

diff --git a/samples/WebAPI/Composition.cs b/samples/WebAPI/Composition.cs
@@ -14,12 +14,6 @@ internal partial class Composition : ServiceProviderFactory<Composition>
 {
     static void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
         .Bind().As(Singleton).To<WeatherForecastService>()
         // Provides the composition root for Weather Forecast controller
         .Root<WeatherForecastController>();

diff --git a/samples/WebApp/Composition.cs b/samples/WebApp/Composition.cs
@@ -14,12 +14,6 @@ internal partial class Composition : ServiceProviderFactory<Composition>
 {
     static void Setup() => DI.Setup()
         .DependsOn(Base)
-        // Specifies not to attempt to resolve types whose fully qualified name
-        // begins with Microsoft.Extensions., Microsoft.AspNetCore.
-        // since ServiceProvider will be used to retrieve them.
-        .Hint(
-            Hint.OnCannotResolveContractTypeNameRegularExpression,
-            @"^Microsoft\.(Extensions|AspNetCore)\..+$")
         .Bind().As(Singleton).To<WeatherForecastService>()
         // Provides the composition root for Home controller
         .Root<HomeController>();

diff --git a/src/Pure.DI.Core/Core/ApiInvocationProcessor.cs b/src/Pure.DI.Core/Core/ApiInvocationProcessor.cs
@@ -117,7 +117,9 @@ MemberAccessExpressionSyntax memberAccess when memberAccess.Kind() == SyntaxKind
                         var hintArgs = arguments.GetArgs(invocation.ArgumentList, "hint", "value");
                         if (hintArgs is [{ Expression: { } hintNameExpression }, { Expression: { } hintValueExpression }])
                         {
-                            metadataVisitor.VisitHint(new MdHint(semantic.GetConstantValue<Hint>(semanticModel, hintNameExpression), semantic.GetRequiredConstantValue<string>(semanticModel, hintValueExpression)));
+                            var values = new LinkedList<string>();
+                            values.AddLast(semantic.GetRequiredConstantValue<string>(semanticModel, hintValueExpression));
+                            metadataVisitor.VisitHint(new MdHint(semantic.GetConstantValue<Hint>(semanticModel, hintNameExpression), values));
                         }
 
                         break;

diff --git a/src/Pure.DI.Core/Core/Code/Comments.cs b/src/Pure.DI.Core/Core/Code/Comments.cs
@@ -41,7 +41,7 @@ where match.Success
                 continue;
             }
 
-            result[setting] = hint.Groups[2].Value;
+            result.GetOrAdd(setting, _ => new LinkedList<string>()).AddLast(hint.Groups[2].Value);
         }
 
         return result;