]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Minor] Migrate lua_maps_expressions.lua from tableshape to lua_shape
authorVsevolod Stakhov <vsevolod@rspamd.com>
Mon, 17 Nov 2025 15:31:52 +0000 (15:31 +0000)
committerVsevolod Stakhov <vsevolod@rspamd.com>
Mon, 17 Nov 2025 15:31:52 +0000 (15:31 +0000)
Replace tableshape with lua_shape for maps expressions schema:
- Convert ts.shape to T.table
- Convert ts.array_of to T.array
- Keep reference to lua_maps.map_schema (will be migrated separately)

No functional changes, luacheck passes.

lualib/lua_maps_expressions.lua

index 2ad9ad1d86b82a3ab49580f35b361aadf1599d11..4b2935a25cf2aebbc7a835390954835785d8dca8 100644 (file)
@@ -39,7 +39,7 @@ local lua_maps = require "lua_maps"
 local rspamd_expression = require "rspamd_expression"
 local rspamd_logger = require "rspamd_logger"
 local fun = require "fun"
-local ts = require("tableshape").types
+local T = require "lua_shape.core"
 
 local exports = {}
 
@@ -86,15 +86,17 @@ local function process_func(elt, task)
   return nil
 end
 
-exports.schema = ts.shape {
-  expression = ts.string,
-  rules = ts.array_of(
-      ts.shape {
-        selector = ts.string,
-        map = lua_maps.map_schema,
-      }
+-- Schema for maps expressions configuration
+-- Note: map field references lua_maps.map_schema which will be migrated separately
+exports.schema = T.table({
+  expression = T.string(),
+  rules = T.array(
+    T.table({
+      selector = T.string(),
+      map = lua_maps.map_schema, -- References schema from lua_maps (to be migrated)
+    })
   )
-}
+})
 
 --[[[
 -- @function lua_maps_expression.create(config, object, module_name)