dont invalidate config if there are extra fields

CFC-Servers · Feb 3, 2024 · acef033 · acef033
1 parent ad4d69c
commit acef033
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lua/includes/modules/schemavalidator.lua b/lua/includes/modules/schemavalidator.lua
@@ -79,6 +79,7 @@ end
 
 ---@class SchemaTypeObject: SchemaType
 ---@field ValidateField fun(self: SchemaTypeObject, key: any, value: any): (boolean, string)
+---@field HasField fun(self: SchemaTypeObject, key: any): boolean
 ---@field fields { [string]: SchemaType }
 
 ---@param tbl { [string]: SchemaType }
@@ -90,6 +91,9 @@ function SchemaValidator.Object( tbl )
         Optional = function( self )
             return SchemaValidator.Optional( self )
         end,
+        HasField = function( self, key )
+            return self.fields[key] ~= nil
+        end,
         ValidateField = function( self, key, value )
             local fieldType = self.fields[key]
             if not fieldType then

diff --git a/lua/mapvote/server/modules/config.lua b/lua/mapvote/server/modules/config.lua
@@ -6,13 +6,17 @@ end
 
 function MapVote.MergeConfig( conf )
     for k, v in pairs( conf ) do
+        local hasField = MapVote.configSchema:HasField( k )
         local valid, reason = MapVote.configSchema:ValidateField( k, v )
-        if not valid then
+        if not hasField then
+            print( "MapVote MergeConfig config has extra field: " .. k )
+        elseif not valid then
             MapVote.configIssues = {}
             print( "MapVote MergeConfig config is invalid: " .. reason )
             return reason
+        else
+            MapVote.config[k] = v
         end
-        MapVote.config[k] = v
     end
 end