Move logic to types

inputfalken · inputfalken · commit 0f8a12f871d6 · 2025-04-19T14:57:36.000+02:00
diff --git a/src/DynamoDBGenerator.SourceGenerator/Generations/Marshalling/Marshaller.cs b/src/DynamoDBGenerator.SourceGenerator/Generations/Marshalling/Marshaller.cs
@@ -124,28 +124,28 @@ private static CodeFactory CreateMethod(ITypeSymbol type, Func<ITypeSymbol, Dyna
                     .CreateScope(
                         $"if ({ParamReference} is null)"
                             .CreateScope(singleGeneric.ReturnNullOrThrow(DataMember))
-                            .Append($"return {AttributeValueUtilityFactory.FromArray}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(singleGeneric.T, "a", "d", options, "o")}{(singleGeneric.T.IsNullable() ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
+                            .Append($"return {AttributeValueUtilityFactory.FromArray}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(singleGeneric.T, "a", "d", options, "o")}{(singleGeneric.IsTNullable ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
                     ).ToConversion(singleGeneric.T),
                 SingleGeneric.SupportedType.List => signature
                     .CreateScope(
                         $"if ({ParamReference} is null)"
                             .CreateScope(singleGeneric.ReturnNullOrThrow(DataMember))
-                            .Append($"return {AttributeValueUtilityFactory.FromList}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(singleGeneric.T, "a", "d", options, "o")}{(singleGeneric.T.IsNullable() ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
+                            .Append($"return {AttributeValueUtilityFactory.FromList}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(singleGeneric.T, "a", "d", options, "o")}{(singleGeneric.IsTNullable ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
                     ).ToConversion(singleGeneric.T),
                 SingleGeneric.SupportedType.IReadOnlyCollection
                     or SingleGeneric.SupportedType.IEnumerable
                     or SingleGeneric.SupportedType.ICollection => signature
                         .CreateScope(
                             $"if ({ParamReference} is null)"
                                 .CreateScope(singleGeneric.ReturnNullOrThrow(DataMember))
-                                .Append($"return {AttributeValueUtilityFactory.FromEnumerable}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(singleGeneric.T, "a", "d", options, "o")}{(singleGeneric.T.IsNullable() ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
+                                .Append($"return {AttributeValueUtilityFactory.FromEnumerable}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(singleGeneric.T, "a", "d", options, "o")}{(singleGeneric.IsTNullable ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
                         ).ToConversion(singleGeneric.T),
                 SingleGeneric.SupportedType.Set when singleGeneric.T.SpecialType is SpecialType.System_String
                     => signature
                         .CreateScope(
                             $"if ({ParamReference} is null)"
                                 .CreateScope(singleGeneric.ReturnNullOrThrow(DataMember))
-                                .Append($"return new {Constants.AWSSDK_DynamoDBv2.AttributeValue} {{ SS = new List<{(singleGeneric.T.IsNullable() ? "string?" : "string")}>({(singleGeneric.T.IsNullable() ? ParamReference : $"{ParamReference}.Select((y,i) => y ?? throw {ExceptionHelper.NullExceptionMethod}($\"{{{DataMember}}}[UNKNOWN]\"))")})}};")
+                                .Append($"return new {Constants.AWSSDK_DynamoDBv2.AttributeValue} {{ SS = new List<{(singleGeneric.IsTNullable ? "string?" : "string")}>({(singleGeneric.T.IsNullable() ? ParamReference : $"{ParamReference}.Select((y,i) => y ?? throw {ExceptionHelper.NullExceptionMethod}($\"{{{DataMember}}}[UNKNOWN]\"))")})}};")
                         )
                         .ToConversion(singleGeneric.T),
                 SingleGeneric.SupportedType.Set when singleGeneric.T.IsNumeric()
@@ -167,14 +167,14 @@ SingleGeneric.SupportedType.Set when singleGeneric.T.IsNumeric()
                     .CreateScope(
                         $"if ({ParamReference} is null)"
                             .CreateScope(keyValueGeneric.ReturnNullOrThrow(DataMember))
-                            .Append($"return {AttributeValueUtilityFactory.FromDictionary}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(keyValueGeneric.TValue, "a", "d", options, "o")}{(keyValueGeneric.TValue.IsNullable() ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
+                            .Append($"return {AttributeValueUtilityFactory.FromDictionary}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(keyValueGeneric.TValue, "a", "d", options, "o")}{(keyValueGeneric.IsTValueNullable ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
                     )
                     .ToConversion(keyValueGeneric.TValue),
                 KeyValueGeneric.SupportedType.LookUp => signature
                     .CreateScope(
                         $"if ({ParamReference} is null)"
                             .CreateScope(keyValueGeneric.ReturnNullOrThrow(DataMember))
-                            .Append($"return {AttributeValueUtilityFactory.FromLookup}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(keyValueGeneric.TValue, "a", "d", options, "o")}{(keyValueGeneric.TValue.IsNullable() ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
+                            .Append($"return {AttributeValueUtilityFactory.FromLookup}({ParamReference}, {MarshallerOptions.ParamReference}, {DataMember}, static (a, o, d) => {InvokeMarshallerMethod(keyValueGeneric.TValue, "a", "d", options, "o")}{(keyValueGeneric.IsTValueNullable ? $" ?? {AttributeValueUtilityFactory.Null}" : null)});")
                     )
                     .ToConversion(keyValueGeneric.TValue),
                 _ => throw UncoveredConversionException(keyValueGeneric, nameof(CreateMethod))
diff --git a/src/DynamoDBGenerator.SourceGenerator/Generations/UnMarshaller.cs b/src/DynamoDBGenerator.SourceGenerator/Generations/UnMarshaller.cs
@@ -166,7 +166,7 @@ private static CodeFactory CreateMethod(ITypeSymbol type, Func<ITypeSymbol, Dyna
                     .CreateScope(
                         $"if ({Value} is null || {Value}.SS is null)"
                             .CreateScope(singleGeneric.ReturnNullOrThrow(DataMember))
-                            .Append($"return new {(singleGeneric.TypeSymbol.TypeKind is TypeKind.Interface ? $"HashSet<{(singleGeneric.T.IsNullable() ? "string?" : "string")}>" : null)}({(singleGeneric.T.IsNullable() ? $"{Value}.SS" : $"{Value}.SS.Select((y,i) => y ?? throw {ExceptionHelper.NullExceptionMethod}($\"{{{DataMember}}}[UNKNOWN]\")")}));")
+                            .Append($"return new {(singleGeneric.TypeSymbol.TypeKind is TypeKind.Interface ? $"HashSet<{(singleGeneric.IsTNullable ? "string?" : "string")}>" : null)}({(singleGeneric.T.IsNullable() ? $"{Value}.SS" : $"{Value}.SS.Select((y,i) => y ?? throw {ExceptionHelper.NullExceptionMethod}($\"{{{DataMember}}}[UNKNOWN]\")")}));")
                         )
                     .ToConversion(),
                 SingleGeneric.SupportedType.Set when singleGeneric.T.IsNumeric() => signature
diff --git a/src/DynamoDBGenerator.SourceGenerator/Types/TypeIdentifier.cs b/src/DynamoDBGenerator.SourceGenerator/Types/TypeIdentifier.cs
@@ -33,10 +33,12 @@ private KeyValueGeneric(in ITypeSymbol typeSymbol, in ITypeSymbol tKey, in IType
         Type = supportedType;
         TKey = tKey;
         TValue = tValue;
+        IsTValueNullable = TValue.IsNullable();
     }
 
     public SupportedType Type { get; }
 
+    public bool IsTValueNullable { get; }
     // ReSharper disable once InconsistentNaming
     public ITypeSymbol TKey { get; }
 
@@ -81,10 +83,12 @@ private SingleGeneric(ITypeSymbol type, ITypeSymbol innerType, in SupportedType
     {
         Type = supportedType;
         T = innerType;
+        IsTNullable = T.IsNullable();
     }
 
     public SupportedType Type { get; }
     public ITypeSymbol T { get; }
+    public bool IsTNullable { get; }
 
 
     public static SingleGeneric? CreateInstance(in ITypeSymbol typeSymbol)

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private static CodeFactory CreateMethod(ITypeSymbol type, Func<ITypeSymbol, Dyna`
`166`	`166`	`.CreateScope(`
`167`	`167`	`$"if ({Value} is null \|\| {Value}.SS is null)"`
`168`	`168`	`.CreateScope(singleGeneric.ReturnNullOrThrow(DataMember))`
`169`		`- .Append($"return new {(singleGeneric.TypeSymbol.TypeKind is TypeKind.Interface ? $"HashSet<{(singleGeneric.T.IsNullable() ? "string?" : "string")}>" : null)}({(singleGeneric.T.IsNullable() ? $"{Value}.SS" : $"{Value}.SS.Select((y,i) => y ?? throw {ExceptionHelper.NullExceptionMethod}($\"{{{DataMember}}}[UNKNOWN]\")")}));")`
	`169`	`+ .Append($"return new {(singleGeneric.TypeSymbol.TypeKind is TypeKind.Interface ? $"HashSet<{(singleGeneric.IsTNullable ? "string?" : "string")}>" : null)}({(singleGeneric.T.IsNullable() ? $"{Value}.SS" : $"{Value}.SS.Select((y,i) => y ?? throw {ExceptionHelper.NullExceptionMethod}($\"{{{DataMember}}}[UNKNOWN]\")")}));")`
`170`	`170`	`)`
`171`	`171`	`.ToConversion(),`
`172`	`172`	`SingleGeneric.SupportedType.Set when singleGeneric.T.IsNumeric() => signature`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,12 @@ private KeyValueGeneric(in ITypeSymbol typeSymbol, in ITypeSymbol tKey, in IType`
`33`	`33`	`Type = supportedType;`
`34`	`34`	`TKey = tKey;`
`35`	`35`	`TValue = tValue;`
	`36`	`+ IsTValueNullable = TValue.IsNullable();`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`public SupportedType Type { get; }`
`39`	`40`
	`41`	`+ public bool IsTValueNullable { get; }`
`40`	`42`	`// ReSharper disable once InconsistentNaming`
`41`	`43`	`public ITypeSymbol TKey { get; }`
`42`	`44`
`@@ -81,10 +83,12 @@ private SingleGeneric(ITypeSymbol type, ITypeSymbol innerType, in SupportedType`
`81`	`83`	`{`
`82`	`84`	`Type = supportedType;`
`83`	`85`	`T = innerType;`
	`86`	`+ IsTNullable = T.IsNullable();`
`84`	`87`	`}`
`85`	`88`
`86`	`89`	`public SupportedType Type { get; }`
`87`	`90`	`public ITypeSymbol T { get; }`
	`91`	`+ public bool IsTNullable { get; }`
`88`	`92`
`89`	`93`
`90`	`94`	`public static SingleGeneric? CreateInstance(in ITypeSymbol typeSymbol)`