26 files changed, 132 insertions(+), 80 deletions(-)

M Packets/NosSmooth.PacketSerializer.Abstractions/BaseStringConverter.cs
A Packets/NosSmooth.PacketSerializer.Abstractions/DeserializeOptions.cs
M Packets/NosSmooth.PacketSerializer.Abstractions/IStringConverter.cs
M Packets/NosSmooth.PacketSerializer.Abstractions/IStringSerializer.cs
M Packets/NosSmooth.PacketSerializer.Abstractions/NullableWrapper.cs
M Packets/NosSmooth.PacketSerializer/Converters/Basic/BasicTypeConverter.cs
M Packets/NosSmooth.PacketSerializer/Converters/Basic/BoolStringConverter.cs
M Packets/NosSmooth.PacketSerializer/Converters/Common/NameStringConverter.cs
M Packets/NosSmooth.PacketSerializer/Converters/Common/NullableWrapperConverter.cs
M Packets/NosSmooth.PacketSerializer/Converters/Packets/UpgradeRareSubPacketConverter.cs
M Packets/NosSmooth.PacketSerializer/Converters/Special/Converters/EnumStringConverter.cs
M Packets/NosSmooth.PacketSerializer/Converters/Special/Converters/ListStringConverter.cs
M Packets/NosSmooth.PacketSerializer/Converters/Special/Converters/NullableStringConverter.cs
M Packets/NosSmooth.PacketSerializer/Converters/Special/StringSerializer.cs
M Packets/NosSmooth.PacketSerializer/PacketSerializer.cs
M Packets/NosSmooth.PacketSerializersGenerator/ConverterDeserializationGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/BasicInlineConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/BoolInlineConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/EnumInlineConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/FallbackInlineConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/IInlineConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/ListInlineConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/StringInlineConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/InlineTypeConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/PacketConverterGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/SourceGenerator.cs

@@ 19,12 19,12 @@ public abstract class BaseStringConverter<TParseType> : IStringConverter<TParseT
     public abstract Result Serialize(TParseType? obj, PacketStringBuilder builder);
 
     /// <inheritdoc />
-    public abstract Result<TParseType?> Deserialize(ref PacketStringEnumerator stringEnumerator);
+    public abstract Result<TParseType?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options);
 
     /// <inheritdoc/>
-    Result<object?> IStringConverter.Deserialize(ref PacketStringEnumerator stringEnumerator)
+    Result<object?> IStringConverter.Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
-        var result = Deserialize(ref stringEnumerator);
+        var result = Deserialize(ref stringEnumerator, options);
         if (!result.IsSuccess)
         {
             return Result<object?>.FromError(result);

@@ 0,0 1,27 @@
+//
+//  DeserializeOptions.cs
+//
+//  Copyright (c) František Boháček. All rights reserved.
+//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace NosSmooth.PacketSerializer.Abstractions;
+
+/// <summary>
+/// Options for deserialization.
+/// </summary>
+/// <param name="CanBeNull">Whether the argument may be null.</param>
+[SuppressMessage
+(
+    "StyleCop.CSharp.NamingRules",
+    "SA1313:Parameter names should begin with lower-case letter",
+    Justification = "Fix this."
+)]
+public record struct DeserializeOptions(bool CanBeNull = false)
+{
+    /// <summary>
+    /// Gets the nullable deserialize options.
+    /// </summary>
+    public static DeserializeOptions Nullable => new DeserializeOptions(true);
+}<
\ No newline at end of file

@@ 17,8 17,9 @@ public interface IStringConverter
     /// Convert the data from the enumerator to the given type.
     /// </summary>
     /// <param name="stringEnumerator">The packet string enumerator with the current position.</param>
+    /// <param name="options">The deserialization options.</param>
     /// <returns>The parsed object or an error.</returns>
-    public Result<object?> Deserialize(ref PacketStringEnumerator stringEnumerator);
+    public Result<object?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options);
 
     /// <summary>
     /// Serializes the given object to string by appending to the packet string builder.


