FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-16 22:46:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(class): remove support for class.init

Browse Source
This commit is contained in:
Linden
2024-03-25 20:09:41 +11:00
parent e031f19bea
commit 1456f4493e
1 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
imports/class/shared.lua
View File

@@ -55,25 +55,12 @@ local function void() return '' end
---@return T
function mixins.new(class, ...)
local constructor = getConstructor(class)
local obj = {
local obj = setmetatable({
private = {}
}
}, class)
if not constructor and table.type(...) == 'hash' then
lib.print.warn(([[Creating instance of %s with a table and no constructor.
This behaviour is deprecated and will not be supported in the future.]])
:format(class.__name))
obj = ...
if obj.private then
assertType('private', obj.private, 'table')
end
end
setmetatable(obj, class)
if constructor and obj ~= ... then
if constructor then
local parent = class
function obj:super(...)
@@ -84,13 +71,6 @@ This behaviour is deprecated and will not be supported in the future.]])
end
constructor(obj, ...)
---@diagnostic disable-next-line: undefined-field
elseif class.init then
lib.print.warn(([[Calling %s:init() is deprecated and will not be supported in the future.
Use %s:constructor(...args) and assign properties in the constructor.]])
:format(class.__name, class.__name))
obj:init()
end
obj.super = nil
@@ -113,7 +93,7 @@ Use %s:constructor(...args) and assign properties in the constructor.]])
local di = getinfo(2, 'n')
if di.namewhat ~= 'method' then
error(("cannot set values on private field '%s'"):format(index), 2)
error(("cannot set value of private field '%s'"):format(index), 2)
end
private[index] = value