adding WithMicrosoftDependencyInjectionRules; fixing things

maximv · maximv · commit 5da3ca993d9d · 2020-08-03T12:05:18.000+03:00
diff --git a/src/DryIoc/Container.cs b/src/DryIoc/Container.cs
@@ -5253,18 +5253,25 @@ public DynamicRegistration(Factory factory,
     /// <summary> Defines resolution/registration rules associated with Container instance. They may be different for different containers.</summary>
     public sealed class Rules
     {
-        /// Default rules as staring point.
+        /// <summary>Default rules as a staring point.</summary>
         public static readonly Rules Default = new Rules();
 
-        /// Default rules as staring point.
-        public static readonly Rules MicrosoftDependencyInjectionRules = new Rules(
-            (DEFAULT_SETTINGS | Settings.TrackingDisposableTransients) 
-            & ~Settings.ThrowOnRegisteringDisposableTransient & ~Settings.VariantGenericTypesInResolvedCollection, 
-            Rules.SelectLastRegisteredFactory(), Reuse.Transient,
-            Made.Of(DryIoc.FactoryMethod.ConstructorWithResolvableArguments), 
-            IfAlreadyRegistered.AppendNotKeyed,
-            DefaultDependencyCountInLambdaToSplitBigObjectGraph, null, null, null, null, null);
-         
+        private static Rules SetMicrosoftDependencyInjectionRules(Rules rules)
+        {
+            rules._settings |= Settings.TrackingDisposableTransients;
+            rules._settings &= ~Settings.ThrowOnRegisteringDisposableTransient;
+            rules._settings &= ~Settings.VariantGenericTypesInResolvedCollection;
+            rules._factorySelector = SelectLastRegisteredFactory;
+            rules._made._factoryMethod = DryIoc.FactoryMethod.ConstructorWithResolvableArguments;
+            return rules;
+        }
+
+        /// <summary>The rules implementing the conventions of Microsoft.Extension.DependencyInjection library.</summary>
+        public static readonly Rules MicrosoftDependencyInjectionRules = SetMicrosoftDependencyInjectionRules(Default.Clone());
+
+        /// <summary>Returns the copy of the rules with the applied conventions of Microsoft.Extension.DependencyInjection library.</summary>
+        public Rules WithMicrosoftDependencyInjectionRules() => SetMicrosoftDependencyInjectionRules(Clone());
+
         /// <summary>Does nothing</summary>
         [Obsolete("Is not used anymore to split the graph - instead use the `DependencyCountInLambdaToSplitBigObjectGraph`")]
         public const int DefaultDependencyDepthToSplitObjectGraph = 20;
@@ -5385,7 +5392,7 @@ public Rules WithDefaultRegistrationServiceKey(object serviceKey) =>
         /// <summary>Rules to select single matched factory default and keyed registered factory/factories.
         /// Selectors applied in specified array order, until first returns not null <see cref="Factory"/>.
         /// Default behavior is to throw on multiple registered default factories, cause it is not obvious what to use.</summary>
-        public FactorySelectorRule FactorySelector { get; }
+        public FactorySelectorRule FactorySelector => _factorySelector;
 
         /// <summary>Sets <see cref="FactorySelector"/></summary>
         public Rules WithFactorySelector(FactorySelectorRule rule) =>
@@ -5590,7 +5597,7 @@ public static DynamicRegistrationProvider AutoFallbackDynamicRegistrations(
 
                         // We nullify default keys (usually passed by ResolveMany to resolve the specific factory in order)
                         // so that `CombineRegisteredWithDynamicFactories` may assign the key again.
-                        // Given that the implementation types are unchanged then the new keys assignement will be the same the last one,
+                        // Given that the implementation types are unchanged then the new keys assignment will be the same the last one,
                         // so that the factory resolution will correctly match the required factory by key.
                         // e.g. bitbucket issue #396
                         var theKey = serviceKey is DefaultDynamicKey ? null : serviceKey;
@@ -5914,7 +5921,7 @@ private Rules(Settings settings,
         {
             _settings = settings;
             _made = made;
-            FactorySelector = factorySelector;
+            _factorySelector = factorySelector;
             DefaultReuse = defaultReuse;
             DefaultIfAlreadyRegistered = defaultIfAlreadyRegistered;
             DependencyCountInLambdaToSplitBigObjectGraph = dependencyCountInLambdaToSplitBigObjectGraph;
@@ -5925,13 +5932,20 @@ private Rules(Settings settings,
             DefaultRegistrationServiceKey = defaultRegistrationServiceKey;
         }
 
-        private Rules WithSettings(Settings newSettings) =>
-            new Rules(newSettings,
-                FactorySelector, DefaultReuse, _made, DefaultIfAlreadyRegistered, DependencyCountInLambdaToSplitBigObjectGraph,
+        private Rules Clone() =>
+            new Rules(_settings, FactorySelector, DefaultReuse,
+                _made.Copy(), DefaultIfAlreadyRegistered, DependencyCountInLambdaToSplitBigObjectGraph,
                 DependencyResolutionCallExprs, ItemToExpressionConverter,
                 DynamicRegistrationProviders, UnknownServiceResolvers, DefaultRegistrationServiceKey);
 
-        private readonly Made _made;
+        private Rules WithSettings(Settings newSettings)
+        {
+            var newRules = Clone();
+            newRules._settings = newSettings;
+            return newRules;
+        }
+
+        private Made _made;
 
         [Flags]
         private enum Settings
@@ -5970,8 +5984,9 @@ private const Settings DEFAULT_SETTINGS
             | Settings.UseInterpretationForTheFirstResolution;
 
         private Settings _settings;
+        private FactorySelectorRule _factorySelector;
 
-#endregion
+        #endregion
     }
 
     /// <summary>Wraps constructor or factory method optionally with factory instance to create service.</summary>
@@ -6268,7 +6283,8 @@ internal FactoryMethod(ConstructorInfo ctor, Expression[] resolvedParameterExpre
     public class Made
     {
         /// <summary>Returns delegate to select constructor based on provided request.</summary>
-        public FactoryMethodSelector FactoryMethod { get; private set; }
+        public FactoryMethodSelector FactoryMethod { get => _factoryMethod; private set => _factoryMethod = value; }
+        internal FactoryMethodSelector _factoryMethod;
 
         /// <summary>Return type of strongly-typed factory method expression.</summary>
         public Type FactoryMethodKnownResultType { get; private set; }
@@ -6285,7 +6301,7 @@ private enum MadeDetails
         private readonly MadeDetails _details;
 
         /// Has any conditional flags
-        public bool IsConditional => _details != MadeDetails.NoConditionals; 
+        public bool IsConditional => _details != MadeDetails.NoConditionals;
 
         /// True is made has properties or parameters with custom value.
         /// That's mean the whole made become context based which affects caching.
@@ -6337,17 +6353,15 @@ public override string ToString()
         public static readonly Made Default = new Made();
 
         /// <summary>Creates rules with only <see cref="FactoryMethod"/> specified.</summary>
-        public static implicit operator Made(FactoryMethodSelector factoryMethod) =>
-            Of(factoryMethod);
+        public static implicit operator Made(FactoryMethodSelector factoryMethod) => new Made(factoryMethod);
 
         /// <summary>Creates rules with only <see cref="Parameters"/> specified.</summary>
-        public static implicit operator Made(ParameterSelector parameters) =>
-            Of(parameters: parameters);
+        public static implicit operator Made(ParameterSelector parameters) => new Made(null, parameters);
 
         /// <summary>Creates rules with only <see cref="PropertiesAndFields"/> specified.</summary>
-        public static implicit operator Made(PropertiesAndFieldsSelector propertiesAndFields) =>
-            Of(propertiesAndFields: propertiesAndFields);
+        public static implicit operator Made(PropertiesAndFieldsSelector propertiesAndFields) => new Made(null, null, propertiesAndFields);
 
+        // todo: @bug fix the spelling for `isConditionalImlementation`
         /// <summary>Specifies injections rules for Constructor, Parameters, Properties and Fields. If no rules specified returns <see cref="Default"/> rules.</summary>
         public static Made Of(FactoryMethodSelector factoryMethod = null,
             ParameterSelector parameters = null, PropertiesAndFieldsSelector propertiesAndFields = null,
@@ -6395,7 +6409,7 @@ public static Made Of(Func<Request, MemberInfo> getMethodOrMember, ServiceInfo f
         /// Where <paramref name="getMethodOrMember"/>Method, or constructor, or member selector.</summary>
         public static Made Of(Func<Request, MemberInfo> getMethodOrMember, Func<Request, ServiceInfo> factoryInfo,
             ParameterSelector parameters = null, PropertiesAndFieldsSelector propertiesAndFields = null) =>
-            new Made(r => DryIoc.FactoryMethod.Of(getMethodOrMember(r), factoryInfo(r)), 
+            new Made(r => DryIoc.FactoryMethod.Of(getMethodOrMember(r), factoryInfo(r)),
                 parameters, propertiesAndFields, isImplMemberDependsOnRequest: true);
 
         /// <summary>Defines how to select constructor from implementation type.
@@ -6526,11 +6540,11 @@ internal TypedMade(FactoryMethodSelector factoryMethod = null,
             { }
         }
 
-#region Implementation
+        #region Implementation
 
         internal Made(
             FactoryMethodSelector factoryMethod = null, ParameterSelector parameters = null, PropertiesAndFieldsSelector propertiesAndFields = null,
-            Type factoryMethodKnownResultType = null, bool hasCustomValue = false, bool isConditionalImlementation = false, 
+            Type factoryMethodKnownResultType = null, bool hasCustomValue = false, bool isConditionalImlementation = false,
             bool isImplMemberDependsOnRequest = false)
         {
             FactoryMethod = factoryMethod;
@@ -6554,6 +6568,20 @@ internal Made(FactoryMethod factoryMethod, Type factoryReturnType)
             FactoryMethodKnownResultType = factoryReturnType;
         }
 
+        private Made(
+            FactoryMethodSelector factoryMethod, ParameterSelector parameters, PropertiesAndFieldsSelector propertiesAndFields,
+            Type factoryMethodKnownResultType, MadeDetails details)
+        {
+            FactoryMethod = factoryMethod;
+            Parameters = parameters;
+            PropertiesAndFields = propertiesAndFields;
+            FactoryMethodKnownResultType = factoryMethodKnownResultType;
+            _details = details;
+        }
+
+        internal Made Copy() =>
+            new Made(FactoryMethod, Parameters, PropertiesAndFields, FactoryMethodKnownResultType, _details);
+
         private static ParameterSelector ComposeParameterSelectorFromArgs(ref bool hasCustomValue,
             System.Linq.Expressions.Expression wholeServiceExpr, ParameterInfo[] paramInfos,
             IList<System.Linq.Expressions.Expression> argExprs,
@@ -6617,7 +6645,7 @@ private static PropertiesAndFieldsSelector ComposePropertiesAndFieldsSelector(re
                     if (methodCallExpr.Method.Name == Arg.ArgIndexMethodName) // handle custom value
                     {
                         var getArgValue = GetArgCustomValueProvider(wholeServiceExpr, methodCallExpr, argValues);
-                        propertiesAndFields = propertiesAndFields.OverrideWith(req => 
+                        propertiesAndFields = propertiesAndFields.OverrideWith(req =>
                             PropertyOrFieldServiceInfo.Of(member).WithDetails(ServiceDetails.Of(getArgValue(req))).One());
                         hasCustomValue = true;
                     }
@@ -6734,7 +6762,7 @@ private static object GetArgExpressionValueOrThrow(
                 argExpr, wholeServiceExpr);
         }
 
-#endregion
+        #endregion
     }
 
     /// <summary>Class for defining parameters/properties/fields service info in <see cref="Made"/> expressions.
diff --git a/test/DryIoc.Microsoft.DependencyInjection.Specification.Tests/ValidateCaptiveTests.cs b/test/DryIoc.Microsoft.DependencyInjection.Specification.Tests/ValidateCaptiveTests.cs
@@ -7,15 +7,15 @@ namespace DryIoc.Microsoft.DependencyInjection.Specification.Tests
     public class ValidateCaptiveTests
     {
         [Test]
-        public void ServiceCollection_AddScoped_dependency_in_a_Singleton_ISNOT_Validated_as_captive_dependency()
+        public void ServiceCollection_AddScoped_dependency_in_a_Singleton_ISNT_Validated_as_captive_dependency()
         {
             var services = new ServiceCollection();
             services.AddScoped<Foo>();      // Actually a `ScopedOrSingleton` due MS.DI convention
             services.AddSingleton<Bar>();
             services.AddScoped<Buz>();      // Actually a `ScopedOrSingleton` due MS.DI convention
 
             // These two line are "presumably" done by the framework
-            var providerFactory = new DryIocAdapter.DryIocServiceProviderFactory();
+            var providerFactory = new DryIocServiceProviderFactory();
             var provider = providerFactory.CreateServiceProvider(providerFactory.CreateBuilder(services));
 
             // Getting back the underlying DryIoc container to use its functions (it is always implicitly available).
@@ -36,7 +36,7 @@ public void DryIoc_own_Register_ReuseScope_dependency_in_a_Singleton_IS_Validate
             services.AddSingleton<Bar>();
 
             // These two line are "presumably" done by the framework
-            var providerFactory = new DryIocAdapter.DryIocServiceProviderFactory();
+            var providerFactory = new DryIocServiceProviderFactory();
             var provider = providerFactory.CreateServiceProvider(providerFactory.CreateBuilder(services));
 
             // Getting back the underlying DryIoc container to use its functions (it is always implicitly available).
