Change class constructors to call the constructor directly, instead of using new() and varargs

Author: vaisest

spec/System/TestItemParse_spec.lua

@@ -50,7 +50,7 @@ describe("TestItemTools", function()
 		if not common.classes.ItemsTab then
 			LoadModule("Classes/ItemsTab")
 		end
-		local item = new("Item", [[
+		local item = new("Item"):Item([[
 Rarity: Rare
 Dire Thread
 Cord Belt

spec/System/TestItemTools_spec.lua

@@ -144,7 +144,7 @@ end
 -- parsing path: the mod sets jewelData.radiusIndex (an annular ring index, not
 -- the same as the full-circle index 3 that "Radius: Large" would produce).
 local function newThreadOfHope()
-	return new("Item", "Rarity: UNIQUE\n" ..
+	return new("Item"):Item("Rarity: UNIQUE\n" ..
 		"Thread of Hope\n" ..
 		"Crimson Jewel\n" ..
 		"Variant: Large Ring\n" ..
@@ -156,7 +156,7 @@ local function newThreadOfHope()
 end
 
 local function newCustomLeapJewel(name)
-	return new("Item", "Rarity: RARE\n" ..
+	return new("Item"):Item("Rarity: RARE\n" ..
 		name .. "\n" ..
 		"Crimson Jewel\n" ..
 		"Radius: Variable\n" ..
@@ -166,7 +166,7 @@ local function newCustomLeapJewel(name)
 end
 
 local function newPlainJewel()
-	return new("Item", "Rarity: RARE\n" ..
+	return new("Item"):Item("Rarity: RARE\n" ..
 		"Plain Spark\n" ..
 		"Crimson Jewel\n" ..
 		"Implicits: 0\n")
@@ -176,7 +176,7 @@ end
 -- a specific keystone. The parser populates both impossibleEscapeKeystone
 -- and impossibleEscapeKeystones from the "in Radius of X" mod.
 local function newImpossibleEscape(keystoneName)
-	return new("Item", "Rarity: UNIQUE\n" ..
+	return new("Item"):Item("Rarity: UNIQUE\n" ..
 		"Impossible Escape\n" ..
 		"Viridian Jewel\n" ..
 		"Radius: Small\n" ..
@@ -196,7 +196,7 @@ end
 -- text are intentionally omitted; the tests exercise behavior, not the parser
 -- against the full serialized form.
 local function newLethalPride()
-	return new("Item", "Rarity: UNIQUE\n" ..
+	return new("Item"):Item("Rarity: UNIQUE\n" ..
 		"Lethal Pride\n" ..
 		"Timeless Jewel\n" ..
 		"Radius: Large\n" ..
@@ -211,7 +211,7 @@ end
 -- will reset the modList back to the original tree node modList.
 local function simulateKaruiConquest(node)
 	node.conqueredBy = { id = 10000, conqueror = { id = 1, type = "karui" } }
-	node.modList = new("ModList")
+	node.modList = new("ModList"):ModList()
 	node.modList:NewMod("Life", "BASE", 100, "Timeless Jewel")
 end
 
@@ -220,7 +220,7 @@ local function overrideNodeWithLife(spec, node, life)
 	override.id = node.id
 	override.dn = node.dn
 	override.sd = { "+" .. life .. " to maximum Life" }
-	override.modList = new("ModList")
+	override.modList = new("ModList"):ModList()
 	override.modList:NewMod("Life", "BASE", life, "Test")
 	spec.hashOverrides[node.id] = override
 end
@@ -456,7 +456,7 @@ describe("TestRadiusJewelStatDiff", function()
 
 		local plainJewel = newPlainJewel()
 		build.itemsTab:AddItem(plainJewel, true)
-		local tooltip = new("Tooltip")
+		local tooltip = new("Tooltip"):Tooltip()
 		build.itemsTab:AddItemTooltip(tooltip, plainJewel, slot)
 
 		assert.is_true(tooltipContains(tooltip, "Equipping this item in"),
@@ -515,7 +515,7 @@ describe("TestRadiusJewelStatDiff", function()
 		assert.are.equals(2, #targetNode.intuitiveLeapLikesAffecting,
 			"Allocated overlap node should still be supported by both radius jewels")
 
-		local tooltip = new("Tooltip")
+		local tooltip = new("Tooltip"):Tooltip()
 		build.itemsTab:AddItemTooltip(tooltip, itemA, slotA)
 
 		assert.is_false(tooltipContainsNegativeStat(tooltip, "Total Life"),
@@ -590,7 +590,7 @@ describe("TestRadiusJewelStatDiff", function()
 		assert.is_true(#nodesInRadius > 0, "Should have allocated nodes in jewel radius")
 		simulateKaruiConquest(nodesInRadius[1])
 
-		local tooltip = new("Tooltip")
+		local tooltip = new("Tooltip"):Tooltip()
 		build.itemsTab:AddItemTooltip(tooltip, item, slot)
 
 		assert.is_true(tooltipContains(tooltip, "Removing this item"),

spec/System/TestRadiusJewelStatDiff_spec.lua

@@ -2,7 +2,7 @@ describe("TradeQuery Currency Conversion", function()
 	local mock_tradeQuery
 
 	before_each(function()
-		mock_tradeQuery = new("TradeQuery", { itemsTab = {} })
+		mock_tradeQuery = new("TradeQuery"):TradeQuery({ itemsTab = {} })
 	end)
 
 	-- test case for commit: "Skip callback on errors to prevent incomplete conversions"

spec/System/TestTradeQueryCurrency_spec.lua

@@ -1,5 +1,5 @@
 describe("TradeQueryGenerator", function()
-	local mock_queryGen = new("TradeQueryGenerator", { itemsTab = {} })
+	local mock_queryGen = new("TradeQueryGenerator"):TradeQueryGenerator({ itemsTab = {} })
 
 	describe("ProcessMod", function()
 		-- Pass: Mod line maps correctly to trade stat entry without error

spec/System/TestTradeQueryGenerator_spec.lua

@@ -3,7 +3,7 @@ describe("TradeQueryRateLimiter", function()
 		-- Pass: Extracts keys/values correctly
 		-- Fail: Nil/malformed values, indicating regex failure, breaking policy updates from API
 		it("parses basic headers", function()
-			local limiter = new("TradeQueryRateLimiter")
+			local limiter = new("TradeQueryRateLimiter"):TradeQueryRateLimiter()
 			local headers = limiter:ParseHeader("X-Rate-Limit-Policy: test\nRetry-After: 5\nContent-Type: json")
 			assert.are.equal(headers["x-rate-limit-policy"], "test")
 			assert.are.equal(headers["retry-after"], "5")
@@ -15,7 +15,7 @@ describe("TradeQueryRateLimiter", function()
 		-- Pass: Extracts rules/limits/states accurately
 		-- Fail: Wrong buckets/windows, indicating parsing bug, enforcing incorrect rates
 		it("parses full policy", function()
-			local limiter = new("TradeQueryRateLimiter")
+			local limiter = new("TradeQueryRateLimiter"):TradeQueryRateLimiter()
 			local header = "X-Rate-Limit-Policy: trade-search-request-limit\nX-Rate-Limit-Rules: Ip,Account\nX-Rate-Limit-Ip: 8:10:60,15:60:120\nX-Rate-Limit-Ip-State: 7:10:60,14:60:120\nX-Rate-Limit-Account: 2:5:60\nX-Rate-Limit-Account-State: 1:5:60\nRetry-After: 10"
 			local policies = limiter:ParsePolicy(header)
 			local policy = policies["trade-search-request-limit"]
@@ -30,7 +30,7 @@ describe("TradeQueryRateLimiter", function()
 		-- Pass: Reduces limits (e.g., 5 -> 4)
 		-- Fail: Unchanged limits, indicating margin ignored, risking user over-requests
 		it("applies margin to limits", function()
-			local limiter = new("TradeQueryRateLimiter")
+			local limiter = new("TradeQueryRateLimiter"):TradeQueryRateLimiter()
 			limiter.limitMargin = 1
 			local header = "X-Rate-Limit-Policy: test\nX-Rate-Limit-Rules: Ip\nX-Rate-Limit-Ip: 5:10:60\nX-Rate-Limit-Ip-State: 4:10:60"
 			limiter:UpdateFromHeader(header)
@@ -42,7 +42,7 @@ describe("TradeQueryRateLimiter", function()
 		-- Pass: Delays past timestamp
 		-- Fail: Allows immediate request, indicating ignored cooldowns, causing 429 errors
 		it("blocks on retry-after", function()
-			local limiter = new("TradeQueryRateLimiter")
+			local limiter = new("TradeQueryRateLimiter"):TradeQueryRateLimiter()
 			local now = os.time()
 			limiter.policies["test"] = {}
 			limiter.retryAfter["test"] = now + 10
@@ -53,7 +53,7 @@ describe("TradeQueryRateLimiter", function()
 		-- Pass: Calculates delay from timestamps
 		-- Fail: Allows request in limit, indicating state misread, over-throttling or bans
 		it("blocks on window limit", function()
-			local limiter = new("TradeQueryRateLimiter")
+			local limiter = new("TradeQueryRateLimiter"):TradeQueryRateLimiter()
 			local now = os.time()
 			limiter.policies["test"] = { ["ip"] = { ["limits"] = { ["10"] = { ["request"] = 1, ["timeout"] = 60 } }, ["state"] = { ["10"] = { ["request"] = 1, ["timeout"] = 0 } } } }
 			limiter.requestHistory["test"] = { timestamps = {now - 5} }
@@ -67,7 +67,7 @@ describe("TradeQueryRateLimiter", function()
 		-- Pass: Removes old stamps, decrements to 1
 		-- Fail: Stale data persists, indicating aging bug, perpetual blocking
 		it("cleans up timestamps and decrements", function()
-			local limiter = new("TradeQueryRateLimiter")
+			local limiter = new("TradeQueryRateLimiter"):TradeQueryRateLimiter()
 			limiter.policies["test"] = { ["ip"] = { ["state"] = { ["10"] = { ["request"] = 2, ["timeout"] = 0, ["decremented"] = nil } } } }
 			limiter.requestHistory["test"] = { timestamps = {os.time() - 15, os.time() - 5}, maxWindow=10, lastCheck=os.time() - 10 }
 			limiter:AgeOutRequests("test", os.time())

spec/System/TestTradeQueryRateLimiter_spec.lua

@@ -12,7 +12,7 @@ describe("TradeQueryRequests", function()
 			return key
 		end
 	}
-	local requests = new("TradeQueryRequests", mock_limiter)
+	local requests = new("TradeQueryRequests"):TradeQueryRequests(mock_limiter)
 
 	local function simulateRetry(requests, mock_limiter, policy, current_time)
 		local now = current_time

spec/System/TestTradeQueryRequests_spec.lua

@@ -7,7 +7,7 @@ describe("TradeQuery", function()
 		-- lives behind a callback we never trigger, or is already initialized
 		-- by the TradeQuery constructor.
 		local function newTradeQuery(state)
-			local tq = new("TradeQuery", { itemsTab = {} })
+			local tq = new("TradeQuery"):TradeQuery({ itemsTab = {} })
 			tq.itemsTab.activeItemSet = {}
 			tq.itemsTab.slots         = {}
 			tq.slotTables[1] = { slotName = "Ring 1" }
@@ -27,7 +27,7 @@ describe("TradeQuery", function()
 			-- No sorted results at all -> first guard must short-circuit.
 			local tq = newTradeQuery({})
 			local dropdown = buildRow1Dropdown(tq)
-			local tooltip = new("Tooltip")
+			local tooltip = new("Tooltip"):Tooltip()
 
 			assert.has_no.errors(function()
 				dropdown.tooltipFunc(tooltip, "DROP", 1, nil)
@@ -46,7 +46,7 @@ describe("TradeQuery", function()
 			})
 			local dropdown = buildRow1Dropdown(tq)
 			tq.resultTbl[1] = {}
-			local tooltip = new("Tooltip")
+			local tooltip = new("Tooltip"):Tooltip()
 
 			assert.has_no.errors(function()
 				dropdown.tooltipFunc(tooltip, "DROP", 1, nil)

spec/System/TestTradeQuery_spec.lua

@@ -17,7 +17,7 @@ function BuildListClass:BuildListControl(anchor, rect, listMode)
 		{ },
 	}
 	self.showRowSeparators = true
-	self.controls.path = new("PathControl", {"BOTTOM",self,"TOP"}, {0, -2, self.width, 24}, main.buildPath, listMode.subPath, function(subPath)
+	self.controls.path = new("PathControl"):PathControl({"BOTTOM",self,"TOP"}, {0, -2, self.width, 24}, main.buildPath, listMode.subPath, function(subPath)
 		listMode.subPath = subPath
 		listMode:BuildList()
 		self.selIndex = nil
@@ -44,7 +44,7 @@ function BuildListClass:BuildListControl(anchor, rect, listMode)
 		end
 	end
 	self.dragTargetList = { self.controls.path, self }
-	self.controls.path.width = function ()
+	self.controls.path.width = function()
 		return self.width()
 	end
 end
@@ -77,8 +77,8 @@ end
 
 function BuildListClass:RenameBuild(build, copyOnName)
 	local controls = { }
-	controls.label = new("LabelControl", nil, {0, 20, 0, 16}, "^7Enter the new name for this "..(build.folderName and "folder:" or "build:"))
-	controls.edit = new("EditControl", nil, {0, 40, 350, 20}, build.folderName or build.buildName, nil, "\\/:%*%?\"<>|%c", 100, function(buf)
+	controls.label = new("LabelControl"):LabelControl(nil, {0, 20, 0, 16}, "^7Enter the new name for this "..(build.folderName and "folder:" or "build:"))
+	controls.edit = new("EditControl"):EditControl(nil, {0, 40, 350, 20}, build.folderName or build.buildName, nil, "\\/:%*%?\"<>|%c", 100, function(buf)
 		controls.save.enabled = false
 		if build.folderName then
 			if buf:match("%S") then
@@ -100,7 +100,7 @@ function BuildListClass:RenameBuild(build, copyOnName)
 			end
 		end
 	end)
-	controls.save = new("ButtonControl", nil, {-45, 70, 80, 20}, "Save", function()
+	controls.save = new("ButtonControl"):ButtonControl(nil, {-45, 70, 80, 20}, "Save", function()
 		local newBuildName = controls.edit.buf
 		if build.folderName then
 			if copyOnName then
@@ -135,7 +135,7 @@ function BuildListClass:RenameBuild(build, copyOnName)
 		self.listMode:SelectControl(self)
 	end)
 	controls.save.enabled = false
-	controls.cancel = new("ButtonControl", nil, {45, 70, 80, 20}, "Cancel", function()
+	controls.cancel = new("ButtonControl"):ButtonControl(nil, {45, 70, 80, 20}, "Cancel", function()
 		main:ClosePopup()
 		self.listMode:SelectControl(self)
 	end)

src/Classes/BuildListControl.lua

@@ -21,13 +21,13 @@ function CalcBreakdownClass:CalcBreakdownControl(calcsTab)
 	self:ControlHost()
 	self.calcsTab = calcsTab
 	self.shown = false
-	self.tooltip = new("Tooltip")
-	self.nodeViewer = new("PassiveTreeView")
+	self.tooltip = new("Tooltip"):Tooltip()
+	self.nodeViewer = new("PassiveTreeView"):PassiveTreeView()
 	self.rangeGuide = NewImageHandle()
 	self.rangeGuide:Load("Assets/range_guide.png")
 	self.uiOverlay = NewImageHandle()
 	self.uiOverlay:Load("Assets/game_ui_small.png")
-	self.controls.scrollBar = new("ScrollBarControl", {"RIGHT",self,"RIGHT"}, {-2, 0, 18, 0}, 80, "VERTICAL", true)
+	self.controls.scrollBar = new("ScrollBarControl"):ScrollBarControl({"RIGHT",self,"RIGHT"}, {-2, 0, 18, 0}, 80, "VERTICAL", true)
 end
 
 function CalcBreakdownClass:IsMouseOver()