Merge Grape from AtomicGmod/develop

feat(core): add network library

Author: smokingplaya

lua/atomic/libraries/class.lua

@@ -55,7 +55,8 @@ end
 ---@param name string
 ---@param packageOrId? Atomic.Package | string
 ---@param packageVersion? string
----@return Atomic.Class?
+---@generic T
+---@return T: Atomic.Class?
 function atomic.class.get(name, packageOrId, packageVersion)
   local pkgName = type(packageOrId) == "table" and packageOrId.id
       or type(packageOrId) == "string" and packageOrId
@@ -107,11 +108,13 @@ function atomic.class.accessors(class, ...)
   local vars = {...}
 
   for _, var in ipairs(vars) do
-    class["get" .. var] = function(self)
+    local varCapped = var:sub(1,1):upper() .. var:sub(2)
+
+    class["get" .. varCapped] = function(self)
       return self[var]
     end
 
-    class["set" .. var] = function(self, value)
+    class["set" .. varCapped] = function(self, value)
       self[var] = value
     end
   end
@@ -135,5 +138,15 @@ function atomic.class.register(class, package)
   ---@diagnostic disable-next-line
   storage[id][version][class._name] = class
 
+  atomic.class._storage = storage
+end
+
+function atomic.class.unregister(class, package)
+  local storage = atomic.class._storage
+  local id, version = package.id, package.version
+
+  ---@diagnostic disable-next-line
+  storage[id][version][class._name] = nil
+
   atomic.class._storage = storage
 end

lua/atomic/libraries/command.lua lua/atomic/libraries/command/class.lualua/atomic/libraries/command.lua renamed to lua/atomic/libraries/command/class.lua

@@ -1,51 +1,29 @@
----@alias Atomic.Command.ArgumentKind "number" | "string" | "time" | "player"
+---@alias Atomic.Command.ArgumentKind "number" | "string" | "boolean" | "time" | "player"
 ---@alias Atomic.Command.ExecuteFunc function(executor: Player, arguments: table<string, Atomic.Command.ArgumentKind): string?
 
----@class Atomic.Command
----@field name string
----@field permission string
----@field arguments {[1]: string, [2]: Atomic.Command.ArgumentKind}[]
+---@class Atomic.Command: Atomic.Class
+---@field private _name string
+---@field private _permission string
+---@field private _arguments {[1]: string, [2]: Atomic.Command.ArgumentKind}[]
 ---@field private _execute Atomic.Command.ExecuteFunc
 ---@field private _enabled boolean Internal
-
-atomic.command = {
-	---@type table<string, Atomic.Command>
-	logger = atomic.logger.new("atomic.command"),
-	_storage = {}
-}
-
----@class Atomic.Command
-local command = {}
-command.__index = command
+local command = atomic.class.create("Command")
+atomic.class.register(command, atomic.class.pseudo)
 
 ---@param name string
 ---@param permission string
-function atomic.command.new(name, permission)
-	return setmetatable({ name = name, permission = permission, arguments = {}, enabled = true }, command)
-end
-
----@param name string
----@param command Atomic.Command
-function atomic.command.add(name, command)
- 	atomic.command._storage[name] = command
-end
-
----@param name string
----@return Atomic.Command?
-function atomic.command.get(name)
-	return atomic.command._storage[name]
-end
-
----@param name string
-function atomic.command.remove(name)
-	atomic.command._storage[name] = nil
+function command:init(name, permission)
+  self._name = name
+  self._permission = permission
+  self._arguments = {}
+  self._enabled = true
 end
 
 ---@param name string
 ---@param kind Atomic.Command.ArgumentKind
 ---@return self
 function command:argument(name, kind)
