Strawberry GUID robustness 11.x (#3863)

dmg-hamann · web-flow · commit ca63f21abcee · 2021-06-24T18:38:55.000+02:00
diff --git a/src/StrawberryShake/Client/src/Core/PublicAPI.Unshipped.txt b/src/StrawberryShake/Client/src/Core/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
-
+override StrawberryShake.Serialization.UuidSerializer.Format(System.Guid runtimeValue) -> string!
+override StrawberryShake.Serialization.UuidSerializer.Parse(string! serializedValue) -> System.Guid
+StrawberryShake.Serialization.UuidSerializer.UuidSerializer(string! typeName = "Uuid", string! format = "D") -> void
diff --git a/src/StrawberryShake/Client/src/Core/Serialization/UuidSerializer.cs b/src/StrawberryShake/Client/src/Core/Serialization/UuidSerializer.cs
@@ -2,12 +2,31 @@
 
 namespace StrawberryShake.Serialization
 {
-    public class UuidSerializer
-        : ScalarSerializer<Guid>
+    /// <summary>
+    /// This serializer handles UUID scalars.
+    /// </summary>
+    public class UuidSerializer : ScalarSerializer<string, Guid>
     {
-        public UuidSerializer(string typeName = BuiltInScalarNames.Uuid)
+        private readonly string _format;
+
+        public UuidSerializer(string typeName = BuiltInScalarNames.Uuid, string format = "D")
             : base(typeName)
         {
+            _format = format;
+        }
+
+        public override Guid Parse(string serializedValue)
+        {
+            if (Guid.TryParse(serializedValue, out Guid guid))
+            {
+                return guid;
+            }
+            throw ThrowHelper.UuidSerializer_CouldNotParse(serializedValue);
+        }
+
+        protected override string Format(Guid runtimeValue)
+        {
+            return runtimeValue.ToString(_format);
         }
     }
 }
diff --git a/src/StrawberryShake/Client/src/Core/ThrowHelper.cs b/src/StrawberryShake/Client/src/Core/ThrowHelper.cs
@@ -57,5 +57,10 @@ internal static GraphQLClientException TimeSpanSerializer_CouldNotFormatValue(
             new(new ClientError(
                 $"The TimeSpan serializer could not serialize value {value}. The provided value " +
                 $"was not in format {format.ToString()}"));
+
+
+        internal static GraphQLClientException UuidSerializer_CouldNotParse(string guid) =>
+            new(new ClientError(
+                $"The Guid serializer could not parse value {guid}. Invalid format."));
     }
 }
diff --git a/src/StrawberryShake/Client/test/Core.Tests/Serialization/UuidSerializerTests.cs b/src/StrawberryShake/Client/test/Core.Tests/Serialization/UuidSerializerTests.cs
@@ -0,0 +1,58 @@
+using System;
+using StrawberryShake;
+using StrawberryShake.Serialization;
+using Xunit;
+
+namespace Core.Tests.Serialization
+{
+    public class UuidSerializerTests
+    {
+        [Theory]
+        [InlineData("D")]
+        [InlineData("N")]
+        [InlineData("B")]
+        [InlineData("P")]
+        [InlineData("X")]
+        public void Parse_Different_Formats(string format)
+        {
+            // arrange
+            var serializer = new UUIDSerializer();
+            var guid = Guid.NewGuid();
+
+            // act
+            Guid result = serializer.Parse(guid.ToString(format));
+
+            // assert
+            Assert.Equal(guid, result);
+        }
+
+        [Fact]
+        public void Parse_Exception()
+        {
+            // arrange
+            var serializer = new UUIDSerializer();
+
+            // assert
+            Assert.Throws<GraphQLClientException>(() => serializer.Parse(string.Empty));
+        }
+
+        [Theory]
+        [InlineData("D")]
+        [InlineData("N")]
+        [InlineData("B")]
+        [InlineData("P")]
+        [InlineData("X")]
+        public void Format(string format)
+        {
+            // arrange
+            var serializer = new UUIDSerializer(format: format);
+            var guid = Guid.NewGuid();
+
+            // act
+            var result = serializer.Format(guid);
+
+            // assert
+            Assert.Equal(guid.ToString(format), result);
+        }
+    }
+}
diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Utilities/SchemaHelper.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Utilities/SchemaHelper.cs
@@ -227,8 +227,9 @@ private static void AddDefaultScalarInfos(
             TryAddLeafType(leafTypes, ScalarNames.Float, TypeNames.Double, TypeNames.Double);
             TryAddLeafType(leafTypes, ScalarNames.Decimal, TypeNames.Decimal, TypeNames.Decimal);
             TryAddLeafType(leafTypes, ScalarNames.Url, TypeNames.Uri);
-            TryAddLeafType(leafTypes, ScalarNames.Uuid, TypeNames.Guid, TypeNames.Guid);
-            TryAddLeafType(leafTypes, "Guid", TypeNames.Guid, TypeNames.Guid);
+            TryAddLeafType(leafTypes, ScalarNames.Uuid, TypeNames.Guid, TypeNames.String);
+            TryAddLeafType(leafTypes, "Uuid", TypeNames.Guid, TypeNames.String);
+            TryAddLeafType(leafTypes, "Guid", TypeNames.Guid, TypeNames.String);
             TryAddLeafType(leafTypes, ScalarNames.DateTime, TypeNames.DateTimeOffset);
             TryAddLeafType(leafTypes, ScalarNames.Date, TypeNames.DateTime);
             TryAddLeafType(leafTypes, ScalarNames.TimeSpan, TypeNames.TimeSpan);
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/EntityIdFactoryGeneratorTests.Simple_Uuid_Entity.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/EntityIdFactoryGeneratorTests.Simple_Uuid_Entity.snap
@@ -122,7 +122,7 @@ namespace Foo.Bar
                 return false;
             }
 
-            return (Id == other.Id) && ((Email is null && other.Email is null) || Email != null && Email.Equals(other.Email));
+            return (Id.Equals(other.Id)) && ((Email is null && other.Email is null) || Email != null && Email.Equals(other.Email));
         }
 
         public override global::System.Boolean Equals(global::System.Object? obj)
