mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.datamapper: Limited support for unparsing simple arrays of strings

Browse source
This commit is contained in:
Kim Alvefur 2021-03-18 13:07:10 +01:00
parent c62c5b307e
commit 576b43151c
3 changed files with 75 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec/util_datamapper_spec.lua
View file

@ -103,15 +103,11 @@ describe("util.datampper", function()
assert.same(x:get_child("delay", "urn:xmpp:delay").attr, u:get_child("delay", "urn:xmpp:delay").attr);
assert.same(x:get_child("origin-id", "urn:xmpp:sid:0").attr, u:get_child("origin-id", "urn:xmpp:sid:0").attr);
for _, tag in ipairs(x.tags) do
if tag.name ~= "UNRELATED" and tag.name ~= "reactions" then
if tag.name ~= "UNRELATED" then
assert.truthy(u:get_child(tag.name, tag.attr.xmlns) or u:get_child(tag.name), tag:top_tag())
end
end
assert.equal(#x.tags-2, #u.tags)
pending("arrays", function ()
assert.truthy(u:get_child("reactions", "urn:xmpp:reactions:0"))
end);
assert.equal(#x.tags-1, #u.tags)
end);
end);

34
teal-src/util/datamapper.tl
View file

@ -192,6 +192,8 @@ function parse_array (schema : js.schema_t, s : st.stanza_t) : { any }
error "NYI"
end
value = totype(proptype, value)
if value ~= nil then
table.insert(out, value);
end
@ -210,7 +212,6 @@ local function parse (schema : js.schema_t, s : st.stanza_t) : table
end
local function unparse ( schema : js.schema_t, t : table, current_name : string, current_ns : string ) : st.stanza_t
if schema.type == "object" then
if schema.xml then
if schema.xml.name then
@ -224,6 +225,8 @@ local function unparse ( schema : js.schema_t, t : table, current_name : string,
local out = st.stanza(current_name, { xmlns = current_ns })
if schema.type == "object" then
for prop, propschema in pairs(schema.properties) do
local v = t[prop]
@ -294,13 +297,40 @@ local function unparse ( schema : js.schema_t, t : table, current_name : string,
if c then
out:add_direct_child(c);
end
-- else TODO
elseif proptype == "array" and propschema is js.schema_t and v is table then
local c = unparse(propschema, v, name, namespace);
if c then
if value_where == "in_wrapper" then
local w = st.stanza(propschema.xml.name or name, { xmlns = propschema.xml.namespace or namespace })
w:add_direct_child(c);
out:add_direct_child(w);
else
out:add_direct_child(c);
end
end
else
error "NYI"
end
end
end
end
return out;
elseif schema.type == "array" then
local proptype, value_where, name, namespace = unpack_propschema(schema.items, current_name, current_ns)
-- TODO , prefix, single_attribute
if proptype == "string" then
for _, item in ipairs(t as { string }) do
if value_where == "in_text_tag" then
out:text_tag(name, item, { xmlns = namespace });
else
error "NYI"
end
end
else
error "NYI"
end
return out;
end
end

52
util/datamapper.lua
View file

@ -162,6 +162,8 @@ function parse_array(schema, s)
error("NYI")
end
value = totype(proptype, value)
if value ~= nil then
table.insert(out, value);
end
@ -180,19 +182,20 @@ local function parse(schema, s)
end
local function unparse(schema, t, current_name, current_ns)
if schema.type == "object" then
if schema.xml then
if schema.xml.name then
current_name = schema.xml.name
end
if schema.xml.namespace then
current_ns = schema.xml.namespace
end
if schema.xml then
if schema.xml.name then
current_name = schema.xml.name
end
if schema.xml.namespace then
current_ns = schema.xml.namespace
end
local out = st.stanza(current_name, {xmlns = current_ns})
end
local out = st.stanza(current_name, {xmlns = current_ns})
if schema.type == "object" then
for prop, propschema in pairs(schema.properties) do
local v = t[prop]
@ -264,13 +267,40 @@ local function unparse(schema, t, current_name, current_ns)
if c then
out:add_direct_child(c);
end
elseif proptype == "array" and type(propschema) == "table" and type(v) == "table" then
local c = unparse(propschema, v, name, namespace);
if c then
if value_where == "in_wrapper" then
local w = st.stanza(propschema.xml.name or name, {xmlns = propschema.xml.namespace or namespace})
w:add_direct_child(c);
out:add_direct_child(w);
else
out:add_direct_child(c);
end
end
else
error("NYI")
end
end
end
end
return out
elseif schema.type == "array" then
local proptype, value_where, name, namespace = unpack_propschema(schema.items, current_name, current_ns)
if proptype == "string" then
for _, item in ipairs(t) do
if value_where == "in_text_tag" then
out:text_tag(name, item, {xmlns = namespace});
else
error("NYI")
end
end
else
error("NYI")
end
return out
end
end