Added support for class generated identifiers.

jscarle · jscarle · commit f2e4f12543a3 · 2024-11-07T15:55:59.000-05:00
diff --git a/ComparisonBenchmarks/ComparisonBenchmarks.csproj b/ComparisonBenchmarks/ComparisonBenchmarks.csproj
@@ -13,7 +13,7 @@
     <ItemGroup>
         <PackageReference Include="BenchmarkDotNet" Version="0.14.0"/>
         <PackageReference Include="FluentResults" Version="3.16.0"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
         <PackageReference Include="Rascal" Version="1.1.0"/>
     </ItemGroup>
 
diff --git a/src/LightResults.Extensions.GeneratedIdentifier/GeneratedIdentifierSourceGenerator.cs b/src/LightResults.Extensions.GeneratedIdentifier/GeneratedIdentifierSourceGenerator.cs
diff --git a/src/LightResults.Extensions.GeneratedIdentifier/LightResults.Extensions.GeneratedIdentifier.csproj b/src/LightResults.Extensions.GeneratedIdentifier/LightResults.Extensions.GeneratedIdentifier.csproj
@@ -36,7 +36,7 @@
     <!-- Output -->
     <PropertyGroup>
         <AssemblyName>LightResults.Extensions.GeneratedIdentifier</AssemblyName>
-        <Version>9.0.0-preview.4</Version>
+        <Version>9.0.0-preview.5</Version>
         <AssemblyVersion>9.0.0.0</AssemblyVersion>
         <FileVersion>9.0.0.0</FileVersion>
         <NeutralLanguage>en-US</NeutralLanguage>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Fixtures/Identifiers/TestStringId.cs b/tests/LightResults.Extensions.GeneratedIdentifier.Fixtures/Identifiers/TestStringId.cs
@@ -1,4 +1,4 @@
 ﻿namespace LightResults.Extensions.GeneratedIdentifier.Fixtures.Identifiers;
 
 [GeneratedIdentifier<string>]
-public partial struct TestStringId;
+public partial class TestStringId;
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Fixtures/LightResults.Extensions.GeneratedIdentifier.Fixtures.csproj b/tests/LightResults.Extensions.GeneratedIdentifier.Fixtures/LightResults.Extensions.GeneratedIdentifier.Fixtures.csproj
@@ -23,7 +23,7 @@
 
     <ItemGroup>
         <PackageReference Include="LightResults" Version="9.0.0-preview.15"/>
-        <PackageReference Include="LightResults.Extensions.ValueObjects" Version="9.0.0-preview.1"/>
+        <PackageReference Include="LightResults.Extensions.ValueObjects" Version="9.0.0-preview.3"/>
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10"/>
     </ItemGroup>
 
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateGuidIdentifier_WithNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateGuidIdentifier_WithNamespace.verified.txt
@@ -139,8 +139,9 @@ readonly partial struct TestGuidId :
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestGuidId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestGuidId)}");
+        if (ReferenceEquals(null, obj))
+            return 1;
+        return obj is TestGuidId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestGuidId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestGuidId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateGuidIdentifier_WithoutNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateGuidIdentifier_WithoutNamespace.verified.txt
@@ -137,8 +137,9 @@ readonly partial struct TestGuidId :
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestGuidId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestGuidId)}");
+        if (ReferenceEquals(null, obj))
+            return 1;
+        return obj is TestGuidId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestGuidId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestGuidId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateIntIdentifier_WithNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateIntIdentifier_WithNamespace.verified.txt
@@ -139,8 +139,9 @@ readonly partial struct TestIntId :
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestIntId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestIntId)}");
+        if (ReferenceEquals(null, obj))
+            return 1;
+        return obj is TestIntId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestIntId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestIntId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateIntIdentifier_WithoutNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateIntIdentifier_WithoutNamespace.verified.txt
@@ -137,8 +137,9 @@ readonly partial struct TestIntId :
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestIntId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestIntId)}");
+        if (ReferenceEquals(null, obj))
+            return 1;
+        return obj is TestIntId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestIntId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestIntId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateLongIdentifier_WithNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateLongIdentifier_WithNamespace.verified.txt
@@ -139,8 +139,9 @@ readonly partial struct TestLongId :
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestLongId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestLongId)}");
+        if (ReferenceEquals(null, obj))
+            return 1;
+        return obj is TestLongId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestLongId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestLongId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateLongIdentifier_WithoutNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateLongIdentifier_WithoutNamespace.verified.txt
@@ -137,8 +137,9 @@ readonly partial struct TestLongId :
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestLongId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestLongId)}");
+        if (ReferenceEquals(null, obj))
+            return 1;
+        return obj is TestLongId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestLongId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestLongId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateShortIdentifier_WithNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateShortIdentifier_WithNamespace.verified.txt
@@ -139,8 +139,9 @@ readonly partial struct TestShortId :
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestShortId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestShortId)}");
+        if (ReferenceEquals(null, obj))
+            return 1;
+        return obj is TestShortId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestShortId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestShortId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateShortIdentifier_WithoutNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateShortIdentifier_WithoutNamespace.verified.txt
@@ -137,8 +137,9 @@ readonly partial struct TestShortId :
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestShortId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestShortId)}");
+        if (ReferenceEquals(null, obj))
+            return 1;
+        return obj is TestShortId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestShortId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestShortId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateStringIdentifier_WithNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateStringIdentifier_WithNamespace.verified.txt
@@ -21,15 +21,12 @@ namespace MyProject.Identifiers;
 
 [TypeConverter(typeof(TestStringIdTypeConverter))]
 [JsonConverter(typeof(TestStringIdJsonConverter))]
