Merge pull request #65 from Nexus-Mods/nullable-value-attributes

Fix nullable value types in the template
Nexus-Mods · Jun 11, 2024 · c9fe3c2 · c9fe3c2
2 parents f7dda21 + eea9ec9
commit c9fe3c2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/NexusMods.MnemonicDB.SourceGenerator/AnalyzedAttribute.cs b/src/NexusMods.MnemonicDB.SourceGenerator/AnalyzedAttribute.cs
@@ -30,6 +30,11 @@ public string ContextualName
     public bool IsIndexed => Markers.Contains("IsIndexed");
     public bool IsOptional => Markers.Contains("IsOptional");
 
+    /// <summary>
+    /// True if this is a value type.
+    /// </summary>
+    public bool IsValueType => HighLevelType.IsValueType;
+
     /// <summary>
     /// The C# prefix for the attribute, for now this is just required or empty
     /// </summary>

diff --git a/src/NexusMods.MnemonicDB.SourceGenerator/Template.weave b/src/NexusMods.MnemonicDB.SourceGenerator/Template.weave
@@ -142,10 +142,14 @@ public partial class {{= model.Name}} {
                 tx.Add(Id, {{= attr.FieldName}}, new __COMPARERS__.Null(), false);
             }
             {{else}}
-            {{if attr.IsOptional && !attr.IsReference}}
+            {{if attr.IsOptional && !attr.IsReference && !attr.IsValueType}}
             if ({{= attr.ContextualName}} is not null) {
                 tx.Add(Id, {{= attr.FieldName}}, {{= attr.ContextualName}}!, false);
             }
+            {{elif attr.IsOptional && attr.IsValueType && !attr.IsReference}}
+            if ({{= attr.ContextualName}}.HasValue) {
+                tx.Add(Id, {{= attr.FieldName}}, {{= attr.ContextualName}}.Value, false);
+            }
             {{elif attr.IsOptional && attr.IsReference}}
             if ({{= attr.ContextualName}}.Value != 0) {
                 tx.Add(Id, {{= attr.FieldName}}, {{= attr.ContextualName}}.Value, false);

diff --git a/tests/NexusMods.MnemonicDB.TestModel/Mod.cs b/tests/NexusMods.MnemonicDB.TestModel/Mod.cs
@@ -13,5 +13,6 @@ public partial class Mod : IModelDefinition
     public static readonly BackReferenceAttribute<File> Files = new(File.Mod);
     public static readonly MarkerAttribute Marked = new(Namespace, nameof(Marked)) { IsIndexed = true };
     public static readonly StringAttribute Description = new(Namespace, nameof(Description)) { IsOptional = true };
+    public static readonly HashAttribute OptionalHash = new(Namespace, nameof(OptionalHash)) { IsOptional = true };
     public static readonly ReferenceAttribute<Mod> LoadAfter = new(Namespace, nameof(LoadAfter)) { IsOptional = true };
 }