@@ -473,14 +473,14 @@ namespace Foo.Bar.State
         private readonly global::StrawberryShake.IEntityStore _entityStore;
         private readonly global::StrawberryShake.IEntityIdSerializer _idSerializer;
         private readonly global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetPersonResult> _resultDataFactory;
-        private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _uuidParser;
+        private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _uuidParser;
         private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.String> _stringParser;
         public GetPersonBuilder(global::StrawberryShake.IEntityStore entityStore, global::StrawberryShake.IEntityIdSerializer idSerializer, global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetPersonResult> resultDataFactory, global::StrawberryShake.Serialization.ISerializerResolver serializerResolver)
         {
             _entityStore = entityStore ?? throw new global::System.ArgumentNullException(nameof(entityStore));
             _idSerializer = idSerializer ?? throw new global::System.ArgumentNullException(nameof(idSerializer));
             _resultDataFactory = resultDataFactory ?? throw new global::System.ArgumentNullException(nameof(resultDataFactory));
-            _uuidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
+            _uuidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
             _stringParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.String>("String") ?? throw new global::System.ArgumentException("No serializer for type `String` found.");
         }
 
@@ -565,7 +565,7 @@ namespace Foo.Bar.State
                 throw new global::System.ArgumentNullException();
             }
 
-            return _uuidParser.Parse(obj.Value.GetGuid()!);
+            return _uuidParser.Parse(obj.Value.GetString()!);
         }
 
         private global::System.String? DeserializeString(global::System.Text.Json.JsonElement? obj)
@@ -606,7 +606,7 @@ namespace Foo.Bar.State
 
         private global::StrawberryShake.EntityId ParsePersonEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)
         {
-            return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);
+            return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);
         }
 
         private global::System.String FormatPersonEntityId(global::StrawberryShake.EntityId entityId)
@@ -615,7 +615,7 @@ namespace Foo.Bar.State
             using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);
             jsonWriter.WriteStartObject();
             jsonWriter.WriteString("__typename", entityId.Name);
-            jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);
+            jsonWriter.WriteString("id", (global::System.String)entityId.Value);
             jsonWriter.WriteEndObject();
             jsonWriter.Flush();
             return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/ResultTypeGeneratorTests.Nested_Entity.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/ResultTypeGeneratorTests.Nested_Entity.snap
@@ -217,7 +217,7 @@ namespace Foo.Bar
                 return false;
             }
 
-            return (Id == other.Id) && ((Make is null && other.Make is null) || Make != null && Make.Equals(other.Make)) && ((MakeCode is null && other.MakeCode is null) || MakeCode != null && MakeCode.Equals(other.MakeCode)) && IsDisabled == other.IsDisabled;
+            return (Id.Equals(other.Id)) && ((Make is null && other.Make is null) || Make != null && Make.Equals(other.Make)) && ((MakeCode is null && other.MakeCode is null) || MakeCode != null && MakeCode.Equals(other.MakeCode)) && IsDisabled == other.IsDisabled;
         }
 
         public override global::System.Boolean Equals(global::System.Object? obj)
@@ -323,7 +323,7 @@ namespace Foo.Bar
                 return false;
             }
 
-            return (Id == other.Id) && ((Model is null && other.Model is null) || Model != null && Model.Equals(other.Model)) && ((ModelCode is null && other.ModelCode is null) || ModelCode != null && ModelCode.Equals(other.ModelCode)) && VehicleMakeId == other.VehicleMakeId && IsDisabled == other.IsDisabled && ((ModelType is null && other.ModelType is null) || ModelType != null && ModelType.Equals(other.ModelType));
+            return (Id.Equals(other.Id)) && ((Model is null && other.Model is null) || Model != null && Model.Equals(other.Model)) && ((ModelCode is null && other.ModelCode is null) || ModelCode != null && ModelCode.Equals(other.ModelCode)) && VehicleMakeId.Equals(other.VehicleMakeId) && IsDisabled == other.IsDisabled && ((ModelType is null && other.ModelType is null) || ModelType != null && ModelType.Equals(other.ModelType));
         }
 
         public override global::System.Boolean Equals(global::System.Object? obj)
@@ -982,15 +982,15 @@ namespace Foo.Bar.State
         private readonly global::StrawberryShake.IEntityIdSerializer _idSerializer;
         private readonly global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IDecodeVINResult> _resultDataFactory;
         private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Boolean, global::System.Boolean> _booleanParser;
-        private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _uuidParser;
+        private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _uuidParser;
         private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.String> _stringParser;
         public DecodeVINBuilder(global::StrawberryShake.IEntityStore entityStore, global::StrawberryShake.IEntityIdSerializer idSerializer, global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IDecodeVINResult> resultDataFactory, global::StrawberryShake.Serialization.ISerializerResolver serializerResolver)
         {
             _entityStore = entityStore ?? throw new global::System.ArgumentNullException(nameof(entityStore));
             _idSerializer = idSerializer ?? throw new global::System.ArgumentNullException(nameof(idSerializer));
             _resultDataFactory = resultDataFactory ?? throw new global::System.ArgumentNullException(nameof(resultDataFactory));
             _booleanParser = serializerResolver.GetLeafValueParser<global::System.Boolean, global::System.Boolean>("Boolean") ?? throw new global::System.ArgumentException("No serializer for type `Boolean` found.");
-            _uuidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
+            _uuidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
             _stringParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.String>("String") ?? throw new global::System.ArgumentException("No serializer for type `String` found.");
         }
 
@@ -1101,7 +1101,7 @@ namespace Foo.Bar.State
                 throw new global::System.ArgumentNullException();
             }
 
-            return _uuidParser.Parse(obj.Value.GetGuid()!);
+            return _uuidParser.Parse(obj.Value.GetString()!);
         }
 
         private global::System.String? DeserializeString(global::System.Text.Json.JsonElement? obj)
