Fix for New() and Empty-field on record struct (#6)

Co-authored-by: Kalle Skattegård <[email protected]>
lucasteles · Nov 27, 2023 · 28e8d55 · 28e8d55
1 parent 8bc42e7
commit 28e8d55
Show file tree

Hide file tree

Showing 37 changed files with 189 additions and 19 deletions.
diff --git a/src/Strongly/SourceGenerationHelper.cs b/src/Strongly/SourceGenerationHelper.cs
@@ -138,8 +138,16 @@ static string CreateStrongValue(
             var ctorIndex =
                 baseDef.IndexOf(EmbeddedSources.CtorKey, StringComparison.InvariantCulture);
 
+            var emptyMethodIndex =
+                baseDef.IndexOf("public static readonly TYPENAME Empty =", StringComparison.InvariantCulture);
+
+            var emptyMethod = emptyMethodIndex == -1
+                ? ""
+                : baseDef.Substring(emptyMethodIndex) + Environment.NewLine;
+
             baseDef = baseDef
-                          .Substring(0, ctorIndex + EmbeddedSources.CtorKey.Length)
+                          .Substring(0, ctorIndex + EmbeddedSources.CtorValueKey.Length)
+                          .Insert(ctorIndex, emptyMethod)
                           .Replace("readonly partial struct", "readonly partial record struct")
                       + Environment.NewLine;
         }

diff --git a/src/Strongly/Templates/BigInteger/BigInteger_Base.cs b/src/Strongly/Templates/BigInteger/BigInteger_Base.cs
@@ -1,4 +1,4 @@
-    public static readonly TYPENAME Empty = new TYPENAME(System.Numerics.BigInteger.Zero);
+    public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
 
-    public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
-
+    public static readonly TYPENAME Empty = new TYPENAME(System.Numerics.BigInteger.Zero);
+       
diff --git a/src/Strongly/Templates/Decimal/Decimal_Base.cs b/src/Strongly/Templates/Decimal/Decimal_Base.cs
@@ -1,3 +1,3 @@
-        public static readonly TYPENAME Empty = new TYPENAME(decimal.Zero);
+    public bool Equals(TYPENAME other) => this.Value.Equals(other.Value); 
 
-        public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
+    public static readonly TYPENAME Empty = new TYPENAME(decimal.Zero);
diff --git a/src/Strongly/Templates/Double/Double_Base.cs b/src/Strongly/Templates/Double/Double_Base.cs
@@ -1,3 +1,4 @@
-        public static readonly TYPENAME Empty = new TYPENAME(0.0);
+    public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
 
-        public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
+    public static readonly TYPENAME Empty = new TYPENAME(0.0);
+
diff --git a/src/Strongly/Templates/Float/Float_Base.cs b/src/Strongly/Templates/Float/Float_Base.cs
@@ -1,3 +1,4 @@
-        public static readonly TYPENAME Empty = new TYPENAME(0f);
+    public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
 
-        public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
+    public static readonly TYPENAME Empty = new TYPENAME(0f);
+
diff --git a/src/Strongly/Templates/Guid/Guid_Base.cs b/src/Strongly/Templates/Guid/Guid_Base.cs
@@ -1,7 +1,6 @@
-    
-    [NEW_METHOD]
-
-    public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
-
+    public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
+
     public static readonly TYPENAME Empty = new TYPENAME(System.Guid.Empty);
-
+
+    [NEW_METHOD]
+
diff --git a/src/Strongly/Templates/Long/Long_Base.cs b/src/Strongly/Templates/Long/Long_Base.cs
@@ -1,2 +1,3 @@
     public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
+
     public static readonly TYPENAME Empty = new TYPENAME(0);
diff --git a/src/Strongly/Templates/NewId/NewId_Base.cs b/src/Strongly/Templates/NewId/NewId_Base.cs
@@ -1,5 +1,6 @@
     public bool Equals(TYPENAME other) => this.Value.Equals(other.Value);
-
+
+    public static readonly TYPENAME Empty = new TYPENAME(MassTransit.NewId.Empty); 
+
     public static TYPENAME New() => new TYPENAME(MassTransit.NewId.Next());
-    public static readonly TYPENAME Empty = new TYPENAME(MassTransit.NewId.Empty);
-
+
diff --git a/test/Strongly.Tests/BigIntegerIdTests.cs b/test/Strongly.Tests/BigIntegerIdTests.cs
@@ -18,6 +18,12 @@ public class BigIntegerIdTests
     const string BigNString = "307056936428751749926718693741896073217";
     static readonly BigInteger BigN = BigInteger.Parse(BigNString);
 
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordBigIntegerId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/ByteIdTests.cs b/test/Strongly.Tests/ByteIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class ByteIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = ByteId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/DecimalIdTests.cs b/test/Strongly.Tests/DecimalIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class DecimalIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordDecimalId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/DefaultIdTests.cs b/test/Strongly.Tests/DefaultIdTests.cs
@@ -12,6 +12,13 @@ namespace Strongly.IntegrationTests;
 
 public class DefaultIdTests
 {
+    [Fact]
+    public void RecordHaveEmptyAndNew()
+    {
+        _ = RecordDefaultId1.New();
+        _ = RecordDefaultId1.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/DoubleIdTests.cs b/test/Strongly.Tests/DoubleIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class DoubleIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordDoubleId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/FloatIdTests.cs b/test/Strongly.Tests/FloatIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class FloatIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordFloatId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/GuidCombIdTests.cs b/test/Strongly.Tests/GuidCombIdTests.cs
@@ -15,6 +15,13 @@ namespace Strongly.IntegrationTests;
 
 public class GuidCombIdTests
 {
+    [Fact]
+    public void RecordHaveEmptyAndNew()
+    {
+        _ = RecordGuidCombId1.New();
+        _ = RecordGuidCombId1.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/GuidIdTests.cs b/test/Strongly.Tests/GuidIdTests.cs
@@ -436,6 +436,13 @@ public void RecordSameValuesAreEqual()
         Assert.Equal(foo1, foo2);
     }
 
+    [Fact]
+    public void RecordHaveNewAndEmpty()
+    {
+        _ = RecordGuidId1.New();
+        _ = RecordGuidId1.Empty;
+    }
+
     [Fact]
     public void ImplicitCasts()
     {

diff --git a/test/Strongly.Tests/IntIdTests.cs b/test/Strongly.Tests/IntIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class IntIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordIntId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/LongIdTests.cs b/test/Strongly.Tests/LongIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class LongIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordLongId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/MassTransitNewIdTests.cs b/test/Strongly.Tests/MassTransitNewIdTests.cs
@@ -15,6 +15,13 @@ namespace Strongly.IntegrationTests;
 
 public class MassTransitNewIdTests
 {
+    [Fact]
+    public void RecordHaveEmptyAndNew()
+    {
+        _ = RecordNewIdId1.Empty;
+        _ = RecordNewIdId1.New();
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/NativeIntIdTests.cs b/test/Strongly.Tests/NativeIntIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class NativeIntIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordNativeIntId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/SequentialGuidIdTests.cs b/test/Strongly.Tests/SequentialGuidIdTests.cs
@@ -15,6 +15,13 @@ namespace Strongly.IntegrationTests;
 
 public class SequentialGuidIdTests
 {
+    [Fact]
+    public void RecordHaveEmptyAndNew()
+    {
+        _ = RecordSequentialGuidId1.New();
+        _ = RecordSequentialGuidId1.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/ShortIdTests.cs b/test/Strongly.Tests/ShortIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class ShortIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordShortId.Empty;
+    }
+
     [Fact]
     public void SameValuesAreEqual()
     {

diff --git a/test/Strongly.Tests/StringIdTests.cs b/test/Strongly.Tests/StringIdTests.cs
@@ -14,6 +14,12 @@ namespace Strongly.IntegrationTests;
 
 public class StringIdTests
 {
+    [Fact]
+    public void RecordHaveEmpty()
+    {
+        _ = RecordStringId.Empty;
+    }
+
     [Fact]
     public async Task ThrowsIfTryToCreateWithNull()
     {

diff --git a/test/Strongly.Tests/Types/BigIntegerId.cs b/test/Strongly.Tests/Types/BigIntegerId.cs
@@ -5,6 +5,11 @@ partial struct BigIntegerId
 {
 }
 
+[Strongly(backingType: StronglyType.BigInteger)]
+partial record struct RecordBigIntegerId
+{
+}
+
 [Strongly(converters: StronglyConverter.None,
     backingType: StronglyType.BigInteger)]
 public partial struct NoConverterBigIntegerId

diff --git a/test/Strongly.Tests/Types/ByteId.cs b/test/Strongly.Tests/Types/ByteId.cs
@@ -5,6 +5,11 @@ public partial struct ByteId
 {
 }
 
+[Strongly(backingType: StronglyType.Byte)]
+public partial record struct RecordByteId
+{
+}
+
 [Strongly(converters: StronglyConverter.None, backingType: StronglyType.Byte)]
 public partial struct NoConverterByteId
 {

diff --git a/test/Strongly.Tests/Types/DecimalId.cs b/test/Strongly.Tests/Types/DecimalId.cs
@@ -5,6 +5,11 @@ public partial struct DecimalId
 {
 }
 
+[Strongly(backingType: StronglyType.Decimal)]
+public partial record struct RecordDecimalId
+{
+}
+
 [Strongly(converters: StronglyConverter.None,
     backingType: StronglyType.Decimal)]
 public partial struct NoConverterDecimalId

diff --git a/test/Strongly.Tests/Types/DefaultId.cs b/test/Strongly.Tests/Types/DefaultId.cs
@@ -9,6 +9,9 @@ namespace Strongly.IntegrationTests.Types;
 [Strongly]
 partial struct DefaultId1 { }
 
+[Strongly]
+partial record struct RecordDefaultId1 { }
+
 [Strongly]
 public partial struct DefaultId2 { }
 

diff --git a/test/Strongly.Tests/Types/DoubleId.cs b/test/Strongly.Tests/Types/DoubleId.cs
@@ -5,6 +5,11 @@ public partial struct DoubleId
 {
 }
 
+[Strongly(backingType: StronglyType.Double)]
+public partial record struct RecordDoubleId
+{
+}
+
 [Strongly(converters: StronglyConverter.None,
     backingType: StronglyType.Double)]
 public partial struct NoConverterDoubleId

diff --git a/test/Strongly.Tests/Types/FloatId.cs b/test/Strongly.Tests/Types/FloatId.cs
@@ -7,6 +7,11 @@ public partial struct FloatId
 {
 }
 
+[Strongly(backingType: StronglyType.Float)]
+public partial record struct RecordFloatId
+{
+}
+
 [Strongly(converters: StronglyConverter.None,
     backingType: StronglyType.Float)]
 public partial struct NoConverterFloatId

diff --git a/test/Strongly.Tests/Types/GuidCombId.cs b/test/Strongly.Tests/Types/GuidCombId.cs
@@ -1,5 +1,10 @@
 namespace Strongly.IntegrationTests.Types;
 
+[Strongly(backingType: StronglyType.GuidComb)]
+public partial record struct RecordGuidCombId1
+{
+}
+
 [Strongly(backingType: StronglyType.GuidComb)]
 public partial struct GuidCombId1
 {

diff --git a/test/Strongly.Tests/Types/IntId.cs b/test/Strongly.Tests/Types/IntId.cs
@@ -5,6 +5,11 @@ public partial struct IntId
 {
 }
 
+[Strongly(backingType: StronglyType.Int)]
+public partial record struct RecordIntId
+{
+}
+
 [Strongly(converters: StronglyConverter.None, backingType: StronglyType.Int)]
 public partial struct NoConverterIntId
 {

diff --git a/test/Strongly.Tests/Types/LongId.cs b/test/Strongly.Tests/Types/LongId.cs
@@ -5,6 +5,11 @@ partial struct LongId
 {
 }
 
+[Strongly(backingType: StronglyType.Long)]
+partial record struct RecordLongId
+{
+}
+
 [Strongly(converters: StronglyConverter.None, backingType: StronglyType.Long)]
 public partial struct NoConverterLongId
 {

diff --git a/test/Strongly.Tests/Types/NIntId.cs b/test/Strongly.Tests/Types/NIntId.cs
@@ -5,6 +5,11 @@ public partial struct NativeIntId
 {
 }
 
+[Strongly(backingType: StronglyType.NativeInt)]
+public partial record struct RecordNativeIntId
+{
+}
+
 [Strongly(converters: StronglyConverter.None, backingType: StronglyType.NativeInt)]
 public partial struct NoConverterNativeIntId
 {