0.8.0

Author: 2A5F

CHANGELOG.CN.md

@@ -1,3 +1,6 @@
+# 0.8.0
+  - 可区分联合生成器现在支持生成 JsonConverter
+
 # 0.7.0
   - 添加了解引用生成器
 

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.8.0
+  - Union Generator not support gen JsonConverter
+
 # 0.7.0
   - Add Deref Generator
 

LibSugar.CodeGen/LibSugar.CodeGen.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-	    <Version>0.7.3</Version>
+	    <Version>0.8.0</Version>
         <Nullable>enable</Nullable>
         <LangVersion>11.0</LangVersion>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>

LibSugar.CodeGen/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "LibSugar.CodeGen": {
       "commandName": "DebugRoslynComponent",
-      "targetProject": "..\\TestGen\\TestGen.csproj"
+      "targetProject": "..\\TestGen2\\TestGen2.csproj"
     }
   }
 }

LibSugar.CodeGen/UnionGenerator.cs

@@ -449,3 +449,15 @@ public static void LogWarning(this SourceProductionContext context, string msg,
         context.ReportDiagnostic(Diagnostic.Create(new DiagnosticDescriptor("Sugar", "", msg, "", DiagnosticSeverity.Warning, true), loc, DiagnosticSeverity.Warning));
     }
 }
+
+public static class UtilsClass
+{
+    public static V? TryGet<K, V>(this Dictionary<K, V> self, K key) where V : class where K : notnull =>
+        self.TryGetValue(key, out var val) ? val : null;
+}
+
+public static class UtilsStruct
+{
+    public static V? TryGet<K, V>(this Dictionary<K, V> self, K key) where V : struct where K : notnull =>
+        self.TryGetValue(key, out var val) ? val : null;
+}

LibSugar.CodeGen/Utils.cs

@@ -9,7 +9,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSugar.CodeGen", "LibSugar.CodeGen\LibSugar.CodeGen.csproj", "{C53AEA48-A9EE-4A2E-B294-B5B681A9D616}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGen", "TestGen\TestGen.csproj", "{AA832EEF-9ED1-479A-88C6-561D13AFD5E4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestGen", "TestGen\TestGen.csproj", "{AA832EEF-9ED1-479A-88C6-561D13AFD5E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGen2", "TestGen2\TestGen2.csproj", "{C7BFB8AF-A751-402D-B488-30C190E8F160}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -42,6 +44,12 @@ Global
 		{AA832EEF-9ED1-479A-88C6-561D13AFD5E4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA832EEF-9ED1-479A-88C6-561D13AFD5E4}.Unity|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA832EEF-9ED1-479A-88C6-561D13AFD5E4}.Unity|Any CPU.Build.0 = Debug|Any CPU
+		{C7BFB8AF-A751-402D-B488-30C190E8F160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7BFB8AF-A751-402D-B488-30C190E8F160}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7BFB8AF-A751-402D-B488-30C190E8F160}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7BFB8AF-A751-402D-B488-30C190E8F160}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7BFB8AF-A751-402D-B488-30C190E8F160}.Unity|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7BFB8AF-A751-402D-B488-30C190E8F160}.Unity|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

LibSugar.sln

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LibSugar;
+
+public static partial class Sugar
+{
+    public static EqByEqualityComparer<T, D> EqBy<T, D>(this Func<T, D> f) => new(f);
+    public static EqByEqualityComparer<T, D> EqBy<T, D>(this Func<T, D> f, IEqualityComparer<D> equality) => new(f, equality);
+    public static EqByEqualityComparer<T, D> EqBy<T, D>(this IEqualityComparer<D> equality, Func<T, D> f) => new(f, equality);
+}
+
+public record EqByEqualityComparer<T, D>(Func<T, D> F, IEqualityComparer<D> Equality) : IEqualityComparer<T>
+{
+    public EqByEqualityComparer(Func<T, D> f) : this(f, EqualityComparer<D>.Default) { }
+
+    public bool Equals(T? x, T? y) => Equality.Equals(F(x!), F(y!));
+
+    public int GetHashCode(T obj) => Equality.GetHashCode(F(obj)!);
+}

LibSugar/EqBy.cs

@@ -3,7 +3,7 @@
   <PropertyGroup>
 	<Configurations>Debug;Release;Unity</Configurations>
 	<TargetFrameworks>netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
-	<Version>0.7.3</Version>
+	<Version>0.8.0</Version>
     <Nullable>enable</Nullable>
 	<LangVersion>11.0</LangVersion>
 	<PackageProjectUrl>https://github.com/libsugar/SugarCs</PackageProjectUrl>

LibSugar/LibSugar.csproj

@@ -3,8 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace LibSugar;
 
@@ -17,6 +15,7 @@ public static partial class Sugar
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IEnumerable<T> Repeat<T>(this T v, int count) => Enumerable.Repeat(v, count);
 
