From 76460d14c911a98cdc1665572e7cf4e2dc8a6f72 Mon Sep 17 00:00:00 2001
From: halgari <tbaldridge@gmail.com>
Date: Tue, 4 Jun 2024 11:55:46 -0600
Subject: [PATCH] Fix up tests and compile issues

---
 .../IndexSegments/EntityIds.cs                |  2 +-
 .../IndexSegments/ValueEntities.cs            | 46 +++++++++++++++++++
 .../IndexSegments/ValuesExtensions.cs         |  9 ++++
 .../Template.weave                            |  4 +-
 tests/NexusMods.MnemonicDB.Tests/DbTests.cs   |  2 +-
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 src/NexusMods.MnemonicDB.Abstractions/IndexSegments/ValueEntities.cs

diff --git a/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/EntityIds.cs b/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/EntityIds.cs
index a0061964..fcbd0df7 100644
--- a/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/EntityIds.cs
+++ b/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/EntityIds.cs
@@ -51,7 +51,7 @@ IEnumerator IEnumerable.GetEnumerator()
     /// <summary>
     /// Creates a view of these Ids that auto-casts every Id into a model of the given model type
     /// </summary>
-    Entities<TModel> AsModels<TModel>(IDb db)
+    public Entities<TModel> AsModels<TModel>(IDb db)
     where TModel : IReadOnlyModel<TModel>
     {
         return new Entities<TModel>(this, db);
diff --git a/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/ValueEntities.cs b/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/ValueEntities.cs
new file mode 100644
index 00000000..c25c858c
--- /dev/null
+++ b/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/ValueEntities.cs
@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using NexusMods.MnemonicDB.Abstractions.Models;
+
+namespace NexusMods.MnemonicDB.Abstractions.IndexSegments;
+
+/// <summary>
+/// A wrapper around Values that auto-creates the given ReadModel on-the-fly
+/// </summary>
+public readonly struct ValueEntities<TModel> : IReadOnlyCollection<TModel>
+    where TModel : IReadOnlyModel<TModel>
+{
+    private readonly Values<EntityId, ulong> _values;
+
+    /// <summary>
+    /// The database the models are read from
+    /// </summary>
+    private IDb Db { get; }
+
+    /// <summary>
+    /// Creates a new ValueEntities, from the given values, database, and entity id
+    /// </summary>
+    public ValueEntities(Values<EntityId, ulong> values, IDb db)
+    {
+        _values = values;
+        Db = db;
+    }
+
+    /// <inheritdoc />
+    public IEnumerator<TModel> GetEnumerator()
+    {
+        foreach (var value in _values)
+        {
+            yield return TModel.Create(Db, value);
+        }
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
+
+    /// <inheritdoc />
+    public int Count => _values.Count;
+}
diff --git a/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/ValuesExtensions.cs b/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/ValuesExtensions.cs
index 37b43a41..d7d48eb4 100644
--- a/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/ValuesExtensions.cs
+++ b/src/NexusMods.MnemonicDB.Abstractions/IndexSegments/ValuesExtensions.cs
@@ -15,4 +15,13 @@ public static Entities<Values<EntityId, ulong>, TModel> As<TModel>(this Values<E
     {
         return new Entities<Values<EntityId, ulong>, TModel>(ids, db);
     }
+
+    /// <summary>
+    /// Returns a view of the values as models whose ids are the given id
+    /// </summary>
+    public static ValueEntities<TModel> AsModels<TModel>(this Values<EntityId, ulong> values, IDb db)
+        where TModel : IReadOnlyModel<TModel>
+    {
+        return new ValueEntities<TModel>(values, db);
+    }
 }
diff --git a/src/NexusMods.MnemonicDB.SourceGenerator/Template.weave b/src/NexusMods.MnemonicDB.SourceGenerator/Template.weave
index 6a7fe926..800f3c4b 100644
--- a/src/NexusMods.MnemonicDB.SourceGenerator/Template.weave
+++ b/src/NexusMods.MnemonicDB.SourceGenerator/Template.weave
@@ -265,7 +265,7 @@ public partial class {{= model.Name}} {
            {{each attr in model.Attributes}}
            {{if attr.IsCollection && attr.IsReference && !attr.IsMarker}}
            public __SEGMENTS__.Values<__ABSTRACTIONS__.EntityId, ulong> {{= attr.ContextualName}} => {{= attr.FieldName}}.Get(this);
-           public IEnumerable<{{= attr.ReferenceType.ToDisplayString()}}.ReadOnly> {{= attr.Name}} => {{= attr.FieldName}}.Get(this).Select(id => new {{= attr.ReferenceType.ToDisplayString()}}.ReadOnly(Db, id));
+           public __SEGMENTS__.ValueEntities<{{= attr.ReferenceType.ToDisplayString()}}.ReadOnly> {{= attr.Name}} => __SEGMENTS__.ValuesExtensions.AsModels<{{= attr.ReferenceType.ToDisplayString()}}.ReadOnly>({{= attr.FieldName}}.Get(this), Db);
            {{elif attr.IsMarker}}
            public bool Is{{= attr.ContextualName}} => {{= attr.FieldName}}.Contains(this);
            {{else}}
@@ -281,7 +281,7 @@ public partial class {{= model.Name}} {
 
            {{each backref in model.BackReferences}}
 
-           public __SEGMENTS__.Entities<{{= backref.OtherModel.ToDisplayString()}}.ReadOnly> {{= backref.Name}} => Db.GetBackRefs({{= backref.OtherAttribute.ToDisplayString()}}, this.Id).AsModels<{{= backRef.OtherModel.ToDisplayString()}}.ReadOnly>(Db);
+           public __SEGMENTS__.Entities<{{= backref.OtherModel.ToDisplayString()}}.ReadOnly> {{= backref.Name}} => Db.GetBackRefs({{= backref.OtherAttribute.ToDisplayString()}}, this.Id).AsModels<{{= backref.OtherModel.ToDisplayString()}}.ReadOnly>(Db);
            {{/each}}
 
            /// <summary>
diff --git a/tests/NexusMods.MnemonicDB.Tests/DbTests.cs b/tests/NexusMods.MnemonicDB.Tests/DbTests.cs
index e9d9ad97..608890d8 100644
--- a/tests/NexusMods.MnemonicDB.Tests/DbTests.cs
+++ b/tests/NexusMods.MnemonicDB.Tests/DbTests.cs
@@ -281,7 +281,7 @@ public async Task CanGetDatomsFromEntity()
             mod.Contains(Mod.Source).Should().BeTrue();
             mod.Contains(Loadout.Name).Should().BeFalse();
 
-            mod.ToString().Should().Be("Mod<200000000000002>");
+            mod.ToString().Should().Be("Mod<EId:200000000000002>");
 
             await VerifyTable(mod);
         }