Merge pull request #61 from nenoNaninu/update_TypeValidator

Update TypeValidator
nenoNaninu · Jan 9, 2024 · 29d5199 · 29d5199
2 parents b508200 + 93d61d2
commit 29d5199
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 7 deletions.
diff --git a/examples/Server/Hubs/InheritHub.cs b/examples/Server/Hubs/InheritHub.cs
@@ -3,7 +3,7 @@
 
 namespace Server.Hubs;
 
-public class InheritHub : Hub<IUnaryHubReceiver>, IInheritHub
+public class InheritHub : Hub<IInheritHubReceiver>, IInheritHub
 {
     private readonly ILogger<InheritHub> _logger;
 
@@ -17,14 +17,17 @@ public Task<int> Add(int x, int y)
         return Task.FromResult(x + y);
     }
 
-    public Task<string> Cat(string x, string y)
+    public async Task<string> Cat(string x, string y)
     {
-        return Task.FromResult(x + y);
+        var str = x + y;
+        await this.Clients.All.ReceiveMessage(str, str.Length);
+        return str;
     }
 
-    public Task<UserDefinedType> Echo(UserDefinedType instance)
+    public async Task<UserDefinedType> Echo(UserDefinedType instance)
     {
-        return Task.FromResult(instance);
+        await this.Clients.All.ReceiveCustomMessage(instance);
+        return instance;
     }
 
     public Task<string> Get()

diff --git a/examples/Shared/IInheritHub.cs b/examples/Shared/IInheritHub.cs
@@ -24,7 +24,24 @@ public interface IInheritHub : IHubBase1, IHubBase2
     Task<UserDefinedType> Echo(UserDefinedType instance);
 }
 
+
+public interface IReceiverBaseBase
+{
+    Task ReceiveMessage(string message, int value);
+}
+
+public interface IReceiverBase1 : IReceiverBaseBase
+{
+    Task ReceiveCustomMessage(UserDefinedType userDefined);
+}
+
+public interface IReceiverBase2 : IReceiverBaseBase
+{
+    Task Notify();
+}
+
 [Receiver]
-public interface IInheritHubReceiver
+public interface IInheritHubReceiver : IReceiverBase1, IReceiverBase2
 {
+    Task ReceiveMessage2(string message, int value);
 }
diff --git a/src/TypedSignalR.Client.DevTools.Specification/CodeAnalysis/Shared/TypeValidator.cs b/src/TypedSignalR.Client.DevTools.Specification/CodeAnalysis/Shared/TypeValidator.cs
@@ -135,9 +135,32 @@ public static bool ValidateReceiverTypeRule(
             return false;
         }
 
+        bool isValid = ValidateReceiverTypeRuleCore(context, receiverTypeSymbol, specialSymbols, accessLocation);
+
+        var allInterfaces = receiverTypeSymbol.AllInterfaces;
+
+        if (allInterfaces.IsEmpty)
+        {
+            return isValid;
+        }
+
+        foreach (var typeSymbol in allInterfaces)
+        {
+            isValid &= ValidateReceiverTypeRuleCore(context, typeSymbol, specialSymbols, accessLocation);
+        }
+
+        return isValid;
+    }
+
+    public static bool ValidateReceiverTypeRuleCore(
+        SourceProductionContext context,
+        ITypeSymbol typeSymbol,
+        SpecialSymbols specialSymbols,
+        Location accessLocation)
+    {
         bool isValid = true;
 
-        foreach (ISymbol memberSymbol in receiverTypeSymbol.GetMembers())
+        foreach (ISymbol memberSymbol in typeSymbol.GetMembers())
         {
             if (memberSymbol is IMethodSymbol methodSymbol)
             {