Merge pull request #6 from TheArchitectDev/fix/1.0.3-GeneratedMarkerAndBugFix

1.0.3: Added "Generated" marker to types and fixed a bug.

Author: Timovzl

DomainModeling.Generator/DummyBuilderGenerator.cs

@@ -271,7 +271,7 @@ namespace {containingNamespace}
 	/// That way, if the constructor changes, only the builder needs to be adjusted, rather than lots of test methods.
 	/// </para>
 	/// </summary>
-	public partial class {typeName}
+	/* Generated */ public partial class {typeName}
 	{{
 #nullable disable
 

DomainModeling.Generator/IdentityGenerator.cs

@@ -309,7 +309,7 @@ namespace {containingNamespace}
 	{(existingComponents.HasFlags(IdTypeComponents.NewtonsoftJsonConverter) ? "*/" : "")}
 
 	{(hasSourceGeneratedAttribute ? "" : "[SourceGenerated]")}
-	{accessibility.ToCodeString()} readonly{(entityTypeName is null ? " partial" : "")} struct {idTypeName} : {Constants.IdentityInterfaceTypeName}<{underlyingTypeFullyQualifiedName}>, IEquatable<{idTypeName}>, IComparable<{idTypeName}>
+	{(entityTypeName is null ? "/* Generated */ " : "")}{accessibility.ToCodeString()} readonly{(entityTypeName is null ? " partial" : "")} struct {idTypeName} : {Constants.IdentityInterfaceTypeName}<{underlyingTypeFullyQualifiedName}>, IEquatable<{idTypeName}>, IComparable<{idTypeName}>
 	{{
 		{(existingComponents.HasFlags(IdTypeComponents.Value) ? "/*" : "")}
 		{nonNullStringSummary}

DomainModeling.Generator/SourceGeneratedAttributeAnalyzer.cs

@@ -48,14 +48,14 @@ private static bool FilterSyntaxNode(SyntaxNode node, CancellationToken cancella
 		var hasMissingPartialKeyword = !tds.Modifiers.Any(SyntaxKind.PartialKeyword);
 
 		string? expectedTypeName = null;
-		if (type.IsOrImplementsInterface(type => type.Arity == 1 && type.IsType(Constants.IdentityInterfaceTypeName, Constants.DomainModelingNamespace), out _))
-			expectedTypeName = tds is StructDeclarationSyntax ? null : "struct"; // Expect a struct
-		else if (type.IsOrInheritsClass(type => type.Arity == 1 && type.IsType(Constants.WrapperValueObjectTypeName, Constants.DomainModelingNamespace), out _))
+		if (type.IsOrInheritsClass(type => type.Arity == 1 && type.IsType(Constants.WrapperValueObjectTypeName, Constants.DomainModelingNamespace), out _))
 			expectedTypeName = tds is ClassDeclarationSyntax ? null : "class"; // Expect a class
 		else if (type.IsOrInheritsClass(type => type.Arity == 0 && type.IsType(Constants.ValueObjectTypeName, Constants.DomainModelingNamespace), out _))
 			expectedTypeName = tds is ClassDeclarationSyntax ? null : "class"; // Expect a class
 		else if (type.IsOrInheritsClass(type => type.Arity == 2 && type.IsType(Constants.DummyBuilderTypeName, Constants.DomainModelingNamespace), out _))
 			expectedTypeName = tds is ClassDeclarationSyntax ? null : "class"; // Expect a class
+		else if (type.IsOrImplementsInterface(type => type.Arity == 1 && type.IsType(Constants.IdentityInterfaceTypeName, Constants.DomainModelingNamespace), out _))
+			expectedTypeName = tds is StructDeclarationSyntax ? null : "struct"; // Expect a struct
 		else
 			expectedTypeName = "*"; // No suitable inheritance found for source generation
 

DomainModeling.Generator/ValueObjectGenerator.cs

@@ -252,7 +252,7 @@ namespace {containingNamespace}
 	[Serializable]
 	{(existingComponents.HasFlags(ValueObjectTypeComponents.SerializableAttribute) ? "*/" : "")}
 
-	{type.DeclaredAccessibility.ToCodeString()} sealed partial {(isRecord ? "record" : "class")} {typeName} : IEquatable<{typeName}>{(isComparable ? "" : "/*")}, IComparable<{typeName}>{(isComparable ? "" : "*/")}
+	/* Generated */ {type.DeclaredAccessibility.ToCodeString()} sealed partial {(isRecord ? "record" : "class")} {typeName} : IEquatable<{typeName}>{(isComparable ? "" : "/*")}, IComparable<{typeName}>{(isComparable ? "" : "*/")}
 	{{
 		{(isRecord || existingComponents.HasFlags(ValueObjectTypeComponents.StringComparison) ? "/*" : "")}
 		{(dataMembers.Any(member => member.Type.IsType<string>())

DomainModeling.Generator/WrapperValueObjectGenerator.cs

@@ -222,7 +222,7 @@ namespace {containingNamespace}
 	[Newtonsoft.Json.JsonConverter(typeof({typeName}.NewtonsoftJsonConverter))]
 	{(existingComponents.HasFlags(WrapperValueObjectTypeComponents.NewtonsoftJsonConverter) ? "*/" : "")}
 
-	{type.DeclaredAccessibility.ToCodeString()} sealed partial class {typeName} : IEquatable<{typeName}>{(isComparable ? "" : "/*")}, IComparable<{typeName}>{(isComparable ? "" : "*/")}
+	/* Generated */ {type.DeclaredAccessibility.ToCodeString()} sealed partial class {typeName} : IEquatable<{typeName}>{(isComparable ? "" : "/*")}, IComparable<{typeName}>{(isComparable ? "" : "*/")}
 	{{
 		{(existingComponents.HasFlags(WrapperValueObjectTypeComponents.StringComparison) ? "/*" : "")}
 		{(underlyingType.IsType<string>() ? "" : @"protected sealed override StringComparison StringComparison => throw new NotSupportedException(""This operation applies to string-based value objects only."");")}

DomainModeling.Tests/Comparisons/DictionaryComparerTests.cs

@@ -133,7 +133,7 @@ public void DictionaryEquals_WithSameKeys_ShouldReturnExpectedResultBasedOnValue
 	{
 		var left = new Dictionary<int, string>() { [1] = leftValue };
 		var right = new Dictionary<int, string>() { [1] = rightValue };
-		
+
 		var result = DictionaryComparer.DictionaryEquals(left, right);
 
 		Assert.Equal(expectedResult, result);

DomainModeling.Tests/DummyBuilderTests.cs

@@ -62,7 +62,7 @@ public sealed class TestEntity : Entity<TestEntityId, string>
 			public DateTimeOffset ModificationDateTime { get; }
 			public ushort Count { get; }
 			public Money Amount { get; }
-			
+
 			/// <summary>
 			/// The type's simplest non-default constructor should be used by the builder.
 			/// </summary>

DomainModeling.Tests/Entities/EntityTests.cs

@@ -12,7 +12,7 @@ public class EntityTests
 	public void DefaultId_WithClassId_ShouldEquateAsExpected(int? value, bool expectedResult)
 	{
 		var instance = new ClassIdEntity(value is null ? null : new ConcreteId() { Value = value.Value, });
-		
+
 		Assert.Equal(expectedResult, instance.HasDefaultId());
 	}
 
@@ -176,7 +176,7 @@ public void GetHashCode_WithInterfaceId_ShouldEquateAsExpected(int? value, bool
 	{
 		var one = new InterfaceIdEntity(value is null ? null : new ConcreteId() { Value = value.Value, });
 		var two = new InterfaceIdEntity(value is null ? null : new ConcreteId() { Value = value.Value, });
-		
+
 		Assert.Equal(expectedResult, one.GetHashCode().Equals(two.GetHashCode()));
 	}
 

DomainModeling.Tests/IdentityTests.cs

@@ -451,7 +451,7 @@ public void DeserializeWithNewtonsoftJson_WithDecimal_ShouldReturnExpectedResult
 			CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("en-US");
 
 			Assert.Equal(value, Newtonsoft.Json.JsonConvert.DeserializeObject<DecimalId?>(json)?.Value);
-			
+
 			if (json != "null")
 				Assert.Equal((decimal)value, System.Text.Json.JsonSerializer.Deserialize<DecimalId>(json).Value);
 		}

DomainModeling.Tests/ValueObjectTests.cs

@@ -968,6 +968,11 @@ public ManualValueObject(int id)
 	// Use a namespace, since our source generators dislike nested types
 	namespace ValueObjectTestTypes
 	{
+		[SourceGenerated]
+		public sealed partial class ValueObjectWithIIdentity : ValueObject, IIdentity<int>
+		{
+		}
+
 		[SourceGenerated]
 		public sealed partial class IntValue : ValueObject
 		{
@@ -1102,12 +1107,12 @@ public sealed override int GetHashCode()
 			{
 				return typeof(FullySelfImplementedValueObject).GetHashCode();
 			}
-			
+
 			public sealed override bool Equals([AllowNull] object other)
 			{
 				return other is FullySelfImplementedValueObject otherValue && this.Equals(otherValue);
 			}
-			
+
 			public bool Equals([AllowNull] FullySelfImplementedValueObject other)
 			{
 				if (other is null) return false;