Fix.

alethic · Dec 25, 2024 · 6e67433 · 6e67433
1 parent d9e0855
commit 6e67433
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 157 deletions.
diff --git a/src/Cogito.DependencyInjection/IRegistrationAttribute.cs b/src/Cogito.DependencyInjection/IRegistrationAttribute.cs
diff --git a/src/Cogito.DependencyInjection/RegisterScopedAttribute.cs b/src/Cogito.DependencyInjection/RegisterScopedAttribute.cs
diff --git a/src/Cogito.DependencyInjection/RegisterTransientAttribute.cs b/src/Cogito.DependencyInjection/RegisterTransientAttribute.cs
diff --git a/src/Cogito.DependencyInjection/ServiceCollectionAttributeExtensions.cs b/src/Cogito.DependencyInjection/ServiceCollectionAttributeExtensions.cs
@@ -14,6 +14,21 @@ namespace Cogito.DependencyInjection
     public static class ServiceCollectionExtensions
     {
 
+        /// <summary>s
+        /// Registers all types by their decorated registration attributes.
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="assembly"></param>
+        public static void AddFromAttributes(this IServiceCollection builder, Assembly assembly)
+        {
+            if (builder == null)
+                throw new ArgumentNullException(nameof(builder));
+            if (assembly == null)
+                throw new ArgumentNullException(nameof(assembly));
+
+            AddFromAttributes(builder, (IEnumerable<Assembly>)[assembly]);
+        }
+
         /// <summary>s
         /// Registers all types by their decorated registration attributes.
         /// </summary>
@@ -26,7 +41,7 @@ public static void AddFromAttributes(this IServiceCollection builder, params Ass
             if (assemblies == null)
                 throw new ArgumentNullException(nameof(assemblies));
 
-            builder.AddFromAttributes((IEnumerable<Assembly>)assemblies);
+            AddFromAttributes(builder, (IEnumerable<Assembly>)assemblies);
         }
 
         /// <summary>s
@@ -41,7 +56,7 @@ public static void AddFromAttributes(this IServiceCollection builder, IEnumerabl
             if (assemblies == null)
                 throw new ArgumentNullException(nameof(assemblies));
 
-            builder.AddFromAttributes(assemblies.SelectMany(i => GetAssemblyTypesSafe(i)));
+            AddFromAttributes(builder, assemblies.SelectMany(i => GetAssemblyTypesSafe(i)));
         }
 
         /// <summary>
@@ -71,16 +86,16 @@ public static void AddFromAttributes(this IServiceCollection builder, IEnumerabl
             if (types == null)
                 throw new ArgumentNullException(nameof(types));
 
-            // group by unique registration handler types
+            // find the set of implementation types and associated registration attributes, ordered
             var items = types
                 .Select(i => i.GetTypeInfo())
-                .Select(i => new { ImplementationType = i, Attributes = i.GetCustomAttributes(typeof(IRegistrationAttribute), true).Cast<IRegistrationAttribute>() })
+                .Select(i => new { ImplementationType = i, Attributes = i.GetCustomAttributes(typeof(IServiceRegistrationAttribute), true).Cast<IServiceRegistrationAttribute>() })
                 .SelectMany(i => i.Attributes.Select(j => new { i.ImplementationType, Attribute = j }))
                 .OrderBy(i => i.Attribute.RegistrationOrder);
 
             // dispatch to associated handler
             foreach (var item in items)
-                item.Attribute.Register(builder, item.ImplementationType);
+                item.Attribute.Add(builder, item.ImplementationType);
         }
 
         /// <summary>
@@ -95,15 +110,15 @@ public static void AddFromAttributes(this IServiceCollection builder, Type type)
             if (type == null)
                 throw new ArgumentNullException(nameof(type));
 
-            // group by unique registration handler types
+            // find the set of implementation types and associated registration attributes, ordered
             var items = type.GetTypeInfo()
-                .GetCustomAttributes(typeof(IRegistrationAttribute), true)
-                .Cast<IRegistrationAttribute>()
+                .GetCustomAttributes(typeof(IServiceRegistrationAttribute), true)
+                .Cast<IServiceRegistrationAttribute>()
                 .OrderBy(i => i.RegistrationOrder);
 
             // dispatch to associated handler
             foreach (var item in items)
-                item.Register(builder, type);
+                item.Add(builder, type);
         }
 
         /// <summary>