resolved #122

Author: ymh199478

src/CatLib.Core.Tests/Support/Container/BindDataTests.cs

@@ -71,7 +71,7 @@ public void CanGetContextual()
 
             Assert.AreEqual("abc", bindData.GetContextual("need1"));
             Assert.AreEqual(container.Type2Service(typeof(BindDataTest)), bindData.GetContextual("need2"));
-            Assert.AreEqual("empty", bindData.GetContextual("empty"));
+            Assert.AreEqual(null, bindData.GetContextual("empty"));
         }
         #endregion
 

src/CatLib.Core.Tests/Support/Container/ContainerTests.cs

@@ -700,12 +700,15 @@ public void CheckIllegalCallMethod()
         public void TestContainerCallWithNullParams()
         {
             var container = MakeContainer();
-            container.Instance("num", 777);
-            container.Alias("$num", "num");
-            var result = container.Call(this, "TestContainerCall", null);
+            var result = container.Call(this, "TestContainerCallEmpty", null);
             Assert.AreEqual(777, result);
         }
 
+        public int TestContainerCallEmpty()
+        {
+            return 777;
+        }
+
         [TestMethod]
         public void TestContainerCallWithErrorParams()
         {
@@ -849,7 +852,7 @@ public class NoClassAttrInject
         public void MakeNoClassAttrInject()
         {
             var container = MakeContainer();
-            container.Bind<NoClassAttrInject>();
+            container.Bind<NoClassAttrInject>().Needs("$Time").Given("Time");
             container.Bind("Time", (c, p) => 100, false).Alias("$Time");
 
             var result = container.Make<NoClassAttrInject>();
@@ -905,9 +908,9 @@ public void MakeNoParamConstructor()
         public void MakeNotClassConstructor()
         {
             var container = MakeContainer();
-            container.Bind<MakeTestNoParamClass>();
+            container.Bind<MakeTestNoParamClass>().Needs("$i").Given("i");
             container.Bind<MakeTestClassDependency>();
-            container.Singleton("i", (_,__) => 77).Alias("$i");
+            container.Singleton("i", (_,__) => 77);
             var result = container.Make<MakeTestNoParamClass>();
             Assert.AreEqual(77, result.I);
             Assert.AreNotEqual(null, result.Dependency);
@@ -1187,8 +1190,7 @@ public TestInjectNullClass(TestMakeBasePrimitiveConstructor cls)
         public void TestInjectNull()
         {
             var container = new SupportNullContainer() as IContainer;
-            container.Bind<TestInjectNullClass>();
-
+            container.Bind<TestInjectNullClass>().Needs("$cls").Given(() => null);
             container.Make<TestInjectNullClass>();
         }
 
@@ -1847,9 +1849,7 @@ public void TestBaseStructChangeInvalid()
         public void TestFormatException()
         {
             var container = new Container();
-            container.Instance("num", 10);
-            container.Alias("$num", "num");
-            Assert.AreEqual(10, container.Call(this, "TestContainerCall", new ContainerTest()));
+            Assert.AreEqual(10, container.Call(this, "TestContainerCall", new ContainerTest(),10));
         }
 
         internal class TestNoConstructorAccessClass
@@ -2020,14 +2020,14 @@ public TestResloveAttrClassSpeculationService(UnresolvableException ex)
         public void TestResloveAttrClassSpeculationServiceFunc()
         {
             var container = new Container();
-            container.Bind<TestResloveAttrClassSpeculationService>();
+            container.Bind<TestResloveAttrClassSpeculationService>()
+                .Needs("$ex").Given("ex")
+                .Needs("$rex").Given("rex");
             container.Instance("ex", new UnresolvableException());
-            container.Alias("$ex", "ex");
             container.Instance("rex", new UnresolvableException());
-            container.Alias("$rex", "rex");
             var cls = container.Make<TestResloveAttrClassSpeculationService>();
 
-            Assert.AreSame(container.Make("$ex"), cls.ex);
+            Assert.AreSame(container.Make("ex"), cls.ex);
         }
 
         [TestMethod]

src/CatLib.Core/Support/Container/Bindable.cs

@@ -131,9 +131,9 @@ internal string GetContextual(string needs)
         {
             if (contextual == null)
             {
-                return needs;
+                return null;
             }
-            return contextual.TryGetValue(needs, out string contextualNeeds) ? contextualNeeds : needs;
+            return contextual.TryGetValue(needs, out string contextualNeeds) ? contextualNeeds : null;
         }
 
         /// <summary>

src/CatLib.Core/Support/Container/Container.cs

@@ -1154,61 +1154,100 @@ protected virtual string GetParamNeedsService(ParameterInfo baseParam)
         /// 根据上下文获取相关的构建闭包
         /// </summary>
         /// <param name="makeServiceBindData">请求注入操作的服务绑定数据</param>
-        /// <param name="service">服务名</param>
+        /// <param name="service">构建的服务名</param>
         /// <param name="paramName">目标参数的名字</param>
         /// <returns>构建闭包</returns>
         protected virtual Func<object> GetContextualClosure(Bindable makeServiceBindData, string service,
             string paramName)
         {
             return makeServiceBindData.GetContextualClosure(service) ??
-                   makeServiceBindData.GetContextualClosure($"${paramName}");
+                   makeServiceBindData.GetContextualClosure($"{GetVariableTag()}{paramName}");
+        }
+
+        /// <summary>
+        /// 根据上下文获取相关的需求服务
+        /// </summary>
+        /// <param name="makeServiceBindData">请求注入操作的服务绑定数据</param>
+        /// <param name="service">构建的服务名</param>
+        /// <param name="paramName">目标参数的名字</param>
+        /// <returns>需求的服务名</returns>
+        protected virtual string GetContextual(Bindable makeServiceBindData, string service, string paramName)
+        {
+            return makeServiceBindData.GetContextual(service) ??
+                   makeServiceBindData.GetContextual($"{GetVariableTag()}{paramName}") ??
+                   service;
         }
 
         /// <summary>
         /// 从上下文闭包中进行构建获得实例
         /// </summary>
         /// <param name="closure">上下文闭包</param>
         /// <param name="needType">参数需求的类型</param>
-        /// <returns>构建的实例</returns>
-        protected virtual object MakeFromContextualClosure(Func<object> closure, Type needType)
+        /// <param name="ouput">构建的实例</param>
+        /// <returns>是否成功构建</returns>
+        protected virtual bool MakeFromContextualClosure(Func<object> closure, Type needType, out object ouput)
         {
-            var instance = closure();
-            if (ChangeType(ref instance, needType))
+            ouput = null;
+            if (closure == null)
             {
-                return instance;
+                return false;
             }
 
-            throw new LogicException("Parameter type cannot be converted to : " + needType);
+            ouput = closure();
+            return ChangeType(ref ouput, needType);
         }
 
         /// <summary>
-        /// 解决基本类型
+        /// 从上下文关系的服务名获取服务实现
         /// </summary>
-        /// <param name="makeServiceBindData">请求注入操作的服务绑定数据</param>
-        /// <param name="service">希望解决的服务名或者别名</param>
-        /// <param name="baseParam">当前正在解决的变量</param>
-        /// <returns>解决结果</returns>
-        protected virtual object ResolveAttrPrimitive(Bindable makeServiceBindData, string service, PropertyInfo baseParam)
+        /// <param name="service">上下文关系的服务名</param>
+        /// <param name="needType">参数需求类型</param>
+        /// <param name="output">构建的实例</param>
+        /// <returns>是否成功构建</returns>
+        protected virtual bool MakeFromContextualService(string service, Type needType, out object output)
         {
-            var contextualClosure = GetContextualClosure(makeServiceBindData, service, baseParam.Name);
-            if (contextualClosure != null)
+            output = null;
+            if (!CanMake(service))
             {
-                return MakeFromContextualClosure(contextualClosure, baseParam.PropertyType);
+                return false;
             }
 
-            service = makeServiceBindData.GetContextual(service);
-            if (CanMake(service))
-            {
-                return Make(service);
-            }
+            output = Make(service);
+            return ChangeType(ref output, needType);
+        }
 
-            var result = SpeculationServiceByParamName(makeServiceBindData, baseParam.Name, baseParam.PropertyType);
-            if (result != null)
+        /// <summary>
+        /// 根据上下文来解决指定需求的服务
+        /// </summary>
+        /// <param name="makeServiceBindData">请求注入操作的服务绑定数据</param>
+        /// <param name="service">构建的服务名字</param>
+        /// <param name="paramName">目标参数的名字</param>
+        /// <param name="paramType">目标参数的类型</param>
+        /// <param name="output">构建的实例</param>
+        /// <returns>是否成功通过上下文解决</returns>
+        protected virtual bool ResloveFromContextual(Bindable makeServiceBindData, string service, string paramName,
+            Type paramType, out object output)
+        {
+            if (MakeFromContextualClosure(GetContextualClosure(makeServiceBindData, service, paramName),
+                paramType, out output))
             {
-                return result;
+                return true;
             }
 
-            throw MakeUnresolvablePrimitiveException(baseParam.Name, baseParam.DeclaringType);
+            return MakeFromContextualService(GetContextual(makeServiceBindData, service, paramName),
+                paramType, out output);
+        }
+
+        /// <summary>
+        /// 解决基本类型
+        /// </summary>
+        /// <param name="makeServiceBindData">请求注入操作的服务绑定数据</param>
+        /// <param name="service">希望解决的服务名或者别名</param>
+        /// <param name="baseParam">当前正在解决的变量</param>
+        /// <returns>解决结果</returns>
+        protected virtual object ResolveAttrPrimitive(Bindable makeServiceBindData, string service, PropertyInfo baseParam)
+        {
+            return ResloveAttrClass(makeServiceBindData, service, baseParam);
         }
 
         /// <summary>
@@ -1220,26 +1259,13 @@ protected virtual object ResolveAttrPrimitive(Bindable makeServiceBindData, stri
         /// <returns>解决结果</returns>
         protected virtual object ResloveAttrClass(Bindable makeServiceBindData, string service, PropertyInfo baseParam)
         {
-            var contextualClosure = GetContextualClosure(makeServiceBindData, service, baseParam.Name);
-            if (contextualClosure != null)
+            if (ResloveFromContextual(makeServiceBindData, service, baseParam.Name, baseParam.PropertyType,
+                out object instance))
             {
-                return MakeFromContextualClosure(contextualClosure, baseParam.PropertyType);
+                return instance;
             }
 
-            try
-            {
-                // 我们不进行CanMake检查以避免一次hash
-                return Make(makeServiceBindData.GetContextual(service));
-            }
-            catch (Exception)
-            {
-                var result = SpeculationServiceByParamName(makeServiceBindData, baseParam.Name, baseParam.PropertyType);
-                if (result != null)
-                {
-                    return result;
-                }
-                throw;
-            }
+            throw MakeUnresolvablePrimitiveException(baseParam.Name, baseParam.DeclaringType);
         }
 
         /// <summary>
@@ -1251,30 +1277,7 @@ protected virtual object ResloveAttrClass(Bindable makeServiceBindData, string s
         /// <returns>解决结果</returns>
         protected virtual object ResolvePrimitive(Bindable makeServiceBindData, string service, ParameterInfo baseParam)
         {
-            var contextualClosure = GetContextualClosure(makeServiceBindData, service, baseParam.Name);
-            if (contextualClosure != null)
-            {
-                return MakeFromContextualClosure(contextualClosure, baseParam.ParameterType);
-            }
-
-            service = makeServiceBindData.GetContextual(service);
-            if (CanMake(service))
-            {
-                return Make(service);
-            }
-
-            var result = SpeculationServiceByParamName(makeServiceBindData, baseParam.Name, baseParam.ParameterType);
-            if (result != null)
-            {
-                return result;
-            }
-
-            if (baseParam.IsOptional)
-            {
-                return baseParam.DefaultValue;
-            }
-
-            throw MakeUnresolvablePrimitiveException(baseParam.Name, baseParam.Member.DeclaringType);
+            return ResloveClass(makeServiceBindData, service, baseParam);
         }
 
         /// <summary>
@@ -1286,68 +1289,27 @@ protected virtual object ResolvePrimitive(Bindable makeServiceBindData, string s
         /// <returns>解决结果</returns>
         protected virtual object ResloveClass(Bindable makeServiceBindData, string service, ParameterInfo baseParam)
         {
-            var contextualClosure = GetContextualClosure(makeServiceBindData, service, baseParam.Name);
-            if (contextualClosure != null)
-            {
-                return MakeFromContextualClosure(contextualClosure, baseParam.ParameterType);
-            }
-
-            try
-            {
-                return Make(makeServiceBindData.GetContextual(service));
-            }
-            catch (UnresolvableException)
+            if (ResloveFromContextual(makeServiceBindData, service, baseParam.Name, baseParam.ParameterType,
+                out object instance))
             {
-                var result = SpeculationServiceByParamName(makeServiceBindData, baseParam.Name, baseParam.ParameterType);
-                if (result != null)
-                {
-                    return result;
-                }
-
-                if (baseParam.IsOptional)
-                {
-                    return baseParam.DefaultValue;
-                }
-
-                throw;
+                return instance;
             }
-        }
 
-        /// <summary>
-        /// 根据参数名字来推测服务
-        /// </summary>
-        /// <param name="makeServiceBindData">请求注入操作的服务绑定数据</param>
-        /// <param name="paramName">参数名</param>
-        /// <param name="paramType">参数类型</param>
-        /// <returns>推测的服务</returns>
-        protected virtual object SpeculationServiceByParamName(Bindable makeServiceBindData, string paramName, Type paramType)
-        {
-            foreach (var tag in GetVariableTags())
+            if (baseParam.IsOptional)
             {
-                var service = makeServiceBindData.GetContextual($"{tag}{paramName}");
-
-                if (!CanMake(service))
-                {
-                    continue;
-                }
-
-                var instance = Make(service);
-                if (ChangeType(ref instance, paramType))
-                {
-                    return instance;
-                }
+                return baseParam.DefaultValue;
             }
 
-            return null;
+            throw MakeUnresolvablePrimitiveException(baseParam.Name, baseParam.Member.DeclaringType);
         }
 
         /// <summary>
         /// 获取变量标签
         /// </summary>
         /// <returns>变量标签</returns>
-        protected virtual char[] GetVariableTags()
+        protected virtual char GetVariableTag()
         {
-            return new[] { '$', '@' };
+            return '$';
         }
 
         /// <summary>