@@ -1201,7 +1201,7 @@ namespace Foo.Bar.State
 
         private global::StrawberryShake.EntityId ParseVehicleMakeEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)
         {
-            return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);
+            return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);
         }
 
         private global::System.String FormatVehicleMakeEntityId(global::StrawberryShake.EntityId entityId)
@@ -1210,15 +1210,15 @@ namespace Foo.Bar.State
             using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);
             jsonWriter.WriteStartObject();
             jsonWriter.WriteString("__typename", entityId.Name);
-            jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);
+            jsonWriter.WriteString("id", (global::System.String)entityId.Value);
             jsonWriter.WriteEndObject();
             jsonWriter.Flush();
             return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);
         }
 
         private global::StrawberryShake.EntityId ParseVehicleModelEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)
         {
-            return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);
+            return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);
         }
 
         private global::System.String FormatVehicleModelEntityId(global::StrawberryShake.EntityId entityId)
@@ -1227,7 +1227,7 @@ namespace Foo.Bar.State
             using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);
             jsonWriter.WriteStartObject();
             jsonWriter.WriteString("__typename", entityId.Name);
-            jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);
+            jsonWriter.WriteString("id", (global::System.String)entityId.Value);
             jsonWriter.WriteEndObject();
             jsonWriter.Flush();
             return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/ScalarGeneratorTests.Complete_Schema_With_Uuid_And_DateTime.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/ScalarGeneratorTests.Complete_Schema_With_Uuid_And_DateTime.snap
@@ -158,7 +158,7 @@ namespace Foo.Bar
                 return false;
             }
 
-            return (Id == other.Id) && Amount == other.Amount && Date.Equals(other.Date) && ((Description is null && other.Description is null) || Description != null && Description.Equals(other.Description)) && Category.Equals(other.Category) && PaymentMethod.Equals(other.PaymentMethod) && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Tags, other.Tags);
+            return (Id.Equals(other.Id)) && Amount == other.Amount && Date.Equals(other.Date) && ((Description is null && other.Description is null) || Description != null && Description.Equals(other.Description)) && Category.Equals(other.Category) && PaymentMethod.Equals(other.PaymentMethod) && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Tags, other.Tags);
         }
 
         public override global::System.Boolean Equals(global::System.Object? obj)
@@ -823,7 +823,7 @@ namespace Foo.Bar.State
         private readonly global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IAllExpensesResult> _resultDataFactory;
         private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::Foo.Bar.ExpenseCategory> _expenseCategoryParser;
         private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::Foo.Bar.PaymentMethod> _paymentMethodParser;
-        private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _uuidParser;
+        private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _uuidParser;
         private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Decimal, global::System.Decimal> _decimalParser;
         private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.DateTimeOffset> _dateTimeParser;
         private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.String> _stringParser;
@@ -834,7 +834,7 @@ namespace Foo.Bar.State
             _resultDataFactory = resultDataFactory ?? throw new global::System.ArgumentNullException(nameof(resultDataFactory));
             _expenseCategoryParser = serializerResolver.GetLeafValueParser<global::System.String, global::Foo.Bar.ExpenseCategory>("ExpenseCategory") ?? throw new global::System.ArgumentException("No serializer for type `ExpenseCategory` found.");
             _paymentMethodParser = serializerResolver.GetLeafValueParser<global::System.String, global::Foo.Bar.PaymentMethod>("PaymentMethod") ?? throw new global::System.ArgumentException("No serializer for type `PaymentMethod` found.");
-            _uuidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
+            _uuidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
             _decimalParser = serializerResolver.GetLeafValueParser<global::System.Decimal, global::System.Decimal>("Decimal") ?? throw new global::System.ArgumentException("No serializer for type `Decimal` found.");
             _dateTimeParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.DateTimeOffset>("DateTime") ?? throw new global::System.ArgumentException("No serializer for type `DateTime` found.");
             _stringParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.String>("String") ?? throw new global::System.ArgumentException("No serializer for type `String` found.");
@@ -937,7 +937,7 @@ namespace Foo.Bar.State
                 throw new global::System.ArgumentNullException();
             }
 
-            return _uuidParser.Parse(obj.Value.GetGuid()!);
+            return _uuidParser.Parse(obj.Value.GetString()!);
         }
 
         private global::System.Decimal DeserializeNonNullableDecimal(global::System.Text.Json.JsonElement? obj)
@@ -1071,7 +1071,7 @@ namespace Foo.Bar.State
 
         private global::StrawberryShake.EntityId ParseExpenseEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)
         {
-            return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);
+            return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);
         }
 
         private global::System.String FormatExpenseEntityId(global::StrawberryShake.EntityId entityId)
@@ -1080,7 +1080,7 @@ namespace Foo.Bar.State
             using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);
             jsonWriter.WriteStartObject();
             jsonWriter.WriteString("__typename", entityId.Name);
