Skip to content

Fixed hub generator #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bretbas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed hub generator #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions samples/Blazor/Server/Hubs/MainHub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using BlazorSignalR.Server.SignalRModules;
using ChatModule.Server;
using SignalR.Modules;
using System;
using WeatherModule.Server;

namespace BlazorSignalR.Server.Hubs
Expand All @@ -10,5 +11,9 @@ namespace BlazorSignalR.Server.Hubs
[SignalRModuleHub(typeof(CounterHub))]
public partial class MainHub : ModulesEntryHub
{
public MainHub(IServiceProvider provider)
: base(provider)
{
}
}
}
67 changes: 57 additions & 10 deletions src/SignalR.Modules.Generator/HubGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;

#nullable enable

namespace SignalR.Modules.Generator
{
[Generator]
Expand All @@ -14,16 +18,23 @@ public class HubGenerator : ISourceGenerator
private const string AttributeName = "SignalRModuleHubAttribute";
private const string AttributeFullName = AttributeNamespace + "." + AttributeName;
private const string AutoGeneratedFileHeader =
@"//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by the SignalR.Modules Source Generator.
// </auto-generated>
@"//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by the SignalR.Modules Source Generator.
// </auto-generated>
//------------------------------------------------------------------------------";

public void Initialize(GeneratorInitializationContext context)
{
// Register a syntax receiver that will be created for each generation pass
context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());

#if DEBUG
if (!Debugger.IsAttached)
{
Debugger.Launch();
}
#endif
}

public void Execute(GeneratorExecutionContext context)
Expand Down Expand Up @@ -94,14 +105,50 @@ public partial class {entryHubTypeSymbol.Name}
}

source.Append(@"
}
}
}");
return source.ToString();
}

private string ProcessModuleHubMethod(INamedTypeSymbol moduleHubTypeSymbol, IMethodSymbol methodSymbol)
{
var attributes = methodSymbol.GetAttributes();
var constructedAttributes = attributes.Where(x => x.ConstructorArguments.Any()).ToList();
var namedArgumentAttributes = attributes.Where(x => x.NamedArguments.Any()).ToList();

var ctorAttributesString = string.Join(Environment.NewLine, constructedAttributes
.Select(x =>
{
var ctorArgumentsString = string.Join(",", x.ConstructorArguments
.Select(y => y.Kind switch
{
TypedConstantKind.Enum => $"{y.Type.Name}.{y.Value}",
_ when y.Type.SpecialType == SpecialType.System_String => $"\"{y.Value}\"",
_ => y.Value
})
);
return $"[{x.AttributeClass.ContainingNamespace.ToDisplayString()}.{x.AttributeClass.Name.Replace("Attribute", string.Empty)}({ctorArgumentsString})]";
})
);

var namedAttributesString = string.Join(Environment.NewLine, namedArgumentAttributes
.Select(x =>
{
var namedArgumentsString = string.Join(",", x.NamedArguments
.Select(y => $@"{y.Key} = {y.Value.Kind switch
{
TypedConstantKind.Enum => $"{y.Value.Type.Name}.{y.Value}",
_ when y.Value.Type.SpecialType == SpecialType.System_String => $"\"{y.Value.Value}\"",
_ => y.Value.Value
}}")
);
return $"[{x.AttributeClass.ContainingNamespace.ToDisplayString()}.{x.AttributeClass.Name.Replace("Attribute", string.Empty)}({namedArgumentsString})]";
})
);

return $@"
{ctorAttributesString}
{namedAttributesString}
public {(methodSymbol.ReturnsVoid ? string.Empty : methodSymbol.ReturnType.ToDisplayString())} {moduleHubTypeSymbol.Name}_{methodSymbol.Name}({string.Join(", ", methodSymbol.Parameters.Select(p => $"{p.Type.ToDisplayString()} {p.Name}"))})
{{
var hub = ServiceProvider.GetRequiredService<{moduleHubTypeSymbol.ToDisplayString()}>();
Expand All @@ -126,7 +173,7 @@ private string ProcessHubClientClass(INamedTypeSymbol entryHubTypeSymbol, INamed

namespace {namespaceName}
{{
public class {className} : ClientProxy<{moduleHubTypeSymbol.Name}>, {typedClientInterface.Name}
public class {className} : ClientProxy<{moduleHubTypeSymbol.ToDisplayString()}>, {typedClientInterface.ToDisplayString()}
{{
public {className}(IClientProxy clientProxy)
: base(clientProxy)
Expand All @@ -143,7 +190,7 @@ public class {className} : ClientProxy<{moduleHubTypeSymbol.Name}>, {typedClient
}

source.Append(@"
}
}
}");
return source.ToString();
}
Expand All @@ -153,7 +200,7 @@ private string ProcessHubClientMethod(IMethodSymbol methodSymbol)
return $@"
public Task {methodSymbol.Name}({string.Join(", ", methodSymbol.Parameters.Select(p => $"{p.Type.ToDisplayString()} {p.Name}"))})
{{
return SendAsync(""{methodSymbol.Name}"", new[] {{ {string.Join(", ", methodSymbol.Parameters.Select(p => p.Name))} }});
return SendAsync(""{methodSymbol.Name}"", new object[] {{ {string.Join(", ", methodSymbol.Parameters.Select(p => p.Name))} }});
}}";
}

Expand Down Expand Up @@ -291,7 +338,7 @@ protected Task ModuleHubsOnDisconnectedAsync(Exception exception)
}

source.Append(@"
}
}
}");
return source.ToString();
}
Expand Down
7 changes: 7 additions & 0 deletions src/SignalR.Modules/ModulesEntryHub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using System;

namespace SignalR.Modules
Expand All @@ -16,6 +17,12 @@ public ModulesEntryHub(ILogger logger, IServiceProvider serviceProvider)
ServiceProvider = serviceProvider;
}

public ModulesEntryHub(IServiceProvider serviceProvider)
{
Logger = NullLogger.Instance;
ServiceProvider = serviceProvider;
}

protected void InitModuleHub<TModuleHub>(TModuleHub hub)
where TModuleHub : ModuleHub
{
Expand Down