@@ 42,8 43,9 @@ public interface IStringConverter<TParseType> : IStringConverter
     /// Convert the data from the enumerator to the given type.
     /// </summary>
     /// <param name="stringEnumerator">The packet string enumerator with the current position.</param>
+    /// <param name="options">The deserialization options.</param>
     /// <returns>The parsed object or an error.</returns>
-    public new Result<TParseType?> Deserialize(ref PacketStringEnumerator stringEnumerator);
+    public new Result<TParseType?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options);
 
     /// <summary>
     /// Serializes the given object to string by appending to the packet string builder.

@@ 18,8 18,9 @@ public interface IStringSerializer
     /// </summary>
     /// <param name="parseType">The type of the object to serialize.</param>
     /// <param name="stringEnumerator">The packet string enumerator with the current position.</param>
+    /// <param name="options">The deserialization options.</param>
     /// <returns>The parsed object or an error.</returns>
-    public Result<object?> Deserialize(Type parseType, ref PacketStringEnumerator stringEnumerator);
+    public Result<object?> Deserialize(Type parseType, ref PacketStringEnumerator stringEnumerator, DeserializeOptions options);
 
     /// <summary>
     /// Serializes the given object to string by appending to the packet string builder.


@@ 35,8 36,9 @@ public interface IStringSerializer
     /// </summary>
     /// <param name="stringEnumerator">The packet string enumerator with the current position.</param>
     /// <typeparam name="TParseType">The type of the object to serialize.</typeparam>
+    /// <param name="options">The deserialization options.</param>
     /// <returns>The parsed object or an error.</returns>
-    public Result<TParseType?> Deserialize<TParseType>(ref PacketStringEnumerator stringEnumerator);
+    public Result<TParseType?> Deserialize<TParseType>(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options);
 
     /// <summary>
     /// Serializes the given object to string by appending to the packet string builder.

@@ 28,4 28,9 @@ public record NullableWrapper<T>(T? Value)
     {
         return wrapper.Value;
     }
+
+    public static implicit operator NullableWrapper<T>(T? value)
+    {
+        return new NullableWrapper<T>(value);
+    }
 }=
\ No newline at end of file

@@ 24,7 24,7 @@ public abstract class BasicTypeConverter<TBasicType> : BaseStringConverter<TBasi
     }
 
     /// <inheritdoc />
-    public override Result<TBasicType?> Deserialize(ref PacketStringEnumerator stringEnumerator)
+    public override Result<TBasicType?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
         var nextTokenResult = stringEnumerator.GetNextToken(out var packetToken);
         if (!nextTokenResult.IsSuccess)


@@ 32,10 32,13 @@ public abstract class BasicTypeConverter<TBasicType> : BaseStringConverter<TBasi
             return Result<TBasicType?>.FromError(nextTokenResult);
         }
 
-        var nullSymbol = GetNullSymbol();
-        if (packetToken.Token.Length == nullSymbol.Length && packetToken.Token.StartsWith(nullSymbol))
+        if (options.CanBeNull)
         {
-            return Result<TBasicType?>.FromSuccess(default);
+            var nullSymbol = GetNullSymbol();
+            if (packetToken.Token.Length == nullSymbol.Length && packetToken.Token.StartsWith(nullSymbol))
+            {
+                return Result<TBasicType?>.FromSuccess(default);
+            }
         }
 
         return Deserialize(packetToken.Token);

@@ 4,6 4,7 @@
 //  Copyright (c) František Boháček. All rights reserved.
 //  Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
 using NosSmooth.PacketSerializer.Abstractions;
 using Remora.Results;
 


@@ 12,7 13,7 @@ namespace NosSmooth.PacketSerializer.Converters.Basic;
 /// <summary>
 /// Converter of <see cref="bool"/>.
 /// </summary>
