Collapse client state handle wrappers

This commit is contained in:
Meta Vens 2026-06-29 09:17:32 +01:00
commit b3b251c315
3 changed files with 128 additions and 218 deletions

View file

@ -4817,7 +4817,7 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root)
"new AetheriaRuntimeMenuTabModelOption(",
"ResolveVisibleTabs(",
"SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)",
"AetheriaRuntimeCurrentDockingDocument",
"AetheriaRuntimeCurrentDocking",
"CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking",
"AetheriaUnityRuntimeClientProvider",
".ReactiveCurrentDocking(\"unity-runtime-menu-tabs\")",
@ -5837,7 +5837,7 @@ static void RequireTradeCargoSelectorUseEveSurface(string root)
"AetheriaRuntimeTradeCargoSelectorCommandKind.Close",
"AetheriaRuntimeTradeCargoSelectorCommandKind.Select",
"SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)",
"AetheriaRuntimeCurrentDockingDocument",
"AetheriaRuntimeCurrentDocking",
"CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking",
".ReactiveCurrentDocking(\"unity-trade\")",
"docking = _currentDocking.Current",
@ -6523,7 +6523,7 @@ static void RequireInventoryDropdownUseEveSurface(string root)
"_observedEntityIndex.TryResolveEntityByRecordKey",
"TryResolveObservedDockingIndex(out var dockingIndex)",
"dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)",
"ResolveStationRefitDocument()",
"ResolveStationRefit",
"currentEntityKey = ResolveCurrentEntity()?.EntityKey ?? \"\"",
"LoadoutRestoreOptions"
};
@ -6589,7 +6589,7 @@ static void RequireInventoryDropdownUseEveSurface(string root)
!source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) ||
!source.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) ||
!source.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) ||
!source.Contains("ResolveStationRefitDocument()", StringComparison.Ordinal) ||
!source.Contains("ResolveStationRefit", StringComparison.Ordinal) ||
!source.Contains("currentEntityKey = ResolveCurrentEntity()?.EntityKey ?? \"\"", StringComparison.Ordinal) ||
!source.Contains("currentDockingBay.DockingBayIndex", StringComparison.Ordinal) ||
!source.Contains("ResolveStationRefit()?.DockParentEntityKey", StringComparison.Ordinal) ||
@ -6608,7 +6608,7 @@ static void RequireInventoryDropdownUseEveSurface(string root)
!inventoryMenu.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) ||
!inventoryMenu.Contains("currentEntityKey = ResolveCurrentEntity()?.EntityKey ?? \"\"", StringComparison.Ordinal) ||
!inventoryMenu.Contains("currentEntity = ResolveCurrentEntity();", StringComparison.Ordinal) ||
!inventoryMenu.Contains("ResolveStationRefitDocument()", StringComparison.Ordinal) ||
!inventoryMenu.Contains("ResolveStationRefit", StringComparison.Ordinal) ||
inventoryMenu.Contains("TryGetTypedCurrentDockingBayFacade", StringComparison.Ordinal) ||
inventoryMenu.Contains("TryResolveCurrentEntityFacade", StringComparison.Ordinal) ||
inventoryMenu.Contains("ResolveDockingState()?.CurrentDocking", StringComparison.Ordinal) ||
@ -6789,7 +6789,7 @@ static void RequireStationRefitDockingBaysUseTypedDocuments(string root)
{
"TryResolveCurrentDockingBayRow(out var currentDockingBay)",
"AetheriaRuntimeStationDockingBayRow dockingBay",
"ResolveStationRefitDocument()",
"ResolveStationRefit",
"refit.DockingBays ?? Array.Empty<AetheriaRuntimeStationDockingBayRow>()",
"currentDockingBay.DockingBayIndex"
};
@ -6808,7 +6808,7 @@ static void RequireStationRefitDockingBaysUseTypedDocuments(string root)
{
"TryResolveCurrentDockingBayRow(out AetheriaRuntimeStationDockingBayRow dockingBay)",
"AetheriaRuntimeStationDockingBayRow dockingBay",
"ResolveStationRefitDocument()",
"ResolveStationRefit",
"refit.DockingBays ?? Array.Empty<AetheriaRuntimeStationDockingBayRow>()"
};
var missingMenuSymbols = requiredMenuSymbols
@ -7255,7 +7255,7 @@ static void RequireInventoryValidationUsesManagedTypedDocuments(string root)
var requiredSymbols = new[]
{
"ResolveCurrentEntity()",
"ResolveStationRefitDocument()",
"ResolveStationRefit",
"ResolveInventory(entityIndex)",
"_inventory?.Current"
};
@ -7354,9 +7354,9 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root)
var requiredClientSymbols = new[]
{
"public CultMeshDocumentHandle<AetheriaRuntimeStationRefitDocument> StationRefit { get; }",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDockingDocument { get; }",
"public CultMeshDocumentHandle<AetheriaRuntimeStationRefitDocument> StationRefitDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDocking()"
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDocking { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> ReactiveStationRefit()",
"public CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> ReactiveCurrentDocking()"
};
var missingClientSymbols = requiredClientSymbols
.Where(symbol => !clientState.Contains(symbol, StringComparison.Ordinal))
@ -7470,7 +7470,7 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root)
static bool HasManagedDockingSnapshotAccess(string source)
{
if (source.Contains("AetheriaRuntimeCurrentDockingDocument", StringComparison.Ordinal) &&
if (source.Contains("AetheriaRuntimeCurrentDocking", StringComparison.Ordinal) &&
source.Contains("CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking", StringComparison.Ordinal) &&
source.Contains(".ReactiveCurrentDocking(", StringComparison.Ordinal) &&
source.Contains("_currentDocking.Current", StringComparison.Ordinal) &&
@ -7479,7 +7479,7 @@ static bool HasManagedDockingSnapshotAccess(string source)
return true;
}
if (source.Contains("AetheriaRuntimeCurrentDockingDocument", StringComparison.Ordinal) &&
if (source.Contains("AetheriaRuntimeCurrentDocking", StringComparison.Ordinal) &&
source.Contains("ResolveClient().State.Latest<AetheriaRuntimeCurrentDockingDocument>()", StringComparison.Ordinal) &&
!source.Contains("ResolveClient().State.CurrentDocking()", StringComparison.Ordinal) &&
!source.Contains("AetheriaClientReactiveDockingState _dockingState", StringComparison.Ordinal) &&
@ -7528,8 +7528,8 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root)
var clientState = File.ReadAllText(clientStatePath);
var requiredClientSymbols = new[]
{
"public CultMeshDocumentHandle<AetheriaRuntimeCatalogSnapshot> CatalogSnapshot()",
"public CultMeshDocumentHandle<AetheriaRuntimePlayerSettingsDocument> PlayerSettingsDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeCatalogSnapshot> Catalog",
"public CultMeshDocumentHandle<AetheriaRuntimePlayerSettingsDocument> PlayerSettings",
"public CultMeshDocumentHandle<AetheriaRuntimeInventoryDocument> Inventory("
};
var missingClientSymbols = requiredClientSymbols
@ -8379,39 +8379,39 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root
var requiredClientSymbols = new[]
{
"public enum AetheriaClientEveSurface",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonProviderAdvertisementDocument> ProviderAdvertisementDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonProviderAdvertisementDocument> ProviderAdvertisement { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeDaemonProviderAdvertisementDocument> ReactiveProviderAdvertisement()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonHealthDocument> HealthDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonHealthDocument> Health { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeDaemonHealthDocument> ReactiveHealth()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonCommandBoundaryDocument> CommandBoundaryDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonCommandBoundaryDocument> CommandBoundary { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeDaemonCommandBoundaryDocument> ReactiveCommandBoundary()",
"public CultMeshDocumentHandle<AetheriaRuntimeVerseAuthorityPolicyDocument> AuthorityPolicyDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeVerseAuthorityPolicyDocument> AuthorityPolicy { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeVerseAuthorityPolicyDocument> ReactiveAuthorityPolicy()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonFrameDocument> DaemonFrameDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonFrameDocument> DaemonFrame { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeDaemonFrameDocument> ReactiveDaemonFrame()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonSoaViewDocument> DaemonSoaViewDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonSoaViewDocument> DaemonSoaView { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeDaemonSoaViewDocument> ReactiveDaemonSoaView()",
"public CultMeshDocumentHandle<AetheriaRuntimeZoneRenderDocument> ZoneRenderDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeZoneRenderDocument> ZoneRender { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeZoneRenderDocument> ReactiveZoneRender()",
"public CultMeshDocumentHandle<AetheriaRuntimeLoadoutTemplatesDocument> LoadoutTemplatesDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeLoadoutTemplatesDocument> LoadoutTemplates { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeLoadoutTemplatesDocument> ReactiveLoadoutTemplates()",
"public CultMeshDocumentHandle<AetheriaRuntimeSectorMapDocument> SectorMapDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeSectorMapDocument> SectorMap { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeSectorMapDocument> ReactiveSectorMap()",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentZoneDocument> CurrentZoneDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentZoneDocument> CurrentZone { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeCurrentZoneDocument> ReactiveCurrentZone()",
"public CultMeshDocumentHandle<AetheriaRuntimeZoneContactsDocument> ZoneContactsDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeZoneContactsDocument> ZoneContacts { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeZoneContactsDocument> ReactiveZoneContacts()",
"public CultMeshDocumentHandle<AetheriaRuntimeVerseHostSettingsDocument> VerseHostSettingsDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeVerseHostSettingsDocument> VerseHostSettings { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeVerseHostSettingsDocument> ReactiveVerseHostSettings()",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDocking()",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDocking { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> ReactiveCurrentDocking()",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentEntityDocument> CurrentEntityDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentEntityDocument> CurrentEntity { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeCurrentEntityDocument> ReactiveCurrentEntity()",
"public CultMeshDocumentHandle<AetheriaRuntimeStationRefitDocument> StationRefitDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeStationRefitDocument> StationRefit { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> ReactiveStationRefit()",
"public CultMeshDocumentHandle<AetheriaRuntimeCatalogSnapshot> CatalogSnapshot()",
"public CultMeshDocumentHandle<AetheriaRuntimeCatalogSnapshot> Catalog { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeCatalogSnapshot> ReactiveCatalogSnapshot()",
"public CultMeshDocumentHandle<AetheriaRuntimePlayerSettingsDocument> PlayerSettingsDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimePlayerSettingsDocument> PlayerSettings { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> ReactivePlayerSettingsDocument()",
"public static bool TryResolveEveSurface(",
"public CultMeshDocumentHandle<global::Aetheria.State.Documents.EveSurfaceState>? EveSurfaceDocument(",
@ -8430,11 +8430,11 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root
"public CultMeshReactiveDocument<AetheriaRuntimeSelectedObjectDocument> ReactiveSelectedObject(",
"public CultMeshDocumentHandle<AetheriaRuntimeInventoryDocument> Inventory(",
"public CultMeshReactiveDocument<AetheriaRuntimeInventoryDocument> ReactiveInventory(",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeScenarioDocument> StarbridgeScenarioDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeScenarioDocument> StarbridgeScenario { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeStarbridgeScenarioDocument> ReactiveStarbridgeScenario()",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionDocument> StarbridgeSessionDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionDocument> StarbridgeSession { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeStarbridgeSessionDocument> ReactiveStarbridgeSession()",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionSummaryDocument> StarbridgeSummaryDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionSummaryDocument> StarbridgeSummary { get; }",
"public CultMeshReactiveDocument<AetheriaRuntimeStarbridgeSessionSummaryDocument> ReactiveStarbridgeSummary()",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgePlayerSeatDocument> StarbridgePlayerSeat(",
"public CultMeshReactiveDocument<AetheriaRuntimeStarbridgePlayerSeatDocument> ReactiveStarbridgePlayerSeat("
@ -8455,11 +8455,23 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root
clientState.Contains("public CultMeshReactiveDocument<TDocument> Reactive<TDocument>", StringComparison.Ordinal) ||
clientState.Contains("TryGetDocument<TDocument>", StringComparison.Ordinal) ||
clientState.Contains("CultMeshDocumentCatalog", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeDaemonProviderAdvertisementDocument> ProviderAdvertisementDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeDaemonHealthDocument> HealthDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeDaemonCommandBoundaryDocument> CommandBoundaryDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeVerseAuthorityPolicyDocument> AuthorityPolicyDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeDaemonFrameDocument> DaemonFrameDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeDaemonSoaViewDocument> DaemonSoaViewDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeCatalogSnapshot> CatalogSnapshot(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimePlayerSettingsDocument> PlayerSettingsDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeCurrentEntityDocument> CurrentEntityDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDocking(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeStationRefitDocument> StationRefitDocument(", StringComparison.Ordinal) ||
clientState.Contains("public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionSummaryDocument> StarbridgeSummaryDocument(", StringComparison.Ordinal) ||
clientState.Contains("public Task<CultMeshReactiveDocument<TDocument>> ReactiveAsync<TDocument>", StringComparison.Ordinal) ||
clientState.Contains("public Observable<TDocument> Watch<TDocument>", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"AetheriaClientState must not reintroduce generic document catalogs or latest/watch shortcuts; callers should use named typed document handles.");
"AetheriaClientState must not reintroduce generic document catalogs, latest/watch shortcuts, or fixed FooDocument() wrappers; callers should use named typed document handles directly.");
}
var forbiddenFixedReactiveWrappers = new[]
@ -8809,7 +8821,7 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root
if (!clientState.Contains("StarbridgeSummary", StringComparison.Ordinal) ||
!checkedSources["DaemonRuntimeDocumentTests.cs"].Contains(
"client.State.StarbridgeSummaryDocument()",
"client.State.StarbridgeSummary",
StringComparison.Ordinal))
{
throw new InvalidOperationException(
@ -11935,7 +11947,7 @@ static void RequireUnityRuntimeCatalogClientUsesManagedDocument(string root)
var forbiddenSymbols = new[]
{
"_node.ReadCatalogSnapshot()",
"_node.ReadCatalog",
"_node.GetCatalogSurfaceAsync()",
"ReadCatalogSurfaceAsync(",
"AetheriaRuntimeCatalogStore.ReadEveSurfaces",
@ -12025,7 +12037,7 @@ static void RequireCatalogSurfaceUsesManagedRuntimeCatalog(string root)
string.Join(", ", missingBridgeSymbols));
}
if (bridge.Contains("ReadCatalogSnapshot()", StringComparison.Ordinal))
if (bridge.Contains("ReadCatalog", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"Eve catalog refresh still rebuilds the legacy catalog snapshot instead of using AetheriaStateNode.RuntimeCatalog().");
@ -12157,10 +12169,10 @@ static void RequireAetheriaRuntimeVerseClientContract(string root)
"managedStarbridgeSession?.Current",
"BootstrapCatalogDocument(",
"CatalogBootstrapSource(",
"BootstrapRuntimeCatalogSnapshot()",
"BootstrapLoadoutTemplatesDocument()",
"BootstrapPlayerSettingsDocument()",
"BootstrapVerseHostSettingsDocument()",
"BootstrapRuntimeCatalog",
"BootstrapLoadoutTemplates",
"BootstrapPlayerSettings",
"BootstrapVerseHostSettings",
"SubmitDaemonCommandAsync(",
"SubmitEveCommandAsync(",
"AetheriaRuntimeVerseRecordKeys.DaemonCommand(command.CommandId)",
@ -12310,7 +12322,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root)
"public sealed class AetheriaClientState : IDisposable",
"public CultMeshDocumentHandle<AetheriaRuntimeInventoryDocument> Inventory(",
"public CultMeshReactiveDocument<AetheriaRuntimeInventoryDocument> ReactiveInventory(",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionDocument> StarbridgeSessionDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionDocument> StarbridgeSession",
"public CultMeshReactiveDocument<AetheriaRuntimeStarbridgeSessionDocument> ReactiveStarbridgeSession()",
"CultMeshReactiveDocument<AetheriaRuntimeDaemonFrameDocument>? _eveStateRefFrame",
"CultMeshReactiveDocument<AetheriaRuntimeDaemonHealthDocument>? _eveStateRefHealth",
@ -12441,7 +12453,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root)
: client.Substring(starbridgeSummaryStart);
if (!starbridgeSummaryBlock.Contains("RequireManagedCatalog()", StringComparison.Ordinal) ||
starbridgeSummaryBlock.Contains("catalogDocument.LatestAsync()", StringComparison.Ordinal) ||
starbridgeSummaryBlock.Contains("BootstrapRuntimeCatalogSnapshot()", StringComparison.Ordinal) ||
starbridgeSummaryBlock.Contains("BootstrapRuntimeCatalog", StringComparison.Ordinal) ||
starbridgeSummaryBlock.Contains("AetheriaRuntimeCatalogStore.OpenReadOnly", StringComparison.Ordinal))
{
throw new InvalidOperationException(
@ -12453,10 +12465,10 @@ static void RequireAetheriaRuntimeVerseClientContract(string root)
"BootstrapCatalogDocument(",
"CatalogBootstrapSource(",
"managed Aetheria document bootstrap seed",
"BootstrapRuntimeCatalogSnapshot()",
"BootstrapLoadoutTemplatesDocument()",
"BootstrapPlayerSettingsDocument()",
"BootstrapVerseHostSettingsDocument()",
"BootstrapRuntimeCatalog",
"BootstrapLoadoutTemplates",
"BootstrapPlayerSettings",
"BootstrapVerseHostSettings",
"return AetheriaRuntimeCatalogStore.OpenReadOnly(StatePath);",
"AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(StatePath)",
"AetheriaRuntimeCatalogStore.ReadPlayerSettings(StatePath)",
@ -12477,10 +12489,14 @@ static void RequireAetheriaRuntimeVerseClientContract(string root)
"return Task.FromResult(AetheriaRuntimeCatalogStore.ReadPlayerSettings(StatePath));",
"return Task.FromResult(AetheriaRuntimeCatalogStore.ReadVerseHostSettings(StatePath));",
"public static class AetheriaRuntimeBootstrapDocuments",
"ReadRuntimeCatalogSnapshot()",
"ReadLoadoutTemplatesDocument()",
"ReadPlayerSettingsDocument()",
"ReadVerseHostSettingsDocument()",
"public AetheriaRuntimeCatalogSnapshot ReadRuntimeCatalog(",
"public AetheriaRuntimeLoadoutTemplatesDocument ReadLoadoutTemplates(",
"public AetheriaRuntimePlayerSettingsDocument ReadPlayerSettings(",
"public AetheriaRuntimeVerseHostSettingsDocument ReadVerseHostSettings(",
"public Task<AetheriaRuntimeCatalogSnapshot> ReadRuntimeCatalogAsync(",
"public Task<AetheriaRuntimeLoadoutTemplatesDocument> ReadLoadoutTemplatesAsync(",
"public Task<AetheriaRuntimePlayerSettingsDocument> ReadPlayerSettingsAsync(",
"public Task<AetheriaRuntimeVerseHostSettingsDocument> ReadVerseHostSettingsAsync(",
"var catalogDocument = CatalogDocument(",
"var loadoutTemplatesDocument = CatalogDocument(",
"CultMeshDocumentHandle<TDocument> CatalogDocument<TDocument>(",
@ -16626,9 +16642,9 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
var requiredManagedStateAccessSymbols = new[]
{
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonFrameDocument> DaemonFrameDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeCatalogSnapshot> CatalogSnapshot()",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentEntityDocument> CurrentEntityDocument()",
"public CultMeshDocumentHandle<AetheriaRuntimeDaemonFrameDocument> DaemonFrame",
"public CultMeshDocumentHandle<AetheriaRuntimeCatalogSnapshot> Catalog",
"public CultMeshDocumentHandle<AetheriaRuntimeCurrentEntityDocument> CurrentEntity",
"public CultMeshDocumentHandle<AetheriaRuntimeObjectsViewportDocument> ObjectsViewport(",
"public CultMeshDocumentHandle<AetheriaRuntimeInventoryDocument> Inventory(",
"public CultMeshDocumentHandle<AetheriaRuntimeStarbridgePlayerSeatDocument> StarbridgePlayerSeat("
@ -16838,7 +16854,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
"public async Task<AetheriaRuntimeAssetManifestDocument> AssetManifestAsync()",
"public async Task<AetheriaRuntimeCurrentZoneDocument> CurrentZoneAsync()",
"public async Task<AetheriaRuntimeCurrentEntityDocument> CurrentEntityAsync()",
"public async Task<AetheriaRuntimeCurrentDockingDocument> CurrentDockingAsync()",
"public async Task<AetheriaRuntimeCurrentDocking> CurrentDockingAsync()",
"public async Task<AetheriaRuntimeZoneContactsDocument> ZoneContactsAsync()",
"public async Task<AetheriaRuntimeStationRefitDocument> StationRefitAsync()",
"public async Task<AetheriaRuntimeSectorMapDocument> SectorMapAsync()",

View file

@ -166,18 +166,18 @@ public class DaemonRuntimeDocumentTests
.GetAwaiter()
.GetResult();
var currentEntity = ReadLatest(client.State.CurrentEntityDocument());
var latestFrame = ReadLatest(client.State.DaemonFrameDocument());
var catalog = ReadLatest(client.State.CatalogSnapshot());
var playerSettings = ReadLatest(client.State.PlayerSettingsDocument());
var verseHostSettings = ReadLatest(client.State.VerseHostSettingsDocument());
var currentEntity = ReadLatest(client.State.CurrentEntity);
var latestFrame = ReadLatest(client.State.DaemonFrame);
var catalog = ReadLatest(client.State.Catalog);
var playerSettings = ReadLatest(client.State.PlayerSettings);
var verseHostSettings = ReadLatest(client.State.VerseHostSettings);
var currentEntityByType = client.State
.CurrentEntityDocument()
.CurrentEntity
.LatestAsync()
.GetAwaiter()
.GetResult();
var latestFrameByType = client.State
.DaemonFrameDocument()
.DaemonFrame
.LatestAsync()
.GetAwaiter()
.GetResult();
@ -192,17 +192,17 @@ public class DaemonRuntimeDocumentTests
var zoneDetails = ReadLatest(client.State.ZoneDetails(0));
var inventory = ReadLatest(client.State.Inventory(0));
var currentEntityFromClientType = client.State
.CurrentEntityDocument()
.CurrentEntity
.LatestAsync()
.GetAwaiter()
.GetResult();
using var currentEntityReactive = client.State
.CurrentEntityDocument()
.CurrentEntity
.ReactiveAsync()
.GetAwaiter()
.GetResult();
using var zoneRenderReactive = client.State.ReactiveZoneRender();
var observedAuthoritativeFrame = ReadLatest(client.State.DaemonFrameDocument());
var observedAuthoritativeFrame = ReadLatest(client.State.DaemonFrame);
using var catalogReactive = client.State.ReactiveCatalogSnapshot();
using var daemonFrameReactive = client.State.ReactiveDaemonFrame();
using var daemonSoaViewReactive = client.State.ReactiveDaemonSoaView();
@ -234,12 +234,12 @@ public class DaemonRuntimeDocumentTests
var gameTuiSurface = ReadLatest(client.State.GameTuiSurface);
var editorSurface = ReadLatest(client.State.EditorSurface);
var editorTuiSurface = ReadLatest(client.State.EditorTuiSurface);
var authorityStatus = ReadLatest(client.State.AuthorityPolicyDocument());
var currentDocking = client.State.CurrentDockingDocument
var authorityStatus = ReadLatest(client.State.AuthorityPolicy);
var currentDocking = client.State.CurrentDocking
.LatestAsync()
.GetAwaiter()
.GetResult();
var stationRefit = ReadLatest(client.State.StationRefitDocument());
var stationRefit = ReadLatest(client.State.StationRefit);
Assert.AreEqual(currentEntity.EntityKey, currentEntityDocumentReactive.Current.EntityKey);
Assert.AreEqual(currentDocking.CurrentEntityKey, currentDockingReactive.Current.CurrentEntityKey);
Assert.AreEqual(stationRefit.StationEntityKey, stationRefitReactive.Current.StationEntityKey);
@ -249,34 +249,28 @@ public class DaemonRuntimeDocumentTests
using var reactiveEditorTuiSurface = client.State.EditorTuiSurface.Reactive();
Assert.AreEqual("aetheria.current.entity", client.State.CurrentEntity.DocumentId);
Assert.AreSame(client.State.CurrentEntity, client.State.CurrentEntityDocument());
Assert.AreSame(client.State.Catalog, client.State.CatalogSnapshot());
Assert.AreSame(client.State.ZoneRender, client.State.ZoneRenderDocument());
Assert.AreSame(
client.State.StarbridgeSummary,
client.State.StarbridgeSummaryDocument());
Assert.AreSame(client.State.DaemonFrame, client.State.DaemonFrameDocument());
Assert.AreSame(client.State.DaemonSoaView, client.State.DaemonSoaViewDocument());
Assert.IsNotNull(ReadLatest(client.State.ProviderAdvertisementDocument()));
Assert.IsNotNull(ReadLatest(client.State.HealthDocument()));
Assert.IsNotNull(ReadLatest(client.State.CommandBoundaryDocument()));
Assert.AreSame(
client.State.AuthorityPolicyDocument(),
client.State.AuthorityPolicy);
Assert.AreEqual("aetheria.catalog.snapshot", client.State.Catalog.DocumentId);
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.Frame, client.State.DaemonFrame.DocumentType);
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.SoaView, client.State.DaemonSoaView.DocumentType);
Assert.IsNotNull(ReadLatest(client.State.ZoneRender));
Assert.IsNotNull(ReadLatest(client.State.StarbridgeSummary));
Assert.IsNotNull(ReadLatest(client.State.ProviderAdvertisement));
Assert.IsNotNull(ReadLatest(client.State.Health));
Assert.IsNotNull(ReadLatest(client.State.CommandBoundary));
Assert.IsNotNull(ReadLatest(client.State.AuthorityPolicy));
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId, reactiveGameSurface.Current.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId, reactiveGameTuiSurface.Current.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId, reactiveEditorSurface.Current.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, reactiveEditorTuiSurface.Current.Surface.Id);
Assert.AreEqual(currentDocking.CurrentEntityKey, currentDockingReactive.Current.CurrentEntityKey);
Assert.AreEqual(stationRefit.StationEntityKey, stationRefitReactive.Current.StationEntityKey);
Assert.AreSame(client.State.PlayerSettings, client.State.PlayerSettingsDocument());
Assert.AreSame(client.State.VerseHostSettings, client.State.VerseHostSettingsDocument());
Assert.AreSame(client.State.CurrentEntity, client.State.CurrentEntityDocument());
Assert.AreSame(client.State.ZoneContacts, client.State.ZoneContactsDocument());
Assert.IsNotNull(ReadLatest(client.State.PlayerSettings));
Assert.IsNotNull(ReadLatest(client.State.VerseHostSettings));
Assert.IsNotNull(ReadLatest(client.State.ZoneContacts));
Assert.AreEqual(
typeof(AetheriaRuntimeCurrentEntityDocument),
client.State.CurrentEntityDocument().DocumentType);
Assert.AreSame(client.State.SectorMap, client.State.SectorMapDocument());
client.State.CurrentEntity.DocumentType);
Assert.IsNotNull(ReadLatest(client.State.SectorMap));
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.CurrentEntity, currentEntity.Schema);
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.Frame, latestFrame.Schema);
Assert.AreEqual(frame.FrameId, latestFrame.FrameId);
@ -360,9 +354,9 @@ public class DaemonRuntimeDocumentTests
.GetAwaiter()
.GetResult();
var player = ReadLatest(client.State.PlayerSettingsDocument());
var verseHost = ReadLatest(client.State.VerseHostSettingsDocument());
var catalog = ReadLatest(client.State.CatalogSnapshot());
var player = ReadLatest(client.State.PlayerSettings);
var verseHost = ReadLatest(client.State.VerseHostSettings);
var catalog = ReadLatest(client.State.Catalog);
Assert.AreEqual(AetheriaRuntimeCatalogSnapshot.SchemaId, client.State.Catalog.Sources.Last().SchemaId);
Assert.IsNotNull(catalog);
@ -370,8 +364,8 @@ public class DaemonRuntimeDocumentTests
Assert.AreEqual(AetheriaRuntimeVerseHostSettingsDocument.SchemaId, verseHost.Schema);
Assert.AreEqual("", player.PlayerName);
Assert.AreEqual("", verseHost.VerseId);
Assert.AreSame(client.State.PlayerSettings, client.State.PlayerSettingsDocument());
Assert.AreSame(client.State.VerseHostSettings, client.State.VerseHostSettingsDocument());
Assert.AreSame(client.State.PlayerSettings, client.State.PlayerSettings);
Assert.AreSame(client.State.VerseHostSettings, client.State.VerseHostSettings);
}
[Test]
@ -2377,7 +2371,7 @@ public class DaemonRuntimeDocumentTests
}
[Test]
public void CommandClientSendsCommandAgainstDaemonFrameDocument()
public void CommandClientSendsCommandAgainstDaemonFrame
{
var statePath = Path.Combine(
Path.GetTempPath(),

View file

@ -78,7 +78,7 @@ namespace GameCult.Aetheria.State.Verse
VerseHostSettings = verseHostSettings ?? throw new ArgumentNullException(nameof(verseHostSettings));
CurrentZone = currentZone ?? throw new ArgumentNullException(nameof(currentZone));
CurrentEntity = currentEntity ?? throw new ArgumentNullException(nameof(currentEntity));
CurrentDockingDocument = currentDocking ?? throw new ArgumentNullException(nameof(currentDocking));
CurrentDocking = currentDocking ?? throw new ArgumentNullException(nameof(currentDocking));
ZoneContacts = zoneContacts ?? throw new ArgumentNullException(nameof(zoneContacts));
StationRefit = stationRefit ?? throw new ArgumentNullException(nameof(stationRefit));
SectorMap = sectorMap ?? throw new ArgumentNullException(nameof(sectorMap));
@ -98,50 +98,30 @@ namespace GameCult.Aetheria.State.Verse
public CultMeshDocumentHandle<AetheriaRuntimeDaemonProviderAdvertisementDocument> ProviderAdvertisement { get; }
public CultMeshDocumentHandle<AetheriaRuntimeDaemonProviderAdvertisementDocument> ProviderAdvertisementDocument()
{
return ProviderAdvertisement;
}
public CultMeshReactiveDocument<AetheriaRuntimeDaemonProviderAdvertisementDocument> ReactiveProviderAdvertisement()
{
return ProviderAdvertisementDocument().Reactive();
return ProviderAdvertisement.Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeDaemonHealthDocument> Health { get; }
public CultMeshDocumentHandle<AetheriaRuntimeDaemonHealthDocument> HealthDocument()
{
return Health;
}
public CultMeshReactiveDocument<AetheriaRuntimeDaemonHealthDocument> ReactiveHealth()
{
return HealthDocument().Reactive();
return Health.Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeDaemonCommandBoundaryDocument> CommandBoundary { get; }
public CultMeshDocumentHandle<AetheriaRuntimeDaemonCommandBoundaryDocument> CommandBoundaryDocument()
{
return CommandBoundary;
}
public CultMeshReactiveDocument<AetheriaRuntimeDaemonCommandBoundaryDocument> ReactiveCommandBoundary()
{
return CommandBoundaryDocument().Reactive();
return CommandBoundary.Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeVerseAuthorityPolicyDocument> AuthorityPolicy { get; }
public CultMeshDocumentHandle<AetheriaRuntimeVerseAuthorityPolicyDocument> AuthorityPolicyDocument()
{
return AuthorityPolicy;
}
public CultMeshReactiveDocument<AetheriaRuntimeVerseAuthorityPolicyDocument> ReactiveAuthorityPolicy()
{
return AuthorityPolicyDocument().Reactive();
return AuthorityPolicy.Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeDaemonFrameDocument> DaemonFrame { get; }
@ -168,42 +148,27 @@ namespace GameCult.Aetheria.State.Verse
public CultMeshDocumentHandle<AetheriaRuntimeCurrentEntityDocument> CurrentEntity { get; }
public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDockingDocument { get; }
public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDocking { get; }
public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeScenarioDocument> StarbridgeScenario { get; }
public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeScenarioDocument> StarbridgeScenarioDocument()
{
return StarbridgeScenario;
}
public CultMeshReactiveDocument<AetheriaRuntimeStarbridgeScenarioDocument> ReactiveStarbridgeScenario()
{
return StarbridgeScenarioDocument().Reactive();
return StarbridgeScenario.Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionDocument> StarbridgeSession { get; }
public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionDocument> StarbridgeSessionDocument()
{
return StarbridgeSession;
}
public CultMeshReactiveDocument<AetheriaRuntimeStarbridgeSessionDocument> ReactiveStarbridgeSession()
{
return StarbridgeSessionDocument().Reactive();
return StarbridgeSession.Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionSummaryDocument> StarbridgeSummary { get; }
public CultMeshDocumentHandle<AetheriaRuntimeStarbridgeSessionSummaryDocument> StarbridgeSummaryDocument()
{
return StarbridgeSummary;
}
public CultMeshReactiveDocument<AetheriaRuntimeStarbridgeSessionSummaryDocument> ReactiveStarbridgeSummary()
{
return StarbridgeSummaryDocument().Reactive();
return StarbridgeSummary.Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeZoneContactsDocument> ZoneContacts { get; }
@ -214,134 +179,69 @@ namespace GameCult.Aetheria.State.Verse
public CultMeshDocumentHandle<AetheriaRuntimeZoneRenderDocument> ZoneRender { get; }
public CultMeshDocumentHandle<AetheriaRuntimeDaemonFrameDocument> DaemonFrameDocument()
{
return DaemonFrame;
}
public CultMeshReactiveDocument<AetheriaRuntimeDaemonFrameDocument> ReactiveDaemonFrame()
{
return DaemonFrameDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeDaemonSoaViewDocument> DaemonSoaViewDocument()
{
return DaemonSoaView;
return DaemonFrame.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeDaemonSoaViewDocument> ReactiveDaemonSoaView()
{
return DaemonSoaViewDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeZoneRenderDocument> ZoneRenderDocument()
{
return ZoneRender;
return DaemonSoaView.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeZoneRenderDocument> ReactiveZoneRender()
{
return ZoneRenderDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeLoadoutTemplatesDocument> LoadoutTemplatesDocument()
{
return LoadoutTemplates;
return ZoneRender.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeLoadoutTemplatesDocument> ReactiveLoadoutTemplates()
{
return LoadoutTemplatesDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeSectorMapDocument> SectorMapDocument()
{
return SectorMap;
return LoadoutTemplates.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeSectorMapDocument> ReactiveSectorMap()
{
return SectorMapDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeCurrentZoneDocument> CurrentZoneDocument()
{
return CurrentZone;
return SectorMap.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeCurrentZoneDocument> ReactiveCurrentZone()
{
return CurrentZoneDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeZoneContactsDocument> ZoneContactsDocument()
{
return ZoneContacts;
return CurrentZone.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeZoneContactsDocument> ReactiveZoneContacts()
{
return ZoneContactsDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeVerseHostSettingsDocument> VerseHostSettingsDocument()
{
return VerseHostSettings;
return ZoneContacts.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeVerseHostSettingsDocument> ReactiveVerseHostSettings()
{
return VerseHostSettingsDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeCurrentDockingDocument> CurrentDocking()
{
return CurrentDockingDocument;
return VerseHostSettings.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> ReactiveCurrentDocking()
{
return CurrentDocking().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeCurrentEntityDocument> CurrentEntityDocument()
{
return CurrentEntity;
return CurrentDocking.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeCurrentEntityDocument> ReactiveCurrentEntity()
{
return CurrentEntityDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeStationRefitDocument> StationRefitDocument()
{
return StationRefit;
return CurrentEntity.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> ReactiveStationRefit()
{
return StationRefitDocument().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimeCatalogSnapshot> CatalogSnapshot()
{
return Catalog;
return StationRefit.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimeCatalogSnapshot> ReactiveCatalogSnapshot()
{
return CatalogSnapshot().Reactive();
}
public CultMeshDocumentHandle<AetheriaRuntimePlayerSettingsDocument> PlayerSettingsDocument()
{
return PlayerSettings;
return Catalog.Reactive();
}
public CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> ReactivePlayerSettingsDocument()
{
return PlayerSettingsDocument().Reactive();
return PlayerSettings.Reactive();
}
public static bool TryResolveEveSurface(