Include self

Author: inputfalken

src/DynamoDBGenerator.SourceGenerator/Generations/AttributeExpressionName.cs

@@ -22,7 +22,7 @@ internal static IEnumerable<string> CreateClasses(IEnumerable<DynamoDBMarshaller
     }
     private static IEnumerable<string> TypeContent(
         ITypeSymbol typeSymbol,
-        (bool IsUnknown, DynamoDbDataMember DDB, string NameRef, string AttributeReference, string AttributeInterfaceName)[] dataMembers,
+        (bool IsUnknown, DynamoDbDataMember DDB, string DbRef, string NameRef, string AttributeReference, string AttributeInterfaceName)[] dataMembers,
         string structName)
     {
         const string self = "_self";
@@ -57,8 +57,8 @@ private static IEnumerable<string> TypeContent(
 
         var yields = dataMembers
             .Select(static x => x.IsUnknown
-                ? $"if ({x.NameRef}.IsValueCreated) foreach (var x in ({x.DDB.DataMember.Name} as {x.AttributeInterfaceName}).{AttributeExpressionNameTrackerInterfaceAccessedNames}()) {{ yield return x; }}"
-                : $@"if ({x.NameRef}.IsValueCreated) yield return new ({x.NameRef}.Value, ""{x.DDB.AttributeName}"");"
+                ? $@"if ({x.NameRef}.IsValueCreated) {{ yield return new (""#{x.DbRef}"", ""{x.DDB.AttributeName}""); foreach (var x in ({x.DDB.DataMember.Name} as {x.AttributeInterfaceName}).{AttributeExpressionNameTrackerInterfaceAccessedNames}()) {{ yield return x; }} }}"
+                : $@"if ({x.NameRef}.IsValueCreated) yield return new (""#{x.DbRef}"", ""{x.DDB.AttributeName}"");"
             )
             .Append($@"if ({self}.IsValueCreated) yield return new ({self}.Value, ""{typeSymbol.Name}"");");
 
@@ -73,6 +73,7 @@ private static CodeFactory CreateStruct(ITypeSymbol typeSymbol, Func<ITypeSymbol
             .Select(x => (
                 IsUnknown: !options.IsConvertable(x.DataMember.Type) && x.DataMember.Type.TypeIdentifier() is UnknownType,
                 DDB: x,
+                DbRef: $"#{x.AttributeName}",
                 NameRef: $"_{x.DataMember.Name}NameRef",
                 AttributeReference: TypeName(x.DataMember.Type),
                 AttributeInterfaceName: AttributeExpressionNameTrackerInterface