-            jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);
+            jsonWriter.WriteString("id", (global::System.String)entityId.Value);
             jsonWriter.WriteEndObject();
             jsonWriter.Flush();
             return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/SchemaGeneratorTests.Create_GetFeatById.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/SchemaGeneratorTests.Create_GetFeatById.snap
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/SchemaGeneratorTests.Create_GetFeatsPage.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/SchemaGeneratorTests.Create_GetFeatsPage.snap
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/SchemaGeneratorTests.Create_UpdateMembers_Mutation.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/SchemaGeneratorTests.Create_UpdateMembers_Mutation.snap
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/SchemaGeneratorTests.QueryInterference.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/__snapshots__/SchemaGeneratorTests.QueryInterference.snap

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,31 @@`
`2`	`2`
`3`	`3`	`namespace StrawberryShake.Serialization`
`4`	`4`	`{`
`5`		`- public class UuidSerializer`
`6`		`- : ScalarSerializer<Guid>`
	`5`	`+ /// <summary>`
	`6`	`+ /// This serializer handles UUID scalars.`
	`7`	`+ /// </summary>`
	`8`	`+ public class UuidSerializer : ScalarSerializer<string, Guid>`
`7`	`9`	`{`
`8`		`- public UuidSerializer(string typeName = BuiltInScalarNames.Uuid)`
	`10`	`+ private readonly string _format;`
	`11`	`+`
	`12`	`+ public UuidSerializer(string typeName = BuiltInScalarNames.Uuid, string format = "D")`
`9`	`13`	`: base(typeName)`
`10`	`14`	`{`
	`15`	`+ _format = format;`
	`16`	`+ }`
	`17`	`+`
	`18`	`+ public override Guid Parse(string serializedValue)`
	`19`	`+ {`
	`20`	`+ if (Guid.TryParse(serializedValue, out Guid guid))`
	`21`	`+ {`
	`22`	`+ return guid;`
	`23`	`+ }`
	`24`	`+ throw ThrowHelper.UuidSerializer_CouldNotParse(serializedValue);`
	`25`	`+ }`
	`26`	`+`
	`27`	`+ protected override string Format(Guid runtimeValue)`
	`28`	`+ {`
	`29`	`+ return runtimeValue.ToString(_format);`
`11`	`30`	`}`
`12`	`31`	`}`
`13`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,10 @@ internal static GraphQLClientException TimeSpanSerializer_CouldNotFormatValue(`
`57`	`57`	`new(new ClientError(`
`58`	`58`	`$"The TimeSpan serializer could not serialize value {value}. The provided value " +`
`59`	`59`	`$"was not in format {format.ToString()}"));`
	`60`	`+`
	`61`	`+`
	`62`	`+ internal static GraphQLClientException UuidSerializer_CouldNotParse(string guid) =>`
	`63`	`+ new(new ClientError(`
	`64`	`+ $"The Guid serializer could not parse value {guid}. Invalid format."));`
`60`	`65`	`}`
`61`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ namespace Foo.Bar`
`122`	`122`	`return false;`
`123`	`123`	`}`
`124`	`124`
`125`		`- return (Id == other.Id) && ((Email is null && other.Email is null) \|\| Email != null && Email.Equals(other.Email));`
	`125`	`+ return (Id.Equals(other.Id)) && ((Email is null && other.Email is null) \|\| Email != null && Email.Equals(other.Email));`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`public override global::System.Boolean Equals(global::System.Object? obj)`
`@@ -473,14 +473,14 @@ namespace Foo.Bar.State`
`473`	`473`	`private readonly global::StrawberryShake.IEntityStore _entityStore;`
`474`	`474`	`private readonly global::StrawberryShake.IEntityIdSerializer _idSerializer;`
`475`	`475`	`private readonly global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetPersonResult> _resultDataFactory;`
`476`		`- private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _uuidParser;`
	`476`	`+ private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _uuidParser;`
`477`	`477`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.String> _stringParser;`
`478`	`478`	`public GetPersonBuilder(global::StrawberryShake.IEntityStore entityStore, global::StrawberryShake.IEntityIdSerializer idSerializer, global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetPersonResult> resultDataFactory, global::StrawberryShake.Serialization.ISerializerResolver serializerResolver)`
`479`	`479`	`{`
`480`	`480`	`_entityStore = entityStore ?? throw new global::System.ArgumentNullException(nameof(entityStore));`
`481`	`481`	`_idSerializer = idSerializer ?? throw new global::System.ArgumentNullException(nameof(idSerializer));`
`482`	`482`	`_resultDataFactory = resultDataFactory ?? throw new global::System.ArgumentNullException(nameof(resultDataFactory));`
`483`		- _uuidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
	`483`	+ _uuidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
`484`	`484`	_stringParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.String>("String") ?? throw new global::System.ArgumentException("No serializer for type `String` found.");
`485`	`485`	`}`
`486`	`486`
`@@ -565,7 +565,7 @@ namespace Foo.Bar.State`
`565`	`565`	`throw new global::System.ArgumentNullException();`
`566`	`566`	`}`
`567`	`567`
`568`		`- return _uuidParser.Parse(obj.Value.GetGuid()!);`
	`568`	`+ return _uuidParser.Parse(obj.Value.GetString()!);`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`private global::System.String? DeserializeString(global::System.Text.Json.JsonElement? obj)`
`@@ -606,7 +606,7 @@ namespace Foo.Bar.State`
`606`	`606`
`607`	`607`	`private global::StrawberryShake.EntityId ParsePersonEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)`
`608`	`608`	`{`
`609`		`- return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);`
	`609`	`+ return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);`
`610`	`610`	`}`
`611`	`611`
`612`	`612`	`private global::System.String FormatPersonEntityId(global::StrawberryShake.EntityId entityId)`
`@@ -615,7 +615,7 @@ namespace Foo.Bar.State`
`615`	`615`	`using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);`
`616`	`616`	`jsonWriter.WriteStartObject();`
`617`	`617`	`jsonWriter.WriteString("__typename", entityId.Name);`
`618`		`- jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);`
	`618`	`+ jsonWriter.WriteString("id", (global::System.String)entityId.Value);`
`619`	`619`	`jsonWriter.WriteEndObject();`
`620`	`620`	`jsonWriter.Flush();`
`621`	`621`	`return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ namespace Foo.Bar`
`217`	`217`	`return false;`
`218`	`218`	`}`
`219`	`219`
`220`		`- return (Id == other.Id) && ((Make is null && other.Make is null) \|\| Make != null && Make.Equals(other.Make)) && ((MakeCode is null && other.MakeCode is null) \|\| MakeCode != null && MakeCode.Equals(other.MakeCode)) && IsDisabled == other.IsDisabled;`
	`220`	`+ return (Id.Equals(other.Id)) && ((Make is null && other.Make is null) \|\| Make != null && Make.Equals(other.Make)) && ((MakeCode is null && other.MakeCode is null) \|\| MakeCode != null && MakeCode.Equals(other.MakeCode)) && IsDisabled == other.IsDisabled;`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`public override global::System.Boolean Equals(global::System.Object? obj)`
`@@ -323,7 +323,7 @@ namespace Foo.Bar`
`323`	`323`	`return false;`
`324`	`324`	`}`
`325`	`325`
`326`		`- return (Id == other.Id) && ((Model is null && other.Model is null) \|\| Model != null && Model.Equals(other.Model)) && ((ModelCode is null && other.ModelCode is null) \|\| ModelCode != null && ModelCode.Equals(other.ModelCode)) && VehicleMakeId == other.VehicleMakeId && IsDisabled == other.IsDisabled && ((ModelType is null && other.ModelType is null) \|\| ModelType != null && ModelType.Equals(other.ModelType));`
	`326`	`+ return (Id.Equals(other.Id)) && ((Model is null && other.Model is null) \|\| Model != null && Model.Equals(other.Model)) && ((ModelCode is null && other.ModelCode is null) \|\| ModelCode != null && ModelCode.Equals(other.ModelCode)) && VehicleMakeId.Equals(other.VehicleMakeId) && IsDisabled == other.IsDisabled && ((ModelType is null && other.ModelType is null) \|\| ModelType != null && ModelType.Equals(other.ModelType));`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`public override global::System.Boolean Equals(global::System.Object? obj)`
`@@ -982,15 +982,15 @@ namespace Foo.Bar.State`
`982`	`982`	`private readonly global::StrawberryShake.IEntityIdSerializer _idSerializer;`
`983`	`983`	`private readonly global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IDecodeVINResult> _resultDataFactory;`
`984`	`984`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Boolean, global::System.Boolean> _booleanParser;`
`985`		`- private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _uuidParser;`
	`985`	`+ private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _uuidParser;`
