huanld/ProxyGenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Method

Browse Source
This commit is contained in:
Stef Heyenrath
2021-07-25 16:06:32 +02:00
parent 2531e8e688
commit b627e169a6
9 changed files with 192 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProxyInterfaceSourceGenerator/Context.cs
+3 -1
View File
@@ -12,5 +12,7 @@ namespace ProxyInterfaceSourceGenerator
public List<ContextData> GeneratedData { get; } = new List<ContextData>();
public IDictionary<InterfaceDeclarationSyntax, ProxyData> CandidateInterfaces { get; init; }
}
public Dictionary<string, string> ReplacedTypes { get; } = new Dictionary<string, string>();
}
}
src/ProxyInterfaceSourceGenerator/Extensions/SymbolExtensions.cs
+17 -34
View File
@@ -1,5 +1,4 @@
using System.Collections.Generic;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis;
using ProxyInterfaceSourceGenerator.Enums;
namespace ProxyInterfaceSourceGenerator.Extensions
@@ -12,7 +11,22 @@ namespace ProxyInterfaceSourceGenerator.Extensions
{
return TypeEnum.ValueTypeOrString;
}
if (p.Type.TypeKind == TypeKind.Interface)
{
return TypeEnum.Interface;
}
return TypeEnum.Complex;
}
public static TypeEnum GetTypeEnum(this IParameterSymbol p)
{
if (p.Type.IsValueType || p.Type.ToString() == "string")
{
return TypeEnum.ValueTypeOrString;
}
if (p.Type.TypeKind == TypeKind.Interface)
{
return TypeEnum.Interface;
@@ -46,36 +60,5 @@ namespace ProxyInterfaceSourceGenerator.Extensions
return $"{overrideType} {property.Name} {{ {get}{set}}}";
}
//public static string ToPropertyTextForClass(this IPropertySymbol property, string overrideType, string className)
//{
// var classNameProxy = $"{className}Proxy";
// var get = property.GetMethod != null ? $"get => new {classNameProxy}(_Instance.{property.Name}); " : string.Empty;
// var set = property.SetMethod != null ? $"set => _Instance.{property.Name} = (({classNameProxy}) value)._Instance; " : string.Empty;
// return $"{overrideType} {property.Name} {{ {get}{set}}}";
//}
public static string ToMethodText(this IMethodSymbol method)
{
var parameters = new List<string>();
foreach (var ps in method.Parameters)
{
parameters.Add($"{ps.Type} {ps.Name}");
}
return $"{method.ReturnType} {method.Name}({string.Join(", ", parameters)})";
}
public static string ToMethodTextForClass(this IMethodSymbol method)
{
var parameters = new List<string>();
foreach (var ps in method.Parameters)
{
parameters.Add($"{ps.Name}");
}
return $"{method.ToMethodText()} => _Instance.{method.Name}({string.Join(", ", parameters)});";
}
}
}
src/ProxyInterfaceSourceGenerator/FileGenerators/BaseGenerator.cs
+97 -14
View File
@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
// using AnyOfTypes;
using Microsoft.CodeAnalysis;
namespace ProxyInterfaceSourceGenerator.FileGenerators
@@ -14,39 +14,122 @@ namespace ProxyInterfaceSourceGenerator.FileGenerators
_context = context;
}
protected string GetPropertyType(IPropertySymbol property, out Dictionary<string, string> differs)
{
differs = new Dictionary<string, string>();
//protected string GetReplacedType(AnyOf<IPropertySymbol, IParameterSymbol> x)
//{
// ITypeSymbol ts = x.IsFirst ? x.First.Type : x.Second.Type;
// var propertyTypeAsString = ts.ToString();
var existing = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == property.Type.ToString());
// var existing = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == propertyTypeAsString);
// if (existing is not null)
// {
// if (!_context.ReplacedTypes.ContainsKey(propertyTypeAsString))
// {
// _context.ReplacedTypes.Add(propertyTypeAsString, existing.InterfaceName);
// }
// return existing.InterfaceName;
// }
// if (ts is INamedTypeSymbol namedTypedSymbol)
// {
// var propertyTypeAsStringToBeModified = propertyTypeAsString;
// foreach (var typeArgument in namedTypedSymbol.TypeArguments)
// {
// var typeArgumentAsString = typeArgument.ToString();
// var exist = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == typeArgumentAsString);
// if (exist is not null)
// {
// if (!_context.ReplacedTypes.ContainsKey(typeArgumentAsString))
// {
// _context.ReplacedTypes.Add(typeArgumentAsString, exist.InterfaceName);
// }
// propertyTypeAsStringToBeModified = propertyTypeAsStringToBeModified.Replace(typeArgumentAsString, exist.InterfaceName);
// }
// }
// return propertyTypeAsStringToBeModified;
// }
// return propertyTypeAsString;
//}
protected string GetPropertyType(IPropertySymbol property)
{
var propertyTypeAsString = property.Type.ToString();
var existing = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == propertyTypeAsString);
if (existing is not null)
{
differs.Add(property.Type.ToString(), existing.InterfaceName);
if (!_context.ReplacedTypes.ContainsKey(propertyTypeAsString))
{
_context.ReplacedTypes.Add(propertyTypeAsString, existing.InterfaceName);
}
return existing.InterfaceName;
}
if (property.Type is INamedTypeSymbol namedTypedSymbol)
{
var type = property.Type.ToString();
var propertyTypeAsStringToBeModified = propertyTypeAsString;
foreach (var typeArgument in namedTypedSymbol.TypeArguments)
{
var exist = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == typeArgument.ToString());
var typeArgumentAsString = typeArgument.ToString();
var exist = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == typeArgumentAsString);
if (exist is not null)
{
if (!differs.ContainsKey(typeArgument.ToString()))
if (!_context.ReplacedTypes.ContainsKey(typeArgumentAsString))
{
differs.Add(typeArgument.ToString(), exist.InterfaceName);
_context.ReplacedTypes.Add(typeArgumentAsString, exist.InterfaceName);
}
type = type.Replace(typeArgument.ToString(), exist.InterfaceName);
propertyTypeAsStringToBeModified = propertyTypeAsStringToBeModified.Replace(typeArgumentAsString, exist.InterfaceName);
}
}
return type;
return propertyTypeAsStringToBeModified;
}
return property.Type.ToString();
return propertyTypeAsString;
}
protected string GetParameterType(IParameterSymbol property)
{
var propertyTypeAsString = property.Type.ToString();
var existing = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == propertyTypeAsString);
if (existing is not null)
{
if (!_context.ReplacedTypes.ContainsKey(propertyTypeAsString))
{
_context.ReplacedTypes.Add(propertyTypeAsString, existing.InterfaceName);
}
return existing.InterfaceName;
}
if (property.Type is INamedTypeSymbol namedTypedSymbol)
{
var propertyTypeAsStringToBeModified = propertyTypeAsString;
foreach (var typeArgument in namedTypedSymbol.TypeArguments)
{
var typeArgumentAsString = typeArgument.ToString();
var exist = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == typeArgumentAsString);
if (exist is not null)
{
if (!_context.ReplacedTypes.ContainsKey(typeArgumentAsString))
{
_context.ReplacedTypes.Add(typeArgumentAsString, exist.InterfaceName);
}
propertyTypeAsStringToBeModified = propertyTypeAsStringToBeModified.Replace(typeArgumentAsString, exist.InterfaceName);
}
}
return propertyTypeAsStringToBeModified;
}
return propertyTypeAsString;
}
protected INamedTypeSymbol GetType(string name)
src/ProxyInterfaceSourceGenerator/FileGenerators/PartialInterfacesGenerator.cs
+20 -38
View File
@@ -10,8 +10,6 @@ namespace ProxyInterfaceSourceGenerator.FileGenerators
{
internal class PartialInterfacesGenerator : BaseGenerator, IFilesGenerator
{
private readonly List<FileData> files = new List<FileData>();
public PartialInterfacesGenerator(Context context) :
base(context)
{
@@ -21,11 +19,8 @@ namespace ProxyInterfaceSourceGenerator.FileGenerators
{
foreach (var ci in _context.CandidateInterfaces)
{
var file = GenerateFile(ci.Value.InterfaceName, ci.Value.TypeName, ci.Value.ProxyAll);
files.Add(file);
yield return GenerateFile(ci.Value.InterfaceName, ci.Value.TypeName, ci.Value.ProxyAll);
}
return files;
}
private FileData GenerateFile(string interfaceName, string typeName, bool proxyAll)
@@ -75,38 +70,8 @@ namespace {symbol.ContainingNamespace}
// ComplexProperties
foreach (var property in MemberHelper.GetPublicProperties(symbol, p => p.GetTypeEnum() == TypeEnum.Complex))
{
//if (proxyAll)
//{
// var existing = _context.GeneratedData
// .FirstOrDefault(x => x.ClassName == $"{property.Name}Proxy" || x.InterfaceName == $"I{property.Name}");
// if (existing is not null)
// {
// str.AppendLine($" {property.ToPropertyText(existing.InterfaceName)}");
// }
// else
// {
// // Create new
// var typeName = $"{property.Type}";
// var file = GenerateFile($"I{property.Name}", typeName, false);
// str.AppendLine($" // {property.ToPropertyText($"I{property.Name}")}");
// }
//}
//else
var type = GetPropertyType(property, out _);
var type = GetPropertyType(property);
str.AppendLine($" {property.ToPropertyText(type)}");
//var existing = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == property.Type.ToString());
//if (existing is not null)
//{
// str.AppendLine($" {property.ToPropertyText(existing.InterfaceName)}");
//}
//else
//{
// str.AppendLine($" {property.ToPropertyText()}");
//}
str.AppendLine();
}
@@ -118,8 +83,25 @@ namespace {symbol.ContainingNamespace}
var str = new StringBuilder();
foreach (var method in MemberHelper.GetPublicMethods(symbol))
{
str.AppendLine($" {method.ToMethodText()};");
var methodParameters = new List<string>();
foreach (var ps in method.Parameters)
{
if (ps.GetTypeEnum() == TypeEnum.Complex)
{
var type = GetParameterType(ps);
methodParameters.Add($"{type} {ps.Name}");
}
else
{
methodParameters.Add($"{ps.Type} {ps.Name}");
}
}
str.AppendLine($" {method.ReturnType} {method.Name}({string.Join(", ", methodParameters)});");
str.AppendLine();
//str.AppendLine($" {method.ToMethodText()};");
//str.AppendLine();
}
return str.ToString();
src/ProxyInterfaceSourceGenerator/FileGenerators/ProxyClassesGenerator.cs
+42 -66
View File
@@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using ProxyInterfaceSourceGenerator.Enums;
@@ -10,10 +9,7 @@ namespace ProxyInterfaceSourceGenerator.FileGenerators
{
internal class ProxyClassesGenerator : BaseGenerator, IFilesGenerator
{
private readonly List<FileData> files = new List<FileData>();
public ProxyClassesGenerator(Context context) :
base(context)
public ProxyClassesGenerator(Context context) : base(context)
{
}
@@ -21,11 +17,8 @@ namespace ProxyInterfaceSourceGenerator.FileGenerators
{
foreach (var ci in _context.CandidateInterfaces)
{
var file = GenerateFile(ci.Value.InterfaceName, ci.Value.ClassName, ci.Value.TypeName, ci.Value.ProxyAll);
files.Add(file);
yield return GenerateFile(ci.Value.InterfaceName, ci.Value.ClassName, ci.Value.TypeName, ci.Value.ProxyAll);
}
return files;
}
private FileData GenerateFile(string interfaceName, string className, string typeName, bool proxyAll)
@@ -53,16 +46,16 @@ namespace {symbol.ContainingNamespace}
public {className} _Instance {{ get; }}
{GeneratePublicProperties(symbol, proxyAll)}
{GeneratePublicMethods(symbol)}
public {className}Proxy({className} instance)
{{
_Instance = instance;
{GenerateAutoMapper()}
}}
{GeneratePublicProperties(symbol, proxyAll)}
{GeneratePublicMethods(symbol)}
}}
}}";
@@ -70,14 +63,14 @@ namespace {symbol.ContainingNamespace}
{
var str = new StringBuilder();
str.AppendLine(" _mapper = new MapperConfiguration(cfg =>");
str.AppendLine(" {");
foreach (var x in _context.CandidateInterfaces)
str.AppendLine(" _mapper = new MapperConfiguration(cfg =>");
str.AppendLine(" {");
foreach (var replacedType in _context.ReplacedTypes)
{
str.AppendLine($" cfg.CreateMap<{x.Value.InterfaceName}, {x.Value.ClassName}>();");
str.AppendLine($" cfg.CreateMap<{x.Value.ClassName}, {x.Value.InterfaceName}>();");
str.AppendLine($" cfg.CreateMap<{replacedType.Key}, {replacedType.Value}>();");
str.AppendLine($" cfg.CreateMap<{replacedType.Value}, {replacedType.Key}>();");
}
str.AppendLine(" }).CreateMapper();");
str.AppendLine(" }).CreateMapper();");
return str.ToString();
}
@@ -103,52 +96,8 @@ namespace {symbol.ContainingNamespace}
// ComplexProperties
foreach (var property in MemberHelper.GetPublicProperties(symbol, p => p.GetTypeEnum() == TypeEnum.Complex))
{
var type = GetPropertyType(property, out var differs);
if (!differs.Any())
{
str.AppendLine($" public {property.ToPropertyTextForClass()}");
}
else
{
str.AppendLine($" public {property.ToPropertyTextForClass(type)}");
// var get = property.GetMethod != null ? $"get => _mapper.Map<{type}>(_Instance.{property.Name}); " : string.Empty;
// var set = property.SetMethod != null ? $"set => _Instance.{property.Name} = _mapper.Map<{property.Type}>(value);" : string.Empty;
//var p = $"{type} {property.Name} {{ {get}{set}}}";
//str.AppendLine($" public {type} {property.Name} {{ {get}{set}}}");
}
/*
public IList<IClazz> Cs
{
get => _mapper.Map<IList<IClazz>>(_instance.Cs);
set => _instance.Cs = _mapper.Map<IList<Clazz>>(value);
}
}*/
//public static string ToPropertyTextForClass(this IPropertySymbol property, string overrideType)
//{
// // var classNameProxy = $"Proxy";
// var get = property.GetMethod != null ? $"get => _mapper.Map<{overrideType}>(_Instance.{property.Name}); " : string.Empty;
// var set = property.SetMethod != null ? $"set => _mapper.Map<{property.Type}>( = (({classNameProxy}) value)._Instance; " : string.Empty;
// return $"{overrideType} {property.Name} {{ {get}{set}}}";
//}
//str.AppendLine($" public {property.ToPropertyTextForClass(type)}");
//var existing = _context.CandidateInterfaces.Values.FirstOrDefault(x => x.TypeName == property.Type.ToString());
//if (existing is not null)
//{
// str.AppendLine($" public {property.ToPropertyTextForClass(existing.InterfaceName, existing.ClassName)}");
//}
//else
//{
// str.AppendLine($" public {property.ToPropertyTextForClass()}");
//}
var type = GetPropertyType(property);
str.AppendLine($" public {property.ToPropertyTextForClass(type)}");
str.AppendLine();
}
@@ -160,7 +109,34 @@ namespace {symbol.ContainingNamespace}
var str = new StringBuilder();
foreach (var method in MemberHelper.GetPublicMethods(symbol))
{
str.AppendLine($" public {method.ToMethodTextForClass()}");
var methodParameters = new List<string>();
foreach (var ps in method.Parameters)
{
if (ps.GetTypeEnum() == TypeEnum.Complex)
{
var type = GetParameterType(ps);
methodParameters.Add($"{type} {ps.Name}");
}
else
{
methodParameters.Add($"{ps.Type} {ps.Name}");
}
}
var invokeParameters = new List<string>();
foreach (var ps in method.Parameters)
{
if (ps.GetTypeEnum() == TypeEnum.Complex)
{
invokeParameters.Add($"_mapper.Map<{ps.Type}>({ps.Name})");
}
else
{
invokeParameters.Add($"{ps.Name}");
}
}
str.AppendLine($" public {method.ReturnType} {method.Name}({string.Join(", ", methodParameters)}) => _Instance.{method.Name}({string.Join(", ", invokeParameters)});");
str.AppendLine();
}
src/ProxyInterfaceSourceGenerator/ProxyInterfaceCodeGenerator.cs
+2 -2
View File
@@ -43,8 +43,8 @@ namespace ProxyInterfaceSourceGenerator
context.GeneratorExecutionContext.AddSource(data.FileName, SourceText.From(data.Text, Encoding.UTF8));
}
var classesGenerator = new ProxyClassesGenerator(context);
foreach (var data in classesGenerator.GenerateFiles())
var proxyClassesGenerator = new ProxyClassesGenerator(context);
foreach (var data in proxyClassesGenerator.GenerateFiles())
{
context.GeneratorExecutionContext.AddSource(data.FileName, SourceText.From(data.Text, Encoding.UTF8));
}
src/ProxyInterfaceSourceGenerator/ProxyInterfaceSourceGenerator.csproj
+1
View File
@@ -31,6 +31,7 @@
</PropertyGroup>
<ItemGroup>
<!--<PackageReference Include="AnyOf" Version="0.0.12" />-->
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">
<PrivateAssets>all</PrivateAssets>