Added serialization to/from deepest underlying type (recursive).

Also cleaned up the way in which lines not being source generated are outcommented.

Also improved source generator performance.

Also prevented transient issues when reporting warnings on wrapper types.

Author: Timovzl

DomainModeling.Generator/Configurators/DomainModelConfiguratorGenerator.Identities.cs

@@ -7,19 +7,22 @@ public partial class DomainModelConfiguratorGenerator
 {
 	internal static void GenerateSourceForIdentities(
 		SourceProductionContext context,
-		(ImmutableArray<ValueWrapperGenerator.BasicGeneratable> Generatables, (bool HasConfigureConventions, string AssemblyName) Metadata) input)
+		(ImmutableArray<ValueWrapperGenerator.BasicGeneratable> ValueWrappers, (bool HasConfigureConventions, string AssemblyName) Metadata) input)
 	{
 		context.CancellationToken.ThrowIfCancellationRequested();
 
-		// Generate the method only if we have any generatables, or if we are an assembly in which ConfigureConventions() is called
-		if (!input.Generatables.Any() && !input.Metadata.HasConfigureConventions)
+		// Generate the method only if we have any value wrappers, or if we are an assembly in which ConfigureConventions() is called
+		if (!input.ValueWrappers.Any() && !input.Metadata.HasConfigureConventions)
 			return;
 
 		var targetNamespace = input.Metadata.AssemblyName;
 
-		var configurationText = String.Join($"{Environment.NewLine}\t\t\t", input.Generatables.Select(generatable => $"""
-			configurator.ConfigureIdentity<{generatable.ContainingNamespace}.{generatable.TypeName}, {generatable.UnderlyingTypeFullyQualifiedName}>({Environment.NewLine}				new Architect.DomainModeling.Configuration.IIdentityConfigurator.Args());
-			"""));
+		var configurationText = String.Join($"{Environment.NewLine}\t\t\t", input.ValueWrappers
+			.Where(generatable => generatable.IsIdentity)
+			.Select(generatable => (Generatable: generatable, CoreTypeName: ValueWrapperGenerator.GetCoreTypeFullyQualifiedName(input.ValueWrappers, generatable.TypeName, generatable.ContainingNamespace)))
+			.Select(tuple => $$"""
+				configurator.ConfigureIdentity<{{tuple.Generatable.ContainingNamespace}}.{{tuple.Generatable.TypeName}}, {{tuple.Generatable.UnderlyingTypeFullyQualifiedName}}, {{tuple.CoreTypeName}}>({{Environment.NewLine}}				new Architect.DomainModeling.Configuration.IIdentityConfigurator.Args());
+				"""));
 
 		var source = $@"
 using Architect.DomainModeling;

DomainModeling.Generator/Configurators/DomainModelConfiguratorGenerator.WrapperValueObjects.cs

@@ -7,19 +7,22 @@ public partial class DomainModelConfiguratorGenerator
 {
 	internal static void GenerateSourceForWrapperValueObjects(
 		SourceProductionContext context,
-		(ImmutableArray<ValueWrapperGenerator.BasicGeneratable> Generatables, (bool HasConfigureConventions, string AssemblyName) Metadata) input)
+		(ImmutableArray<ValueWrapperGenerator.BasicGeneratable> ValueWrappers, (bool HasConfigureConventions, string AssemblyName) Metadata) input)
 	{
 		context.CancellationToken.ThrowIfCancellationRequested();
 
-		// Generate the method only if we have any generatables, or if we are an assembly in which ConfigureConventions() is called
-		if (!input.Generatables.Any() && !input.Metadata.HasConfigureConventions)
+		// Generate the method only if we have any value wrappers, or if we are an assembly in which ConfigureConventions() is called
+		if (!input.ValueWrappers.Any() && !input.Metadata.HasConfigureConventions)
 			return;
 
 		var targetNamespace = input.Metadata.AssemblyName;
 
-		var configurationText = String.Join($"{Environment.NewLine}\t\t\t", input.Generatables.Select(generatable => $"""
-			configurator.ConfigureWrapperValueObject<{generatable.ContainingNamespace}.{generatable.TypeName}, {generatable.UnderlyingTypeFullyQualifiedName}>({Environment.NewLine}				new Architect.DomainModeling.Configuration.IWrapperValueObjectConfigurator.Args());
-			"""));
+		var configurationText = String.Join($"{Environment.NewLine}\t\t\t", input.ValueWrappers
+			.Where(generatable => !generatable.IsIdentity)
+			.Select(generatable => (Generatable: generatable, CoreTypeName: ValueWrapperGenerator.GetCoreTypeFullyQualifiedName(input.ValueWrappers, generatable.TypeName, generatable.ContainingNamespace)))
+			.Select(tuple => $$"""
+				configurator.ConfigureWrapperValueObject<{{tuple.Generatable.ContainingNamespace}}.{{tuple.Generatable.TypeName}}, {{tuple.Generatable.UnderlyingTypeFullyQualifiedName}}, {{tuple.CoreTypeName}}>({{Environment.NewLine}}				new Architect.DomainModeling.Configuration.IWrapperValueObjectConfigurator.Args());
+				"""));
 
 		var source = $@"
 using Architect.DomainModeling;

DomainModeling.Generator/Configurators/EntityFrameworkConfigurationGenerator.cs

@@ -259,34 +259,36 @@ file sealed record class DomainModelConfigurator(
 	file sealed record class EntityFrameworkIdentityConfigurator(ModelConfigurationBuilder ConfigurationBuilder)
 		: Architect.DomainModeling.Configuration.IIdentityConfigurator
 	{{
-		public void ConfigureIdentity<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TIdentity, TUnderlying>(
-			in Architect.DomainModeling.Configuration.IIdentityConfigurator.Args _)
-			where TIdentity : IIdentity<TUnderlying>, ISerializableDomainObject<TIdentity, TUnderlying>
+		private static readonly ConverterMappingHints DecimalIdConverterMappingHints = new ConverterMappingHints(precision: 28, scale: 0); // For decimal IDs
+
+		public void ConfigureIdentity<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TIdentity, TUnderlying, TCore>(
+			in Architect.DomainModeling.Configuration.IIdentityConfigurator.Args args)
+			where TIdentity : IIdentity<TUnderlying>, IDirectValueWrapper<TIdentity, TUnderlying>, ICoreValueWrapper<TIdentity, TCore>
 			where TUnderlying : notnull, IEquatable<TUnderlying>, IComparable<TUnderlying>
 		{{
 			// Configure properties of the type
 			this.ConfigurationBuilder.Properties<TIdentity>()
-				.HaveConversion<IdentityValueObjectConverter<TIdentity, TUnderlying>>();
+				.HaveConversion<IdentityValueObjectConverter<TIdentity, TCore>>();
 
 			// Configure non-property occurrences of the type, such as in CAST(), SUM(), AVG(), etc.
 			this.ConfigurationBuilder.DefaultTypeMapping<TIdentity>()
-				.HasConversion<IdentityValueObjectConverter<TIdentity, TUnderlying>>();
+				.HasConversion<IdentityValueObjectConverter<TIdentity, TCore>>();
 
 			// The converter's mapping hints are currently ignored by DefaultTypeMapping<T>, which is probably a bug: https://github.com/dotnet/efcore/issues/32533
-			if (typeof(TUnderlying) == typeof(decimal))
+			if (typeof(TCore) == typeof(decimal))
 				this.ConfigurationBuilder.DefaultTypeMapping<TIdentity>()
 					.HasPrecision(28, 0);
 		}}
 
 		private sealed class IdentityValueObjectConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TModel, TProvider>
 			: ValueConverter<TModel, TProvider>
-			where TModel : ISerializableDomainObject<TModel, TProvider>
+			where TModel : IValueWrapper<TModel, TProvider>
 		{{
 			public IdentityValueObjectConverter()
 				: base(
-					DomainObjectSerializer.CreateSerializeExpression<TModel, TProvider>(),
-					DomainObjectSerializer.CreateDeserializeExpression<TModel, TProvider>(),
-					new ConverterMappingHints(precision: 28, scale: 0)) // For decimal IDs
+					model => DomainObjectSerializer.Serialize<TModel, TProvider>(model)!,
+					provider => DomainObjectSerializer.Deserialize<TModel, TProvider>(provider)!,
+					typeof(TProvider) == typeof(decimal) ? DecimalIdConverterMappingHints : null)
 			{{
 			}}
 		}}
@@ -296,28 +298,28 @@ file sealed record class EntityFrameworkWrapperValueObjectConfigurator(
 		ModelConfigurationBuilder ConfigurationBuilder)
 		: Architect.DomainModeling.Configuration.IWrapperValueObjectConfigurator
 	{{
-		public void ConfigureWrapperValueObject<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TWrapper, TValue>(
-			in Architect.DomainModeling.Configuration.IWrapperValueObjectConfigurator.Args _)
-			where TWrapper : IWrapperValueObject<TValue>, ISerializableDomainObject<TWrapper, TValue>
+		public void ConfigureWrapperValueObject<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TWrapper, TValue, TCore>(
+			in Architect.DomainModeling.Configuration.IWrapperValueObjectConfigurator.Args args)
+			where TWrapper : IWrapperValueObject<TValue>, IDirectValueWrapper<TWrapper, TValue>, ICoreValueWrapper<TWrapper, TCore>
 			where TValue : notnull
 		{{
 			// Configure properties of the type
 			this.ConfigurationBuilder.Properties<TWrapper>()
-				.HaveConversion<WrapperValueObjectConverter<TWrapper, TValue>>();
+				.HaveConversion<WrapperValueObjectConverter<TWrapper, TCore>>();
 
 			// Configure non-property occurrences of the type, such as in CAST(), SUM(), AVG(), etc.
 			this.ConfigurationBuilder.DefaultTypeMapping<TWrapper>()
-				.HasConversion<WrapperValueObjectConverter<TWrapper, TValue>>();
+				.HasConversion<WrapperValueObjectConverter<TWrapper, TCore>>();
 		}}
 
 		private sealed class WrapperValueObjectConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TModel, TProvider>
 			: ValueConverter<TModel, TProvider>
-			where TModel : ISerializableDomainObject<TModel, TProvider>
+			where TModel : IValueWrapper<TModel, TProvider>
 		{{
 			public WrapperValueObjectConverter()
 				: base(
-					DomainObjectSerializer.CreateSerializeExpression<TModel, TProvider>(),
-					DomainObjectSerializer.CreateDeserializeExpression<TModel, TProvider>())
+					model => DomainObjectSerializer.Serialize<TModel, TProvider>(model)!,
+					provider => DomainObjectSerializer.Deserialize<TModel, TProvider>(provider)!)
 			{{
 			}}
 		}}
@@ -350,7 +352,7 @@ public void ProcessModelFinalizing(IConventionModelBuilder modelBuilder, IConven
 
 #pragma warning disable EF1001 // Internal EF Core API usage -- No public APIs are available for this yet, and interceptors do not work because EF demands a usable ctor even the interceptor would prevent ctor usage
 			var entityType = entityTypeConvention as EntityType ?? throw new NotImplementedException($""{{entityTypeConvention.GetType().Name}} was received when {{nameof(EntityType)}} was expected. Either a non-entity was passed or internal changes to Entity Framework have broken this code."");
-			entityType.ConstructorBinding = new UninitializedInstantiationBinding(typeof(TEntity), DomainObjectSerializer.CreateDeserializeExpression(typeof(TEntity)));
+			entityType.ConstructorBinding = UninitializedInstantiationBinding.Create(() => DomainObjectSerializer.Deserialize<TEntity>());
 #pragma warning restore EF1001 // Internal EF Core API usage
 		}}
 
@@ -363,7 +365,7 @@ public void ProcessModelFinalizing(IConventionModelBuilder modelBuilder, IConven
 
 #pragma warning disable EF1001 // Internal EF Core API usage -- No public APIs are available for this yet, and interceptors do not work because EF demands a usable ctor even the interceptor would prevent ctor usage
 			var entityType = entityTypeConvention as EntityType ?? throw new NotImplementedException($""{{entityTypeConvention.GetType().Name}} was received when {{nameof(EntityType)}} was expected. Either a non-entity was passed or internal changes to Entity Framework have broken this code."");
-			entityType.ConstructorBinding = new UninitializedInstantiationBinding(typeof(TDomainEvent), DomainObjectSerializer.CreateDeserializeExpression(typeof(TDomainEvent)));
+			entityType.ConstructorBinding = UninitializedInstantiationBinding.Create(() => DomainObjectSerializer.Deserialize<TDomainEvent>());
 #pragma warning restore EF1001 // Internal EF Core API usage
 		}}
 
@@ -373,23 +375,29 @@ private sealed class UninitializedInstantiationBinding
 			private static readonly MethodInfo GetUninitializedObjectMethod = typeof(RuntimeHelpers).GetMethod(nameof(RuntimeHelpers.GetUninitializedObject))!;
 
 			public override Type RuntimeType {{ get; }}
-			private Expression? Expression {{ get; }}
+			private Expression Expression {{ get; }}
+
+			public static UninitializedInstantiationBinding Create<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(
+				Expression<Func<T>> expression)
+			{{
+				return new UninitializedInstantiationBinding(typeof(T), expression.Body);
+			}}
 
 			public UninitializedInstantiationBinding(
 				[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] Type runtimeType,
 				Expression? expression = null)
 				: base(Array.Empty<ParameterBinding>())
 			{{
 				this.RuntimeType = runtimeType;
-				this.Expression = expression;
+				this.Expression = expression ??
+					Expression.Convert(
+						Expression.Call(method: GetUninitializedObjectMethod, arguments: Expression.Constant(this.RuntimeType)),
+						this.RuntimeType);
 			}}
 
 			public override Expression CreateConstructorExpression(ParameterBindingInfo bindingInfo)
 			{{
-				return this.Expression ??
-					Expression.Convert(
-						Expression.Call(method: GetUninitializedObjectMethod, arguments: Expression.Constant(this.RuntimeType)),
-						this.RuntimeType);
+				return this.Expression;
 			}}
 
 			public override InstantiationBinding With(IReadOnlyList<ParameterBinding> parameterBindings)

DomainModeling.Generator/SourceProductionContextExtensions.cs renamed to DomainModeling.Generator/DiagnosticReportingExtensions.cs

@@ -6,7 +6,7 @@ namespace Architect.DomainModeling.Generator;
 /// <summary>
 /// Defines extension methods on <see cref="SourceProductionContext"/>.
 /// </summary>
-internal static class SourceProductionContextExtensions
+internal static class DiagnosticReportingExtensions
 {
 	/// <summary>
 	/// Shorthand extension method to report a diagnostic, with less boilerplate code.

DomainModeling.Generator/EnumExtensions.cs

@@ -59,10 +59,14 @@ public static string ToCodeString(this Accessibility accessibility, string unspe
 	/// <code>myEnum |= MyEnum.SomeFlag.If(1 == 2);</code>
 	/// </para>
 	/// </summary>
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static T If<T>(this T enumValue, bool condition)
 		where T : unmanaged, Enum
 	{
-		return condition ? enumValue : default;
+		// Branch-free implementation
+		ReadOnlySpan<T> values = stackalloc T[] { default, enumValue, };
+		var index = Unsafe.As<bool, byte>(ref condition);
+		return values[index];
 	}
 
 	/// <summary>
@@ -77,15 +81,20 @@ public static T If<T>(this T enumValue, bool condition)
 	/// <code>myEnum |= MyEnum.SomeFlag.Unless(1 == 2);</code>
 	/// </para>
 	/// </summary>
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static T Unless<T>(this T enumValue, bool condition)
 		where T : unmanaged, Enum
 	{
-		return condition ? default : enumValue;
+		// Branch-free implementation
+		ReadOnlySpan<T> values = stackalloc T[] { enumValue, default, };
+		var index = Unsafe.As<bool, byte>(ref condition);
+		return values[index];
 	}
 
 	/// <summary>
-	/// Efficiently returns whether the <paramref name="enumValue"/> has the given <paramref name="flag"/> set.
+	/// Efficiently returns whether the <paramref name="subject"/> has the given <paramref name="flag"/>(s) set.
 	/// </summary>
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static bool HasFlags<T>(this T subject, T flag)
 		where T : unmanaged, Enum
 	{
@@ -107,11 +116,8 @@ public static bool HasFlags<T>(this T subject, T flag)
 	private static ulong GetNumericValue<T>(T enumValue)
 		where T : unmanaged, Enum
 	{
-		Span<ulong> ulongSpan = stackalloc ulong[] { 0UL };
-		var span = MemoryMarshal.Cast<ulong, T>(ulongSpan);
-
-		span[0] = enumValue;
-
-		return ulongSpan[0];
+		var result = 0UL;
+		Unsafe.WriteUnaligned(ref Unsafe.As<ulong, byte>(ref result), enumValue);
+		return result;
 	}
 }