Move duplicated methods to types

Author: inputfalken

src/DynamoDBGenerator.SourceGenerator/Generations/AttributeExpressionName.cs

@@ -110,8 +110,7 @@ private static CodeFactory CreateStruct(ITypeSymbol typeSymbol, Func<ITypeSymbol
     {
         var dataMembers = fn(typeSymbol)
             .Select(x => (
-                IsUnknown: !options.IsConvertable(x.DataMember.Type) &&
-                           x.DataMember.Type.TypeIdentifier() is UnknownType,
+                IsUnknown: options.IsUnknown(x.DataMember.Type),
                 DDB: x,
                 DbRef: $"#{x.AttributeName}",
                 AttributeReference: TypeName(x.DataMember.Type),

src/DynamoDBGenerator.SourceGenerator/Generations/AttributeExpressionValue.cs

@@ -135,17 +135,13 @@ private static CodeFactory CreateStruct(ITypeSymbol typeSymbol, Func<ITypeSymbol
                     .Empty<(bool IsUnknown, DynamoDbDataMember DDB, string AttributeReference, string
                         AttributeInterfaceName)>()
                 : fn(typeSymbol)
-                    .Select(x =>
-                    {
-                        return (
-                            IsUnknown: !options.IsConvertable(x.DataMember.Type) &&
-                                       x.DataMember.Type.TypeIdentifier() is UnknownType,
-                            DDB: x,
-                            AttributeReference: TypeName(x.DataMember.Type),
-                            AttributeInterfaceName:
-                            $"{Constants.DynamoDBGenerator.Marshaller.AttributeExpressionValueTrackerInterface}<{x.DataMember.Type.Representation().annotated}>"
-                        );
-                    })
+                    .Select(x => (
+                        IsUnknown: options.IsUnknown(x.DataMember.Type),
+                        DDB: x,
+                        AttributeReference: TypeName(x.DataMember.Type),
+                        AttributeInterfaceName:
+                        $"{Constants.DynamoDBGenerator.Marshaller.AttributeExpressionValueTrackerInterface}<{x.DataMember.Type.Representation().annotated}>"
+                    ))
                     .ToArray();
 
         var structName = TypeName(typeSymbol);

src/DynamoDBGenerator.SourceGenerator/Generations/Marshalling/Keys.cs

@@ -23,16 +23,15 @@ private static IEnumerable<string> CreateAssignment(string validateReference, st
             DynamoDbDataMember dataMember, MarshallerOptions options)
         {
             const string reference = "value";
-            var expectedType = dataMember.DataMember.Type.Representation().original;
-            var expression = $"{keyReference} is {expectedType} {{ }} {reference}";
+            var expression = $"{keyReference} is {dataMember.DataMember.OriginalRepresentation} {{ }} {reference}";
 
             var innerContent = $"if ({expression}) "
                 .CreateScope(
                     $@"{DictionaryName}.Add(""{dataMember.AttributeName}"", {InvokeMarshallerMethod(dataMember.DataMember.Type, reference, $"nameof({keyReference})", options)});")
                 .Concat($"else if ({keyReference} is null) ".CreateScope(
                     $@"throw {ExceptionHelper.KeysArgumentNullExceptionMethod}(""{dataMember.DataMember.Name}"", ""{keyReference}"");"))
                 .Concat("else".CreateScope(
-                    $@"throw {ExceptionHelper.KeysInvalidConversionExceptionMethod}(""{dataMember.DataMember.Name}"", ""{keyReference}"", {keyReference}, ""{expectedType}"");"));
+                    $@"throw {ExceptionHelper.KeysInvalidConversionExceptionMethod}(""{dataMember.DataMember.Name}"", ""{keyReference}"", {keyReference}, ""{dataMember.DataMember.OriginalRepresentation}"");"));
 
             return $"if ({validateReference})".CreateScope(innerContent);
         }

src/DynamoDBGenerator.SourceGenerator/Generations/Marshalling/Marshaller.cs

@@ -22,19 +22,18 @@ private static CodeFactory CreateDictionaryMethod(ITypeSymbol typeSymbol, Func<I
             .Select(x =>
             {
                 var accessPattern = $"{ParamReference}.{x.DataMember.Name}";
-                var isNullable = x.DataMember.Type.IsNullable();
 
                 var marshallerInvocation = InvokeMarshallerMethod(x.DataMember.Type, accessPattern, $"\"{x.DataMember.Name}\"", options);
 
-                var assignment = isNullable
+                var assignment = x.DataMember.IsNullable
                     ? $"if ({x.DataMember.NameAsCamelCase} is not null)"
                         .CreateScope($"{DictionaryReference}[\"{x.AttributeName}\"] = {x.DataMember.NameAsCamelCase};")
                         .Prepend($"var {x.DataMember.NameAsCamelCase} = {marshallerInvocation};")
                     : new[] { $"{DictionaryReference}[\"{x.AttributeName}\"] = {marshallerInvocation};" };
 
                 return (
                     dictionaryAssignment: assignment,
-                    capacityTernary: isNullable ? x.DataMember.Type.NotNullTernaryExpression(in accessPattern, "1", "0") : "1",
+                    capacityTernary: x.DataMember.IsNullable ? x.DataMember.Type.NotNullTernaryExpression(in accessPattern, "1", "0") : "1",
                     x.DataMember.Type
                 );
             })

src/DynamoDBGenerator.SourceGenerator/Types/DataMember.cs

@@ -14,14 +14,15 @@ private DataMember(in ISymbol symbol, in string fieldName, in ITypeSymbol type,
         Type = type;
         BaseSymbol = symbol;
         IsAssignable = isAssignable;
-
+        IsNullable = type.IsNullable();
         NameAsPrivateField = fieldName.ToPrivateFieldFromPascal();
         NameAsCamelCase = fieldName.ToCamelCaseFromPascal();
+        OriginalRepresentation = type.Representation().original;
     }
 
     public static DataMember FromField(in IFieldSymbol fieldSymbol)
     {
-        var symbol = (ISymbol)fieldSymbol;
+        ISymbol symbol = fieldSymbol;
         var name = fieldSymbol.Name;
         var type = fieldSymbol.Type;
 
@@ -30,7 +31,7 @@ public static DataMember FromField(in IFieldSymbol fieldSymbol)
 
     public static DataMember FromProperty(in IPropertySymbol property)
     {
-        var symbol = (ISymbol)property;
+        ISymbol symbol = property;
         var name = property.Name;
         var type = property.Type;
 
@@ -48,9 +49,12 @@ public static DataMember FromProperty(in IPropertySymbol property)
     public string Name { get; }
 
 
+    public string OriginalRepresentation { get; }
     public string NameAsPrivateField { get; }
     public string NameAsCamelCase { get; }
 
+    public bool IsNullable { get; }
+    
     /// <summary>
     ///     The type of the data member.
     /// </summary>

src/DynamoDBGenerator.SourceGenerator/Types/MarshallerOptions.cs

@@ -17,7 +17,9 @@ public readonly struct MarshallerOptions
     public string FullName { get; }
     public string FieldDeclaration { get; }
 
-    
+    public bool IsUnknown(ITypeSymbol typeSymbol) => !IsConvertable(typeSymbol) && typeSymbol.TypeIdentifier() is UnknownType;
+
+
     private MarshallerOptions(
         INamedTypeSymbol originalType,
         INamedTypeSymbol convertersType,