Moved source generation for ObjectFactoryAttribute to its own Source Generator.

Author: PawelGerr

samples/Thinktecture.Runtime.Extensions.MessagePack.Samples/TextOrNumberSerializableWithFormatter.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
-using MessagePack;
-using Thinktecture.Formatters;
 
 namespace Thinktecture;
 
@@ -11,20 +8,16 @@ namespace Thinktecture;
                     SwitchMethods = SwitchMapMethodsGeneration.DefaultWithPartialOverloads,
                     MapMethods = SwitchMapMethodsGeneration.DefaultWithPartialOverloads)]
 [ObjectFactory<string>(UseForSerialization = SerializationFrameworks.All)]
-[MessagePackFormatter(typeof(ThinktectureMessagePackFormatter<TextOrNumberSerializableWithFormatter, string, ValidationError>))]
-public partial class TextOrNumberSerializableWithFormatter :
-   IObjectFactory<TextOrNumberSerializableWithFormatter, string, ValidationError>, // For deserialization
-   IConvertible<string>,                                                // For serialization
-   IParsable<TextOrNumberSerializableWithFormatter>                                // For Minimal API and ASP.NET Core model binding validation
+public partial class TextOrNumberSerializableWithFormatter
 {
-   // For serialization
+   // For serialization (implementation of IConvertible<string>)
    public string ToValue()
    {
       return Switch(text: t => $"Text|{t}",
                     number: n => $"Number|{n}");
    }
 
-   // For deserialization
+   // For deserialization (implementation of IObjectFactory<TextOrNumberSerializableWithFormatter, string, ValidationError>)
    public static ValidationError? Validate(string? value, IFormatProvider? provider, out TextOrNumberSerializableWithFormatter? item)
    {
       if (String.IsNullOrWhiteSpace(value))
@@ -54,29 +47,4 @@ public string ToValue()
       item = null;
       return new ValidationError("Invalid format");
    }
-
-   public static TextOrNumberSerializableWithFormatter Parse(string s, IFormatProvider? provider)
-   {
-      var validationError = Validate(s, provider, out var result);
-
-      if (validationError is null)
-         return result!;
-
-      throw new FormatException(validationError.Message);
-   }
-
-   public static bool TryParse(
-      [NotNullWhen(true)] string? s,
-      IFormatProvider? provider,
-      [MaybeNullWhen(false)] out TextOrNumberSerializableWithFormatter result)
-   {
-      if (s is null)
-      {
-         result = null;
-         return false;
-      }
-
-      var validationError = Validate(s, provider, out result!);
-      return validationError is null;
-   }
 }

samples/Thinktecture.Runtime.Extensions.Samples/Unions/TextOrNumberSerializable.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using Thinktecture.Text.Json.Serialization;
 
@@ -11,19 +10,16 @@ namespace Thinktecture.Unions;
                     MapMethods = SwitchMapMethodsGeneration.DefaultWithPartialOverloads)]
 [ObjectFactory<string>(UseForSerialization = SerializationFrameworks.All)]
 [JsonConverter(typeof(ThinktectureJsonConverterFactory))] // Optional, ThinktectureJsonConverterFactory can be registered with JsonSerializerOptions
-public partial class TextOrNumberSerializable :
-   IObjectFactory<TextOrNumberSerializable, string, ValidationError>, // For deserialization
-   IConvertible<string>,                                        // For serialization
-   IParsable<TextOrNumberSerializable> // For Minimal API and ASP.NET Core model binding validation
+public partial class TextOrNumberSerializable
 {
-   // For serialization
+   // For serialization (implementation of IConvertible<string>)
    public string ToValue()
    {
       return Switch(text: t => $"Text|{t}",
                     number: n => $"Number|{n}");
    }
 
-   // For deserialization
+   // For deserialization (implementation of IObjectFactory<TextOrNumberSerializable, string, ValidationError>)
    public static ValidationError? Validate(string? value, IFormatProvider? provider, out TextOrNumberSerializable? item)
    {
       if (String.IsNullOrWhiteSpace(value))
@@ -53,29 +49,4 @@ public string ToValue()
       item = null;
       return new ValidationError("Invalid format");
    }
-
-   public static TextOrNumberSerializable Parse(string s, IFormatProvider? provider)
-   {
-      var validationError = Validate(s, provider, out var result);
-
-      if (validationError is null)
-         return result!;
-
-      throw new FormatException(validationError.Message);
-   }
-
-   public static bool TryParse(
-      [NotNullWhen(true)] string? s,
-      IFormatProvider? provider,
-      [MaybeNullWhen(false)] out TextOrNumberSerializable result)
-   {
-      if (s is null)
-      {
-         result = null;
-         return false;
-      }
-
-      var validationError = Validate(s, provider, out result!);
-      return validationError is null;
-   }
 }

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/AdHocUnions/AdHocUnionCodeGenerator.cs

