diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 4a03c5ca7..905e52f36 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -6069,8 +6069,9 @@ static void RequireTradeItemDetailsUseEveSurface(string root) "HandleTradeItemDetailsSurfaceCommand(", "AetheriaEveUnitySurfaceHost.RenderRuntime(", "AetheriaEveUnitySurfaceHost.Hide(_tradeItemSurfaceDocument)", - "AetheriaRuntimeTradeItemDetailsSurfaceBuilder.Build(ProjectTradeItemDetailsSurface(", - "AetheriaRuntimeTradeItemDetailsSurfaceBuilder.Project(", + "AetheriaRuntimeTradeItemDetailsSurfaceBuilder.Build(", + "ResolveManufacturerName(item)", + "FormatTemperature", "AetheriaRuntimeTradeItemDetailsSurfaceCommands.TryRead(request, out var command)", "AetheriaRuntimeTradeItemDetailsCommandKind.Close" }; @@ -6102,7 +6103,9 @@ static void RequireTradeItemDetailsUseEveSurface(string root) "new EveSurfaceComponent(", "string.Equals(request.Command, AetheriaRuntimeTradeItemDetailsSurfaceBuilder.Close", "new AetheriaRuntimeTradeItemDetailsSurfaceState(", + "ProjectTradeItemDetailsSurface(", "ProjectTradeItemDetailsSurfaceState(", + "AetheriaRuntimeTradeItemDetailsSurfaceBuilder.Project(", "ProjectTradeItemBehaviorSections(", "ProjectTradeItemBehaviorMetric(" }; @@ -6130,7 +6133,7 @@ static void RequireTradeItemDetailsUseEveSurface(string root) "AetheriaRuntimeTradeItemDetailsSurfaceState", "AetheriaRuntimeTradeItemSection", "AetheriaRuntimeTradeItemMetric", - "public static AetheriaRuntimeTradeItemDetailsSurfaceState Project(", + "private static AetheriaRuntimeTradeItemDetailsSurfaceState ProjectState(", "ProjectBehaviorSections(", "ProjectBehaviorMetric(", "public static AetheriaRuntimeSurfaceDocument Build(", @@ -6146,6 +6149,13 @@ static void RequireTradeItemDetailsUseEveSurface(string root) "Shared runtime trade item details surface builder no longer owns the trade item-details shell contract: " + string.Join(", ", missingBuilderSymbols)); } + + if (tradeItemDetailsSurfaceBuilder.Contains("public static AetheriaRuntimeTradeItemDetailsSurfaceState Project(", StringComparison.Ordinal) || + tradeItemDetailsSurfaceBuilder.Contains("public static AetheriaRuntimeTradeItemDetailsSurfaceState Compose(", StringComparison.Ordinal)) + { + throw new InvalidOperationException( + "Runtime trade item detail projection must stay behind Build(...); do not re-expose Project/Compose as the public trade item details path."); + } } static void RequireTradeItemValuesUseRuntimeQueries(string root) diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index cb269fc08..667b5e69c 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -722,7 +722,11 @@ public class TradeMenu : MonoBehaviour transform, _tradeItemSurfaceDocument, "Aetheria Trade Item Details Surface", - AetheriaRuntimeTradeItemDetailsSurfaceBuilder.Build(ProjectTradeItemDetailsSurface(item)), + AetheriaRuntimeTradeItemDetailsSurfaceBuilder.Build( + item, + ResolveManufacturerName(item), + FormatValue, + FormatTemperature), HandleTradeItemDetailsSurfaceCommand, _tradeItemSurfaceChrome, sortingOrder: 1003); @@ -753,15 +757,6 @@ public class TradeMenu : MonoBehaviour AetheriaEveUnitySurfaceHost.Hide(_tradeItemSurfaceDocument); } - private AetheriaRuntimeTradeItemDetailsSurfaceState ProjectTradeItemDetailsSurface(AetheriaRuntimeCatalogItem item) - { - return AetheriaRuntimeTradeItemDetailsSurfaceBuilder.Project( - item, - ResolveManufacturerName(item), - FormatValue, - FormatTemperature); - } - void Start() { FoldoutButton.onClick.AddListener(() => diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeTradeItemDetailsSurfaceBuilder.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeTradeItemDetailsSurfaceBuilder.cs index 0a3e5cc0f..55f3d0b5d 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeTradeItemDetailsSurfaceBuilder.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeTradeItemDetailsSurfaceBuilder.cs @@ -80,7 +80,25 @@ namespace GameCult.Aetheria.State.Verse public const string SurfaceId = "aetheria.trade.item_details"; public const string Close = "aetheria.trade.item_details.close"; - public static AetheriaRuntimeTradeItemDetailsSurfaceState Project( + public static AetheriaRuntimeSurfaceDocument Build( + AetheriaRuntimeCatalogItem item, + string manufacturer, + Func formatValue, + Func formatTemperature, + DateTime updatedAtUtc = default(DateTime), + long version = 1) + { + return Build( + ProjectState( + item, + manufacturer, + formatValue, + formatTemperature, + updatedAtUtc), + version); + } + + private static AetheriaRuntimeTradeItemDetailsSurfaceState ProjectState( AetheriaRuntimeCatalogItem item, string manufacturer, Func formatValue,