nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-config-api: simplify merged_keys() -> keys()

Browse Source
This commit is contained in:
lemoer 2021-08-12 01:14:51 +02:00
parent 299d6b8aa7
commit 3ded15df29
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/gluon-config-api/luasrc/lib/gluon/config-api/controller/schema.lua
View File

@ -30,24 +30,17 @@ local function merge_types(Ta, Tb)
end end
end end
local function merged_keys(table1, table2) local function keys(tab)
local keys = {} local keys = {}
if table1 then if tab then
for k, _ in pairs(table1) do for k, _ in pairs(tab) do
table.insert(keys, k) table.insert(keys, k)
end end
end end
if table2 then
for k, _ in pairs(table2) do
if not util.contains(keys, k) then
table.insert(keys, k)
end
end
end
return keys return keys
end end
local function merged_values(table1, table2) local function merge_array(table1, table2)
local values = {} local values = {}
if table1 then if table1 then
for _, v in pairs(table1) do for _, v in pairs(table1) do
@ -84,7 +77,6 @@ local function deepcopy(o, seen)
return no return no
end end
function M.merge_schemas(schema1, schema2) function M.merge_schemas(schema1, schema2)
local merged = {} local merged = {}
@ -100,7 +92,7 @@ function M.merge_schemas(schema1, schema2)
local properties1 = schema1.properties or {} local properties1 = schema1.properties or {}
local properties2 = schema2.properties or {} local properties2 = schema2.properties or {}
for _, pkey in pairs(merged_keys(properties1, properties2)) do for _, pkey in pairs(merge_array(keys(properties1), keys(properties2))) do
local pdef1 = properties1[pkey] local pdef1 = properties1[pkey]
local pdef2 = properties2[pkey] local pdef2 = properties2[pkey]
@ -122,7 +114,7 @@ function M.merge_schemas(schema1, schema2)
end end
-- generate merged.required -- generate merged.required
merged.required = merged_values(schema1.required, schema2.required) merged.required = merge_array(schema1.required, schema2.required)
if #merged.required == 0 then if #merged.required == 0 then
merged.required = nil merged.required = nil
end end