`986`	`986`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.String> _stringParser;`
`987`	`987`	`public DecodeVINBuilder(global::StrawberryShake.IEntityStore entityStore, global::StrawberryShake.IEntityIdSerializer idSerializer, global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IDecodeVINResult> resultDataFactory, global::StrawberryShake.Serialization.ISerializerResolver serializerResolver)`
`988`	`988`	`{`
`989`	`989`	`_entityStore = entityStore ?? throw new global::System.ArgumentNullException(nameof(entityStore));`
`990`	`990`	`_idSerializer = idSerializer ?? throw new global::System.ArgumentNullException(nameof(idSerializer));`
`991`	`991`	`_resultDataFactory = resultDataFactory ?? throw new global::System.ArgumentNullException(nameof(resultDataFactory));`
`992`	`992`	_booleanParser = serializerResolver.GetLeafValueParser<global::System.Boolean, global::System.Boolean>("Boolean") ?? throw new global::System.ArgumentException("No serializer for type `Boolean` found.");
`993`		- _uuidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
	`993`	+ _uuidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
`994`	`994`	_stringParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.String>("String") ?? throw new global::System.ArgumentException("No serializer for type `String` found.");
`995`	`995`	`}`
`996`	`996`
`@@ -1101,7 +1101,7 @@ namespace Foo.Bar.State`
`1101`	`1101`	`throw new global::System.ArgumentNullException();`
`1102`	`1102`	`}`
`1103`	`1103`
`1104`		`- return _uuidParser.Parse(obj.Value.GetGuid()!);`
	`1104`	`+ return _uuidParser.Parse(obj.Value.GetString()!);`
`1105`	`1105`	`}`
`1106`	`1106`
`1107`	`1107`	`private global::System.String? DeserializeString(global::System.Text.Json.JsonElement? obj)`
`@@ -1201,7 +1201,7 @@ namespace Foo.Bar.State`
`1201`	`1201`
`1202`	`1202`	`private global::StrawberryShake.EntityId ParseVehicleMakeEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)`
`1203`	`1203`	`{`
`1204`		`- return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);`
	`1204`	`+ return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);`
`1205`	`1205`	`}`
`1206`	`1206`
`1207`	`1207`	`private global::System.String FormatVehicleMakeEntityId(global::StrawberryShake.EntityId entityId)`
`@@ -1210,15 +1210,15 @@ namespace Foo.Bar.State`
`1210`	`1210`	`using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);`
`1211`	`1211`	`jsonWriter.WriteStartObject();`
`1212`	`1212`	`jsonWriter.WriteString("__typename", entityId.Name);`
`1213`		`- jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);`
	`1213`	`+ jsonWriter.WriteString("id", (global::System.String)entityId.Value);`
`1214`	`1214`	`jsonWriter.WriteEndObject();`
`1215`	`1215`	`jsonWriter.Flush();`
`1216`	`1216`	`return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);`
`1217`	`1217`	`}`
`1218`	`1218`
`1219`	`1219`	`private global::StrawberryShake.EntityId ParseVehicleModelEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)`
`1220`	`1220`	`{`
`1221`		`- return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);`
	`1221`	`+ return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);`
`1222`	`1222`	`}`
`1223`	`1223`
`1224`	`1224`	`private global::System.String FormatVehicleModelEntityId(global::StrawberryShake.EntityId entityId)`
`@@ -1227,7 +1227,7 @@ namespace Foo.Bar.State`
`1227`	`1227`	`using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);`
`1228`	`1228`	`jsonWriter.WriteStartObject();`
`1229`	`1229`	`jsonWriter.WriteString("__typename", entityId.Name);`
`1230`		`- jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);`
	`1230`	`+ jsonWriter.WriteString("id", (global::System.String)entityId.Value);`
`1231`	`1231`	`jsonWriter.WriteEndObject();`
`1232`	`1232`	`jsonWriter.Flush();`
`1233`	`1233`	`return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ namespace Foo.Bar`
`209`	`209`	`return false;`
`210`	`210`	`}`
`211`	`211`
`212`		`- return (Id == other.Id) && Name.Equals(other.Name) && Level == other.Level && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Details, other.Details);`
	`212`	`+ return (Id.Equals(other.Id)) && Name.Equals(other.Name) && Level == other.Level && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Details, other.Details);`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`public override global::System.Boolean Equals(global::System.Object? obj)`
`@@ -851,15 +851,15 @@ namespace Foo.Bar.State`
`851`	`851`	`private readonly global::StrawberryShake.IEntityStore _entityStore;`
`852`	`852`	`private readonly global::StrawberryShake.IEntityIdSerializer _idSerializer;`
`853`	`853`	`private readonly global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetFeatByIdResult> _resultDataFactory;`
`854`		`- private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _uuidParser;`
	`854`	`+ private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _uuidParser;`
`855`	`855`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.String> _stringParser;`
`856`	`856`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Int32, global::System.Int32> _intParser;`
`857`	`857`	`public GetFeatByIdBuilder(global::StrawberryShake.IEntityStore entityStore, global::StrawberryShake.IEntityIdSerializer idSerializer, global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetFeatByIdResult> resultDataFactory, global::StrawberryShake.Serialization.ISerializerResolver serializerResolver)`
`858`	`858`	`{`
`859`	`859`	`_entityStore = entityStore ?? throw new global::System.ArgumentNullException(nameof(entityStore));`
`860`	`860`	`_idSerializer = idSerializer ?? throw new global::System.ArgumentNullException(nameof(idSerializer));`
`861`	`861`	`_resultDataFactory = resultDataFactory ?? throw new global::System.ArgumentNullException(nameof(resultDataFactory));`
`862`		- _uuidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
	`862`	+ _uuidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
`863`	`863`	_stringParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.String>("String") ?? throw new global::System.ArgumentException("No serializer for type `String` found.");
`864`	`864`	_intParser = serializerResolver.GetLeafValueParser<global::System.Int32, global::System.Int32>("Int") ?? throw new global::System.ArgumentException("No serializer for type `Int` found.");
`865`	`865`	`}`
`@@ -977,7 +977,7 @@ namespace Foo.Bar.State`
`977`	`977`	`throw new global::System.ArgumentNullException();`
`978`	`978`	`}`
`979`	`979`
`980`		`- return _uuidParser.Parse(obj.Value.GetGuid()!);`
	`980`	`+ return _uuidParser.Parse(obj.Value.GetString()!);`
`981`	`981`	`}`
`982`	`982`
`983`	`983`	`private global::System.String DeserializeNonNullableString(global::System.Text.Json.JsonElement? obj)`
`@@ -1091,7 +1091,7 @@ namespace Foo.Bar.State`
`1091`	`1091`
`1092`	`1092`	`private global::StrawberryShake.EntityId ParseFeatEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)`
`1093`	`1093`	`{`
`1094`		`- return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);`
	`1094`	`+ return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`	`1097`	`private global::System.String FormatFeatEntityId(global::StrawberryShake.EntityId entityId)`
`@@ -1100,15 +1100,15 @@ namespace Foo.Bar.State`
`1100`	`1100`	`using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);`
`1101`	`1101`	`jsonWriter.WriteStartObject();`
`1102`	`1102`	`jsonWriter.WriteString("__typename", entityId.Name);`
`1103`		`- jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);`
	`1103`	`+ jsonWriter.WriteString("id", (global::System.String)entityId.Value);`
`1104`	`1104`	`jsonWriter.WriteEndObject();`
`1105`	`1105`	`jsonWriter.Flush();`
`1106`	`1106`	`return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);`
`1107`	`1107`	`}`
`1108`	`1108`
`1109`	`1109`	`private global::StrawberryShake.EntityId ParseFeatDetailsBlockEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)`
`1110`	`1110`	`{`
`1111`		`- return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);`
	`1111`	`+ return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);`
`1112`	`1112`	`}`
`1113`	`1113`
`1114`	`1114`	`private global::System.String FormatFeatDetailsBlockEntityId(global::StrawberryShake.EntityId entityId)`
`@@ -1117,7 +1117,7 @@ namespace Foo.Bar.State`
`1117`	`1117`	`using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);`
`1118`	`1118`	`jsonWriter.WriteStartObject();`
`1119`	`1119`	`jsonWriter.WriteString("__typename", entityId.Name);`
`1120`		`- jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);`
	`1120`	`+ jsonWriter.WriteString("id", (global::System.String)entityId.Value);`
`1121`	`1121`	`jsonWriter.WriteEndObject();`
`1122`	`1122`	`jsonWriter.Flush();`
`1123`	`1123`	`return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ namespace Foo.Bar`
`184`	`184`	`return false;`
`185`	`185`	`}`
`186`	`186`
`187`		`- return (CorrelationId == other.CorrelationId);`
	`187`	`+ return (CorrelationId.Equals(other.CorrelationId));`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`public override global::System.Boolean Equals(global::System.Object? obj)`
`@@ -375,7 +375,7 @@ namespace Foo.Bar`
`375`	`375`	`return false;`
`376`	`376`	`}`
`377`	`377`
`378`		`- return (Id == other.Id) && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Members, other.Members);`
	`378`	`+ return (Id.Equals(other.Id)) && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Members, other.Members);`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`public override global::System.Int32 GetHashCode()`
`@@ -531,7 +531,7 @@ namespace Foo.Bar`
`531`	`531`	`return false;`
`532`	`532`	`}`
`533`	`533`
`534`		`- return (Id == other.Id) && Type.Equals(other.Type) && Remove == other.Remove;`
	`534`	`+ return (Id.Equals(other.Id)) && Type.Equals(other.Type) && Remove == other.Remove;`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`public override global::System.Int32 GetHashCode()`
`@@ -927,15 +927,15 @@ namespace Foo.Bar.State`
`927`	`927`	`private readonly global::StrawberryShake.IEntityIdSerializer _idSerializer;`
`928`	`928`	`private readonly global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IUpdateMembersResult> _resultDataFactory;`
`929`	`929`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::Foo.Bar.ProjectUserRoleType> _projectUserRoleTypeParser;`
`930`		`- private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _guidParser;`
	`930`	`+ private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _guidParser;`