-readonly partial struct TestStringId :
+partial class TestStringId :
     ICreatableValueObject<string, TestStringId>,
     IValueObject<string, TestStringId>,
     IComparable<TestStringId>,
     IComparable
 {
-    /// <summary>Gets whether this identifier is the default value.</summary>
-    public bool IsDefault => _value == default;
-
     string IValueObject<string, TestStringId>.Value => _value;
 
     private readonly string _value;
@@ -62,15 +59,23 @@ readonly partial struct TestStringId :
         return Result.Ok<TestStringId>(new TestStringId(value, true));
     }
 
-    /// <inheritdoc />
-    public bool Equals(TestStringId other)
-    {
-        return _value == other._value;
-    }
+  /// <inheritdoc />
+  public bool Equals(TestStringId? other)
+  {
+      if (other is null)
+          return false;
+      if (ReferenceEquals(this, other))
+          return true;
+      return _value == other._value;
+  }
 
     /// <inheritdoc />
     public override bool Equals(object? obj)
     {
+        if (obj is null)
+            return false;
+        if (ReferenceEquals(this, obj))
+            return true;
         return obj is TestStringId other && Equals(other);
     }
 
@@ -99,16 +104,23 @@ readonly partial struct TestStringId :
     }
 
     /// <inheritdoc />
-    public int CompareTo(TestStringId other)
+    public int CompareTo(TestStringId? other)
     {
-        return _value.CompareTo(other._value);
+        if (other is null)
+            return 1;
+        if (ReferenceEquals(this, other))
+            return 0;
+        return string.Compare(_value, other._value, StringComparison.Ordinal);
     }
 
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestStringId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestStringId)}");
+        if (obj is null)
+            return 1;
+        if (ReferenceEquals(this, obj))
+            return 0;
+        return obj is TestStringId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestStringId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestStringId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateStringIdentifier_WithoutNamespace.verified.txt b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.GenerateStringIdentifier_WithoutNamespace.verified.txt
@@ -19,15 +19,12 @@ using LightResults.Extensions.ValueObjects;
 
 [TypeConverter(typeof(TestStringIdTypeConverter))]
 [JsonConverter(typeof(TestStringIdJsonConverter))]
-readonly partial struct TestStringId :
+partial class TestStringId :
     ICreatableValueObject<string, TestStringId>,
     IValueObject<string, TestStringId>,
     IComparable<TestStringId>,
     IComparable
 {
-    /// <summary>Gets whether this identifier is the default value.</summary>
-    public bool IsDefault => _value == default;
-
     string IValueObject<string, TestStringId>.Value => _value;
 
     private readonly string _value;
@@ -60,15 +57,23 @@ readonly partial struct TestStringId :
         return Result.Ok<TestStringId>(new TestStringId(value, true));
     }
 