-public class BoolStringConverter : BaseStringConverter<bool>
+public class BoolStringConverter : BasicTypeConverter<bool>
 {
     /// <inheritdoc />
     public override Result Serialize(bool obj, PacketStringBuilder builder)


@@ 22,14 23,8 @@ public class BoolStringConverter : BaseStringConverter<bool>
     }
 
     /// <inheritdoc />
-    public override Result<bool> Deserialize(ref PacketStringEnumerator stringEnumerator)
+    protected override Result<bool> Deserialize(ReadOnlySpan<char> value)
     {
-        var nextTokenResult = stringEnumerator.GetNextToken(out var packetToken);
-        if (!nextTokenResult.IsSuccess)
-        {
-            return Result<bool>.FromError(nextTokenResult);
-        }
-
-        return packetToken.Token[0] == '1' ? true : false;
+        return value[0] == '1';
     }
 }=
\ No newline at end of file

@@ 29,7 29,7 @@ public class NameStringConverter : BaseStringConverter<NameString>
     }
 
     /// <inheritdoc />
-    public override Result<NameString?> Deserialize(ref PacketStringEnumerator stringEnumerator)
+    public override Result<NameString?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
         var tokenResult = stringEnumerator.GetNextToken(out var packetToken);
         if (!tokenResult.IsSuccess)


@@ 37,9 37,12 @@ public class NameStringConverter : BaseStringConverter<NameString>
             return Result<NameString?>.FromError(tokenResult);
         }
 
-        if (packetToken.Token[0] == '-' && packetToken.Token.Length == 1)
+        if (options.CanBeNull)
         {
-            return Result<NameString?>.FromSuccess(null);
+            if (packetToken.Token[0] == '-' && packetToken.Token.Length == 1)
+            {
+                return Result<NameString?>.FromSuccess(null);
+            }
         }
 
         return NameString.FromPacket(packetToken.Token.ToString());

@@ 49,7 49,7 @@ public class NullableWrapperConverter<T> : BaseStringConverter<NullableWrapper<T
     }
 
     /// <inheritdoc />
-    public override Result<NullableWrapper<T>?> Deserialize(ref PacketStringEnumerator stringEnumerator)
+    public override Result<NullableWrapper<T>?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
         var tokenResult = stringEnumerator.GetNextToken(out var packetToken, false);
         if (!tokenResult.IsSuccess)


@@ 68,7 68,7 @@ public class NullableWrapperConverter<T> : BaseStringConverter<NullableWrapper<T
             return Result<NullableWrapper<T>?>.FromError(converterResult);
         }
 
-        var deserializationResult = converter.Deserialize(ref stringEnumerator);
+        var deserializationResult = converter.Deserialize(ref stringEnumerator, new DeserializeOptions(true));
         if (!deserializationResult.IsDefined(out var deserialization))
         {
             return Result<NullableWrapper<T>?>.FromError(deserializationResult);

@@ 31,7 31,7 @@ public class UpgradeRareSubPacketConverter : BaseStringConverter<UpgradeRareSubP
     }
 
     /// <inheritdoc />
-    public override Result<UpgradeRareSubPacket?> Deserialize(ref PacketStringEnumerator stringEnumerator)
+    public override Result<UpgradeRareSubPacket?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
         var tokenResult = stringEnumerator.GetNextToken(out var packetToken);
         if (!tokenResult.IsSuccess)

@@ 35,9 35,9 @@ public class EnumStringConverter<TEnum, TUnderlyingType> : BaseStringConverter<T
     }
 
     /// <inheritdoc />
-    public override Result<TEnum?> Deserialize(ref PacketStringEnumerator stringEnumerator)
+    public override Result<TEnum?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
-        var result = _serializer.Deserialize<TUnderlyingType>(ref stringEnumerator);
+        var result = _serializer.Deserialize<TUnderlyingType>(ref stringEnumerator, options);
         if (!result.IsSuccess)
         {
             return Result<TEnum?>.FromError(result);

@@ 57,7 57,7 @@ public class ListStringConverter<TGeneric> : BaseStringConverter<IReadOnlyList<T
     }
 
     /// <inheritdoc />
