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,15 +1,11 @@
local tableMerge = table.merge
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
---@class Node : Item
---@field defaultDef Node.NodeDefinition
local Node = Class.extend(Item, {})
---The alias `table.merge` for EmmyLua
---@type fun(...):(Node.NodeDefinition)
local defMerge = function(...)
return table.merge(...)
end
---@param nodeDef Node.NodeDefinition
local function registerSlab(nodeDef)
nodeDef = table.copy_with_metatables(nodeDef)
@@ -71,7 +67,7 @@ end
---@return Node
function Node:new(nodeDef)
-- Adding default parameters.
nodeDef = defMerge(nodeDef, self.defaultDef, true)
nodeDef = tableMerge(nodeDef, self.defaultDef, true)
local settings = nodeDef.settings
settings._type = 'node'
@@ -103,7 +99,7 @@ end
---@param defaultDef Node.NodeDefinition
---@return Node
function Node:getExtended(defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef, true)
defaultDef = tableMerge(defaultDef, self.defaultDef, true)
---@type Node
local ChildClass = Class.extend(self, {
@@ -120,7 +116,7 @@ function Node: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