AnyKey support and service key injection

.pre-commit-config.yaml

@@ -1,20 +1,20 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b" # v5.0.0
+    rev: "3e8a8703264a2f4a69428a0aa4dcb512790b2c8c"  # frozen: v6.0.0
     hooks:
       - id: check-json
       - id: check-yaml
       - id: check-merge-conflict
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: "192ad822316c3a22fb3d3cc8aa6eafa0b8488360" # v0.45.0
+    rev: "76b3d32d3f4b965e1d6425253c59407420ae2c43"  # frozen: v0.47.0
     hooks:
       - id: markdownlint
         args:
           - --fix
   - repo: https://github.com/tillig/json-sort-cli
-    rev: "009ab2ab49e1f2fa9d6b9dfc31009ceeca055204" # v3.0.0
+    rev: "009ab2ab49e1f2fa9d6b9dfc31009ceeca055204"  # frozen: v3.0.0
     hooks:
       - id: json-sort
         args:

.vscode/settings.json

@@ -11,6 +11,7 @@
     "finalizers",
     "inheritdoc",
     "langword",
+    "medi",
     "netcoreapp",
     "netstandard",
     "notnull",
@@ -20,6 +21,7 @@
     "subclassing",
     "typeparam",
     "unconfigured",
+    "unkeyed",
     "xunit"
   ],
   "coverage-gutters.coverageBaseDir": "artifacts/logs",

bench/Autofac.Benchmarks/RequiredPropertyBenchmark.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Autofac Project. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Autofac.Core;
-
 namespace Autofac.Benchmarks;
 
 public class RequiredPropertyBenchmark

default.proj

@@ -2,7 +2,7 @@
 <Project DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
     <!-- Increment the overall semantic version here. -->
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <SolutionName>Autofac</SolutionName>
     <Configuration Condition="'$(Configuration)'==''">Release</Configuration>
     <ArtifactDirectory>$([System.IO.Path]::Combine($(MSBuildProjectDirectory),"artifacts"))</ArtifactDirectory>

src/Autofac/Builder/MetadataKeys.cs

@@ -37,4 +37,9 @@ internal static class MetadataKeys
     /// Event handler for <see cref="Core.Registration.ComponentRegistryBuilder.RegistrationSourceAdded"/>.
     /// </summary>
     internal const string RegistrationSourceAddedPropertyKey = "__RegistrationSourceAddedKey";
+
+    /// <summary>
+    /// Marks registrations generated by the AnyKey adapter.
+    /// </summary>
+    internal const string AnyKeyAdapter = "__AnyKeyAdapter";
 }

src/Autofac/ContainerBuilder.cs

@@ -7,6 +7,7 @@
 using Autofac.Features.Collections;
 using Autofac.Features.GeneratedFactories;
 using Autofac.Features.Indexed;
+using Autofac.Features.KeyedServices;
 using Autofac.Features.LazyDependencies;
 using Autofac.Features.Metadata;
 using Autofac.Features.OwnedInstances;
