feat(core): add config system, a lot of improvements

Author: smokingplaya

.luarc.json

@@ -1,7 +1,7 @@
 {
   "Lua.workspace.library": [
-    "${addons}/garrysmod/module/library"
-  ],
+        "${addons}/garrysmod/module/library"
+    ],
   "Lua.runtime.version": "LuaJIT",
   "Lua.runtime.special": {
     "include": "dofile",
@@ -11,13 +11,21 @@
     "atomic.loader.server": "dofile"
   },
   "Lua.runtime.nonstandardSymbol": [
-    "continue"
+    "continue",
+        "!",
+        "!=",
+        "&&",
+        "||",
+        "//",
+        "/**/"
   ],
   "Lua.diagnostics.disable": [
     "duplicate-set-field"
   ],
   "Lua.workspace.checkThirdParty": false,
     "diagnostics.globals": [
-        "atomic"
+        "atomic",
+        "git",
+        "mysqloo"
     ]
 }

lua/atomic/libraries/class.lua

@@ -34,6 +34,10 @@ function atomic.class.create(name, parent)
     return "instance of " .. tostring(self._name)
   end
 
+  class.__classname = function(self)
+    return name
+  end
+
   return class
 end
 
@@ -70,11 +74,11 @@ end
 --- local animal = atomic.class.new(animalClass)
 --- ```
 ---
+---@generic T
 ---@param class Atomic.Class
----@param tab table? Content of the instance
+---@param tab T? Content of the instance
 ---@vararg any
----@generic T
----@return Atomic.Class
+---@return T: Atomic.Class
 function atomic.class.new(class, tab, ...)
   local instance = setmetatable(tab or {}, class)
 

lua/atomic/libraries/loader.lua

@@ -9,7 +9,7 @@ function atomic.loader.client(path)
     return AddCSLuaFile(path)
   end
 
-  atomic.loader.logger:debug("including client file `%s`", path)
+  atomic.loader.logger:trace("including client file `%s`", path)
 
   return include(path)
 end
@@ -21,7 +21,7 @@ function atomic.loader.shared(path)
     AddCSLuaFile(path)
   end
 
-  atomic.loader.logger:debug("including shared file `%s`", path)
+  atomic.loader.logger:trace("including shared file `%s`", path)
 
   return include(path)
 end
@@ -30,7 +30,7 @@ end
 ---@return ...?
 function atomic.loader.server(path)
   if (SERVER) then
-    atomic.loader.logger:debug("including server file `%s`", path)
+    atomic.loader.logger:trace("including server file `%s`", path)
     return include(path)
   end
 end

lua/atomic/libraries/logger.lua

@@ -35,19 +35,21 @@ local iswin = jit.os == "Windows"
 
 -- colors
 local white = iswin and Color(255, 255, 255) or "\27[37m"
-local info = iswin and Color(0, 255, 0) or "\27[32m"
+local trace = iswin and Color(128, 128, 128) or "\27[90m"
 local debug = iswin and Color(0, 255, 255) or "\27[36m"
+local info = iswin and Color(0, 255, 0) or "\27[32m"
 local warn = iswin and Color(255, 255, 0) or "\27[33m"
 local err = iswin and Color(255, 0, 0) or "\27[31m"
 
 local levels = {
-  DEBUG = 1,
-  INFO = 2,
-  WARN = 3,
-  ERR = 4,
+  TRACE = 1,
+  DEBUG = 2,
+  INFO = 3,
+  WARN = 4,
+  ERR = 5,
 }
 
-local logvar = CreateConVar("atomic_log", "INFO", FCVAR_ARCHIVE + FCVAR_PROTECTED, "Minimum log level (INFO, DEBUG, WARN, ERR)")
+local logvar = CreateConVar("atomic_log", "INFO", {FCVAR_ARCHIVE, FCVAR_PROTECTED}, "Minimum log level (INFO, DEBUG, WARN, ERR)")
 
 ---@param prefix string
 function loggerClass:init(prefix)
@@ -70,14 +72,19 @@ function loggerClass:log(color, level, message, ...)
   MsgN()
 end
 
-function loggerClass:info(message, ...)
-  self:log(info, "INFO", message, ...)
+function loggerClass:trace(message, ...)
+  self:log(trace, "TRACE", message, ...)
 end
 
 function loggerClass:debug(message, ...)
   self:log(debug, "DEBUG", message, ...)
 end
 
+
+function loggerClass:info(message, ...)
+  self:log(info, "INFO", message, ...)
+end
+
 function loggerClass:warn(message, ...)
   self:log(warn, "WARN", message, ...)
 end

lua/atomic/libraries/package/class.lua

@@ -4,7 +4,7 @@
 ---@field description string?
 ---@field version string
 ---@field documentation string?
--- @field configuration table<string, any>?
+-- @field configuration Atomic.Package.Configuration?
 ---@field files table<"client" | "shared" | "server", string[]>
 ---@field dependencies table<string, string>?
 ---@field atomic { version: string }?
@@ -18,14 +18,15 @@
 local package = atomic.class.create("Package")
 atomic.class.register(package, atomic.class.pseudo)
 
-local logger = atomic.class.get("Logger")
-
----@cast logger Atomic.Logger
+local configClass = atomic.class.get("Configuration")
+---@cast configClass Atomic.Package
 
 function package:init()
-  local prefix = (self.id:Split(".")[3] or ""):lower()
+  local prefix = (self.id:Split(".")[3] or "n/a"):lower()
+
+  local config = self.configuration or {}
 
-  self.configuration = self.configuration or {}
+  self.configuration = atomic.class.new(configClass, nil, config, self)
   self._isLoaded = false
   self._events = {}
   self._commands = {}
@@ -101,11 +102,15 @@ end
 ---@param callback fun(player: Player)
 ---@return integer registrationId
 function package:bind(key, callback)
-  self._binds[#self._binds+1] = {
+  local id = #self._binds+1
+
+  self._binds[id] = {
     key = key,
     callback = callback,
     registrationId = 0
   }
+
+  return id
 end
 
 --- Commands
@@ -173,4 +178,29 @@ end
 ---@param eventName string
 function package:unlisten(eventName)
   self._events[eventName] = nil
-end
+end
+
+--- Classes
+
+--- Creates new class and automatically registeres it
+---@param name string
+---@generic T
+---@return T: Atomic.Class
+function package:newClass(name)
+  local class = atomic.class.create(name)
+  atomic.class.register(class, self)
+
+  return class
+end
+
+--- Return package's registered class
+---@param class Atomic.Class
+function package:registerClass(class)
+  return atomic.class.register(class, self)
+end
+
+--- Return package's registered class
+---@param name string
+function package:getClass(name)
+  return atomic.class.get(name, self)
+end

lua/atomic/libraries/package/common.lua

@@ -5,6 +5,10 @@ atomic.package = atomic.package or {
   _pathMap = {}
 }
 
+---@include
+atomic.loader.shared("config.lua")
+atomic.loader.shared("class.lua")
+
 local packageClass = atomic.class.get("Package")
 
 ---@cast packageClass Atomic.Package
@@ -30,7 +34,17 @@ end
 ---@param id string
 ---@param version string
 function atomic.package.get(id, version)
-  return (atomic.package._storage[id] or {})[version]
+  local packages = atomic.package._storage[id]
+
+  if (not packages) then
+    return
+  end
+
+  for ver, package in pairs(packages) do
+    if (util.IsVersionSuitable(ver, version)) then
+      return package
+    end
+  end
 end
 
 --- Searches for packages along the specified path
@@ -93,10 +107,11 @@ function atomic.package.load(package)
 
   local packageInstance = atomic.package.new(package)
 
+  ---@diagnostic disable-next-line
   atomic.package._pathMap[package._path] = { package.id, package.version }
 
   ---@cast packageInstance Atomic.Package
-  if packageInstance.atomic and not util.IsVersionSuitable(packageInstance.atomic.version, atomic.meta.version) then
+  if packageInstance.atomic and not util.IsVersionSuitable(atomic.meta.version, packageInstance.atomic.version) then
     atomic.log:err(
       "package `%s` requires atomic %s, but current is %s",
       packageInstance.id, tostring(packageInstance.atomic.version), tostring(atomic.meta.version)
@@ -128,17 +143,32 @@ function atomic.package.loadMany(packages)
 
   local packagesCache = {}
 
+  local findPackage = function(id, version)
+    local packagesCached = packagesCache[id]
+    local cached = packagesCached and packagesCached[version]
+
+    return cached or atomic.package.get(id, version)
+  end
+
+  local insertPackage = function(id, version, package)
+    if (not packagesCache[id]) then
+      packagesCache[id] = {}
+    end
+
+    packagesCache[id][version] = package
+  end
+
   for _, pkg in ipairs(packages) do
-    if not pkg.id or not pkg.version then
+    local id, version = pkg.id, pkg.version
+    if not id or not version then
       atomic.log:err("invalid package detected (missing id/version), skipping.")
       continue
     end
 
-    local key = pkg.id .. "@" .. pkg.version
-    if packagesCache[key] then
+    if findPackage(id, version) then
       atomic.log:warn("duplicate package `%s@%s` ignored.", pkg.id, pkg.version)
     else
-      packagesCache[key] = pkg
+      insertPackage(id, version, pkg)
     end
   end
 
@@ -148,7 +178,7 @@ function atomic.package.loadMany(packages)
     local deps = pkg.dependencies
     if type(deps) == "table" then
       for depId, depVersion in pairs(deps) do
-        if not packagesCache[depId .. "@" .. depVersion] then
+        if not findPackage(depId, depVersion) then
           atomic.log:err("dependency `%s` version %s is required for `%s`, but was not found.", depId, depVersion, pkg.id)
           table.insert(toRemove, id)
           break
@@ -166,15 +196,15 @@ function atomic.package.loadMany(packages)
   end
 
   local indegree = {}
-  for _, pkg in pairs(packagesCache) do
-    indegree[pkg.id] = 0
+  for id in pairs(packagesCache) do
+    -- todo version
+    indegree[id] = 0
   end
 
   for _, pkg in pairs(packagesCache) do
     if type(pkg.dependencies) == "table" then
       for depId, depVersion in pairs(pkg.dependencies) do
-        local depKey = depId .. "@" .. depVersion
-        if packagesCache[depKey] then
+        if findPackage(depId, depVersion) then
           indegree[pkg.id] = (indegree[pkg.id] or 0) + 1
         end
       end
@@ -192,8 +222,8 @@ function atomic.package.loadMany(packages)
     for _, pkg in pairs(packagesCache) do
       if type(pkg.dependencies) == "table" then
         for depId, depVersion in pairs(pkg.dependencies) do
-          local depKey = depId .. "@" .. depVersion
-          if packagesCache[depKey] and depId == id then
+          local depdendency = findPackage(depId, depVersion)
+          if depdendency and depId == depdendency.id then
             indegree[pkg.id] = indegree[pkg.id] - 1
             if indegree[pkg.id] == 0 then table.insert(queue, pkg.id) end
           end
@@ -208,10 +238,12 @@ function atomic.package.loadMany(packages)
     return
   end
 
-  for _, id in ipairs(loadOrder) do
-    for _, pkg in pairs(packagesCache) do
-      if pkg.id == id then
-        atomic.package.load(pkg)
+  for _, orderId in ipairs(loadOrder) do
+    for id, pkgs in pairs(packagesCache) do
+      for _version, pkg in pairs(pkgs) do
+        if id == orderId then
+          atomic.package.load(pkg)
+        end
       end
     end
   end