-	self.arguments[#self.arguments + 1] = { name, kind }
+	self._arguments[#self._arguments + 1] = { name, kind }
 
 	return self
 end
@@ -62,7 +40,7 @@ end
 ---@param msg string
 local function sayToPlayer(player, msg)
 	if (IsValid(player)) then
-		player:ChatPrint(msg)
+		player:ChatPrint(language.GetPhrase(msg))
 	else
 		atomic.command.logger:error("Failed to execute command due to: %s", msg)
 	end
@@ -86,23 +64,22 @@ end
 ---@private
 ---@param executor Player
 ---@param arguments table<string, Atomic.Command.ArgumentKind>
----@return thread
 function command:doExecute(executor, arguments)
-	local thread = coroutine.create(function()
+  if (not self._enabled) then
+    return
+  end
+
+  coroutine.start(function()
 		local couldExecute = hook.Run("CouldPlayerExecuteCommand", executor, self)
 
-		if (!couldExecute or hasRightToExecute(executor, self.permission)) then
+		if (!couldExecute or hasRightToExecute(executor, self._permission)) then
 			return sayToPlayer(executor, "#atomic.no_perms")
 		end
 
 		local err = self._execute(executor, arguments)
 
 		sayToPlayer(executor, err)
 	end)
-
-	coroutine.resume(thread)
-
-	return thread
 end
 
 ---@param b boolean

lua/atomic/libraries/command/common.lua

@@ -0,0 +1,47 @@
+atomic.command = {
+	---@type table<string, Atomic.Command>
+	logger = atomic.logger.new("command"),
+	_storage = {}
+}
+
+---@include
+atomic.loader.server("class.lua")
+
+---@type Atomic.Command
+local commandClass = atomic.class.get("Command", atomic.class.pseudo)
+
+---@param name string
+---@param permission string
+---@return Atomic.Command
+function atomic.command.new(name, permission)
+  return atomic.class.new(commandClass, nil, name, permission)
+end
+
+---@param name string
+---@param command Atomic.Command
+function atomic.command.add(name, command)
+ 	atomic.command._storage[name] = command
+end
+
+---@param name string
+---@return Atomic.Command
+function atomic.command.get(name)
+	return atomic.command._storage[name]
+end
+
+---@param name string
+function atomic.command.remove(name)
+	atomic.command._storage[name] = nil
+end
+
+---@param command string
+---@vararg any
+---@return table<string, any>
+-- function atomic.command.toArgumentsTable(command, ...)
+--   local cmd = atomic.command.get(command)
+--   local args = cmd._arguments
+
+--   for _, type in ipairs(args) do
+
+--   end
+-- end

lua/atomic/libraries/loader.lua

@@ -1,5 +1,5 @@
 atomic.loader = atomic.loader or {
-  logger = atomic.logger.new("atomic.loader")
+  logger = atomic.logger.new("loader")
 }
 
 ---@param path string

lua/atomic/libraries/mysql.lua

@@ -24,7 +24,7 @@ if (file.Size("data/atomic/mysql/credentials.json", "GAME") <= 0) then
 }]];
 
   file.Write("atomic/mysql/credentials.json", defaultJson)
-	logger:warn("The `credentials.json` file has just been created in `data/atomic/mysql/` folder. To work with MySQL, fill in the database connection credentials in this file.")
+	logger:warn("the `credentials.json` file has just been created in `data/atomic/mysql/` folder. to work with MySQL, fill in the database connection credentials in this file.")
 end
 
 ---@class Atomic.MySQL.Credentials
@@ -46,15 +46,15 @@ if (autoconnect:GetBool() and not atomic.mysql._database) then
   )
 
   atomic.mysql._database.onConnected = function(_)
-    logger:info("Successfully connected to the MySQL database")
+    logger:info("successfully connected to the MySQL database")
   end
 
   atomic.mysql._database.onConnectionFailed = function(_, err)
-    logger:err("Error while connecting to database: %s", err)
+    logger:err("error while connecting to database: %s", err)
   end
 
   atomic.mysql._database.onError = function(_, err, sql)
-    logger:debug("Error executing query `%s`: %s", sql, err)
+    logger:debug("error executing query `%s`: %s", sql, err)
   end
 
   atomic.mysql._database:connect()
@@ -90,18 +90,13 @@ end
 function atomic.mysql.query(query, ...)
   local co = coroutine.get()
 
-  local result, error
   local prepared = atomic.mysql._database:prepare(query)
   prepared.onSuccess = function(_, data)
-    result = data
-
-    coroutine.resume(co)
+    coroutine.resume(co, data)
   end
 
   prepared.onError = function(_, err)
-    error = err
-
-    coroutine.resume(co)
+    coroutine.resume(co, nil, err)
   end
 
   for index, value in ipairs({...}) do
@@ -111,7 +106,5 @@ function atomic.mysql.query(query, ...)
 
   prepared:start()
 
-  coroutine.yield()
-
-  return result, error
+  return coroutine.yield()
 end