@@ -233,6 +234,7 @@ private void RegisterDefaultAdapters(IComponentRegistryBuilder componentRegistry
     {
         this.RegisterGeneric(typeof(KeyedServiceIndex<,>)).As(typeof(IIndex<,>)).InstancePerLifetimeScope();
         componentRegistry.AddRegistrationSource(new CollectionRegistrationSource());
+        componentRegistry.AddRegistrationSource(new AnyKeyRegistrationSource());
         componentRegistry.AddRegistrationSource(new OwnedInstanceRegistrationSource());
         componentRegistry.AddRegistrationSource(new MetaRegistrationSource());
         componentRegistry.AddRegistrationSource(new LazyRegistrationSource());

src/Autofac/Core/Activators/DefaultPropertySelector.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 using Autofac.Util;
 

src/Autofac/Core/Activators/Reflection/AutowiringPropertyInjector.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Autofac Project. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections.Concurrent;
 using System.Reflection;
 using Autofac.Util;
 

src/Autofac/Core/Activators/Reflection/DefaultConstructorFinder.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Autofac Project. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections.Concurrent;
 using System.Reflection;
 
 namespace Autofac.Core.Activators.Reflection;

src/Autofac/Core/Activators/Reflection/InjectableProperty.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 using Autofac.Util;
 

src/Autofac/Core/Activators/Reflection/ReflectionActivator.cs

@@ -3,7 +3,6 @@
 
 using System.Globalization;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Text;
 using Autofac.Core.Resolving.Pipeline;
 using Autofac.Util;
@@ -18,6 +17,7 @@ public class ReflectionActivator : InstanceActivator, IInstanceActivator
     private readonly Type _implementationType;
     private readonly Parameter[] _configuredProperties;
     private readonly Parameter[] _defaultParameters;
+    private readonly bool _requiresServiceKeyParameter;
 
     private ConstructorBinder[]? _constructorBinders;
     private bool _anyRequiredMembers;
@@ -50,6 +50,9 @@ public ReflectionActivator(
         }
 
         _implementationType = implementationType;
+        _requiresServiceKeyParameter = ReflectionCacheSet.Shared.Internal.ServiceKeyUsageByType.GetOrAdd(
+            _implementationType,
+            static t => UsesServiceKeyAttribute(t));
         ConstructorFinder = constructorFinder ?? throw new ArgumentNullException(nameof(constructorFinder));
         ConstructorSelector = constructorSelector ?? throw new ArgumentNullException(nameof(constructorSelector));
         _configuredProperties = configuredProperties.ToArray();
@@ -66,6 +69,11 @@ public ReflectionActivator(
     /// </summary>
     public IConstructorSelector ConstructorSelector { get; }
 
+    /// <summary>
+    /// Gets a value indicating whether the activation pipeline needs a keyed service parameter for this type.
+    /// </summary>
+    internal bool RequiresServiceKeyParameter => _requiresServiceKeyParameter;
+
     /// <inheritdoc/>
     public void ConfigurePipeline(IComponentRegistryServices componentRegistryServices, IResolvePipelineBuilder pipelineBuilder)
     {
@@ -156,6 +164,43 @@ public void ConfigurePipeline(IComponentRegistryServices componentRegistryServic
         });
     }
 
+    /// <summary>
+    /// Determines if any constructor parameters or settable properties on the
+    /// type have a <see cref="ServiceKeyAttribute"/>, which would require
+    /// special handling in the activation pipeline.
+    /// </summary>
+    /// <param name="implementationType">The type to inspect.</param>
+    /// <returns><see langword="true"/> if the type uses the <see cref="ServiceKeyAttribute"/>; otherwise, <see langword="false"/>.</returns>
+    private static bool UsesServiceKeyAttribute(Type implementationType)
+    {
+        // Intentionally not picky about _which_ constructor or property has the
+        // attribute. If a different constructor is picked via constructor
+        // binder/selector, it's fine; we just want to try to shortcut the case
+        // where we "may or may not need it." If you mark a property with the
+        // attribute but never inject properties, we'll still provide the
+        // parameter "just in case" you change your mind at runtime.
+        foreach (var constructor in implementationType.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
+        {
+            foreach (var parameter in constructor.GetParameters())
+            {
+                if (ServiceKeyAttributeCache.ParameterHasServiceKey(parameter))
+                {
+                    return true;
+                }
+            }
+        }
+
+        foreach (var property in implementationType.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
+        {
+            if (property.CanWrite && ServiceKeyAttributeCache.PropertyHasServiceKey(property))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private void UseSingleConstructorActivation(IResolvePipelineBuilder pipelineBuilder, ConstructorBinder singleConstructor)
     {
         if (singleConstructor.ParameterCount == 0)

src/Autofac/Core/ImplicitRegistrationSource.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Autofac Project. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections.Concurrent;
 using System.Reflection;
 using Autofac.Builder;
 using Autofac.Util;

src/Autofac/Core/InternalReflectionCaches.cs

@@ -35,6 +35,9 @@ public InternalReflectionCaches(ReflectionCacheSet set)
         DefaultPublicConstructors = set.GetOrCreateCache<ReflectionCacheDictionary<Type, ConstructorInfo[]>>(nameof(DefaultPublicConstructors));
         GenericTypeDefinitionByType = set.GetOrCreateCache<ReflectionCacheDictionary<Type, Type>>(nameof(GenericTypeDefinitionByType));
         HasRequiredMemberAttribute = set.GetOrCreateCache<ReflectionCacheDictionary<Type, bool>>(nameof(HasRequiredMemberAttribute));
+        ServiceKeyParameterAttributes = set.GetOrCreateCache<ReflectionCacheParameterDictionary<bool>>(nameof(ServiceKeyParameterAttributes));
+        ServiceKeyPropertyAttributes = set.GetOrCreateCache<ReflectionCacheDictionary<PropertyInfo, bool>>(nameof(ServiceKeyPropertyAttributes));
+        ServiceKeyUsageByType = set.GetOrCreateCache<ReflectionCacheDictionary<Type, bool>>(nameof(ServiceKeyUsageByType));
     }
 
     /// <summary>
@@ -91,4 +94,19 @@ public InternalReflectionCaches(ReflectionCacheSet set)
     /// Gets a cache used by <see cref="ReflectionActivator"/>.
     /// </summary>
     public ReflectionCacheDictionary<Type, bool> HasRequiredMemberAttribute { get; }
+
+    /// <summary>
+    /// Gets a cache used to track <see cref="ServiceKeyAttribute"/> usage on parameters.
+    /// </summary>
+    public ReflectionCacheParameterDictionary<bool> ServiceKeyParameterAttributes { get; }
+
+    /// <summary>
+    /// Gets a cache used to track <see cref="ServiceKeyAttribute"/> usage on properties.
+    /// </summary>
+    public ReflectionCacheDictionary<PropertyInfo, bool> ServiceKeyPropertyAttributes { get; }
+
+    /// <summary>
+    /// Gets a cache used to determine if a type uses <see cref="ServiceKeyAttribute"/>.
+    /// </summary>
+    public ReflectionCacheDictionary<Type, bool> ServiceKeyUsageByType { get; }
 }

src/Autofac/Core/KeyedService.cs

@@ -19,6 +19,18 @@ public KeyedService(object serviceKey, Type serviceType)
         ServiceType = serviceType ?? throw new ArgumentNullException(nameof(serviceType));
     }
 
+    /// <summary>
+    /// Gets a sentinel key representing a wildcard keyed registration.
+    /// </summary>
+    /// <value>
+    /// A singleton object that can be used as a key to match any keyed registration.
+    /// </value>
+    /// <remarks>
+    /// Registering a service with this key will allow it to be resolved by any
+    /// keyed service request for the same service type.
+    /// </remarks>
+    public static object AnyKey { get; } = new object();
+
     /// <summary>
     /// Gets the key of the service.
     /// </summary>
@@ -37,6 +49,23 @@ public KeyedService(object serviceKey, Type serviceType)
     /// <value>The description.</value>
     public override string Description => ServiceKey + " (" + ServiceType.FullName + ")";
 
+    /// <summary>
+    /// Determines whether the provided key is the <see cref="AnyKey"/> sentinel.
+    /// </summary>
+    /// <param name="serviceKey">The key to test.</param>
+    /// <returns>
+    /// <see langword="true"/> when the key is <see cref="AnyKey"/>; otherwise, <see langword="false"/>.
+    /// </returns>
+    public static bool IsAnyKey(object serviceKey)
+    {
+        if (serviceKey == null)
+        {
+            throw new ArgumentNullException(nameof(serviceKey));
+        }
+
+        return ReferenceEquals(serviceKey, AnyKey);
+    }
+
     /// <summary>
     /// Indicates whether the current object is equal to another object of the same type.
     /// </summary>