Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@feast107
feast107 committed Dec 6, 2023
1 parent bd6c5cc commit 0e7d234
Show file tree
Hide file tree
Showing 13 changed files with 54 additions and 118 deletions.
2 changes: 1 addition & 1 deletion extern/CodeAnalysis
Submodule CodeAnalysis updated 10 files
+1 −1 src/Feast.CodeAnalysis.SourceGenerators/Feast.CodeAnalysis.SourceGenerators.csproj
+1 −1 src/Feast.CodeAnalysis.SourceGenerators/Global.cs
+56 −0 src/Feast.CodeAnalysis.SourceGenerators/Templates/ISymbolExtensions.g.cs
+34 −2 src/Feast.CodeAnalysis.SourceGenerators/Templates/ISymbolExtensions.g.tt
+32 −0 src/Feast.CodeAnalysis.SourceGenerators/Templates/ITypeSymbolExtensions.g.cs
+18 −0 src/Feast.CodeAnalysis.SourceGenerators/Templates/ITypeSymbolExtensions.g.tt
+59 −3 src/Feast.CodeAnalysis.SourceGenerators/Templates/TypedConstantExtensions.cs
+32 −3 src/Feast.CodeAnalysis.SourceGenerators/Templates/TypedConstantExtensions.tt
+8 −8 src/Feast.CodeAnalysis.SourceGenerators/Templates/Utils/TypeInfo.g.cs
+4 −4 src/Feast.CodeAnalysis.SourceGenerators/Templates/Utils/TypeInfo.g.tt
41 changes: 0 additions & 41 deletions src/Antelcat.ClaimSerialization.Abstractions/Antelcat.ClaimSerialization.Abstractions.csproj
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/Antelcat.ClaimSerialization.Sample/Antelcat.ClaimSerialization.Sample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Antelcat.ClaimSerialization.Abstractions\Antelcat.ClaimSerialization.Abstractions.csproj"/>
<ProjectReference ReferenceOutputAssembly="false" OutputItemType="Analyzer" Include="..\Antelcat.ClaimSerialization.SourceGenerators\Antelcat.ClaimSerialization.SourceGenerators.csproj"/>
<ProjectReference Include="..\Antelcat.ClaimSerialization\Antelcat.ClaimSerialization.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Antelcat.ClaimSerialization.Sample/ClaimSerializableClass.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Security.Claims;
using Antelcat.Attributes;
using Antelcat.ClaimSerialization.Attributes;

namespace Antelcat.ClaimSerialization.Sample;

Expand Down
2 changes: 1 addition & 1 deletion src/Antelcat.ClaimSerialization.Shared/Attributes/ClaimConverterAttribute.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Antelcat.Attributes;
namespace Antelcat.ClaimSerialization.Attributes;

[AttributeUsage(AttributeTargets.Property)]
public class ClaimConverterAttribute(Type converterType) : Attribute;
2 changes: 1 addition & 1 deletion src/Antelcat.ClaimSerialization.Shared/Attributes/ClaimIgnoreAttribute.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Antelcat.Attributes;
namespace Antelcat.ClaimSerialization.Attributes;

/// <summary>
/// Properties marked this attribute will not be mapped into claims
Expand Down
2 changes: 1 addition & 1 deletion src/Antelcat.ClaimSerialization.Shared/Attributes/ClaimSerializableAttribute.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Antelcat.Attributes;
namespace Antelcat.ClaimSerialization.Attributes;

/// <summary>
/// Types marked this attribute will auto generate implement methods of <see cref="Antelcat.Interfaces.IClaimSerializable"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Antelcat.ClaimSerialization.Shared/Attributes/ClaimTypeAttribute.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Security.Claims;

namespace Antelcat.Attributes;
namespace Antelcat.ClaimSerialization.Attributes;

/// <summary>
/// Replace the <see cref="Claim.Type"/> of the <see cref="Claim"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Antelcat.ClaimSerialization.Shared/Interfaces/IClaimSerializable.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Security.Claims;

namespace Antelcat.Interfaces;
namespace Antelcat.ClaimSerialization.Interfaces;

