Defer loading of trade stat data and fix tests

Author: vaisest

spec/System/TestTradeQueryGenerator_spec.lua

@@ -5,10 +5,9 @@ describe("TradeQueryGenerator", function()
 		-- Pass: Mod line maps correctly to trade stat entry without error
 		-- Fail: Mapping fails (e.g., no match found), indicating incomplete stat parsing for curse mods, potentially missing curse-enabling items in queries
 		it("handles special curse case", function()
-			local mod = { tradeHashes = {[30642521] = {"You can apply an additional Curse"}} }
-			local tradeStatsParsed = { result = { [2] = { entries = { { text = "You can apply # additional Curses", id = "explicit.stat_30642521" } } } } }
-			mock_queryGen.modData = { Explicit = true }
-			mock_queryGen:ProcessMod(mod, tradeStatsParsed, 1)
+			local mod = { tradeHashes = {[30642521] = {"You can apply an additional Curse"}}, type = "Prefix", weightKey = {}, weightVal = {} }
+			mock_queryGen.modData = { Explicit = {} }
+			mock_queryGen:ProcessMod(mod)
 			-- Simplified assertion; in full impl, check modData
 			assert.is_true(true)
 		end)

src/Classes/TradeHelpers.lua

@@ -32,18 +32,25 @@ function M.modLineValue(line)
 	return tonumber(line:match("%-?[%d]+%.?[%d]*"))
 end
 
+local _tradeStats
+
 ---@return table? tradeStats
 function M.getTradeStats()
+	if _tradeStats then return _tradeStats end
 	local file = io.open("./Data/trade_site_stats.json")
 	if not file then return nil end
 	local fileContents = file:read("*a")
 	local parsed = dkjson.decode(fileContents)
-	return parsed and parsed.result
+	_tradeStats = parsed and parsed.result
+	return _tradeStats
 end
 
+local _optionTradeStatMap
+
 ---@param tradeStats table table of data from https://www.pathofexile.com/api/trade2/data/stats
 ---@return table optionTradeStatMap table containing helper data for matching trade option filters
 local function getOptionTradeStatMap(tradeStats)
+	if _optionTradeStatMap then return _optionTradeStatMap end
 	local optionTradeStatMap = {}
 	for _, cat in ipairs(tradeStats) do
 		if cat.id == "enchant" or cat.id == "explicit" or cat.id == "implicit" then
@@ -62,7 +69,8 @@ local function getOptionTradeStatMap(tradeStats)
 			end
 		end
 	end
-	return optionTradeStatMap
+	_optionTradeStatMap = optionTradeStatMap
+	return _optionTradeStatMap
 end
 
 -- Map source types used in OpenBuySimilarPopup to trade API category labels
@@ -152,8 +160,6 @@ function M.formatDatabaseText(text)
 	return text
 end
 
-local tradeStats = M.getTradeStats()
-local optionTradeStatMap = getOptionTradeStatMap(tradeStats)
 
 -- Helper: find the trade stat ID for a mod line
 ---@param item         table
@@ -191,7 +197,9 @@ function M.findTradeHash(item, modLine, modType, isDesecrated)
 		end
 	end
 
-	if not tradeStats then return end
+	local tradeStats = M.getTradeStats()
+	local optionTradeStatMap = getOptionTradeStatMap(tradeStats)
+	if not tradeStats or not optionTradeStatMap then return end
 
 	for _, v in ipairs(optionTradeStatMap[modType] or {}) do
 		if v.pattern then

src/Classes/TradeQuery.lua

@@ -777,7 +777,7 @@ function TradeQueryClass:GetResultEvaluation(row_idx, result_index, calcFunc, ba
 		self.onlyWeightedBaseOutput[row_idx][result_index] = onlyWeightedBaseOutput
 		self.lastComparedWeightList[row_idx][result_index] = self.statSortSelectionList
 	end
-	
+
 	local slotName = self.slotTables[row_idx].nodeId and "Jewel " .. tostring(self.slotTables[row_idx].nodeId) or self.slotTables[row_idx].slotName
 	if slotName == "Megalomaniac" then
 		local addedNodes = {}
@@ -787,7 +787,7 @@ function TradeQueryClass:GetResultEvaluation(row_idx, result_index, calcFunc, ba
 				addedNodes[node] = true
 			end
 		end
-		
+
 		local output = self:ReduceOutput(calcFunc({ addNodes = addedNodes }))
 		local weight = self.tradeQueryGenerator.WeightedRatioOutputs(baseOutput, output, self.statSortSelectionList)
 		result.evaluation = {{ output = output, weight = weight }}
@@ -971,7 +971,9 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 					if self.tradeQueryGenerator.lastAugmentBehaviour == "Copy Current" or self.tradeQueryGenerator.lastAnointBehaviour == "Copy Current" then
 						for i, _ in ipairs(items) do
 							local item = new("Item", items[i].item_string)
-							self.itemsTab:CopyAnointsAndAugments(item, true, true, context.slotTbl.slotName)
+							if item.base then
+								self.itemsTab:CopyAnointsAndAugments(item, true, true, context.slotTbl.slotName)
+							end
 							items[i].item_string = item:BuildRaw()
 						end
 					elseif self.tradeQueryGenerator.lastAugmentBehaviour == "Remove" then

src/Classes/TradeQueryGenerator.lua

@@ -81,10 +81,10 @@ for type, bases in pairs(data.itemBaseLists) do
 	end
 end
 
-local tradeStats = tradeHelpers.getTradeStats()
 
 ---@return table[]? category list of entries for the mod type
 local function getStatEntries(modType)
+	local tradeStats = tradeHelpers.getTradeStats()
 	local tradeStatCategoryIndices = {
 		["Explicit"] = "explicit",
 		["Implicit"] = "implicit",

src/Data/QueryMods.lua

@@ -22385,10 +22385,17 @@ return {
 			}, 
 		}, 
 		["3759663284"] = {
+<<<<<<< HEAD
 			["Bow"] = {
 				["max"] = 20, 
 				["min"] = 20, 
 			}, 
+=======
+			["2HWeapon"] = {
+				["max"] = 20,
+				["min"] = 20,
+			},
+>>>>>>> 44955925b (Defer loading of trade stat data and fix tests)
 			["specialCaseData"] = {
 			}, 
 			["tradeMod"] = {
@@ -22528,10 +22535,17 @@ return {
 			}, 
 		}, 
 		["3885405204"] = {
+<<<<<<< HEAD
 			["Bow"] = {
 				["max"] = 1, 
 				["min"] = 1, 
 			}, 
+=======
+			["2HWeapon"] = {
+				["max"] = 1,
+				["min"] = 1,
+			},
+>>>>>>> 44955925b (Defer loading of trade stat data and fix tests)
 			["specialCaseData"] = {
 				["overrideModLineSingular"] = "Bow Attacks fire an additional Arrow",
 			},