`931`	`931`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Boolean, global::System.Boolean> _booleanParser;`
`932`	`932`	`public UpdateMembersBuilder(global::StrawberryShake.IEntityStore entityStore, global::StrawberryShake.IEntityIdSerializer idSerializer, global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IUpdateMembersResult> resultDataFactory, global::StrawberryShake.Serialization.ISerializerResolver serializerResolver)`
`933`	`933`	`{`
`934`	`934`	`_entityStore = entityStore ?? throw new global::System.ArgumentNullException(nameof(entityStore));`
`935`	`935`	`_idSerializer = idSerializer ?? throw new global::System.ArgumentNullException(nameof(idSerializer));`
`936`	`936`	`_resultDataFactory = resultDataFactory ?? throw new global::System.ArgumentNullException(nameof(resultDataFactory));`
`937`	`937`	_projectUserRoleTypeParser = serializerResolver.GetLeafValueParser<global::System.String, global::Foo.Bar.ProjectUserRoleType>("ProjectUserRoleType") ?? throw new global::System.ArgumentException("No serializer for type `ProjectUserRoleType` found.");
`938`		- _guidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Guid") ?? throw new global::System.ArgumentException("No serializer for type `Guid` found.");
	`938`	+ _guidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Guid") ?? throw new global::System.ArgumentException("No serializer for type `Guid` found.");
`939`	`939`	_booleanParser = serializerResolver.GetLeafValueParser<global::System.Boolean, global::System.Boolean>("Boolean") ?? throw new global::System.ArgumentException("No serializer for type `Boolean` found.");
`940`	`940`	`}`
`941`	`941`
`@@ -1024,7 +1024,7 @@ namespace Foo.Bar.State`
`1024`	`1024`	`throw new global::System.ArgumentNullException();`
`1025`	`1025`	`}`
`1026`	`1026`
`1027`		`- return _guidParser.Parse(obj.Value.GetGuid()!);`
	`1027`	`+ return _guidParser.Parse(obj.Value.GetString()!);`
`1028`	`1028`	`}`
`1029`	`1029`	`}`
`1030`	`1030`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ namespace Foo.Bar`
`222`	`222`	`return false;`
`223`	`223`	`}`
`224`	`224`
`225`		`- return (Id == other.Id) && Name.Equals(other.Name) && Level == other.Level && CanBeLearnedMoreThanOnce == other.CanBeLearnedMoreThanOnce && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Details, other.Details);`
	`225`	`+ return (Id.Equals(other.Id)) && Name.Equals(other.Name) && Level == other.Level && CanBeLearnedMoreThanOnce == other.CanBeLearnedMoreThanOnce && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Details, other.Details);`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`public override global::System.Boolean Equals(global::System.Object? obj)`