public interface IClaimSerializable
{
Expand Down
91 changes: 40 additions & 51 deletions src/Antelcat.ClaimSerialization.SourceGenerators/Generators/ClaimSerializeGenerator.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using System.ComponentModel;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Security.Claims;
using System.Text;
using Antelcat.Attributes;
using Antelcat.ClaimSerialization.Attributes;
using Antelcat.ClaimSerialization.Interfaces;
using Feast.CodeAnalysis.Utils;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
Expand All @@ -20,28 +19,27 @@ namespace Antelcat.ClaimSerialization.SourceGenerators.Generators;
[Generator]
public class ClaimSerializeGenerator : IIncrementalGenerator
{
private const string Attribute = "Antelcat.Attributes.ClaimSerializableAttribute";
private const string Claim = "global::System.Security.Claims.Claim";
private const string IClaimSerializable = $"global::Antelcat.Interfaces.{nameof(IClaimSerializable)}";
private const string JsonSerializer = "global::System.Text.Json.JsonSerializer";
private const string IEnumerable = "global::System.Collections.Generic.IEnumerable";
private const string ICollection = "global::System.Collections.Generic.ICollection";
private const string Dictionary = "global::System.Collections.Generic.Dictionary";
private const string List = "global::System.Collections.Generic.List";
private static readonly string Attribute = $"{typeof(ClaimSerializableAttribute).FullName}";
private static readonly string IClaimSerializable = $"global::{typeof(IClaimSerializable).FullName}";
private const string Claim = "global::System.Security.Claims.Claim";
private const string JsonSerializer = "global::System.Text.Json.JsonSerializer";
private const string IEnumerable = "global::System.Collections.Generic.IEnumerable";

private const string group = nameof(group);

private static readonly IEnumerable<TypeInfo> ParsableTypes = typeof(object)
.Assembly
.GetExportedTypes()
.Where(x => x.GetMethods(BindingFlags.Public | BindingFlags.Static)
.FirstOrDefault(m =>
{
if( m.Name != nameof(int.Parse))return false;
if (m.Name != nameof(int.Parse)) return false;
var param = m.GetParameters();
return param.Length == 1 && param[0].ParameterType == typeof(string);
}) != null)
.Select(TypeInfo.FromType);


private static string GetClaimValueTypes(ITypeSymbol symbol)
{
return symbol.SpecialType switch
Expand Down Expand Up @@ -74,7 +72,7 @@ private static string GeneratePropToClaim(
return
$"yield return new {Claim}({claimType}, $\"{{{propertyName}}}\", {GetClaimValueTypes(propertyType)});";
}

var enumerable = (RuntimeTypeInfo)typeof(IEnumerable<>);
if (!TypeInfo.FromSymbol(propertyType).IsAssignableTo(enumerable))
return $"yield return new {Claim}({claimType}, {JsonSerializer}.Serialize({propertyName}));";
Expand All @@ -91,37 +89,36 @@ private static string GeneratePropToClaim(
{{GeneratePropToClaim(claimType, argument, "item")}}
}
""";

}

private static string GenerateClaimToProp(
string propName,
string argumentName,
ITypeSymbol propertyType,bool inner = false)
ITypeSymbol propertyType, bool inner = false)
{

// String 直接使用
if (propertyType.SpecialType == SpecialType.System_String)
{
return $"{(!inner ? $"{propName} = " : string.Empty )}{argumentName}";
return $"{(!inner ? $"{propName} = " : string.Empty)}{argumentName}";
}

// 可转换类型
if (propertyType.IsJsonBool()
|| propertyType.IsJsonNumber()
if (propertyType.IsJsonBool()
|| propertyType.IsJsonNumber()
|| propertyType.IsJsonString()
|| propertyType.TypeKind == TypeKind.Enum
|| ParsableTypes.Any(x => x.SameAs(TypeInfo.FromSymbol(propertyType))))
{
return $"{(!inner ? $"{propName} = " : string.Empty )}{
( propertyType.TypeKind != TypeKind.Enum ? propertyType.GetFullyQualifiedName() : $"global::{typeof(Enum).FullName}" )
return $"{(!inner ? $"{propName} = " : string.Empty)}{
(propertyType.TypeKind != TypeKind.Enum ? propertyType.GetFullyQualifiedName() : $"global::{typeof(Enum).FullName}")
}.Parse{(
propertyType.TypeKind == TypeKind.Enum ? $"<{propertyType.GetFullyQualifiedName()}>" : string.Empty ) }({argumentName})";
propertyType.TypeKind == TypeKind.Enum ? $"<{propertyType.GetFullyQualifiedName()}>" : string.Empty)}({argumentName})";
}

var enumerable = (RuntimeTypeInfo)typeof(IEnumerable<>);
if (!TypeInfo.FromSymbol(propertyType).IsAssignableTo(enumerable))
return $"{(!inner ? $"{propName} = " : string.Empty )}{JsonSerializer}.Deserialize<{propertyType.GetFullyQualifiedName()}>({argumentName})";
return
$"{(!inner ? $"{propName} = " : string.Empty)}{JsonSerializer}.Deserialize<{propertyType.GetFullyQualifiedName()}>({argumentName})";
var comp = propertyType
.Interfaces
.FirstOrDefault(x =>
Expand All @@ -134,7 +131,8 @@ private static string GenerateClaimToProp(
_ => ".ToList()"
};

return $"{(!inner ? $"{propName} = " : string.Empty )}pair.Value.Select(x=> {GenerateClaimToProp(propName, "x.Value", argument, true)}){suffix}";
return
$"{(!inner ? $"{propName} = " : string.Empty)}{group}.Select(x=> {GenerateClaimToProp(propName, "x.Value", argument, true)}){suffix}";
}


Expand Down Expand Up @@ -178,11 +176,11 @@ private static void GenerateCode(SourceProductionContext context, Compilation co
.ToList();
var propToClaims = transform
.Where(x => !x.typeSymbol.IsReadOnly)
.Select(p => p.converter == null
? GeneratePropToClaim(p.claimType, p.typeSymbol.Type, p.propName)
.Select(p => p.converter == null
? GeneratePropToClaim(p.claimType, p.typeSymbol.Type, p.propName)
: $"yield return new {Claim}({p.claimType}, new {p.converter.GetFullyQualifiedName()}().ConvertToString({p.propName}));"
);

var claimsToProps = transform
.Where(x =>
{
Expand All @@ -197,12 +195,13 @@ private static void GenerateCode(SourceProductionContext context, Compilation co
true
), x.typeSymbol.Locations.First()));
}

return !x.typeSymbol.IsWriteOnly;
})
.Select(p => $"case {p.claimType} :"
+ (p.converter == null
? GenerateClaimToProp(p.propName, "pair.Value.First().Value", p.typeSymbol.Type)
: $"{p.propName} = ({p.typeSymbol.Type.GetFullyQualifiedName()})new {p.converter.GetFullyQualifiedName()}().ConvertFromString(pair.Value.First().Value)")
? GenerateClaimToProp(p.propName, $"{group}.First().Value", p.typeSymbol.Type)
: $"{p.propName} = ({p.typeSymbol.Type.GetFullyQualifiedName()})new {p.converter.GetFullyQualifiedName()}().ConvertFromString({group}.First().Value)")
+ "; break;");

var head = TriviaList(
Expand Down Expand Up @@ -233,19 +232,9 @@ private static void GenerateCode(SourceProductionContext context, Compilation co
$$"""
public void {{nameof(Interfaces.IClaimSerializable.FromClaims)}}({{IEnumerable}}<{{Claim}}> claims)
{
foreach (var pair in claims.Aggregate(new {{Dictionary}}<string, {{ICollection}}<{{Claim}}>>(), (d, c) =>
{
if (!d.TryGetValue(c.Type, out var value))
{
value = new {{List}}<{{Claim}}>();
d[c.Type] = value;
}
value.Add(c);
return d;
}))
foreach (var {{group}} in claims.GroupBy(x => x.Type))
{
switch (pair.Key)
switch ({{group}}.Key)
{
{{string.Join("\n", claimsToProps).Replace("\n", "\n\t\t\t\t")}}
}
Expand All @@ -260,19 +249,19 @@ private static void GenerateCode(SourceProductionContext context, Compilation co
}
}

private static bool FilterAttribute(IPropertySymbol symbol,SourceProductionContext context)
private static bool FilterAttribute(IPropertySymbol symbol, SourceProductionContext context)
{
var attrs = symbol.GetAttributes();

if (!attrs.Any(a => TypeInfo
.FromSymbol(a.AttributeClass!)
.SameAs(typeof(ClaimIgnoreAttribute))))
return true;

foreach (var info in attrs.Select(attr =>
TypeInfo.FromSymbol(attr.AttributeClass!))
.Where(info =>
info.SameAs(typeof(ClaimTypeAttribute))
TypeInfo.FromSymbol(attr.AttributeClass!))
.Where(info =>
info.SameAs(typeof(ClaimTypeAttribute))
|| info.SameAs(typeof(ClaimConverterAttribute))))
{
context.ReportDiagnostic(Diagnostic.Create(new DiagnosticDescriptor(
Expand All @@ -285,7 +274,7 @@ private static bool FilterAttribute(IPropertySymbol symbol,SourceProductionConte
), symbol.Locations.First(), info.Name, nameof(ClaimIgnoreAttribute)));
return false;
}

return false;
}

Expand All @@ -302,7 +291,7 @@ private static (string claimType, IPropertySymbol typeSymbol, string propName, I
}

INamedTypeSymbol? converter = null;
var convertAttr = attrs.FirstOrDefault(x=>
var convertAttr = attrs.FirstOrDefault(x =>
x.AttributeClass.GetFullyQualifiedName() == $"global::{typeof(ClaimConverterAttribute).FullName}");
if (convertAttr is { ConstructorArguments.Length: 1 })
{
Expand All @@ -316,7 +305,7 @@ private static (string claimType, IPropertySymbol typeSymbol, string propName, I
nameof(ClaimSerializableAttribute),
DiagnosticSeverity.Error,
true
), symbol.Locations.First(),converter.Name));
), symbol.Locations.First(), converter.Name));
converter = null;
}
}
Expand Down
5 changes: 1 addition & 4 deletions src/Antelcat.ClaimSerialization.Tests/ClaimSerializationGeneratorTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.Json;
using Antelcat.Attributes;
using Antelcat.ClaimSerialization.Attributes;
using Antelcat.ClaimSerialization.SourceGenerators.Generators;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
Expand Down
6 changes: 0 additions & 6 deletions src/Antelcat.ClaimSerialization.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Feast.CodeAnalysis.SourceGe
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Antelcat.ClaimSerialization.Shared", "Antelcat.ClaimSerialization.Shared\Antelcat.ClaimSerialization.Shared.shproj", "{A5E305BF-C775-48F9-8A19-8B4D84F90983}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.ClaimSerialization.Abstractions", "Antelcat.ClaimSerialization.Abstractions\Antelcat.ClaimSerialization.Abstractions.csproj", "{1B45914A-8727-462D-A8CF-D60EC3659579}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antelcat.ClaimSerialization", "Antelcat.ClaimSerialization\Antelcat.ClaimSerialization.csproj", "{3A766E62-AC05-4F91-ADE7-8356C750EF52}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__", "__", "{E2C896D1-7BBD-417A-8574-2F684E0CC15A}"
Expand Down Expand Up @@ -47,10 +45,6 @@ Global
{7184E740-24E8-4DB5-8484-A81B55DF4BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7184E740-24E8-4DB5-8484-A81B55DF4BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7184E740-24E8-4DB5-8484-A81B55DF4BB7}.Release|Any CPU.Build.0 = Release|Any CPU
{1B45914A-8727-462D-A8CF-D60EC3659579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B45914A-8727-462D-A8CF-D60EC3659579}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B45914A-8727-462D-A8CF-D60EC3659579}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B45914A-8727-462D-A8CF-D60EC3659579}.Release|Any CPU.Build.0 = Release|Any CPU
{3A766E62-AC05-4F91-ADE7-8356C750EF52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A766E62-AC05-4F91-ADE7-8356C750EF52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A766E62-AC05-4F91-ADE7-8356C750EF52}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
13 changes: 5 additions & 8 deletions src/Antelcat.ClaimSerialization/Antelcat.ClaimSerialization.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<IsPackable>true</IsPackable>
<LangVersion>preview</LangVersion>

