[3/4] Improve: Small Cleanup / Tech Debt Reduction Around NexusWebApi / V2 Types.

src/Abstractions/NexusMods.Abstractions.Collections/Json/ModSource.cs

@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using NexusMods.Abstractions.NexusWebApi.Types;
+using NexusMods.Abstractions.NexusWebApi.Types.V2;
 using NexusMods.Paths;
 
 namespace NexusMods.Abstractions.Collections.Json;

src/Abstractions/NexusMods.Abstractions.NexusModsLibrary/NexusModsFileMetadata.cs

@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using NexusMods.Abstractions.MnemonicDB.Attributes;
 using NexusMods.Abstractions.NexusWebApi.Types;
+using NexusMods.Abstractions.NexusWebApi.Types.V2;
 using NexusMods.MnemonicDB.Abstractions.Attributes;
 using NexusMods.MnemonicDB.Abstractions.Models;
 

src/Abstractions/NexusMods.Abstractions.NexusModsLibrary/NexusModsModPageMetadata.cs

@@ -2,6 +2,7 @@
 using NexusMods.Abstractions.MnemonicDB.Attributes;
 using NexusMods.Abstractions.NexusWebApi.Types;
 using NexusMods.Abstractions.Resources.DB;
+using NexusMods.Abstractions.NexusWebApi.Types.V2;
 using NexusMods.Abstractions.Telemetry;
 using NexusMods.MnemonicDB.Abstractions.Attributes;
 using NexusMods.MnemonicDB.Abstractions.Models;

src/Abstractions/NexusMods.Abstractions.NexusWebApi/DTOs/GameInfo.cs

@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using NexusMods.Abstractions.NexusWebApi.DTOs.Interfaces;
-using GameId = NexusMods.Abstractions.NexusWebApi.Types.GameId;
+using GameId = NexusMods.Abstractions.NexusWebApi.Types.V2.GameId;
 
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable InconsistentNaming
@@ -27,7 +27,7 @@ public class GameInfo : IJsonArraySerializable<GameInfo>
     ///    This field is for deserialization only.
     /// </remarks>
     [JsonPropertyName("id")]
-    public int _Id { get; set; }
+    public uint _Id { get; set; }
 
     /// <summary>
     /// Returns the ID as typed ValueObject <see cref="GameId"/>.

src/Abstractions/NexusMods.Abstractions.NexusWebApi/DTOs/ModFile.cs

@@ -2,7 +2,8 @@
 using System.Text.Json.Serialization.Metadata;
 using NexusMods.Abstractions.NexusWebApi.DTOs.Interfaces;
 using NexusMods.Abstractions.NexusWebApi.Types;
-using FileId = NexusMods.Abstractions.NexusWebApi.Types.FileId;
+using NexusMods.Abstractions.NexusWebApi.Types.V2;
+using FileId = NexusMods.Abstractions.NexusWebApi.Types.V2.FileId;
 
 // 👇 Suppress uninitialised variables. Currently Nexus has mostly read-only API and we expect server to return the data.
 #pragma warning disable CS8618
@@ -47,7 +48,7 @@ public class ModFile : IJsonSerializable<ModFile>
     ///    This ID is unique within the context of the game.
     ///    i.e. This ID might be used for another mod if you search for mods for another game.
     /// </remarks>
-    public FileId FileId => FileId.From(_FileId);
+    public FileId FileId => FileId.From((uint)_FileId);
 
     /// <summary>
     /// Name (title) of the mod file as seen on the `Files` section of the mod page.

src/Abstractions/NexusMods.Abstractions.NexusWebApi/DTOs/ModUpdate.cs

@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using NexusMods.Abstractions.NexusWebApi.DTOs.Interfaces;
-using ModId = NexusMods.Abstractions.NexusWebApi.Types.ModId;
+using ModId = NexusMods.Abstractions.NexusWebApi.Types.V2.ModId;
 
 // 👇 Suppress uninitialised variables. Currently Nexus has mostly read-only API and we expect server to return the data.
 #pragma warning disable CS8618
@@ -25,7 +25,7 @@ public class ModUpdate : IJsonArraySerializable<ModUpdate>
     /// <summary>
     /// An individual mod ID that is unique for this game.
     /// </summary>
-    public ModId ModId => ModId.From(_ModId);
+    public ModId ModId => ModId.From((uint)_ModId);
 
     /// <summary>
     /// The last time a file on the mod page was updated.

src/Abstractions/NexusMods.Abstractions.NexusWebApi/INexusApiClient.cs