-    /// <inheritdoc />
-    public bool Equals(TestStringId other)
-    {
-        return _value == other._value;
-    }
+  /// <inheritdoc />
+  public bool Equals(TestStringId? other)
+  {
+      if (other is null)
+          return false;
+      if (ReferenceEquals(this, other))
+          return true;
+      return _value == other._value;
+  }
 
     /// <inheritdoc />
     public override bool Equals(object? obj)
     {
+        if (obj is null)
+            return false;
+        if (ReferenceEquals(this, obj))
+            return true;
         return obj is TestStringId other && Equals(other);
     }
 
@@ -97,16 +102,23 @@ readonly partial struct TestStringId :
     }
 
     /// <inheritdoc />
-    public int CompareTo(TestStringId other)
+    public int CompareTo(TestStringId? other)
     {
-        return _value.CompareTo(other._value);
+        if (other is null)
+            return 1;
+        if (ReferenceEquals(this, other))
+            return 0;
+        return string.Compare(_value, other._value, StringComparison.Ordinal);
     }
 
     /// <inheritdoc />
     public int CompareTo(object? obj)
     {
-        if (ReferenceEquals(null, obj)) return 1;
-        return obj is TestStringId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestStringId)}");
+        if (obj is null)
+            return 1;
+        if (ReferenceEquals(this, obj))
+            return 0;
+        return obj is TestStringId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestStringId)}.");
     }
 
     /// <summary>Determines whether the first instance of <see cref="TestStringId" /> is less than the second instance.</summary>
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.cs b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/GeneratedIdentifierSourceGeneratorTests.cs
@@ -91,7 +91,7 @@ public async Task GenerateStringIdentifier(bool withNamespace)
         var sources = GetSources("""
                                  /// <summary>Represents an identifier.</summary>
                                  [GeneratedIdentifier<string>]
-                                 public partial struct TestStringId;
+                                 public partial class TestStringId;
                                  """, withNamespace
         );
 
@@ -126,7 +126,7 @@ namespace MyProject.Identifiers;
 
                      namespace LightResults.Extensions.GeneratedIdentifier;
 
-                     [AttributeUsage(AttributeTargets.Struct)]
+                     [AttributeUsage(AttributeTargets.Struct | AttributeTargets.Class)]
                      public sealed class GeneratedIdentifierAttribute<TIdentifier> : Attribute;
                      """;
     }
diff --git a/tests/LightResults.Extensions.GeneratedIdentifier.Tests/LightResults.Extensions.GeneratedIdentifier.Tests.csproj b/tests/LightResults.Extensions.GeneratedIdentifier.Tests/LightResults.Extensions.GeneratedIdentifier.Tests.csproj
@@ -28,7 +28,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
         <PackageReference Include="SourceGeneratorTestHelpers.XUnit" Version="8.1.0"/>
         <PackageReference Include="Verify.DiffPlex" Version="3.1.2"/>
-        <PackageReference Include="Verify.Xunit" Version="27.0.1"/>
+        <PackageReference Include="Verify.Xunit" Version="28.1.3" />
         <PackageReference Include="xunit" Version="2.9.2"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tools/Benchmarks/Benchmarks.csproj b/tools/Benchmarks/Benchmarks.csproj
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
         <PackageReference Include="BenchmarkDotNet" Version="0.14.0"/>
     </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,9 @@ readonly partial struct TestGuidId :`
`139`	`139`	`/// <inheritdoc />`
`140`	`140`	`public int CompareTo(object? obj)`
`141`	`141`	`{`
`142`		`- if (ReferenceEquals(null, obj)) return 1;`
`143`		`- return obj is TestGuidId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestGuidId)}");`
	`142`	`+ if (ReferenceEquals(null, obj))`
	`143`	`+ return 1;`
	`144`	`+ return obj is TestGuidId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestGuidId)}.");`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`/// <summary>Determines whether the first instance of <see cref="TestGuidId" /> is less than the second instance.</summary>`
Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,9 @@ readonly partial struct TestGuidId :`
`137`	`137`	`/// <inheritdoc />`
`138`	`138`	`public int CompareTo(object? obj)`
`139`	`139`	`{`
`140`		`- if (ReferenceEquals(null, obj)) return 1;`
`141`		`- return obj is TestGuidId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestGuidId)}");`
	`140`	`+ if (ReferenceEquals(null, obj))`
	`141`	`+ return 1;`
	`142`	`+ return obj is TestGuidId other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TestGuidId)}.");`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`/// <summary>Determines whether the first instance of <see cref="TestGuidId" /> is less than the second instance.</summary>`