Item & Node: add merge defaults defs to getExtended and getFactory

This commit is contained in:
Van
2026-02-09 18:15:22 +03:00
parent 430ac78ea1
commit ec8499ff76
2 changed files with 9 additions and 1 deletions

View File

@@ -193,6 +193,8 @@ end
---@param defaultDef Item.ItemDefinition ---@param defaultDef Item.ItemDefinition
---@return Item ---@return Item
function Item:getExtended(defaultDef) function Item:getExtended(defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef)
---@type Item ---@type Item
local ChildClass = extend(self, { local ChildClass = extend(self, {
defaultDef = defaultDef, defaultDef = defaultDef,
@@ -207,6 +209,8 @@ end
function Item:getFactory(defaultDef) function Item:getFactory(defaultDef)
if defaultDef == nil then if defaultDef == nil then
defaultDef = self.defaultDef defaultDef = self.defaultDef
else
defaultDef = defMerge(self.defaultDef, defaultDef)
end end
---@type ItemFactory ---@type ItemFactory

View File

@@ -35,6 +35,8 @@ end
---@param defaultDef Node.NodeDefinition ---@param defaultDef Node.NodeDefinition
---@return Node ---@return Node
function Node:getExtended(defaultDef) function Node:getExtended(defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef)
---@type Node ---@type Node
local ChildClass = Class.extend(self, { local ChildClass = Class.extend(self, {
defaultDef = defaultDef, defaultDef = defaultDef,
@@ -49,6 +51,8 @@ end
function Node:getFactory(defaultDef) function Node:getFactory(defaultDef)
if defaultDef == nil then if defaultDef == nil then
defaultDef = self.defaultDef defaultDef = self.defaultDef
else
defaultDef = defMerge(self.defaultDef, defaultDef)
end end
---@type ItemFactory ---@type ItemFactory
@@ -57,4 +61,4 @@ function Node:getFactory(defaultDef)
return instance return instance
end end
return Node return Node