@@ -1,6 +1,8 @@
 using NexusMods.Abstractions.NexusWebApi.DTOs;
 using NexusMods.Abstractions.NexusWebApi.DTOs.OAuth;
 using NexusMods.Abstractions.NexusWebApi.Types;
+using FileId = NexusMods.Abstractions.NexusWebApi.Types.V2.FileId;
+using ModId = NexusMods.Abstractions.NexusWebApi.Types.V2.ModId;
 
 namespace NexusMods.Abstractions.NexusWebApi;
 

src/Abstractions/NexusMods.Abstractions.NexusWebApi/NexusMods.Abstractions.NexusWebApi.csproj

@@ -12,4 +12,8 @@
       <ProjectReference Include="..\NexusMods.Abstractions.Serialization\NexusMods.Abstractions.Serialization.csproj" />
       <PackageReference Include="NexusMods.MnemonicDB.SourceGenerator" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Types\V2\" />
+    </ItemGroup>
 </Project>

src/Abstractions/NexusMods.Abstractions.NexusWebApi/NexusModsArchiveMetadata.cs

@@ -1,4 +1,5 @@
 using NexusMods.Abstractions.NexusWebApi.Types;
+using NexusMods.Abstractions.NexusWebApi.Types.V2;
 using NexusMods.MnemonicDB.Abstractions.Attributes;
 using NexusMods.MnemonicDB.Abstractions.Models;
 

src/Abstractions/NexusMods.Abstractions.NexusWebApi/Types/NXMModUrl.cs

@@ -9,12 +9,12 @@ public class NXMModUrl : NXMUrl
     /// <summary>
     /// id of the mod page
     /// </summary>
-    public ModId ModId { get; set; }
+    public V2.ModId ModId { get; set; }
 
     /// <summary>
     /// id of the file (within that game domain)
     /// </summary>
-    public FileId FileId { get; set; }
+    public V2.FileId FileId { get; set; }
 
     /// <summary>
     /// game domain (name of the game within the Nexus Mods page)