-    public override Result<IReadOnlyList<TGeneric>?> Deserialize(ref PacketStringEnumerator stringEnumerator)
+    public override Result<IReadOnlyList<TGeneric>?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
         var list = new List<TGeneric>();
 


@@ 68,7 68,7 @@ public class ListStringConverter<TGeneric> : BaseStringConverter<IReadOnlyList<T
                 return new ArgumentInvalidError(nameof(stringEnumerator), "The string enumerator has to have a prepared level for all lists.");
             }
 
-            var result = _serializer.Deserialize<TGeneric>(ref stringEnumerator);
+            var result = _serializer.Deserialize<TGeneric>(ref stringEnumerator, default);
 
             // If we know that we are not on the last token in the item level, just skip to the end of the item.
             // Note that if this is the case, then that means the converter is either corrupted

@@ 43,7 43,7 @@ public class NullableStringConverter<T> : BaseStringConverter<Nullable<T>>
     }
 
     /// <inheritdoc />
-    public override Result<T?> Deserialize(ref PacketStringEnumerator stringEnumerator)
+    public override Result<T?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
         var nextToken = stringEnumerator.GetNextToken(out var packetToken, false);
         if (!nextToken.IsSuccess)


@@ 57,7 57,7 @@ public class NullableStringConverter<T> : BaseStringConverter<Nullable<T>>
             return Result<T?>.FromSuccess(null);
         }
 
-        var result = _stringSerializer.Deserialize<T>(ref stringEnumerator);
+        var result = _stringSerializer.Deserialize<T>(ref stringEnumerator, new DeserializeOptions(true));
         if (!result.IsSuccess)
         {
             return Result<T?>.FromError(result);

@@ 25,7 25,7 @@ public class StringSerializer : IStringSerializer
     }
 
     /// <inheritdoc />
-    public Result<object?> Deserialize(Type parseType, ref PacketStringEnumerator stringEnumerator)
+    public Result<object?> Deserialize(Type parseType, ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
         var converterResult = _converterRepository.GetTypeConverter(parseType);
         if (!converterResult.IsSuccess)


@@ 33,7 33,7 @@ public class StringSerializer : IStringSerializer
             return Result<object?>.FromError(converterResult);
         }
 
-        var deserializedResult = converterResult.Entity.Deserialize(ref stringEnumerator);
+        var deserializedResult = converterResult.Entity.Deserialize(ref stringEnumerator, options);
         if (!deserializedResult.IsSuccess)
         {
             return Result<object?>.FromError(deserializedResult);


@@ 55,7 55,7 @@ public class StringSerializer : IStringSerializer
     }
 
     /// <inheritdoc />
-    public Result<TParseType?> Deserialize<TParseType>(ref PacketStringEnumerator stringEnumerator)
+    public Result<TParseType?> Deserialize<TParseType>(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
     {
         var converterResult = _converterRepository.GetTypeConverter<TParseType>();
         if (!converterResult.IsSuccess)


@@ 63,7 63,7 @@ public class StringSerializer : IStringSerializer
             return Result<TParseType?>.FromError(converterResult);
         }
 
-        return converterResult.Entity.Deserialize(ref stringEnumerator);
+        return converterResult.Entity.Deserialize(ref stringEnumerator, options);
     }
 
     /// <inheritdoc />

@@ 73,7 73,7 @@ public class PacketSerializer : IPacketSerializer
         }
 
         var packetInfo = packetInfoResult.Entity;
