From a21f7be2960c69c591dc1665780e95a3fa5999a5 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 05:01:45 +0100 Subject: [PATCH] Use typed indexed Aetheria state access --- Aetheria.State.Verify/Program.cs | 76 +++++++++---------- .../Tests/DaemonRuntimeDocumentTests.cs | 10 +-- Assets/Scripts/UI/Menu/InventoryMenu.cs | 2 +- Assets/Scripts/UI/Menu/InventoryPanel.cs | 2 +- Assets/Scripts/UI/Menu/SectorRenderer.cs | 2 +- .../Runtime/AetheriaClientState.cs | 67 +++------------- 6 files changed, 55 insertions(+), 104 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 78b2f2da1..0077a3cf7 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -4559,7 +4559,7 @@ static void RequireSectorMapZoneDetailsUseEveSurface(string root) "AetheriaUnityRuntimeClientProvider.ResolveClient(", ".State", ".Reactive()", - ".State.Reactive(AetheriaClientState.Zone(zoneIndex))", + ".State.Reactive(zoneIndex)", "_zoneDetails?.Current", "AetheriaClient", "AetheriaRuntimeZoneDetailsSurfaceCommands.TryRead(request, out var command)", @@ -4598,7 +4598,7 @@ static void RequireSectorMapZoneDetailsUseEveSurface(string root) "SectorRenderer", "AetheriaRuntimeZoneDetailsDocument", "_zoneDetails", - ".Reactive(AetheriaClientState.Zone(zoneIndex))", + ".Reactive(zoneIndex)", "AetheriaRuntimeZoneDetailsSession", ".ObserveZone(zoneIndex)"); RequireReactiveTypedDocumentAccess( @@ -7055,16 +7055,16 @@ static void RequireInventoryValidationUsesManagedTypedDocuments(string root) var clientState = File.ReadAllText(clientStatePath); if (!clientState.Contains("public CultMeshDocumentHandle Document()", StringComparison.Ordinal) || - !clientState.Contains("public static AetheriaClientZone Zone(int zoneIndex)", StringComparison.Ordinal) || - !clientState.Contains("public static AetheriaClientEntity Entity(int entityIndex)", StringComparison.Ordinal) || - !clientState.Contains("public CultMeshDocumentHandle Document(AetheriaClientZone zone)", StringComparison.Ordinal) || - !clientState.Contains("public CultMeshDocumentHandle Document(AetheriaClientEntity entity)", StringComparison.Ordinal) || + !clientState.Contains("public CultMeshDocumentHandle Document(int index)", StringComparison.Ordinal) || !clientState.Contains("public CultMeshReactiveDocument Reactive(", StringComparison.Ordinal) || - !clientState.Contains("public CultMeshReactiveDocument Reactive(AetheriaClientZone zone)", StringComparison.Ordinal) || - !clientState.Contains("public CultMeshReactiveDocument Reactive(AetheriaClientEntity entity)", StringComparison.Ordinal)) + !clientState.Contains("public CultMeshReactiveDocument Reactive(int index)", StringComparison.Ordinal) || + clientState.Contains("AetheriaClientState.Zone(", StringComparison.Ordinal) || + clientState.Contains("AetheriaClientState.Entity(", StringComparison.Ordinal) || + clientState.Contains("AetheriaClientZone", StringComparison.Ordinal) || + clientState.Contains("AetheriaClientEntity", StringComparison.Ordinal)) { throw new InvalidOperationException( - "AetheriaClientState must expose native typed document handles and native reactive typed documents for current entity, station refit, and explicitly scoped inventory/zone documents."); + "AetheriaClientState must expose native typed document handles and indexed reactive typed documents for current entity, station refit, inventory, and zone documents."); } var sources = new Dictionary @@ -7089,7 +7089,7 @@ static void RequireInventoryValidationUsesManagedTypedDocuments(string root) { ".Reactive()", ".Reactive()", - ".Reactive(AetheriaClientState.Entity(entityIndex))" + ".Reactive(entityIndex)" }; missingSymbols = missingSymbols .Concat(requiredCompactedSymbols.Where(symbol => !compact.Contains(symbol, StringComparison.Ordinal))) @@ -7148,7 +7148,7 @@ static void RequireInventoryValidationUsesManagedTypedDocuments(string root) name, "AetheriaRuntimeInventoryDocument", "_inventory", - ".Reactive(AetheriaClientState.Entity(entityIndex))", + ".Reactive(entityIndex)", "AetheriaRuntimeInventorySession", ".ObserveInventory(entityIndex)"); } @@ -7346,8 +7346,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) var requiredClientSymbols = new[] { "public CultMeshDocumentHandle Document()", - "public CultMeshDocumentHandle Document(AetheriaClientZone zone)", - "public CultMeshDocumentHandle Document(AetheriaClientEntity entity)" + "public CultMeshDocumentHandle Document(int index)" }; var missingClientSymbols = requiredClientSymbols .Where(symbol => !clientState.Contains(symbol, StringComparison.Ordinal)) @@ -7355,19 +7354,17 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) if (missingClientSymbols.Length > 0) { throw new InvalidOperationException( - "AetheriaClientState must expose typed document handles for shared Unity documents, with reactive sync owned by CultMesh handles: " + + "AetheriaClientState must expose typed document handles for shared and indexed Unity documents, with reactive sync owned by CultMesh handles: " + string.Join(", ", missingClientSymbols)); } if (clientState.Contains("public Task LatestAsync", StringComparison.Ordinal) || clientState.Contains("public TDocument Latest", StringComparison.Ordinal) || clientState.Contains("public Task> ReactiveAsync", StringComparison.Ordinal) || - clientState.Contains("public Observable Watch", StringComparison.Ordinal) || - clientState.Contains("public CultMeshDocumentHandle Document(int ", StringComparison.Ordinal) || - clientState.Contains("public CultMeshReactiveDocument Reactive(int ", StringComparison.Ordinal)) + clientState.Contains("public Observable Watch", StringComparison.Ordinal)) { throw new InvalidOperationException( - "AetheriaClientState must not expose latest/watch/session wrappers or ambiguous raw-index document access; callers should hold native typed documents scoped by explicit selectors."); + "AetheriaClientState must not expose latest/watch/session wrappers; callers should hold native typed documents and CultMesh reactive handles."); } var unityPaths = new[] @@ -7842,7 +7839,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) { ".Reactive()", ".Reactive()", - ".Reactive(AetheriaClientState.Zone(zoneIndex))" + ".Reactive(zoneIndex)" }.Where(symbol => !compactSectorRenderer.Contains(symbol, StringComparison.Ordinal))) .ToArray(); if (missingSectorRendererSharedDocumentSymbols.Length > 0) @@ -7873,7 +7870,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "SectorRenderer", "AetheriaRuntimeZoneDetailsDocument", "_zoneDetails", - ".Reactive(AetheriaClientState.Zone(zoneIndex))", + ".Reactive(zoneIndex)", "AetheriaRuntimeZoneDetailsSession", ".ObserveZone(zoneIndex)"); RequireReactiveTypedDocumentAccess( @@ -7986,8 +7983,7 @@ static void RequireUnityViewportAndMapReadsUseManagedAccessors(string root) { "public CultMeshDocumentHandle Document()", "public CultMeshDocumentHandle Document(AetheriaRuntimeRtsViewportBounds viewport)", - "public CultMeshDocumentHandle Document(AetheriaClientZone zone)", - "public CultMeshDocumentHandle Document(AetheriaClientEntity entity)" + "public CultMeshDocumentHandle Document(int index)" }; var missingClientSymbols = requiredClientSymbols .Where(symbol => !clientState.Contains(symbol, StringComparison.Ordinal)) @@ -7995,7 +7991,7 @@ static void RequireUnityViewportAndMapReadsUseManagedAccessors(string root) if (missingClientSymbols.Length > 0) { throw new InvalidOperationException( - "AetheriaClientState must expose generic parameterized document handles for map, viewport, contacts, and current-entity documents: " + + "AetheriaClientState must expose generic parameterized document handles for map, viewport, indexed, contacts, and current-entity documents: " + string.Join(", ", missingClientSymbols)); } @@ -8197,14 +8193,12 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root "public enum AetheriaClientEveSurface", "public CultMeshDocumentHandle Document(AetheriaClientEveSurface surface)", "public CultMeshDocumentHandle Document(AetheriaRuntimeRtsViewportBounds viewport)", - "public CultMeshDocumentHandle Document(AetheriaClientZone zone)", - "public CultMeshDocumentHandle Document(AetheriaClientEntity entity)", + "public CultMeshDocumentHandle Document(int index)", "public CultMeshDocumentHandle Document(string seatId)", "public CultMeshReactiveDocument Reactive()", "public CultMeshReactiveDocument Reactive(AetheriaClientEveSurface surface)", "public CultMeshReactiveDocument Reactive(AetheriaRuntimeRtsViewportBounds viewport)", - "public CultMeshReactiveDocument Reactive(AetheriaClientZone zone)", - "public CultMeshReactiveDocument Reactive(AetheriaClientEntity entity)", + "public CultMeshReactiveDocument Reactive(int index)", "public CultMeshReactiveDocument Reactive(string seatId)" }; var missingClientSymbols = requiredClientSymbols @@ -8220,12 +8214,10 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root if (clientState.Contains("public Task LatestAsync", StringComparison.Ordinal) || clientState.Contains("public TDocument Latest", StringComparison.Ordinal) || clientState.Contains("public Task> ReactiveAsync", StringComparison.Ordinal) || - clientState.Contains("public Observable Watch", StringComparison.Ordinal) || - clientState.Contains("public CultMeshDocumentHandle Document(int ", StringComparison.Ordinal) || - clientState.Contains("public CultMeshReactiveDocument Reactive(int ", StringComparison.Ordinal)) + clientState.Contains("public Observable Watch", StringComparison.Ordinal)) { throw new InvalidOperationException( - "AetheriaClientState must not reintroduce generic latest/watch shortcuts or ambiguous raw-index access; callers should sample native typed document handles scoped by explicit selectors."); + "AetheriaClientState must not reintroduce generic latest/watch shortcuts; callers should sample native typed document handles."); } var forbiddenFixedReactiveWrappers = new[] @@ -12061,6 +12053,9 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) { "public CultMeshStateRefResolver CreateEveSurfaceCultMeshStateRefResolver()", "public sealed class AetheriaClientState : IDisposable", + "public CultMeshDocumentHandle Document(int index)", + "public CultMeshReactiveDocument Reactive(int index)", + "Aetheria typed state does not expose an indexed document", "CultMeshReactiveDocument? _eveStateRefFrame", "CultMeshReactiveDocument? _eveStateRefHealth", "CultMeshReactiveDocument? _eveStateRefCommandBoundary", @@ -12091,6 +12086,12 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) } if (clientState.Contains("var frameTask = Daemon.LatestFrameDocumentAsync()", StringComparison.Ordinal) || + clientState.Contains("public readonly struct AetheriaClientZone", StringComparison.Ordinal) || + clientState.Contains("public readonly struct AetheriaClientEntity", StringComparison.Ordinal) || + clientState.Contains("public static AetheriaClientZone Zone(", StringComparison.Ordinal) || + clientState.Contains("public static AetheriaClientEntity Entity(", StringComparison.Ordinal) || + clientState.Contains("Document(AetheriaClientZone", StringComparison.Ordinal) || + clientState.Contains("Document(AetheriaClientEntity", StringComparison.Ordinal) || clientState.Contains("var healthTask = Daemon.LatestHealthAsync()", StringComparison.Ordinal) || clientState.Contains("var commandBoundaryTask = Daemon.LatestCommandBoundaryAsync()", StringComparison.Ordinal) || clientState.Contains("LatestAsync()", StringComparison.Ordinal) || @@ -12100,7 +12101,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) clientState.Contains("LatestCatalog)", StringComparison.Ordinal)) { throw new InvalidOperationException( - "AetheriaClientState Eve state-ref resolver must own reactive typed documents instead of bootstrapping one-shot latest snapshots."); + "AetheriaClientState must expose native managed typed documents instead of bootstrapping one-shot latest snapshots or scoped wrapper handles."); } if (!client.Contains("_aetheriaState?.Dispose()", StringComparison.Ordinal) || @@ -14509,7 +14510,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) !compactMapRenderer.Contains(".State.Reactive()", StringComparison.Ordinal) || !sectorRenderer.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) || !compactSectorRenderer.Contains(".State.Reactive()", StringComparison.Ordinal) || - !compactSectorRenderer.Contains(".State.Reactive(AetheriaClientState.Zone(zoneIndex))", StringComparison.Ordinal) || + !compactSectorRenderer.Contains(".State.Reactive(zoneIndex)", StringComparison.Ordinal) || !sectorRenderer.Contains(".Current", StringComparison.Ordinal) || !compactSectorRenderer.Contains("ResolveClient().State.Reactive()", StringComparison.Ordinal) || !compactSectorRenderer.Contains(".State.Reactive()", StringComparison.Ordinal) || @@ -16284,8 +16285,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "public CultMeshDocumentHandle Document()", "public CultMeshDocumentHandle Document(AetheriaClientEveSurface surface)", "public CultMeshDocumentHandle Document(AetheriaRuntimeRtsViewportBounds viewport)", - "public CultMeshDocumentHandle Document(AetheriaClientZone zone)", - "public CultMeshDocumentHandle Document(AetheriaClientEntity entity)", + "public CultMeshDocumentHandle Document(int index)", "public CultMeshDocumentHandle Document(string seatId)" }; var missingManagedStateAccessSymbols = requiredManagedStateAccessSymbols @@ -16302,13 +16302,11 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) aetheriaClientState.Contains("public TDocument Latest", StringComparison.Ordinal) || aetheriaClientState.Contains("public Observable Watch", StringComparison.Ordinal) || aetheriaClientState.Contains("public Task> ReactiveAsync", StringComparison.Ordinal) || - aetheriaClientState.Contains("public CultMeshDocumentHandle Document(int ", StringComparison.Ordinal) || - aetheriaClientState.Contains("public CultMeshReactiveDocument Reactive(int ", StringComparison.Ordinal) || aetheriaClientState.Contains("DocumentBySchema(", StringComparison.Ordinal) || aetheriaClientState.Contains("TryGetDocumentBySchema(", StringComparison.Ordinal)) { throw new InvalidOperationException( - "AetheriaClientState still exposes generic latest/watch, raw-index, or schema-string shortcuts instead of direct typed CultMesh document handles."); + "AetheriaClientState still exposes generic latest/watch or schema-string shortcuts instead of direct typed CultMesh document handles."); } if (aetheriaClientState.Contains("public AetheriaRuntimeDaemonRenderView? CurrentObservedDaemon(", StringComparison.Ordinal) || @@ -17465,7 +17463,7 @@ static void RequireInventoryDoubleClickTransferRequestAuthority(string root) "TryResolveTypedInventoryRows(", "TryValidateTypedCargoSlot(", "TryValidateTypedEquipmentSlot(", - ".State.Reactive(AetheriaClientState.Entity(entityIndex))", + ".State.Reactive(entityIndex)", "origin.Cargo.TryGetValue(item, out var originPosition)", "SourceIndex == cargoIndex", "SourceIndex == equipmentIndex", diff --git a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs index 7d19d633f..1052ea8e2 100644 --- a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs +++ b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs @@ -189,8 +189,8 @@ public class DaemonRuntimeDocumentTests MaxY = 100 }; var objectsViewport = ReadLatest(client.State.Document(viewport)); - var zoneDetails = ReadLatest(client.State.Document(AetheriaClientState.Zone(0))); - var inventory = ReadLatest(client.State.Document(AetheriaClientState.Entity(0))); + var zoneDetails = ReadLatest(client.State.Document(0)); + var inventory = ReadLatest(client.State.Document(0)); var currentEntityFromClientType = client.State .Document() .LatestAsync() @@ -220,9 +220,9 @@ public class DaemonRuntimeDocumentTests using var currentEntityDocumentReactive = client.State.Reactive(); using var currentDockingReactive = client.State.Reactive(); using var stationRefitReactive = client.State.Reactive(); - using var zoneDetailsReactive = client.State.Reactive(AetheriaClientState.Zone(0)); - using var selectedObjectReactive = client.State.Reactive(AetheriaClientState.Entity(0)); - using var inventoryReactive = client.State.Reactive(AetheriaClientState.Entity(0)); + using var zoneDetailsReactive = client.State.Reactive(0); + using var selectedObjectReactive = client.State.Reactive(0); + using var inventoryReactive = client.State.Reactive(0); using var mapViewportReactive = client.State.Reactive(viewport); using var objectsViewportReactive = client.State.Reactive(viewport); using var gravityViewportReactive = client.State.Reactive(viewport); diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 0123de71a..e0db01773 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -1001,7 +1001,7 @@ public class InventoryMenu : MonoBehaviour try { var nextInventory = ResolveClient() - .State.Reactive(AetheriaClientState.Entity(entityIndex)); + .State.Reactive(entityIndex); _inventory?.Dispose(); _inventoryEntityIndex = entityIndex; _inventory = nextInventory; diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 8e27656cc..f9e1b28e4 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -1565,7 +1565,7 @@ private void Update() try { var nextInventory = ResolveClient() - .State.Reactive(AetheriaClientState.Entity(entityIndex)); + .State.Reactive(entityIndex); _inventory?.Dispose(); _inventoryEntityIndex = entityIndex; _inventory = nextInventory; diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index 5327d7baf..9a0750534 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -203,7 +203,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS try { var nextZoneDetails = ResolveClient() - .State.Reactive(AetheriaClientState.Zone(zoneIndex)); + .State.Reactive(zoneIndex); _zoneDetails?.Dispose(); _zoneDetailsIndex = zoneIndex; _zoneDetails = nextZoneDetails; diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs index 39aed43a0..eee30eb4b 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs @@ -13,32 +13,6 @@ namespace GameCult.Aetheria.State.Verse EditorTui } - public readonly struct AetheriaClientZone - { - public AetheriaClientZone(int zoneIndex) - { - if (zoneIndex < 0) - throw new ArgumentOutOfRangeException(nameof(zoneIndex), zoneIndex, "Zone index must be non-negative."); - - ZoneIndex = zoneIndex; - } - - public int ZoneIndex { get; } - } - - public readonly struct AetheriaClientEntity - { - public AetheriaClientEntity(int entityIndex) - { - if (entityIndex < 0) - throw new ArgumentOutOfRangeException(nameof(entityIndex), entityIndex, "Entity index must be non-negative."); - - EntityIndex = entityIndex; - } - - public int EntityIndex { get; } - } - public sealed class AetheriaClientState : IDisposable { private readonly CultMeshDocumentCatalog _documents; @@ -267,48 +241,27 @@ namespace GameCult.Aetheria.State.Verse return Document(viewport).Reactive(); } - public static AetheriaClientZone Zone(int zoneIndex) - { - return new AetheriaClientZone(zoneIndex); - } - - public static AetheriaClientEntity Entity(int entityIndex) - { - return new AetheriaClientEntity(entityIndex); - } - - public CultMeshDocumentHandle Document(AetheriaClientZone zone) + public CultMeshDocumentHandle Document(int index) where TDocument : class { + if (index < 0) + throw new ArgumentOutOfRangeException(nameof(index), index, "Aetheria document index must be non-negative."); + if (typeof(TDocument) == typeof(AetheriaRuntimeZoneDetailsDocument)) - return (CultMeshDocumentHandle)(object)_zoneDetails(zone.ZoneIndex); - - throw new NotSupportedException( - $"Aetheria typed state does not expose a zone-scoped document for {typeof(TDocument).FullName}."); - } - - public CultMeshReactiveDocument Reactive(AetheriaClientZone zone) - where TDocument : class - { - return Document(zone).Reactive(); - } - - public CultMeshDocumentHandle Document(AetheriaClientEntity entity) - where TDocument : class - { + return (CultMeshDocumentHandle)(object)_zoneDetails(index); if (typeof(TDocument) == typeof(AetheriaRuntimeSelectedObjectDocument)) - return (CultMeshDocumentHandle)(object)_selectedObject(entity.EntityIndex); + return (CultMeshDocumentHandle)(object)_selectedObject(index); if (typeof(TDocument) == typeof(AetheriaRuntimeInventoryDocument)) - return (CultMeshDocumentHandle)(object)_inventory(entity.EntityIndex); + return (CultMeshDocumentHandle)(object)_inventory(index); throw new NotSupportedException( - $"Aetheria typed state does not expose an entity-scoped document for {typeof(TDocument).FullName}."); + $"Aetheria typed state does not expose an indexed document for {typeof(TDocument).FullName}."); } - public CultMeshReactiveDocument Reactive(AetheriaClientEntity entity) + public CultMeshReactiveDocument Reactive(int index) where TDocument : class { - return Document(entity).Reactive(); + return Document(index).Reactive(); } public CultMeshDocumentHandle Document(string seatId)