Table: fix annotations, remove defMerge alias from Item, Node, and Tool

This commit is contained in:
Van
2026-05-19 17:14:56 +03:00
parent bd1059f9d7
commit 85aaf470f7
4 changed files with 21 additions and 33 deletions

View File

@@ -1,20 +1,16 @@
local tableMerge = table.merge
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
---@class Tool : Item
---@field defaultDef Item.ItemDefinition
local Tool = Class.extend(Item, {})
---The alias `table.merge` for EmmyLua
---@type fun(...):(Item.ItemDefinition)
local defMerge = function(...)
return table.merge(...)
end
---@param ToolDef Item.ItemDefinition
---@return Tool
function Tool:new(ToolDef)
---Adding default parameters
ToolDef = defMerge(ToolDef, self.defaultDef, true)
ToolDef = tableMerge(ToolDef, self.defaultDef, true)
ToolDef.settings._type = 'tool'
@@ -29,7 +25,7 @@ end
---@param defaultDef Item.ItemDefinition
---@return Tool
function Tool:getExtended(defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef, true)
defaultDef = tableMerge(defaultDef, self.defaultDef, true)
---@type Tool
local ChildClass = Class.extend(self, {
@@ -46,7 +42,7 @@ function Tool:getFactory(defaultDef)
if defaultDef == nil then
defaultDef = self.defaultDef
else
defaultDef = defMerge(self.defaultDef, defaultDef, true)
defaultDef = tableMerge(self.defaultDef, defaultDef, true)
end
---@type ItemFactory