@@ -36,8 +36,8 @@ public NXMModUrl(Uri uri)
         Game = uri.Host;
         try
         {
-            ModId = ModId.From(ulong.Parse(uri.Segments[2].TrimEnd('/')));
-            FileId = FileId.From(ulong.Parse(uri.Segments[4].TrimEnd('/')));
+            ModId = V2.ModId.From(uint.Parse(uri.Segments[2].TrimEnd('/')));
+            FileId = V2.FileId.From(uint.Parse(uri.Segments[4].TrimEnd('/')));
         }
         catch (FormatException)
         {

src/Abstractions/NexusMods.Abstractions.NexusWebApi/Types/V2/FileId.cs

@@ -0,0 +1,29 @@
+using NexusMods.MnemonicDB.Abstractions;
+using NexusMods.MnemonicDB.Abstractions.Attributes;
+using NexusMods.MnemonicDB.Abstractions.ElementComparers;
+using TransparentValueObjects;
+namespace NexusMods.Abstractions.NexusWebApi.Types.V2;
+
+/// <summary>
+/// Unique ID for a mod file associated with a game (<see cref="GameId"/>).
+/// Querying mod pages returns items of this type.
+/// </summary>
+[ValueObject<uint>] // Matches backend. Do not change.
+public readonly partial struct FileId : IAugmentWith<DefaultValueAugment>, IAugmentWith<JsonAugment>
+{
+    /// <inheritdoc/>
+    public static FileId DefaultValue => From(default(uint));
+}
+
+/// <summary>
+/// File ID attribute, for NexusMods API file IDs.
+/// </summary>
+public class FileIdAttribute(string ns, string name) : 
+    ScalarAttribute<FileId, uint>(ValueTags.UInt32, ns, name)
+{
+    /// <inheritdoc />
+    protected override uint ToLowLevel(FileId value) => value.Value;
+
+    /// <inheritdoc />
+    protected override FileId FromLowLevel(uint value, ValueTags tags, AttributeResolver resolver) => FileId.From(value);
+}

src/Abstractions/NexusMods.Abstractions.NexusWebApi/Types/GameId.cs → src/Abstractions/NexusMods.Abstractions.NexusWebApi/Types/V2/GameId.cs

@@ -1,13 +1,12 @@
 using TransparentValueObjects;
-
-namespace NexusMods.Abstractions.NexusWebApi.Types;
+namespace NexusMods.Abstractions.NexusWebApi.Types.V2;
 
 /// <summary>
 /// Unique identifier for an individual game hosted on Nexus.
 /// </summary>
-[ValueObject<int>]
+[ValueObject<uint>] // Matches backend. Do not change.
 public readonly partial struct GameId : IAugmentWith<DefaultValueAugment>
 {
     /// <inheritdoc/>
-    public static GameId DefaultValue => From(default);
+    public static GameId DefaultValue => From(default(uint));
 }

src/Abstractions/NexusMods.Abstractions.NexusWebApi/Types/ModId.cs → src/Abstractions/NexusMods.Abstractions.NexusWebApi/Types/V2/ModId.cs

@@ -2,30 +2,29 @@
 using NexusMods.MnemonicDB.Abstractions.Attributes;
 using NexusMods.MnemonicDB.Abstractions.ElementComparers;
 using TransparentValueObjects;
-
-namespace NexusMods.Abstractions.NexusWebApi.Types;
+namespace NexusMods.Abstractions.NexusWebApi.Types.V2;
 
 /// <summary>
-/// An individual mod ID. Unique per game.
+/// An individual mod ID. Unique per <see cref="GameId"/>.
 /// i.e. Each game has its own set of IDs and starts with 0.
 /// </summary>
-[ValueObject<ulong>]
+[ValueObject<uint>] // Matches backend. Do not change.
 public readonly partial struct ModId : IAugmentWith<DefaultValueAugment>, IAugmentWith<JsonAugment>
 {
     /// <inheritdoc/>
-    public static ModId DefaultValue => From(default);
+    public static ModId DefaultValue => From(default(uint));
 }
 
 
 /// <summary>
 /// Mod ID attribute, for NexusMods API mod IDs.
 /// </summary>
 public class ModIdAttribute(string ns, string name) 
-    : ScalarAttribute<ModId, ulong>(ValueTags.UInt64, ns, name)
+    : ScalarAttribute<ModId, uint>(ValueTags.UInt32, ns, name)
 {
     /// <inheritdoc />
-    protected override ulong ToLowLevel(ModId value) => value.Value;
+    protected override uint ToLowLevel(ModId value) => value.Value;
 
     /// <inheritdoc />
-    protected override ModId FromLowLevel(ulong value, ValueTags tags, AttributeResolver resolver) => ModId.From(value);
+    protected override ModId FromLowLevel(uint value, ValueTags tags, AttributeResolver resolver) => ModId.From(value);
 } 

src/Abstractions/NexusMods.Abstractions.NexusWebApi/Types/V2/Uid/UidForFile.cs

@@ -0,0 +1,46 @@
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+namespace NexusMods.Abstractions.NexusWebApi.Types.V2.Uid;
+
+/// <summary>
+/// This represents a unique ID of an individual file as stored on Nexus Mods.
+/// 
+/// This is a composite key of <see cref="FileId"/> and <see cref="GameId"/>, where
+/// the upper 4 bytes represent the <see cref="FileId"/> and the lower 4 bytes represent
+/// the <see cref="GameId"/>.
+///
+/// This is consistent with how the Nexus Mods backend produces the UID and is not
+/// expected to change.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, Pack = 1)]
+public struct UidForFile
+{
+    /// <summary>
+    /// Unique identifier for the file, within the specific <see cref="GameId"/>.
+    /// </summary>
+    public FileId FileId;
+
+    /// <summary>
+    /// Unique identifier for the game.
+    /// </summary>
+    public GameId GameId;
+
+    /// <summary>
+    /// Decodes a Nexus Mods API result which contains an 'uid' field into a <see cref="UidForFile"/>.
+    /// </summary>
+    /// <param name="uid">The 'uid' field of a GraphQL API query. This should be an 8 byte number represented as a string.</param>
+    /// <remarks>
+    /// This throws if <param name="uid"/> is not a valid number.
+    /// </remarks>
+    public static UidForFile FromV2Api(string uid) => FromUlong(ulong.Parse(uid));
+
+    /// <summary>
+    /// Reinterprets the current <see cref="UidForFile"/> as a single <see cref="ulong"/>.
+    /// </summary>
+    public ulong AsUlong => Unsafe.As<UidForFile, ulong>(ref this);
+
+    /// <summary>
+    /// Reinterprets a given <see cref="ulong"/> into a <see cref="UidForFile"/>.
+    /// </summary>
+    public static UidForFile FromUlong(ulong value) => Unsafe.As<ulong, UidForFile>(ref value);
+}

src/Abstractions/NexusMods.Abstractions.NexusWebApi/Types/V2/Uid/UidForMod.cs

@@ -0,0 +1,49 @@
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+namespace NexusMods.Abstractions.NexusWebApi.Types.V2.Uid;
+
+/// <summary>
+/// This represents a unique ID of an individual mod page as stored on Nexus Mods.
+/// 
+/// This is a composite key of <see cref="ModId"/> and <see cref="GameId"/>, where
+/// the upper 4 bytes represent the <see cref="ModId"/> and the lower 4 bytes represent
+/// the <see cref="GameId"/>. Values are stored in little endian byte order.
+/// 
+/// When transferred over the wire via the API, the resulting `ulong` is converted into
+/// a string.
+///
+/// This is consistent with how the Nexus Mods backend produces the UID and is not
+/// expected to change.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, Pack = 1)]
+public struct UidForMod
+{
+    /// <summary>
+    /// Unique identifier for the mod, within the specific <see cref="GameId"/>.
+    /// </summary>
+    public ModId ModId;
+
+    /// <summary>
+    /// Unique identifier for the game.
+    /// </summary>
+    public GameId GameId;
+
+    /// <summary>
+    /// Decodes a Nexus Mods API result which contains an 'uid' field into a <see cref="UidForFile"/>.
+    /// </summary>
+    /// <param name="uid">The 'uid' field of a GraphQL API query. This should be an 8 byte number represented as a string.</param>
+    /// <remarks>
+    /// This throws if <param name="uid"/> is not a valid number.
+    /// </remarks>
+    public static UidForMod FromV2Api(string uid) => FromUlong(ulong.Parse(uid));
+
+    /// <summary>
+    /// Reinterprets the current <see cref="UidForMod"/> as a single <see cref="ulong"/>.
+    /// </summary>
+    public ulong AsUlong => Unsafe.As<UidForMod, ulong>(ref this);
+
+    /// <summary>
+    /// Reinterprets a given <see cref="ulong"/> into a <see cref="UidForMod"/>.
+    /// </summary>
+    public static UidForMod FromUlong(ulong value) => Unsafe.As<ulong, UidForMod>(ref value);
+}

src/Games/NexusMods.Games.RedEngine/Cyberpunk2077/Emitters/Pattern.cs

@@ -2,6 +2,7 @@
 using DynamicData.Kernel;
 using NexusMods.Abstractions.GameLocators;
 using NexusMods.Abstractions.NexusWebApi.Types;
+using NexusMods.Abstractions.NexusWebApi.Types.V2;
 using NexusMods.Paths;
 
 namespace NexusMods.Games.RedEngine.Cyberpunk2077.Emitters;

src/Games/NexusMods.Games.RedEngine/Cyberpunk2077/Emitters/PatternDefinitions.cs

@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using NexusMods.Abstractions.GameLocators;
 using NexusMods.Abstractions.NexusWebApi.Types;
+using NexusMods.Abstractions.NexusWebApi.Types.V2;
 using NexusMods.Paths;
 
 namespace NexusMods.Games.RedEngine.Cyberpunk2077.Emitters;

src/Games/NexusMods.Games.TestHarness/Verbs/StressTest.cs

@@ -13,7 +13,7 @@
 using NexusMods.ProxyConsole.Abstractions;
 using NexusMods.ProxyConsole.Abstractions.VerbDefinitions;
 using NexusMods.StandardGameLocators;
-using ModId = NexusMods.Abstractions.NexusWebApi.Types.ModId;
+using ModId = NexusMods.Abstractions.NexusWebApi.Types.V2.ModId;
 
 namespace NexusMods.Games.TestHarness.Verbs;
 
@@ -38,7 +38,7 @@ internal static async Task<int> RunStressTest(
         AdvancedManualInstallerUI.Headless = true;
 
         var mods = await nexusApiClient.ModUpdatesAsync(game.Domain.Value, PastTime.Day, token);
-        var results = new List<(string FileName, ModId ModId, Abstractions.NexusWebApi.Types.FileId FileId, Hash Hash, bool Passed, Exception? exception)>();
+        var results = new List<(string FileName, ModId ModId, Abstractions.NexusWebApi.Types.V2.FileId FileId, Hash Hash, bool Passed, Exception? exception)>();
 
         await using var gameFolder = temporaryFileManager.CreateFolder();
         var (manualId, install) = await manualLocator.Add(game, new Version(1, 0), gameFolder);