+
     public static string JoinStr<T>(this IEnumerable<T> iter) => string.Join(", ", iter);
     public static string JoinStr<T>(this IEnumerable<T> iter, char separator) => string.Join(separator, iter);
     public static string JoinStr<T>(this IEnumerable<T> iter, string separator) => string.Join(separator, iter);
@@ -27,10 +26,12 @@ public static partial class Sugar
     public static string JoinStr(this string[] arr, char separator) => string.Join(separator, arr);
     public static string JoinStr(this string[] arr, string separator) => string.Join(separator, arr);
 
+
     public static IEnumerable<(T a, int i)> Indexed<T>(this IEnumerable<T> iter) => iter.Select((a, b) => (a, b));
 
     public static ParallelQuery<(T a, int i)> Indexed<T>(this ParallelQuery<T> iter) => iter.Select((a, b) => (a, b));
 
+
     public static IEnumerable<R> WhereSelect<T, R>(this IEnumerable<T> iter, Func<T, Option<R>> f)
         => iter.Select(f).Where(a => a.Has).Select(a => a.Value);
 
@@ -51,6 +52,7 @@ public static IEnumerable<R> WhereCast<R>(this IEnumerable iter)
     public static ParallelQuery<R> WhereCast<T, R>(this ParallelQuery<T> iter)
         => iter.Where(a => a is R).Cast<R>();
 
+
     /// <summary>ForEach for <see cref="IEnumerable&lt;T&gt;"/></summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void ForEach<T>(this IEnumerable<T> iter, Action<T> f)
@@ -91,4 +93,112 @@ public static Option<R> ForEach<T, R>(this IEnumerable<T> iter, Func<T, Option<R
         }
         return new();
     }
+
+    #region IEnumerable ByX
+
+#if !NET6_0_OR_GREATER
+
+    public static IEnumerable<T> DistinctBy<T, D>(this IEnumerable<T> iter, Func<T, D> f)
+        => iter.Distinct(EqBy(f));
+
+    public static IEnumerable<T> DistinctBy<T, D>(this IEnumerable<T> iter, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.Distinct(EqBy(f, equality));
+
+    public static IEnumerable<T> DistinctBy<T, D>(this IEnumerable<T> iter, Func<T, D> f, IEqualityComparer<D> equality)
+        => iter.Distinct(EqBy(f, equality));
+
+
+    public static IEnumerable<T> UnionBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, Func<T, D> f)
+        => iter.Union(other, EqBy(f));
+
+    public static IEnumerable<T> UnionBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.Union(other, EqBy(f, equality));
+
+    public static IEnumerable<T> UnionBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, Func<T, D> f, IEqualityComparer<D> equality)
+        => iter.Union(other, EqBy(f, equality));
+
+#else
+
+    public static IEnumerable<T> DistinctBy<T, D>(this IEnumerable<T> iter, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.DistinctBy(f, equality);
+
+
+    public static IEnumerable<T> ExceptBy<T, D>(this IEnumerable<T> iter, IEnumerable<D> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.ExceptBy(other, f, equality);
+
+
+    public static IEnumerable<T> IntersectBy<T, D>(this IEnumerable<T> iter, IEnumerable<D> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.IntersectBy(other, f, equality);
+
+
+    public static IEnumerable<T> UnionBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.UnionBy(other, f, equality);
+
+#endif
+
+    public static IEnumerable<T> ExceptBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, Func<T, D> f)
+        => iter.Except(other, EqBy(f));
+
+    public static IEnumerable<T> ExceptBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.Except(other, EqBy(f, equality));
+
+    public static IEnumerable<T> ExceptBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, Func<T, D> f, IEqualityComparer<D> equality)
+        => iter.Except(other, EqBy(f, equality));
+
+
+    public static IEnumerable<T> IntersectBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, Func<T, D> f)
+        => iter.Intersect(other, EqBy(f));
+
+    public static IEnumerable<T> IntersectBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.Intersect(other, EqBy(f, equality));
+
+    public static IEnumerable<T> IntersectBy<T, D>(this IEnumerable<T> iter, IEnumerable<T> other, Func<T, D> f, IEqualityComparer<D> equality)
+        => iter.Intersect(other, EqBy(f, equality));
+
+    #endregion
+
+
+    #region ParallelQuery ByX
+
+    public static ParallelQuery<T> DistinctBy<T, D>(this ParallelQuery<T> iter, Func<T, D> f)
+        => iter.Distinct(EqBy(f));
+
+    public static ParallelQuery<T> DistinctBy<T, D>(this ParallelQuery<T> iter, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.Distinct(EqBy(f, equality));
+
+    public static ParallelQuery<T> DistinctBy<T, D>(this ParallelQuery<T> iter, Func<T, D> f, IEqualityComparer<D> equality)
+        => iter.Distinct(EqBy(f, equality));
+
+
+    public static ParallelQuery<T> ExceptBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, Func<T, D> f)
+        => iter.Except(other, EqBy(f));
+
+    public static ParallelQuery<T> ExceptBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.Except(other, EqBy(f, equality));
+
+    public static ParallelQuery<T> ExceptBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, Func<T, D> f, IEqualityComparer<D> equality)
+        => iter.Except(other, EqBy(f, equality));
+
+
+    public static ParallelQuery<T> IntersectBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, Func<T, D> f)
+        => iter.Intersect(other, EqBy(f));
+
+    public static ParallelQuery<T> IntersectBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.Intersect(other, EqBy(f, equality));
+
+    public static ParallelQuery<T> IntersectBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, Func<T, D> f, IEqualityComparer<D> equality)
+        => iter.Intersect(other, EqBy(f, equality));
+
+
+    public static ParallelQuery<T> UnionBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, Func<T, D> f)
+        => iter.Union(other, EqBy(f));
+
+    public static ParallelQuery<T> UnionBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, IEqualityComparer<D> equality, Func<T, D> f)
+        => iter.Union(other, EqBy(f, equality));
+
+    public static ParallelQuery<T> UnionBy<T, D>(this ParallelQuery<T> iter, ParallelQuery<T> other, Func<T, D> f, IEqualityComparer<D> equality)
+        => iter.Union(other, EqBy(f, equality));
+    
+    #endregion
+
 }