-        var deserializedResult = packetInfo.PacketConverter.Deserialize(ref packetStringEnumerator);
+        var deserializedResult = packetInfo.PacketConverter.Deserialize(ref packetStringEnumerator, default);
         if (!deserializedResult.IsSuccess)
         {
             return Result<IPacket>.FromError(deserializedResult);

@@ 188,7 188,7 @@ if ({nullableVariableName} is null) {{
     public void DeserializeAndCheck(ParameterInfo parameter, PacketInfo packet, InlineTypeConverterGenerator inlineTypeConverter)
     {
         _textWriter.WriteLine($"var {parameter.GetResultVariableName()} = ");
-        inlineTypeConverter.CallDeserialize(_textWriter, packet);
+        inlineTypeConverter.CallDeserialize(_textWriter, packet, parameter.Nullable);
 
         _textWriter.WriteLine($"if (!{parameter.GetResultVariableName()}.IsSuccess)");
         _textWriter.Indent++;

@@ 47,7 47,7 @@ public class BasicInlineConverterGenerator : IInlineConverterGenerator
     }
 
     /// <inheritdoc />
-    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol)
+    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol, bool nullable)
     {
         var type = typeSyntax is not null
             ? typeSyntax.ToString().TrimEnd('?')


@@ 57,7 57,7 @@ public class BasicInlineConverterGenerator : IInlineConverterGenerator
             throw new Exception("TypeSyntax or TypeSymbol has to be non null.");
         }
 
-        textWriter.WriteLine($"{Constants.HelperClass}.ParseBasic{type}(typeConverter, ref stringEnumerator);");
+        textWriter.WriteLine($"{Constants.HelperClass}.ParseBasic{type}(typeConverter, ref stringEnumerator, {nullable.ToString().ToLower()});");
         return null;
     }
 


@@ 67,7 67,7 @@ public class BasicInlineConverterGenerator : IInlineConverterGenerator
         foreach (var type in HandleTypes)
         {
             textWriter.WriteMultiline($@"
-public static Result<{type}?> ParseBasic{type}(IStringConverter typeConverter, ref PacketStringEnumerator stringEnumerator)
+public static Result<{type}?> ParseBasic{type}(IStringConverter typeConverter, ref PacketStringEnumerator stringEnumerator, bool nullable)
 {{
     var tokenResult = stringEnumerator.GetNextToken(out var packetToken);
     if (!tokenResult.IsSuccess)


@@ 76,9 76,12 @@ public static Result<{type}?> ParseBasic{type}(IStringConverter typeConverter, r
     }}
 
     var token = packetToken.Token;
-    if (token.Length == 2 && token.StartsWith(""-1""))
+    if (nullable)
     {{
-        return Result<{type}?>.FromSuccess(null);
+        if (token.Length == 2 && token.StartsWith(""-1""))
+        {{
+            return Result<{type}?>.FromSuccess(null);
+        }}
     }}
 
     if (!{type}.TryParse(token, out var val))

@@ 42,9 42,9 @@ public class BoolInlineConverterGenerator : IInlineConverterGenerator
     }
 
     /// <inheritdoc />
-    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol)
+    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol, bool nullable)
     {
-        textWriter.WriteLine($"{Constants.HelperClass}.ParseBool(ref stringEnumerator);");
+        textWriter.WriteLine($"{Constants.HelperClass}.ParseBool(ref stringEnumerator, {nullable.ToString().ToLower()});");
         return null;
     }
 