`@@ -629,7 +629,7 @@ namespace Foo.Bar`
`629`	`629`	`return false;`
`630`	`630`	`}`
`631`	`631`
`632`		`- return (Id == other.Id) && Name.Equals(other.Name) && Level == other.Level && ((Special is null && other.Special is null) \|\| Special != null && Special.Equals(other.Special)) && ((Trigger is null && other.Trigger is null) \|\| Trigger != null && Trigger.Equals(other.Trigger)) && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Details, other.Details) && ActionType.Equals(other.ActionType);`
	`632`	`+ return (Id.Equals(other.Id)) && Name.Equals(other.Name) && Level == other.Level && ((Special is null && other.Special is null) \|\| Special != null && Special.Equals(other.Special)) && ((Trigger is null && other.Trigger is null) \|\| Trigger != null && Trigger.Equals(other.Trigger)) && global::StrawberryShake.Helper.ComparisonHelper.SequenceEqual(Details, other.Details) && ActionType.Equals(other.ActionType);`
`633`	`633`	`}`
`634`	`634`
`635`	`635`	`public override global::System.Boolean Equals(global::System.Object? obj)`
`@@ -3526,7 +3526,7 @@ namespace Foo.Bar.State`
`3526`	`3526`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::Foo.Bar.SortEnumType> _sortEnumTypeParser;`
`3527`	`3527`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Int32, global::System.Int32> _intParser;`
`3528`	`3528`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.String> _stringParser;`
`3529`		`- private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _uuidParser;`
	`3529`	`+ private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _uuidParser;`
`3530`	`3530`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Boolean, global::System.Boolean> _booleanParser;`
`3531`	`3531`	`public GetFeatsPageBuilder(global::StrawberryShake.IEntityStore entityStore, global::StrawberryShake.IEntityIdSerializer idSerializer, global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetFeatsPageResult> resultDataFactory, global::StrawberryShake.Serialization.ISerializerResolver serializerResolver)`
`3532`	`3532`	`{`
`@@ -3536,7 +3536,7 @@ namespace Foo.Bar.State`
`3536`	`3536`	_sortEnumTypeParser = serializerResolver.GetLeafValueParser<global::System.String, global::Foo.Bar.SortEnumType>("SortEnumType") ?? throw new global::System.ArgumentException("No serializer for type `SortEnumType` found.");
`3537`	`3537`	_intParser = serializerResolver.GetLeafValueParser<global::System.Int32, global::System.Int32>("Int") ?? throw new global::System.ArgumentException("No serializer for type `Int` found.");
`3538`	`3538`	_stringParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.String>("String") ?? throw new global::System.ArgumentException("No serializer for type `String` found.");
`3539`		- _uuidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
	`3539`	+ _uuidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
`3540`	`3540`	_booleanParser = serializerResolver.GetLeafValueParser<global::System.Boolean, global::System.Boolean>("Boolean") ?? throw new global::System.ArgumentException("No serializer for type `Boolean` found.");
`3541`	`3541`	`}`
`3542`	`3542`
`@@ -3663,7 +3663,7 @@ namespace Foo.Bar.State`
`3663`	`3663`	`throw new global::System.ArgumentNullException();`
`3664`	`3664`	`}`
`3665`	`3665`
`3666`		`- return _uuidParser.Parse(obj.Value.GetGuid()!);`
	`3666`	`+ return _uuidParser.Parse(obj.Value.GetString()!);`
`3667`	`3667`	`}`
`3668`	`3668`
`3669`	`3669`	`private global::System.String DeserializeNonNullableString(global::System.Text.Json.JsonElement? obj)`
`@@ -3736,15 +3736,15 @@ namespace Foo.Bar.State`
`3736`	`3736`	`private readonly global::StrawberryShake.IEntityStore _entityStore;`
`3737`	`3737`	`private readonly global::StrawberryShake.IEntityIdSerializer _idSerializer;`
`3738`	`3738`	`private readonly global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetFeatByIdResult> _resultDataFactory;`
`3739`		`- private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Guid, global::System.Guid> _uuidParser;`
	`3739`	`+ private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.Guid> _uuidParser;`