@@ -53,7 +53,7 @@ private void GenerateUnion(CancellationToken cancellationToken)
 
       _sb.Append(@"
    [global::System.Diagnostics.CodeAnalysis.SuppressMessage(""ThinktectureRuntimeExtensionsAnalyzer"", ""TTRESG1000:Internal Thinktecture.Runtime.Extensions API usage"")]
-   ").Append(_state.IsReferenceType ? "sealed " : "readonly ").Append("partial ").Append(_state.IsReferenceType ? "class" : "struct").Append(" ").Append(_state.Name).Append(" :");
+   ").Append(_state.IsReferenceType ? "sealed " : "readonly ").Append("partial ").AppendTypeKind(_state).Append(" ").Append(_state.Name).Append(" :");
 
       if (!_state.IsRefStruct)
       {

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/AdHocUnions/AdHocUnionMemberTypeState.cs

@@ -1,6 +1,10 @@
 namespace Thinktecture.CodeAnalysis.AdHocUnions;
 
-public sealed class AdHocUnionMemberTypeState : IEquatable<AdHocUnionMemberTypeState>, IMemberInformation, ITypeMinimallyQualified, IHashCodeComputable
+public sealed class AdHocUnionMemberTypeState
+   : IEquatable<AdHocUnionMemberTypeState>,
+     IMemberInformation,
+     ITypeMinimallyQualified,
+     IHashCodeComputable
 {
    public string TypeFullyQualified { get; }
    public string TypeMinimallyQualified { get; }
@@ -16,6 +20,8 @@ public sealed class AdHocUnionMemberTypeState : IEquatable<AdHocUnionMemberTypeS
    public string BackingFieldName { get; }
    public AdHocUnionMemberTypeSetting Setting { get; }
 
+   public bool IsRecord => false;
+
    public AdHocUnionMemberTypeState(
       string name,
       string defaultName,

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/AdHocUnions/AdHocUnionSourceGenState.cs

@@ -1,6 +1,8 @@
 namespace Thinktecture.CodeAnalysis.AdHocUnions;
 
-public sealed class AdHocUnionSourceGenState : ITypeInformation, IEquatable<AdHocUnionSourceGenState>
+public sealed class AdHocUnionSourceGenState
+   : ITypeInformation,
+     IEquatable<AdHocUnionSourceGenState>
 {
    public string? Namespace { get; }
    public string Name { get; }
@@ -13,10 +15,12 @@ public sealed class AdHocUnionSourceGenState : ITypeInformation, IEquatable<AdHo
    public bool IsNullableStruct { get; }
    public bool IsRefStruct { get; }
    public bool IsEqualWithReferenceEquality => false;
+
+   public bool IsRecord => false;
    public bool DisallowsDefaultValue => true;
+   public int NumberOfGenerics => 0;
 
    public IReadOnlyList<AdHocUnionMemberTypeState> MemberTypes { get; }
-   public IReadOnlyList<string> GenericsFullyQualified => [];
    public AdHocUnionSettings Settings { get; }
 
    public AdHocUnionSourceGenState(

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/AttributeInfo.cs

@@ -6,7 +6,7 @@ namespace Thinktecture.CodeAnalysis;
    public bool HasJsonConverterAttribute { get; }
    public bool HasNewtonsoftJsonConverterAttribute { get; }
    public bool HasMessagePackFormatterAttribute { get; }
-   public ImmutableArray<DesiredFactory> DesiredFactories { get; }
+   public ImmutableArray<ObjectFactoryState> ObjectFactories { get; }
    public ValidationErrorState ValidationError { get; }
    public string? KeyMemberComparerAccessor { get; }
    public string? KeyMemberEqualityComparerAccessor { get; }
@@ -16,7 +16,7 @@ private AttributeInfo(
       bool hasJsonConverterAttribute,
       bool hasNewtonsoftJsonConverterAttribute,
       bool hasMessagePackFormatterAttribute,
-      ImmutableArray<DesiredFactory> desiredFactories,
+      ImmutableArray<ObjectFactoryState> objectFactories,
       ValidationErrorState validationError,
       string? keyMemberComparerAccessor,
       string? keyMemberEqualityComparerAccessor)
@@ -25,22 +25,33 @@ private AttributeInfo(
       HasJsonConverterAttribute = hasJsonConverterAttribute;
       HasNewtonsoftJsonConverterAttribute = hasNewtonsoftJsonConverterAttribute;
       HasMessagePackFormatterAttribute = hasMessagePackFormatterAttribute;
-      DesiredFactories = desiredFactories;
+      ObjectFactories = objectFactories;
       ValidationError = validationError;
       KeyMemberComparerAccessor = keyMemberComparerAccessor;
       KeyMemberEqualityComparerAccessor = keyMemberEqualityComparerAccessor;
    }
 
-   public static string? TryCreate(INamedTypeSymbol type, out AttributeInfo info)
+   public static string? TryCreate(
+      INamedTypeSymbol type,
+      out AttributeInfo info)
+   {
+      return TryCreate(type, out info, out _);
+   }
+
+   public static string? TryCreate(
+      INamedTypeSymbol type,
+      out AttributeInfo info,
+      out AttributeData? thinktectureComponentAttribute)
    {
       var hasStructLayoutAttribute = false;
       var hasJsonConverterAttribute = false;
       var hasNewtonsoftJsonConverterAttribute = false;
       var hasMessagePackFormatterAttribute = false;
       var validationError = ValidationErrorState.Default;
-      var valueObjectFactories = ImmutableArray<DesiredFactory>.Empty;
+      var valueObjectFactories = ImmutableArray<ObjectFactoryState>.Empty;
       string? keyMemberComparerAccessor = null;
       string? keyMemberEqualityComparerAccessor = null;
+      thinktectureComponentAttribute = null;
       var numberOfSourceGenAttributes = 0;
 
       foreach (var attribute in type.GetAttributes())
@@ -67,7 +78,7 @@ private AttributeInfo(
          else if (attribute.AttributeClass.IsObjectFactoryAttribute())
          {
             var useForSerialization = attribute.FindUseForSerialization();
-            var desiredFactory = new DesiredFactory(attribute.AttributeClass.TypeArguments[0], useForSerialization);
+            var desiredFactory = new ObjectFactoryState(attribute.AttributeClass.TypeArguments[0], useForSerialization);
 
             valueObjectFactories = valueObjectFactories.RemoveAll(static (f, fullTypeName) => f.TypeFullyQualified == fullTypeName, desiredFactory.TypeFullyQualified);
             valueObjectFactories = valueObjectFactories.Add(desiredFactory);
@@ -84,17 +95,16 @@ private AttributeInfo(
          {
             keyMemberEqualityComparerAccessor = attribute.AttributeClass.TypeArguments[0].ToFullyQualifiedDisplayString();
          }
-         else if (attribute.AttributeClass.IsSmartEnumAttribute()
-                  || attribute.AttributeClass.IsKeyedValueObjectAttribute()
-                  || attribute.AttributeClass.IsComplexValueObjectAttribute())
+         else if (attribute.AttributeClass.IsThinktectureComponentAttribute())
          {
             ++numberOfSourceGenAttributes;
+            thinktectureComponentAttribute = attribute;
          }
 
          if (numberOfSourceGenAttributes > 1)
          {
             info = default;
-            return "Multiple ValueObject/SmartEnum-attributes found";
+            return "Multiple ValueObject/SmartEnum/Union-attributes found";
          }
       }
 
@@ -120,7 +130,7 @@ public bool Equals(AttributeInfo other)
              && HasJsonConverterAttribute == other.HasJsonConverterAttribute
              && HasNewtonsoftJsonConverterAttribute == other.HasNewtonsoftJsonConverterAttribute
              && HasMessagePackFormatterAttribute == other.HasMessagePackFormatterAttribute
-             && DesiredFactories.SequenceEqual(other.DesiredFactories)
+             && ObjectFactories.SequenceEqual(other.ObjectFactories)
              && ValidationError.Equals(other.ValidationError)
              && KeyMemberComparerAccessor == other.KeyMemberComparerAccessor
              && KeyMemberEqualityComparerAccessor == other.KeyMemberEqualityComparerAccessor;
@@ -134,7 +144,7 @@ public override int GetHashCode()
          hashCode = (hashCode * 397) ^ HasJsonConverterAttribute.GetHashCode();
          hashCode = (hashCode * 397) ^ HasNewtonsoftJsonConverterAttribute.GetHashCode();
          hashCode = (hashCode * 397) ^ HasMessagePackFormatterAttribute.GetHashCode();
-         hashCode = (hashCode * 397) ^ DesiredFactories.ComputeHashCode();
+         hashCode = (hashCode * 397) ^ ObjectFactories.ComputeHashCode();
          hashCode = (hashCode * 397) ^ ValidationError.GetHashCode();
          hashCode = (hashCode * 397) ^ (KeyMemberComparerAccessor?.GetHashCode() ?? 0);
          hashCode = (hashCode * 397) ^ (KeyMemberEqualityComparerAccessor?.GetHashCode() ?? 0);

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/Constants.cs

@@ -54,6 +54,8 @@ public static class DisallowDefaultStructs
 
    public static class Attributes
    {
+      public const string NAMESPACE = "Thinktecture";
+
       public static class Properties
       {
          public const string KEY_MEMBER_NAME = "KeyMemberName";
@@ -69,7 +71,6 @@ public static class Properties
 
       public static class ValueObject
       {
-         public const string NAMESPACE = "Thinktecture";
          public const string KEYED_NAME = "ValueObjectAttribute";
          public const string COMPLEX_NAME = "ComplexValueObjectAttribute";
          public const string KEYED_FULL_NAME = "Thinktecture.ValueObjectAttribute`1";
@@ -78,20 +79,26 @@ public static class ValueObject
 
       public static class SmartEnum
       {
-         public const string NAMESPACE = "Thinktecture";
          public const string NAME = "SmartEnumAttribute";
          public const string KEYED_FULL_NAME = "Thinktecture.SmartEnumAttribute`1";
          public const string KEYLESS_FULL_NAME = "Thinktecture.SmartEnumAttribute";
       }
 
-      public static class UseDelegateFromConstructorAttribute
+      public static class UseDelegateFromConstructor
       {
          public const string NAME = "UseDelegateFromConstructorAttribute";
       }
 
+      public static class ObjectFactory
+      {
+         public const string NAME = "ObjectFactoryAttribute";
+         public const string NAME_OBSOLETE = "ValueObjectFactoryAttribute";
+         public const string FULL_NAME = $"{NAMESPACE}.{NAME}`1";
+         public const string FULL_NAME_OBSOLETE = $"{NAMESPACE}.{NAME_OBSOLETE}`1";
+      }
+
       public static class Union
       {
-         public const string NAMESPACE = "Thinktecture";
          public const string NAME = "UnionAttribute";
          public const string FULL_NAME = "Thinktecture.UnionAttribute";
          public const string FULL_NAME_2_TYPES = "Thinktecture.UnionAttribute`2";

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ContainingTypeState.cs

@@ -1,6 +1,9 @@
 namespace Thinktecture.CodeAnalysis;
 
-public sealed class ContainingTypeState : IEquatable<ContainingTypeState>, IHashCodeComputable
+public sealed class ContainingTypeState
+   : IEquatable<ContainingTypeState>,
+     IHasGenerics,
+     IHashCodeComputable
 {
    public string Name { get; }
    public bool IsReferenceType { get; }

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/DefaultMemberState.cs

@@ -15,6 +15,8 @@ public sealed class DefaultMemberState : IMemberState, IEquatable<DefaultMemberS
    public NullableAnnotation NullableAnnotation => _typedMemberState.NullableAnnotation;
    public bool IsInterface => _typedMemberState.TypeKind == TypeKind.Interface;
 
+   public bool IsRecord => false;
+
    public DefaultMemberState(ITypedMemberState typedMemberState, string name, string argumentName)
    {
       _typedMemberState = typedMemberState;

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/Diagnostics/ThinktectureRuntimeExtensionsAnalyzer.cs

@@ -448,7 +448,7 @@ private static void AnalyzeUnion(OperationAnalysisContext context)
 
       try
       {
-         if (!attrCreation.Type.IsUnionAttribute())
+         if (!attrCreation.Type.IsRegularUnionAttribute())
             return;
 
          ValidateUnion(context, type);