<Version>1.0.0</Version>
<FileVersion>1.0.0</FileVersion>
<AssemblyVersion>1.0.0</AssemblyVersion>
<Version>1.1.1</Version>
<FileVersion>1.1.1</FileVersion>
<AssemblyVersion>1.1.1</AssemblyVersion>

<Authors>Antelcat</Authors>
<Title>Antelcat.ClaimSerialization</Title>
<PackageId>Antelcat.ClaimSerialization</PackageId>
<RootNamespace>Antelcat.ClaimSerialization</RootNamespace>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageReleaseNotes>Initial release</PackageReleaseNotes>
<PackageReleaseNotes>Merge abstraction into one package and refactor namespace</PackageReleaseNotes>
<Copyright>Copyright Antelcat. All rights reserved</Copyright>
<PackageTags>claim;serialization;auto;generate;</PackageTags>
<Description>Auto generate serialization implements to/from Claim</Description>
Expand All @@ -30,10 +30,6 @@
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Antelcat.ClaimSerialization.Abstractions\Antelcat.ClaimSerialization.Abstractions.csproj" />
</ItemGroup>

<ItemGroup Label="Package">
<!-- Pack the source generator binary -->
<None Include="..\Antelcat.ClaimSerialization.SourceGenerators\bin\$(Configuration)\netstandard2.0\Antelcat.ClaimSerialization.SourceGenerators.dll" PackagePath="analyzers\dotnet\cs" Pack="true" />
Expand All @@ -43,5 +39,6 @@
<None Include="..\..\README.md" PackagePath="\" Pack="true" />
</ItemGroup>

<Import Project="..\Antelcat.ClaimSerialization.Shared\Antelcat.ClaimSerialization.Shared.projitems" Label="Shared" />

</Project>

0 comments on commit 0e7d234

Please sign in to comment.