`3740`	`3740`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.String, global::System.String> _stringParser;`
`3741`	`3741`	`private readonly global::StrawberryShake.Serialization.ILeafValueParser<global::System.Int32, global::System.Int32> _intParser;`
`3742`	`3742`	`public GetFeatByIdBuilder(global::StrawberryShake.IEntityStore entityStore, global::StrawberryShake.IEntityIdSerializer idSerializer, global::StrawberryShake.IOperationResultDataFactory<global::Foo.Bar.IGetFeatByIdResult> resultDataFactory, global::StrawberryShake.Serialization.ISerializerResolver serializerResolver)`
`3743`	`3743`	`{`
`3744`	`3744`	`_entityStore = entityStore ?? throw new global::System.ArgumentNullException(nameof(entityStore));`
`3745`	`3745`	`_idSerializer = idSerializer ?? throw new global::System.ArgumentNullException(nameof(idSerializer));`
`3746`	`3746`	`_resultDataFactory = resultDataFactory ?? throw new global::System.ArgumentNullException(nameof(resultDataFactory));`
`3747`		- _uuidParser = serializerResolver.GetLeafValueParser<global::System.Guid, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
	`3747`	+ _uuidParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.Guid>("Uuid") ?? throw new global::System.ArgumentException("No serializer for type `Uuid` found.");
`3748`	`3748`	_stringParser = serializerResolver.GetLeafValueParser<global::System.String, global::System.String>("String") ?? throw new global::System.ArgumentException("No serializer for type `String` found.");
`3749`	`3749`	_intParser = serializerResolver.GetLeafValueParser<global::System.Int32, global::System.Int32>("Int") ?? throw new global::System.ArgumentException("No serializer for type `Int` found.");
`3750`	`3750`	`}`
`@@ -3862,7 +3862,7 @@ namespace Foo.Bar.State`
`3862`	`3862`	`throw new global::System.ArgumentNullException();`
`3863`	`3863`	`}`
`3864`	`3864`
`3865`		`- return _uuidParser.Parse(obj.Value.GetGuid()!);`
	`3865`	`+ return _uuidParser.Parse(obj.Value.GetString()!);`
`3866`	`3866`	`}`
`3867`	`3867`
`3868`	`3868`	`private global::System.String DeserializeNonNullableString(global::System.Text.Json.JsonElement? obj)`
`@@ -4018,7 +4018,7 @@ namespace Foo.Bar.State`
`4018`	`4018`
`4019`	`4019`	`private global::StrawberryShake.EntityId ParseFeatEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)`
`4020`	`4020`	`{`
`4021`		`- return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);`
	`4021`	`+ return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);`
`4022`	`4022`	`}`
`4023`	`4023`
`4024`	`4024`	`private global::System.String FormatFeatEntityId(global::StrawberryShake.EntityId entityId)`
`@@ -4027,15 +4027,15 @@ namespace Foo.Bar.State`
`4027`	`4027`	`using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);`
`4028`	`4028`	`jsonWriter.WriteStartObject();`
`4029`	`4029`	`jsonWriter.WriteString("__typename", entityId.Name);`
`4030`		`- jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);`
	`4030`	`+ jsonWriter.WriteString("id", (global::System.String)entityId.Value);`
`4031`	`4031`	`jsonWriter.WriteEndObject();`
`4032`	`4032`	`jsonWriter.Flush();`
`4033`	`4033`	`return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);`
`4034`	`4034`	`}`
`4035`	`4035`
`4036`	`4036`	`private global::StrawberryShake.EntityId ParseFeatDetailsBlockEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)`
`4037`	`4037`	`{`
`4038`		`- return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);`
	`4038`	`+ return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);`
`4039`	`4039`	`}`
`4040`	`4040`
`4041`	`4041`	`private global::System.String FormatFeatDetailsBlockEntityId(global::StrawberryShake.EntityId entityId)`
`@@ -4044,15 +4044,15 @@ namespace Foo.Bar.State`
`4044`	`4044`	`using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);`
`4045`	`4045`	`jsonWriter.WriteStartObject();`
`4046`	`4046`	`jsonWriter.WriteString("__typename", entityId.Name);`
`4047`		`- jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);`
	`4047`	`+ jsonWriter.WriteString("id", (global::System.String)entityId.Value);`
`4048`	`4048`	`jsonWriter.WriteEndObject();`
`4049`	`4049`	`jsonWriter.Flush();`
`4050`	`4050`	`return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);`
`4051`	`4051`	`}`
`4052`	`4052`
`4053`	`4053`	`private global::StrawberryShake.EntityId ParseActionTypeEntityId(global::System.Text.Json.JsonElement obj, global::System.String type)`
`4054`	`4054`	`{`
`4055`		`- return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetGuid()!);`
	`4055`	`+ return new global::StrawberryShake.EntityId(type, obj.GetProperty("id").GetString()!);`
`4056`	`4056`	`}`
`4057`	`4057`
`4058`	`4058`	`private global::System.String FormatActionTypeEntityId(global::StrawberryShake.EntityId entityId)`
`@@ -4061,7 +4061,7 @@ namespace Foo.Bar.State`
`4061`	`4061`	`using var jsonWriter = new global::System.Text.Json.Utf8JsonWriter(writer, _options);`
`4062`	`4062`	`jsonWriter.WriteStartObject();`
`4063`	`4063`	`jsonWriter.WriteString("__typename", entityId.Name);`
`4064`		`- jsonWriter.WriteString("id", (global::System.Guid)entityId.Value);`
	`4064`	`+ jsonWriter.WriteString("id", (global::System.String)entityId.Value);`
`4065`	`4065`	`jsonWriter.WriteEndObject();`
`4066`	`4066`	`jsonWriter.Flush();`
`4067`	`4067`	`return global::System.Text.Encoding.UTF8.GetString(writer.GetInternalBuffer(), 0, writer.Length);`