LibSugar/Seq.cs

@@ -22,11 +22,14 @@ public static UResult<T, A> MakeOk<T>(T v) where T : unmanaged
 }
 
 [Union, For("T", "E")]
+#if !NETSTANDARD
+[UnionJson]
+#endif
 public enum UResultKind : byte
 {
-    [Of("E")]
+    [Of("E"), UnionJsonName("err")]
     Err,
-    [Of("T")]
+    [Of("T"), UnionJsonName("ok")]
     Ok,
 }
 

LibSugar/UResult.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 namespace LibSugar;
 
@@ -18,3 +20,97 @@ public UnionAttribute() { }
 
     public UnionAttribute(string name) => Name = name;
 }
+
+[AttributeUsage(AttributeTargets.Enum | AttributeTargets.Class | AttributeTargets.Struct)]
+public class UnionJsonAttribute : Attribute
+{
+#if NETSTANDARD
+    /// <summary>
+    /// Generate System.Text.Json.Serialization.JsonConverter
+    /// </summary>
+#else
+    /// <summary>
+    /// Generate <see cref="System.Text.Json.Serialization.JsonConverter{T}"/>
+    /// </summary>
+#endif
+    public bool WithSystemText { get; set; } = true;
+
+    /// <summary>
+    /// Converter class name for System.Text.Json
+    /// </summary>
+    public string? SystemTextClassName { get; set; }
+
+    /// <summary>
+    /// How to serialize and deserialize json
+    /// </summary>
+    public UnionJsonMode JsonMode { get; set; } = UnionJsonMode.External;
+
+    /// <summary>
+    /// Tag name when <see cref="JsonMode"/> is <see cref="UnionJsonMode.Adjacent"/>
+    /// </summary>
+    public string Tag { get; set; } = "t";
+    /// <summary>
+    /// Content name when <see cref="JsonMode"/> is <see cref="UnionJsonMode.Adjacent"/>
+    /// </summary>
+    public string Content { get; set; } = "c";
+
+    /// <summary>
+    /// Use enum value as tag
+    /// </summary>
+    public bool NumberTag { get; set; } = false;
+}
+
+/// <summary>
+/// How to serialize and deserialize json
+/// </summary>
+public enum UnionJsonMode
+{
+    /// <summary>
+    /// <code>
+    /// { "Tag": { "a": 1 } }
+    /// </code>
+    /// </summary>
+    External,
+    /// <summary>
+    /// <code>
+    /// ["Tag", { "a": 1 }]
+    /// </code>
+    /// </summary>
+    Tuple,
+    /// <summary>
+    /// <code>
+    /// { "t": "Tag", "c": { "a": 1 } }
+    /// </code>
+    /// <para>
+    /// For System.Text.Json: <br/>
+    /// This object needs to be ordered, "t" must come before "c"
+    /// </para>
+    /// </summary>
+    Adjacent,
+}
+
+public record struct UnionMeta<K> where K : Enum
+{
+    public UnionMeta(Dictionary<string, K> nameToKind, Dictionary<K, string> kindToName, Dictionary<K, Type> variantTypes, Dictionary<string, K> jsonNameToKind)
+    {
+        NameToKind = new(nameToKind);
+        KindToName = new(kindToName);
+        VariantTypes = new(variantTypes);
+        JsonNameToKind = new(jsonNameToKind);
+    }
+    public ReadOnlyDictionary<string, K> NameToKind { get; }
+    public ReadOnlyDictionary<K, string> KindToName { get; }
+    public ReadOnlyDictionary<K, Type> VariantTypes { get; }
+    public ReadOnlyDictionary<string, K> JsonNameToKind { get; }
+}
+
+[AttributeUsage(AttributeTargets.Field)]
+public class UnionJsonNameAttribute : Attribute
+{
+    public string Name { get; }
+
+    public UnionJsonNameAttribute(string name)
+    {
+        Name = name;
+    }
+}