Skip to content

fix: support binary map keys in unions #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomas-abrahamsson merged 1 commit into from
Sep 14, 2025
Merged

fix: support binary map keys in unions #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/gpb_gen_verifiers.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,11 @@ field_oneof_omitted_flat_verifier(MsgName, FName, OFields,
FVar, MsgVar, TrUserDataVar,
AnRes, Opts) ->
%% FIXME: Verify at most one oneof field is set
OFNames = gpb_lib:get_field_names(OFields),
OFNames0 = gpb_lib:get_field_names(OFields),
OFNames = case gpb_lib:get_maps_key_type_by_opts(Opts) of
atom -> OFNames0;
binary -> lists:map(fun(X) -> atom_to_binary(X, utf8) end, OFNames0)
end,
?expr(
case 'M' of
'#{OFName := OFVar}' ->
Expand Down Expand Up @@ -958,6 +962,7 @@ atom_to_stree(Atom) ->
erl_syntax:atom(Atom).

atom_to_binary_string_stree(Atom) ->
Cs = atom_to_list(Atom),
erl_syntax:binary(
[erl_syntax:binary_field(
erl_syntax:string(atom_to_list(Atom)))]).
erl_syntax:integer(C)) || C <- Cs]).
11 changes: 5 additions & 6 deletions src/gpb_lib.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,9 +614,10 @@ mapkey_literal_by_opts(Opts) ->
fun(Atom) -> erl_syntax:atom(Atom) end;
binary ->
fun(Atom) ->
Cs = atom_to_list(Atom),
erl_syntax:binary(
[erl_syntax:binary_field(
erl_syntax:string(atom_to_list(Atom)))])
erl_syntax:integer(C)) || C <- Cs])
end
end.

Expand All @@ -626,11 +627,9 @@ mapkey_expr_by_opts(Opts) ->
fun(Expr) -> Expr end;
binary ->
fun(Expr) ->
erl_syntax:binary(
[erl_syntax:binary_field(
erl_syntax:application(erl_syntax:atom(erlang),
erl_syntax:atom(atom_to_list),
[Expr]))])
erl_syntax:application(erl_syntax:atom(erlang),
erl_syntax:atom(atom_to_binary),
[Expr, erl_syntax:atom(utf8)])
end
end.

Expand Down
27 changes: 27 additions & 0 deletions test/gpb_compile_maps_tests.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,33 @@ flat_oneof_with_translation_with_typespec_maps_test_aux() ->
]),
?assert(gpb_lib:is_substr("a1=>string()", strip_ws(Erl))).

flat_oneof_with_maps_key_type_binary_test() ->
M = compile_iolist([ "message test {"
, " map<string, string> args = 1;"
, "}"
, "message union {"
, " oneof u {"
, " int32 a = 1;"
, " string b = 2;"
, " }"
, "}"
],
[{maps, true},
{maps_oneof, flat},
{maps_key_type, binary},
{maps_unset_optional, omitted},
strings_as_binaries,
{verify, always}]),
MapInput1 = #{<<"args">> => #{<<"hello">> => <<"world">>}},
MapData1 = M:encode_msg(MapInput1, test),
?assertEqual(MapInput1, M:decode_msg(MapData1, test)),
UnionInput1 = #{<<"a">> => 1},
UnionData1 = M:encode_msg(UnionInput1, union),
?assertEqual(UnionInput1, M:decode_msg(UnionData1, union)),
UnionInput2 = #{<<"b">> => <<"hello">>},
UnionData2 = M:encode_msg(UnionInput2, union),
?assertEqual(UnionInput2, M:decode_msg(UnionData2, union)),
unload_code(M).

strip_ws(B) when is_list(B) ->
binary_to_list(
Expand Down