@@ 52,7 52,7 @@ public class BoolInlineConverterGenerator : IInlineConverterGenerator
     public void GenerateHelperMethods(IndentedTextWriter textWriter)
     {
         textWriter.WriteLine(@"
-public static Result<bool?> ParseBool(ref PacketStringEnumerator stringEnumerator)
+public static Result<bool?> ParseBool(ref PacketStringEnumerator stringEnumerator, bool nullable)
 {{
     var tokenResult = stringEnumerator.GetNextToken(out var packetToken);
     if (!tokenResult.IsSuccess)


@@ 61,9 61,12 @@ public static Result<bool?> ParseBool(ref PacketStringEnumerator stringEnumerato
     }}
 
     var token = packetToken.Token;
-    if (token.Length == 2 && token.StartsWith(""-1""))
+    if (nullable)
     {{
-        return Result<bool?>.FromSuccess(null);
+        if (token.Length == 2 && token.StartsWith(""-1""))
+        {{
+            return Result<bool?>.FromSuccess(null);
+        }}
     }}
 
     return token[0] == '1' ? true : false;

@@ 57,7 57,7 @@ public class EnumInlineConverterGenerator : IInlineConverterGenerator
     }
 
     /// <inheritdoc />
-    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol)
+    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol, bool nullable)
     {
         if (_enumTypes.All(x => x.ToString() != typeSymbol!.ToString()))
         {


@@ 66,7 66,7 @@ public class EnumInlineConverterGenerator : IInlineConverterGenerator
 
         textWriter.WriteLine
         (
-            $"{Constants.HelperClass}.ParseEnum{typeSymbol?.ToString().TrimEnd('?').Replace('.', '_')}(typeConverter, ref stringEnumerator);"
+            $"{Constants.HelperClass}.ParseEnum{typeSymbol?.ToString().TrimEnd('?').Replace('.', '_')}(typeConverter, ref stringEnumerator, {nullable.ToString().ToLower()});"
         );
         return null;
     }


@@ 80,7 80,7 @@ public class EnumInlineConverterGenerator : IInlineConverterGenerator
             textWriter.WriteMultiline
             (
                 $@"
-public static Result<{type}?> ParseEnum{type.ToString().Replace('.', '_')}(IStringConverter typeConverter, ref PacketStringEnumerator stringEnumerator)
+public static Result<{type}?> ParseEnum{type.ToString().Replace('.', '_')}(IStringConverter typeConverter, ref PacketStringEnumerator stringEnumerator, bool nullable)
 {{
     var tokenResult = stringEnumerator.GetNextToken(out var packetToken);
     if (!tokenResult.IsSuccess)

@@ 44,11 44,12 @@ public class FallbackInlineConverterGenerator : IInlineConverterGenerator
     }
 
     /// <inheritdoc />
-    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol)
+    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol, bool nullable)
     {
+        var options = nullable ? "DeserializeOptions.Nullable" : "default";
         textWriter.WriteLine
         (
-            $"_stringSerializer.Deserialize<{(typeSyntax?.ToString() ?? typeSymbol!.ToString()).TrimEnd('?')}?>(ref stringEnumerator);"
+            $"_stringSerializer.Deserialize<{(typeSyntax?.ToString() ?? typeSymbol!.ToString()).TrimEnd('?')}?>(ref stringEnumerator, {options});"
         );
         return null;
     }

@@ 41,8 41,9 @@ public interface IInlineConverterGenerator
     /// <param name="textWriter">The text writer to write to.</param>
     /// <param name="typeSyntax">The type syntax.</param>
     /// <param name="typeSymbol">The type symbol.</param>
+    /// <param name="nullable">Whether the parameter is nullable.</param>
     /// <returns>An error, if any.</returns>
-    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol);
+    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol, bool nullable);
 
     /// <summary>
     /// Generate helper methods to HelperClass.

@@ 76,7 76,7 @@ public class ListInlineConverterGenerator : IInlineConverterGenerator
     }
 
     /// <inheritdoc />
-    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol)
+    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol, bool nullable)
     {
         ITypeSymbol genericArgument = ((INamedTypeSymbol)typeSymbol!).TypeArguments[0];
         if (_listTypes.All


@@ 89,25 89,24 @@ public class ListInlineConverterGenerator : IInlineConverterGenerator
         }
 
         textWriter.WriteLine
-            ($"{Constants.HelperClass}.{GetMethodName(genericArgument)}(typeConverter, _stringSerializer, ref stringEnumerator);");
+            ($"{Constants.HelperClass}.{GetMethodName(genericArgument, nullable)}(typeConverter, _stringSerializer, ref stringEnumerator);");
         return null;
     }
 
-    private string GetMethodName(ITypeSymbol genericArgumentType)
+    private string GetMethodName(ITypeSymbol genericArgumentType, bool nullable)
     {
         return
-            $"ParseList{genericArgumentType.ToString().TrimEnd('?').Replace('.', '_').Replace('<', '_').Replace('>', '_')}{((genericArgumentType.IsNullable() ?? false) ? "Nullable" : string.Empty)}";
+            $"ParseList{genericArgumentType.ToString().TrimEnd('?').Replace('.', '_').Replace('<', '_').Replace('>', '_')}{((genericArgumentType.IsNullable() ?? false) ? "Nullable" : string.Empty)}{(nullable ? "NullableSupport" : string.Empty)}";
     }
 
-    /// <inheritdoc />
-    public void GenerateHelperMethods(IndentedTextWriter textWriter)
+    private void GenerateHelperMethods(IndentedTextWriter textWriter, bool nullable)
     {
         foreach (var type in _listTypes)
         {
             textWriter.WriteLine
             (
                 @$"
-public static Result<IReadOnlyList<{type.GetActualType()}>> {GetMethodName(type)}(IStringConverter typeConverter, IStringSerializer _stringSerializer, ref PacketStringEnumerator stringEnumerator)
+public static Result<IReadOnlyList<{type.GetActualType()}>> {GetMethodName(type, nullable)}(IStringConverter typeConverter, IStringSerializer _stringSerializer, ref PacketStringEnumerator stringEnumerator)
 {{
     var data = new List<{type.GetActualType()}>();
 


@@ 120,7 119,7 @@ public static Result<IReadOnlyList<{type.GetActualType()}>> {GetMethodName(type)
 
         var result = "
             );
-            /*var error = */_inlineConverters.CallDeserialize(textWriter, null, type); // TODO handle error
+            /*var error = */_inlineConverters.CallDeserialize(textWriter, null, type, nullable); // TODO handle error
 
             textWriter.WriteMultiline(@$"
 


@@ 159,4 158,12 @@ if (result.Entity is null)
             textWriter.WriteLine("}");
         }
     }
+
+    /// <inheritdoc />
+    public void GenerateHelperMethods(IndentedTextWriter textWriter)
+    {
+        GenerateHelperMethods(textWriter, true);
+        GenerateHelperMethods(textWriter, false);
+    }
+
 }=
\ No newline at end of file

@@ 28,9 28,9 @@ public class StringInlineConverterGenerator : IInlineConverterGenerator
     }
 
     /// <inheritdoc />
-    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol)
+    public IError? CallDeserialize(IndentedTextWriter textWriter, TypeSyntax? typeSyntax, ITypeSymbol? typeSymbol, bool nullable)
     {
-        textWriter.WriteLine($"{Constants.HelperClass}.ParseString(ref stringEnumerator);");
+        textWriter.WriteLine($"{Constants.HelperClass}.ParseString(ref stringEnumerator, {nullable.ToString().ToLower()});");
         return null;
     }
 


@@ 40,7 40,7 @@ public class StringInlineConverterGenerator : IInlineConverterGenerator
         textWriter.WriteLine
         (
             @"
-public static Result<string?> ParseString(ref PacketStringEnumerator stringEnumerator)
+public static Result<string?> ParseString(ref PacketStringEnumerator stringEnumerator, bool nullable)
 {{
     var tokenResult = stringEnumerator.GetNextToken(out var packetToken);
     if (!tokenResult.IsSuccess)


@@ 48,9 48,12 @@ public static Result<string?> ParseString(ref PacketStringEnumerator stringEnume
         return Result<string?>.FromError(tokenResult);
     }}
 
-    if (packetToken.Token.Length == 1 && packetToken.Token[0] == '-')
+    if (nullable)
     {{
-        return Result<string?>.FromSuccess(null);
+        if (packetToken.Token.Length == 1 && packetToken.Token[0] == '-')
+        {{
+            return Result<string?>.FromSuccess(null);
+        }}
     }}
 
     return packetToken.Token.ToString();

@@ 38,8 38,9 @@ public class InlineTypeConverterGenerator
     /// </summary>
     /// <param name="textWriter">The text writer.</param>
     /// <param name="packet">The packet.</param>
+    /// <param name="nullable">Whether the parameter is nullable.</param>
     /// <returns>An error, if any.</returns>
-    public IError? CallDeserialize(IndentedTextWriter textWriter, PacketInfo packet)
+    public IError? CallDeserialize(IndentedTextWriter textWriter, PacketInfo packet, bool nullable)
     {
         var parameter = packet.Parameters.Current;
         var shouldGenerateInline = packet.GenerateAttribute.GetIndexedValue<bool>(0);


@@ 49,12 50,12 @@ public class InlineTypeConverterGenerator
             {
                 if (generator.ShouldHandle(parameter.Parameter.Type, parameter.Type))
                 {
-                    return generator.CallDeserialize(textWriter, parameter.Parameter.Type, parameter.Type);
+                    return generator.CallDeserialize(textWriter, parameter.Parameter.Type, parameter.Type, nullable);
                 }
             }
         }
 
-        return _fallbackInlineConverterGenerator.CallDeserialize(textWriter, parameter.Parameter.Type, parameter.Type);
+        return _fallbackInlineConverterGenerator.CallDeserialize(textWriter, parameter.Parameter.Type, parameter.Type, nullable);
     }
 
     /// <summary>


@@ 63,23 64,25 @@ public class InlineTypeConverterGenerator
     /// <param name="textWriter">The text writer.</param>
     /// <param name="typeSyntax">The type syntax.</param>
     /// <param name="typeSymbol">The type symbol.</param>
+    /// <param name="nullable">Whether the parameter is nullable.</param>
     /// <returns>An error, if any.</returns>
     public IError? CallDeserialize
     (
         IndentedTextWriter textWriter,
         TypeSyntax? typeSyntax,
-        ITypeSymbol? typeSymbol
+        ITypeSymbol? typeSymbol,
+        bool nullable
     )
     {
         foreach (var generator in _typeGenerators)
         {
             if (generator.ShouldHandle(typeSyntax, typeSymbol))
             {
-                return generator.CallDeserialize(textWriter, typeSyntax, typeSymbol);
+                return generator.CallDeserialize(textWriter, typeSyntax, typeSymbol, nullable);
             }
         }
 
-        return _fallbackInlineConverterGenerator.CallDeserialize(textWriter, typeSyntax, typeSymbol);
+        return _fallbackInlineConverterGenerator.CallDeserialize(textWriter, typeSyntax, typeSymbol, nullable);
     }
 
     /// <summary>

@@ 94,7 94,7 @@ public override Result Serialize({_packetInfo.Name}? obj, PacketStringBuilder bu
 }}
 
 /// <inheritdoc />
-public override Result<{_packetInfo.Name}?> Deserialize(ref PacketStringEnumerator stringEnumerator)
+public override Result<{_packetInfo.Name}?> Deserialize(ref PacketStringEnumerator stringEnumerator, DeserializeOptions options)
 {{
     var typeConverter = this;
 "

@@ 130,12 130,6 @@ public class SourceGenerator : ISourceGenerator
                     $"{packetRecord.GetPrefix()}.{packetRecord.Identifier.NormalizeWhitespace().ToFullString()}Converter.g.cs",
                     stringWriter.GetStringBuilder().ToString()
                 );
-
-                File.WriteAllText
-                (
-                    Path.Combine(Path.GetTempPath(), $"{packetRecord.GetPrefix()}.{packetRecord.Identifier.NormalizeWhitespace().ToFullString()}Converter.g.cs"),
-                    stringWriter.GetStringBuilder().ToString()
-                );
             }
         }