Fix fetching of private packages from orgs on hex repos (#2020)

- vendor in hex_core at v0.5.0
  - Change where repo_name should be the org and not the parent
  - Changed rebar_utils:url_append_path/2 to not explicitly add a '?',
    this is returned in the Query chunk by http_uri:parse/1 (e.g., "?foo=bar")
  - update organization_merging test to expect the sub-repo as the repo_name
  - Add tests for rebar_utils:url_append_path/2
  - Stop referencing/setting "organization" in config and use new
     organization settings (api_repository and repo_organization)
  - Do not set (assume) the read key is valid for any/every repo
  - Set repo_organization and api_repository to org
  - Update tests to check for new config opts

1 files changed, 958 insertions, 0 deletions

diff --git a/src/r3_hex_pb_versions.erl b/src/r3_hex_pb_versions.erl
new file mode 100644
index 0000000..66407dd
--- /dev/null
+++ b/src/r3_hex_pb_versions.erl
@@ -0,0 +1,958 @@
+%% Vendored from hex_core v0.5.0, do not edit manually
+
+%% -*- coding: utf-8 -*-
+%% Automatically generated, do not edit
+%% Generated by gpb_compile version 4.3.1
+-module(r3_hex_pb_versions).
+
+-export([encode_msg/2, encode_msg/3]).
+-export([decode_msg/2, decode_msg/3]).
+-export([merge_msgs/3, merge_msgs/4]).
+-export([verify_msg/2, verify_msg/3]).
+-export([get_msg_defs/0]).
+-export([get_msg_names/0]).
+-export([get_group_names/0]).
+-export([get_msg_or_group_names/0]).
+-export([get_enum_names/0]).
+-export([find_msg_def/1, fetch_msg_def/1]).
+-export([find_enum_def/1, fetch_enum_def/1]).
+-export([enum_symbol_by_value/2, enum_value_by_symbol/2]).
+-export([get_service_names/0]).
+-export([get_service_def/1]).
+-export([get_rpc_names/1]).
+-export([find_rpc_def/2, fetch_rpc_def/2]).
+-export([get_package_name/0]).
+-export([gpb_version_as_string/0, gpb_version_as_list/0]).
+
+
+%% enumerated types
+
+-export_type([]).
+
+%% message types
+-type 'Versions'() ::
+      #{packages                => ['Package'()],   % = 1
+        repository              => iodata()         % = 2
+       }.
+
+-type 'Package'() ::
+      #{name                    => iodata(),        % = 1
+        versions                => [iodata()],      % = 2
+        retired                 => [integer()]      % = 3, 32 bits
+       }.
+
+-export_type(['Versions'/0, 'Package'/0]).
+
+-spec encode_msg('Versions'() | 'Package'(), atom()) -> binary().
+encode_msg(Msg, MsgName) when is_atom(MsgName) ->
+    encode_msg(Msg, MsgName, []).
+
+-spec encode_msg('Versions'() | 'Package'(), atom(), list()) -> binary().
+encode_msg(Msg, MsgName, Opts) ->
+    verify_msg(Msg, MsgName, Opts),
+    TrUserData = proplists:get_value(user_data, Opts),
+    case MsgName of
+      'Versions' ->
+	  e_msg_Versions(id(Msg, TrUserData), TrUserData);
+      'Package' ->
+	  e_msg_Package(id(Msg, TrUserData), TrUserData)
+    end.
+
+
+e_msg_Versions(Msg, TrUserData) ->
+    e_msg_Versions(Msg, <<>>, TrUserData).
+
+
+e_msg_Versions(#{repository := F2} = M, Bin,
+	       TrUserData) ->
+    B1 = case M of
+	   #{packages := F1} ->
+	       TrF1 = id(F1, TrUserData),
+	       if TrF1 == [] -> Bin;
+		  true -> e_field_Versions_packages(TrF1, Bin, TrUserData)
+	       end;
+	   _ -> Bin
+	 end,
+    begin
+      TrF2 = id(F2, TrUserData),
+      e_type_string(TrF2, <<B1/binary, 18>>, TrUserData)
+    end.
+
+e_msg_Package(Msg, TrUserData) ->
+    e_msg_Package(Msg, <<>>, TrUserData).
+
+
+e_msg_Package(#{name := F1} = M, Bin, TrUserData) ->
+    B1 = begin
+	   TrF1 = id(F1, TrUserData),
+	   e_type_string(TrF1, <<Bin/binary, 10>>, TrUserData)
+	 end,
+    B2 = case M of
+	   #{versions := F2} ->
+	       TrF2 = id(F2, TrUserData),
+	       if TrF2 == [] -> B1;
+		  true -> e_field_Package_versions(TrF2, B1, TrUserData)
+	       end;
+	   _ -> B1
+	 end,
+    case M of
+      #{retired := F3} ->
+	  TrF3 = id(F3, TrUserData),
+	  if TrF3 == [] -> B2;
+	     true -> e_field_Package_retired(TrF3, B2, TrUserData)
+	  end;
+      _ -> B2
+    end.
+
+e_mfield_Versions_packages(Msg, Bin, TrUserData) ->
+    SubBin = e_msg_Package(Msg, <<>>, TrUserData),
+    Bin2 = e_varint(byte_size(SubBin), Bin),
+    <<Bin2/binary, SubBin/binary>>.
+
+e_field_Versions_packages([Elem | Rest], Bin,
+			  TrUserData) ->
+    Bin2 = <<Bin/binary, 10>>,
+    Bin3 = e_mfield_Versions_packages(id(Elem, TrUserData),
+				      Bin2, TrUserData),
+    e_field_Versions_packages(Rest, Bin3, TrUserData);
+e_field_Versions_packages([], Bin, _TrUserData) -> Bin.
+
+e_field_Package_versions([Elem | Rest], Bin,
+			 TrUserData) ->
+    Bin2 = <<Bin/binary, 18>>,
+    Bin3 = e_type_string(id(Elem, TrUserData), Bin2,
+			 TrUserData),
+    e_field_Package_versions(Rest, Bin3, TrUserData);
+e_field_Package_versions([], Bin, _TrUserData) -> Bin.
+
+e_field_Package_retired(Elems, Bin, TrUserData)
+    when Elems =/= [] ->
+    SubBin = e_pfield_Package_retired(Elems, <<>>,
+				      TrUserData),
+    Bin2 = <<Bin/binary, 26>>,
+    Bin3 = e_varint(byte_size(SubBin), Bin2),
+    <<Bin3/binary, SubBin/binary>>;
+e_field_Package_retired([], Bin, _TrUserData) -> Bin.
+
+e_pfield_Package_retired([Value | Rest], Bin,
+			 TrUserData) ->
+    Bin2 = e_type_int32(id(Value, TrUserData), Bin,
+			TrUserData),
+    e_pfield_Package_retired(Rest, Bin2, TrUserData);
+e_pfield_Package_retired([], Bin, _TrUserData) -> Bin.
+
+-compile({nowarn_unused_function,e_type_sint/3}).
+e_type_sint(Value, Bin, _TrUserData) when Value >= 0 ->
+    e_varint(Value * 2, Bin);
+e_type_sint(Value, Bin, _TrUserData) ->
+    e_varint(Value * -2 - 1, Bin).
+
+-compile({nowarn_unused_function,e_type_int32/3}).
+e_type_int32(Value, Bin, _TrUserData)
+    when 0 =< Value, Value =< 127 ->
+    <<Bin/binary, Value>>;
+e_type_int32(Value, Bin, _TrUserData) ->
+    <<N:64/unsigned-native>> = <<Value:64/signed-native>>,
+    e_varint(N, Bin).
+
+-compile({nowarn_unused_function,e_type_int64/3}).
+e_type_int64(Value, Bin, _TrUserData)
+    when 0 =< Value, Value =< 127 ->
+    <<Bin/binary, Value>>;
+e_type_int64(Value, Bin, _TrUserData) ->
+    <<N:64/unsigned-native>> = <<Value:64/signed-native>>,
+    e_varint(N, Bin).
+
+-compile({nowarn_unused_function,e_type_bool/3}).
+e_type_bool(true, Bin, _TrUserData) ->
+    <<Bin/binary, 1>>;
+e_type_bool(false, Bin, _TrUserData) ->
+    <<Bin/binary, 0>>;
+e_type_bool(1, Bin, _TrUserData) -> <<Bin/binary, 1>>;
+e_type_bool(0, Bin, _TrUserData) -> <<Bin/binary, 0>>.
+
+-compile({nowarn_unused_function,e_type_string/3}).
+e_type_string(S, Bin, _TrUserData) ->
+    Utf8 = unicode:characters_to_binary(S),
+    Bin2 = e_varint(byte_size(Utf8), Bin),
+    <<Bin2/binary, Utf8/binary>>.
+
+-compile({nowarn_unused_function,e_type_bytes/3}).
+e_type_bytes(Bytes, Bin, _TrUserData)
+    when is_binary(Bytes) ->
+    Bin2 = e_varint(byte_size(Bytes), Bin),
+    <<Bin2/binary, Bytes/binary>>;
+e_type_bytes(Bytes, Bin, _TrUserData)
+    when is_list(Bytes) ->
+    BytesBin = iolist_to_binary(Bytes),
+    Bin2 = e_varint(byte_size(BytesBin), Bin),
+    <<Bin2/binary, BytesBin/binary>>.
+
+-compile({nowarn_unused_function,e_type_fixed32/3}).
+e_type_fixed32(Value, Bin, _TrUserData) ->
+    <<Bin/binary, Value:32/little>>.
+
+-compile({nowarn_unused_function,e_type_sfixed32/3}).
+e_type_sfixed32(Value, Bin, _TrUserData) ->
+    <<Bin/binary, Value:32/little-signed>>.
+
+-compile({nowarn_unused_function,e_type_fixed64/3}).
+e_type_fixed64(Value, Bin, _TrUserData) ->
+    <<Bin/binary, Value:64/little>>.
+
+-compile({nowarn_unused_function,e_type_sfixed64/3}).
+e_type_sfixed64(Value, Bin, _TrUserData) ->
+    <<Bin/binary, Value:64/little-signed>>.
+
+-compile({nowarn_unused_function,e_type_float/3}).
+e_type_float(V, Bin, _) when is_number(V) ->
+    <<Bin/binary, V:32/little-float>>;
+e_type_float(infinity, Bin, _) ->
+    <<Bin/binary, 0:16, 128, 127>>;
+e_type_float('-infinity', Bin, _) ->
+    <<Bin/binary, 0:16, 128, 255>>;
+e_type_float(nan, Bin, _) ->
+    <<Bin/binary, 0:16, 192, 127>>.
+
+-compile({nowarn_unused_function,e_type_double/3}).
+e_type_double(V, Bin, _) when is_number(V) ->
+    <<Bin/binary, V:64/little-float>>;
+e_type_double(infinity, Bin, _) ->
+    <<Bin/binary, 0:48, 240, 127>>;
+e_type_double('-infinity', Bin, _) ->
+    <<Bin/binary, 0:48, 240, 255>>;
+e_type_double(nan, Bin, _) ->
+    <<Bin/binary, 0:48, 248, 127>>.
+
+-compile({nowarn_unused_function,e_varint/3}).
+e_varint(N, Bin, _TrUserData) -> e_varint(N, Bin).
+
+-compile({nowarn_unused_function,e_varint/2}).
+e_varint(N, Bin) when N =< 127 -> <<Bin/binary, N>>;
+e_varint(N, Bin) ->
+    Bin2 = <<Bin/binary, (N band 127 bor 128)>>,
+    e_varint(N bsr 7, Bin2).
+
+
+decode_msg(Bin, MsgName) when is_binary(Bin) ->
+    decode_msg(Bin, MsgName, []).
+
+decode_msg(Bin, MsgName, Opts) when is_binary(Bin) ->
+    TrUserData = proplists:get_value(user_data, Opts),
+    decode_msg_1_catch(Bin, MsgName, TrUserData).
+
+-ifdef('OTP_RELEASE').
+decode_msg_1_catch(Bin, MsgName, TrUserData) ->
+    try decode_msg_2_doit(MsgName, Bin, TrUserData)
+    catch Class:Reason:StackTrace -> error({gpb_error,{decoding_failure, {Bin, MsgName, {Class, Reason, StackTrace}}}})
+    end.
+-else.
+-ifdef('GPB_PATTERN_STACK').
+decode_msg_1_catch(Bin, MsgName, TrUserData) ->
+    try decode_msg_2_doit(MsgName, Bin, TrUserData)
+    catch Class:Reason:StackTrace -> error({gpb_error,{decoding_failure, {Bin, MsgName, {Class, Reason, StackTrace}}}})
+    end.
+-else.
+decode_msg_1_catch(Bin, MsgName, TrUserData) ->
+    try decode_msg_2_doit(MsgName, Bin, TrUserData)
+    catch Class:Reason ->
+        StackTrace = erlang:get_stacktrace(),
+        error({gpb_error,{decoding_failure, {Bin, MsgName, {Class, Reason, StackTrace}}}})
+    end.
+-endif.
+
+-endif.
+
+decode_msg_2_doit('Versions', Bin, TrUserData) ->
+    id(d_msg_Versions(Bin, TrUserData), TrUserData);
+decode_msg_2_doit('Package', Bin, TrUserData) ->
+    id(d_msg_Package(Bin, TrUserData), TrUserData).
+
+
+
+d_msg_Versions(Bin, TrUserData) ->
+    dfp_read_field_def_Versions(Bin, 0, 0,
+				id([], TrUserData), id('$undef', TrUserData),
+				TrUserData).
+
+dfp_read_field_def_Versions(<<10, Rest/binary>>, Z1, Z2,
+			    F@_1, F@_2, TrUserData) ->
+    d_field_Versions_packages(Rest, Z1, Z2, F@_1, F@_2,
+			      TrUserData);
+dfp_read_field_def_Versions(<<18, Rest/binary>>, Z1, Z2,
+			    F@_1, F@_2, TrUserData) ->
+    d_field_Versions_repository(Rest, Z1, Z2, F@_1, F@_2,
+				TrUserData);
+dfp_read_field_def_Versions(<<>>, 0, 0, R1, F@_2,
+			    TrUserData) ->
+    S1 = #{repository => F@_2},
+    if R1 == '$undef' -> S1;
+       true -> S1#{packages => lists_reverse(R1, TrUserData)}
+    end;
+dfp_read_field_def_Versions(Other, Z1, Z2, F@_1, F@_2,
+			    TrUserData) ->
+    dg_read_field_def_Versions(Other, Z1, Z2, F@_1, F@_2,
+			       TrUserData).
+
+dg_read_field_def_Versions(<<1:1, X:7, Rest/binary>>, N,
+			   Acc, F@_1, F@_2, TrUserData)
+    when N < 32 - 7 ->
+    dg_read_field_def_Versions(Rest, N + 7, X bsl N + Acc,
+			       F@_1, F@_2, TrUserData);
+dg_read_field_def_Versions(<<0:1, X:7, Rest/binary>>, N,
+			   Acc, F@_1, F@_2, TrUserData) ->
+    Key = X bsl N + Acc,
+    case Key of
+      10 ->
+	  d_field_Versions_packages(Rest, 0, 0, F@_1, F@_2,
+				    TrUserData);
+      18 ->
+	  d_field_Versions_repository(Rest, 0, 0, F@_1, F@_2,
+				      TrUserData);
+      _ ->
+	  case Key band 7 of
+	    0 ->
+		skip_varint_Versions(Rest, 0, 0, F@_1, F@_2,
+				     TrUserData);
+	    1 ->
+		skip_64_Versions(Rest, 0, 0, F@_1, F@_2, TrUserData);
+	    2 ->
+		skip_length_delimited_Versions(Rest, 0, 0, F@_1, F@_2,
+					       TrUserData);
+	    3 ->
+		skip_group_Versions(Rest, Key bsr 3, 0, F@_1, F@_2,
+				    TrUserData);
+	    5 ->
+		skip_32_Versions(Rest, 0, 0, F@_1, F@_2, TrUserData)
+	  end
+    end;
+dg_read_field_def_Versions(<<>>, 0, 0, R1, F@_2,
+			   TrUserData) ->
+    S1 = #{repository => F@_2},
+    if R1 == '$undef' -> S1;
+       true -> S1#{packages => lists_reverse(R1, TrUserData)}
+    end.
+
+d_field_Versions_packages(<<1:1, X:7, Rest/binary>>, N,
+			  Acc, F@_1, F@_2, TrUserData)
+    when N < 57 ->
+    d_field_Versions_packages(Rest, N + 7, X bsl N + Acc,
+			      F@_1, F@_2, TrUserData);
+d_field_Versions_packages(<<0:1, X:7, Rest/binary>>, N,
+			  Acc, Prev, F@_2, TrUserData) ->
+    {NewFValue, RestF} = begin
+			   Len = X bsl N + Acc,
+			   <<Bs:Len/binary, Rest2/binary>> = Rest,
+			   {id(d_msg_Package(Bs, TrUserData), TrUserData),
+			    Rest2}
+			 end,
+    dfp_read_field_def_Versions(RestF, 0, 0,
+				cons(NewFValue, Prev, TrUserData), F@_2,
+				TrUserData).
+
+d_field_Versions_repository(<<1:1, X:7, Rest/binary>>,
+			    N, Acc, F@_1, F@_2, TrUserData)
+    when N < 57 ->
+    d_field_Versions_repository(Rest, N + 7, X bsl N + Acc,
+				F@_1, F@_2, TrUserData);
+d_field_Versions_repository(<<0:1, X:7, Rest/binary>>,
+			    N, Acc, F@_1, _, TrUserData) ->
+    {NewFValue, RestF} = begin
+			   Len = X bsl N + Acc,
+			   <<Bytes:Len/binary, Rest2/binary>> = Rest,
+			   {id(binary:copy(Bytes), TrUserData), Rest2}
+			 end,
+    dfp_read_field_def_Versions(RestF, 0, 0, F@_1,
+				NewFValue, TrUserData).
+
+skip_varint_Versions(<<1:1, _:7, Rest/binary>>, Z1, Z2,
+		     F@_1, F@_2, TrUserData) ->
+    skip_varint_Versions(Rest, Z1, Z2, F@_1, F@_2,
+			 TrUserData);
+skip_varint_Versions(<<0:1, _:7, Rest/binary>>, Z1, Z2,
+		     F@_1, F@_2, TrUserData) ->
+    dfp_read_field_def_Versions(Rest, Z1, Z2, F@_1, F@_2,
+				TrUserData).
+
+skip_length_delimited_Versions(<<1:1, X:7,
+				 Rest/binary>>,
+			       N, Acc, F@_1, F@_2, TrUserData)
+    when N < 57 ->
+    skip_length_delimited_Versions(Rest, N + 7,
+				   X bsl N + Acc, F@_1, F@_2, TrUserData);
+skip_length_delimited_Versions(<<0:1, X:7,
+				 Rest/binary>>,
+			       N, Acc, F@_1, F@_2, TrUserData) ->
+    Length = X bsl N + Acc,
+    <<_:Length/binary, Rest2/binary>> = Rest,
+    dfp_read_field_def_Versions(Rest2, 0, 0, F@_1, F@_2,
+				TrUserData).
+
+skip_group_Versions(Bin, FNum, Z2, F@_1, F@_2,
+		    TrUserData) ->
+    {_, Rest} = read_group(Bin, FNum),
+    dfp_read_field_def_Versions(Rest, 0, Z2, F@_1, F@_2,
+				TrUserData).
+
+skip_32_Versions(<<_:32, Rest/binary>>, Z1, Z2, F@_1,
+		 F@_2, TrUserData) ->
+    dfp_read_field_def_Versions(Rest, Z1, Z2, F@_1, F@_2,
+				TrUserData).
+
+skip_64_Versions(<<_:64, Rest/binary>>, Z1, Z2, F@_1,
+		 F@_2, TrUserData) ->
+    dfp_read_field_def_Versions(Rest, Z1, Z2, F@_1, F@_2,
+				TrUserData).
+
+d_msg_Package(Bin, TrUserData) ->
+    dfp_read_field_def_Package(Bin, 0, 0,
+			       id('$undef', TrUserData), id([], TrUserData),
+			       id([], TrUserData), TrUserData).
+
+dfp_read_field_def_Package(<<10, Rest/binary>>, Z1, Z2,
+			   F@_1, F@_2, F@_3, TrUserData) ->
+    d_field_Package_name(Rest, Z1, Z2, F@_1, F@_2, F@_3,
+			 TrUserData);
+dfp_read_field_def_Package(<<18, Rest/binary>>, Z1, Z2,
+			   F@_1, F@_2, F@_3, TrUserData) ->
+    d_field_Package_versions(Rest, Z1, Z2, F@_1, F@_2, F@_3,
+			     TrUserData);
+dfp_read_field_def_Package(<<26, Rest/binary>>, Z1, Z2,
+			   F@_1, F@_2, F@_3, TrUserData) ->
+    d_pfield_Package_retired(Rest, Z1, Z2, F@_1, F@_2, F@_3,
+			     TrUserData);
+dfp_read_field_def_Package(<<24, Rest/binary>>, Z1, Z2,
+			   F@_1, F@_2, F@_3, TrUserData) ->
+    d_field_Package_retired(Rest, Z1, Z2, F@_1, F@_2, F@_3,
+			    TrUserData);
+dfp_read_field_def_Package(<<>>, 0, 0, F@_1, R1, R2,
+			   TrUserData) ->
+    #{name => F@_1,
+      versions => lists_reverse(R1, TrUserData),
+      retired => lists_reverse(R2, TrUserData)};
+dfp_read_field_def_Package(Other, Z1, Z2, F@_1, F@_2,
+			   F@_3, TrUserData) ->
+    dg_read_field_def_Package(Other, Z1, Z2, F@_1, F@_2,
+			      F@_3, TrUserData).
+
+dg_read_field_def_Package(<<1:1, X:7, Rest/binary>>, N,
+			  Acc, F@_1, F@_2, F@_3, TrUserData)
+    when N < 32 - 7 ->
+    dg_read_field_def_Package(Rest, N + 7, X bsl N + Acc,
+			      F@_1, F@_2, F@_3, TrUserData);
+dg_read_field_def_Package(<<0:1, X:7, Rest/binary>>, N,
+			  Acc, F@_1, F@_2, F@_3, TrUserData) ->
+    Key = X bsl N + Acc,
+    case Key of
+      10 ->
+	  d_field_Package_name(Rest, 0, 0, F@_1, F@_2, F@_3,
+			       TrUserData);
+      18 ->
+	  d_field_Package_versions(Rest, 0, 0, F@_1, F@_2, F@_3,
+				   TrUserData);
+      26 ->
+	  d_pfield_Package_retired(Rest, 0, 0, F@_1, F@_2, F@_3,
+				   TrUserData);
+      24 ->
+	  d_field_Package_retired(Rest, 0, 0, F@_1, F@_2, F@_3,
+				  TrUserData);
+      _ ->
+	  case Key band 7 of
+	    0 ->
+		skip_varint_Package(Rest, 0, 0, F@_1, F@_2, F@_3,
+				    TrUserData);
+	    1 ->
+		skip_64_Package(Rest, 0, 0, F@_1, F@_2, F@_3,
+				TrUserData);
+	    2 ->
+		skip_length_delimited_Package(Rest, 0, 0, F@_1, F@_2,
+					      F@_3, TrUserData);
+	    3 ->
+		skip_group_Package(Rest, Key bsr 3, 0, F@_1, F@_2, F@_3,
+				   TrUserData);
+	    5 ->
+		skip_32_Package(Rest, 0, 0, F@_1, F@_2, F@_3,
+				TrUserData)
+	  end
+    end;
+dg_read_field_def_Package(<<>>, 0, 0, F@_1, R1, R2,
+			  TrUserData) ->
+    #{name => F@_1,
+      versions => lists_reverse(R1, TrUserData),
+      retired => lists_reverse(R2, TrUserData)}.
+
+d_field_Package_name(<<1:1, X:7, Rest/binary>>, N, Acc,
+		     F@_1, F@_2, F@_3, TrUserData)
+    when N < 57 ->
+    d_field_Package_name(Rest, N + 7, X bsl N + Acc, F@_1,
+			 F@_2, F@_3, TrUserData);
+d_field_Package_name(<<0:1, X:7, Rest/binary>>, N, Acc,
+		     _, F@_2, F@_3, TrUserData) ->
+    {NewFValue, RestF} = begin
+			   Len = X bsl N + Acc,
+			   <<Bytes:Len/binary, Rest2/binary>> = Rest,
+			   {id(binary:copy(Bytes), TrUserData), Rest2}
+			 end,
+    dfp_read_field_def_Package(RestF, 0, 0, NewFValue, F@_2,
+			       F@_3, TrUserData).
+
+d_field_Package_versions(<<1:1, X:7, Rest/binary>>, N,
+			 Acc, F@_1, F@_2, F@_3, TrUserData)
+    when N < 57 ->
+    d_field_Package_versions(Rest, N + 7, X bsl N + Acc,
+			     F@_1, F@_2, F@_3, TrUserData);
+d_field_Package_versions(<<0:1, X:7, Rest/binary>>, N,
+			 Acc, F@_1, Prev, F@_3, TrUserData) ->
+    {NewFValue, RestF} = begin
+			   Len = X bsl N + Acc,
+			   <<Bytes:Len/binary, Rest2/binary>> = Rest,
+			   {id(binary:copy(Bytes), TrUserData), Rest2}
+			 end,
+    dfp_read_field_def_Package(RestF, 0, 0, F@_1,
+			       cons(NewFValue, Prev, TrUserData), F@_3,
+			       TrUserData).
+
+d_field_Package_retired(<<1:1, X:7, Rest/binary>>, N,
+			Acc, F@_1, F@_2, F@_3, TrUserData)
+    when N < 57 ->
+    d_field_Package_retired(Rest, N + 7, X bsl N + Acc,
+			    F@_1, F@_2, F@_3, TrUserData);
+d_field_Package_retired(<<0:1, X:7, Rest/binary>>, N,
+			Acc, F@_1, F@_2, Prev, TrUserData) ->
+    {NewFValue, RestF} = {begin
+			    <<Res:32/signed-native>> = <<(X bsl N +
+							    Acc):32/unsigned-native>>,
+			    id(Res, TrUserData)
+			  end,
+			  Rest},
+    dfp_read_field_def_Package(RestF, 0, 0, F@_1, F@_2,
+			       cons(NewFValue, Prev, TrUserData), TrUserData).
+
+d_pfield_Package_retired(<<1:1, X:7, Rest/binary>>, N,
+			 Acc, F@_1, F@_2, F@_3, TrUserData)
+    when N < 57 ->
+    d_pfield_Package_retired(Rest, N + 7, X bsl N + Acc,
+			     F@_1, F@_2, F@_3, TrUserData);
+d_pfield_Package_retired(<<0:1, X:7, Rest/binary>>, N,
+			 Acc, F@_1, F@_2, E, TrUserData) ->
+    Len = X bsl N + Acc,
+    <<PackedBytes:Len/binary, Rest2/binary>> = Rest,
+    NewSeq = d_packed_field_Package_retired(PackedBytes, 0,
+					    0, E, TrUserData),
+    dfp_read_field_def_Package(Rest2, 0, 0, F@_1, F@_2,
+			       NewSeq, TrUserData).
+
+d_packed_field_Package_retired(<<1:1, X:7,
+				 Rest/binary>>,
+			       N, Acc, AccSeq, TrUserData)
+    when N < 57 ->
+    d_packed_field_Package_retired(Rest, N + 7,
+				   X bsl N + Acc, AccSeq, TrUserData);
+d_packed_field_Package_retired(<<0:1, X:7,
+				 Rest/binary>>,
+			       N, Acc, AccSeq, TrUserData) ->
+    {NewFValue, RestF} = {begin
+			    <<Res:32/signed-native>> = <<(X bsl N +
+							    Acc):32/unsigned-native>>,
+			    id(Res, TrUserData)
+			  end,
+			  Rest},
+    d_packed_field_Package_retired(RestF, 0, 0,
+				   [NewFValue | AccSeq], TrUserData);
+d_packed_field_Package_retired(<<>>, 0, 0, AccSeq, _) ->
+    AccSeq.
+
+skip_varint_Package(<<1:1, _:7, Rest/binary>>, Z1, Z2,
+		    F@_1, F@_2, F@_3, TrUserData) ->
+    skip_varint_Package(Rest, Z1, Z2, F@_1, F@_2, F@_3,
+			TrUserData);
+skip_varint_Package(<<0:1, _:7, Rest/binary>>, Z1, Z2,
+		    F@_1, F@_2, F@_3, TrUserData) ->
+    dfp_read_field_def_Package(Rest, Z1, Z2, F@_1, F@_2,
+			       F@_3, TrUserData).
+
+skip_length_delimited_Package(<<1:1, X:7, Rest/binary>>,
+			      N, Acc, F@_1, F@_2, F@_3, TrUserData)
+    when N < 57 ->
+    skip_length_delimited_Package(Rest, N + 7,
+				  X bsl N + Acc, F@_1, F@_2, F@_3, TrUserData);
+skip_length_delimited_Package(<<0:1, X:7, Rest/binary>>,
+			      N, Acc, F@_1, F@_2, F@_3, TrUserData) ->
+    Length = X bsl N + Acc,
+    <<_:Length/binary, Rest2/binary>> = Rest,
+    dfp_read_field_def_Package(Rest2, 0, 0, F@_1, F@_2,
+			       F@_3, TrUserData).
+
+skip_group_Package(Bin, FNum, Z2, F@_1, F@_2, F@_3,
+		   TrUserData) ->
+    {_, Rest} = read_group(Bin, FNum),
+    dfp_read_field_def_Package(Rest, 0, Z2, F@_1, F@_2,
+			       F@_3, TrUserData).
+
+skip_32_Package(<<_:32, Rest/binary>>, Z1, Z2, F@_1,
+		F@_2, F@_3, TrUserData) ->
+    dfp_read_field_def_Package(Rest, Z1, Z2, F@_1, F@_2,
+			       F@_3, TrUserData).
+
+skip_64_Package(<<_:64, Rest/binary>>, Z1, Z2, F@_1,
+		F@_2, F@_3, TrUserData) ->
+    dfp_read_field_def_Package(Rest, Z1, Z2, F@_1, F@_2,
+			       F@_3, TrUserData).
+
+read_group(Bin, FieldNum) ->
+    {NumBytes, EndTagLen} = read_gr_b(Bin, 0, 0, 0, 0, FieldNum),
+    <<Group:NumBytes/binary, _:EndTagLen/binary, Rest/binary>> = Bin,
+    {Group, Rest}.
+
+%% Like skipping over fields, but record the total length,
+%% Each field is <(FieldNum bsl 3) bor FieldType> ++ <FieldValue>
+%% Record the length because varints may be non-optimally encoded.
+%%
+%% Groups can be nested, but assume the same FieldNum cannot be nested
+%% because group field numbers are shared with the rest of the fields
+%% numbers. Thus we can search just for an group-end with the same
+%% field number.
+%%
+%% (The only time the same group field number could occur would
+%% be in a nested sub message, but then it would be inside a
+%% length-delimited entry, which we skip-read by length.)
+read_gr_b(<<1:1, X:7, Tl/binary>>, N, Acc, NumBytes, TagLen, FieldNum)
+  when N < (32-7) ->
+    read_gr_b(Tl, N+7, X bsl N + Acc, NumBytes, TagLen+1, FieldNum);
+read_gr_b(<<0:1, X:7, Tl/binary>>, N, Acc, NumBytes, TagLen,
+          FieldNum) ->
+    Key = X bsl N + Acc,
+    TagLen1 = TagLen + 1,
+    case {Key bsr 3, Key band 7} of
+        {FieldNum, 4} -> % 4 = group_end
+            {NumBytes, TagLen1};
+        {_, 0} -> % 0 = varint
+            read_gr_vi(Tl, 0, NumBytes + TagLen1, FieldNum);
+        {_, 1} -> % 1 = bits64
+            <<_:64, Tl2/binary>> = Tl,
+            read_gr_b(Tl2, 0, 0, NumBytes + TagLen1 + 8, 0, FieldNum);
+        {_, 2} -> % 2 = length_delimited
+            read_gr_ld(Tl, 0, 0, NumBytes + TagLen1, FieldNum);
+        {_, 3} -> % 3 = group_start
+            read_gr_b(Tl, 0, 0, NumBytes + TagLen1, 0, FieldNum);
+        {_, 4} -> % 4 = group_end
+            read_gr_b(Tl, 0, 0, NumBytes + TagLen1, 0, FieldNum);
+        {_, 5} -> % 5 = bits32
+            <<_:32, Tl2/binary>> = Tl,
+            read_gr_b(Tl2, 0, 0, NumBytes + TagLen1 + 4, 0, FieldNum)
+    end.
+
+read_gr_vi(<<1:1, _:7, Tl/binary>>, N, NumBytes, FieldNum)
+  when N < (64-7) ->
+    read_gr_vi(Tl, N+7, NumBytes+1, FieldNum);
+read_gr_vi(<<0:1, _:7, Tl/binary>>, _, NumBytes, FieldNum) ->
+    read_gr_b(Tl, 0, 0, NumBytes+1, 0, FieldNum).
+
+read_gr_ld(<<1:1, X:7, Tl/binary>>, N, Acc, NumBytes, FieldNum)
+  when N < (64-7) ->
+    read_gr_ld(Tl, N+7, X bsl N + Acc, NumBytes+1, FieldNum);
+read_gr_ld(<<0:1, X:7, Tl/binary>>, N, Acc, NumBytes, FieldNum) ->
+    Len = X bsl N + Acc,
+    NumBytes1 = NumBytes + 1,
+    <<_:Len/binary, Tl2/binary>> = Tl,
+    read_gr_b(Tl2, 0, 0, NumBytes1 + Len, 0, FieldNum).
+
+merge_msgs(Prev, New, MsgName) when is_atom(MsgName) ->
+    merge_msgs(Prev, New, MsgName, []).
+
+merge_msgs(Prev, New, MsgName, Opts) ->
+    TrUserData = proplists:get_value(user_data, Opts),
+    case MsgName of
+      'Versions' -> merge_msg_Versions(Prev, New, TrUserData);
+      'Package' -> merge_msg_Package(Prev, New, TrUserData)
+    end.
+
+-compile({nowarn_unused_function,merge_msg_Versions/3}).
+merge_msg_Versions(#{} = PMsg,
+		   #{repository := NFrepository} = NMsg, TrUserData) ->
+    S1 = #{repository => NFrepository},
+    case {PMsg, NMsg} of
+      {#{packages := PFpackages},
+       #{packages := NFpackages}} ->
+	  S1#{packages =>
+		  'erlang_++'(PFpackages, NFpackages, TrUserData)};
+      {_, #{packages := NFpackages}} ->
+	  S1#{packages => NFpackages};
+      {#{packages := PFpackages}, _} ->
+	  S1#{packages => PFpackages};
+      {_, _} -> S1
+    end.
+
+-compile({nowarn_unused_function,merge_msg_Package/3}).
+merge_msg_Package(#{} = PMsg, #{name := NFname} = NMsg,
+		  TrUserData) ->
+    S1 = #{name => NFname},
+    S2 = case {PMsg, NMsg} of
+	   {#{versions := PFversions},
+	    #{versions := NFversions}} ->
+	       S1#{versions =>
+		       'erlang_++'(PFversions, NFversions, TrUserData)};
+	   {_, #{versions := NFversions}} ->
+	       S1#{versions => NFversions};
+	   {#{versions := PFversions}, _} ->
+	       S1#{versions => PFversions};
+	   {_, _} -> S1
+	 end,
+    case {PMsg, NMsg} of
+      {#{retired := PFretired}, #{retired := NFretired}} ->
+	  S2#{retired =>
+		  'erlang_++'(PFretired, NFretired, TrUserData)};
+      {_, #{retired := NFretired}} ->
+	  S2#{retired => NFretired};
+      {#{retired := PFretired}, _} ->
+	  S2#{retired => PFretired};
+      {_, _} -> S2
+    end.
+
+
+verify_msg(Msg, MsgName) when is_atom(MsgName) ->
+    verify_msg(Msg, MsgName, []).
+
+verify_msg(Msg, MsgName, Opts) ->
+    TrUserData = proplists:get_value(user_data, Opts),
+    case MsgName of
+      'Versions' ->
+	  v_msg_Versions(Msg, [MsgName], TrUserData);
+      'Package' -> v_msg_Package(Msg, [MsgName], TrUserData);
+      _ -> mk_type_error(not_a_known_message, Msg, [])
+    end.
+
+
+-compile({nowarn_unused_function,v_msg_Versions/3}).
+v_msg_Versions(#{repository := F2} = M, Path,
+	       TrUserData) ->
+    case M of
+      #{packages := F1} ->
+	  if is_list(F1) ->
+		 _ = [v_msg_Package(Elem, [packages | Path], TrUserData)
+		      || Elem <- F1],
+		 ok;
+	     true ->
+		 mk_type_error({invalid_list_of, {msg, 'Package'}}, F1,
+			       [packages | Path])
+	  end;
+      _ -> ok
+    end,
+    v_type_string(F2, [repository | Path], TrUserData),
+    lists:foreach(fun (packages) -> ok;
+		      (repository) -> ok;
+		      (OtherKey) ->
+			  mk_type_error({extraneous_key, OtherKey}, M, Path)
+		  end,
+		  maps:keys(M)),
+    ok;
+v_msg_Versions(M, Path, _TrUserData) when is_map(M) ->
+    mk_type_error({missing_fields,
+		   [repository] -- maps:keys(M), 'Versions'},
+		  M, Path);
+v_msg_Versions(X, Path, _TrUserData) ->
+    mk_type_error({expected_msg, 'Versions'}, X, Path).
+
+-compile({nowarn_unused_function,v_msg_Package/3}).
+v_msg_Package(#{name := F1} = M, Path, TrUserData) ->
+    v_type_string(F1, [name | Path], TrUserData),
+    case M of
+      #{versions := F2} ->
+	  if is_list(F2) ->
+		 _ = [v_type_string(Elem, [versions | Path], TrUserData)
+		      || Elem <- F2],
+		 ok;
+	     true ->
+		 mk_type_error({invalid_list_of, string}, F2,
+			       [versions | Path])
+	  end;
+      _ -> ok
+    end,
+    case M of
+      #{retired := F3} ->
+	  if is_list(F3) ->
+		 _ = [v_type_int32(Elem, [retired | Path], TrUserData)
+		      || Elem <- F3],
+		 ok;
+	     true ->
+		 mk_type_error({invalid_list_of, int32}, F3,
+			       [retired | Path])
+	  end;
+      _ -> ok
+    end,
+    lists:foreach(fun (name) -> ok;
+		      (versions) -> ok;
+		      (retired) -> ok;
+		      (OtherKey) ->
+			  mk_type_error({extraneous_key, OtherKey}, M, Path)
+		  end,
+		  maps:keys(M)),
+    ok;
+v_msg_Package(M, Path, _TrUserData) when is_map(M) ->
+    mk_type_error({missing_fields, [name] -- maps:keys(M),
+		   'Package'},
+		  M, Path);
+v_msg_Package(X, Path, _TrUserData) ->
+    mk_type_error({expected_msg, 'Package'}, X, Path).
+
+-compile({nowarn_unused_function,v_type_int32/3}).
+v_type_int32(N, _Path, _TrUserData)
+    when -2147483648 =< N, N =< 2147483647 ->
+    ok;
+v_type_int32(N, Path, _TrUserData) when is_integer(N) ->
+    mk_type_error({value_out_of_range, int32, signed, 32},
+		  N, Path);
+v_type_int32(X, Path, _TrUserData) ->
+    mk_type_error({bad_integer, int32, signed, 32}, X,
+		  Path).
+
+-compile({nowarn_unused_function,v_type_string/3}).
+v_type_string(S, Path, _TrUserData)
+    when is_list(S); is_binary(S) ->
+    try unicode:characters_to_binary(S) of
+      B when is_binary(B) -> ok;
+      {error, _, _} ->
+	  mk_type_error(bad_unicode_string, S, Path)
+    catch
+      error:badarg ->
+	  mk_type_error(bad_unicode_string, S, Path)
+    end;
+v_type_string(X, Path, _TrUserData) ->
+    mk_type_error(bad_unicode_string, X, Path).
+
+-compile({nowarn_unused_function,mk_type_error/3}).
+-spec mk_type_error(_, _, list()) -> no_return().
+mk_type_error(Error, ValueSeen, Path) ->
+    Path2 = prettify_path(Path),
+    erlang:error({gpb_type_error,
+		  {Error, [{value, ValueSeen}, {path, Path2}]}}).
+
+
+-compile({nowarn_unused_function,prettify_path/1}).
+prettify_path([]) -> top_level;
+prettify_path(PathR) ->
+    list_to_atom(string:join(lists:map(fun atom_to_list/1,
+				       lists:reverse(PathR)),
+			     ".")).
+
+
+-compile({nowarn_unused_function,id/2}).
+-compile({inline,id/2}).
+id(X, _TrUserData) -> X.
+
+-compile({nowarn_unused_function,v_ok/3}).
+-compile({inline,v_ok/3}).
+v_ok(_Value, _Path, _TrUserData) -> ok.
+
+-compile({nowarn_unused_function,m_overwrite/3}).
+-compile({inline,m_overwrite/3}).
+m_overwrite(_Prev, New, _TrUserData) -> New.
+
+-compile({nowarn_unused_function,cons/3}).
+-compile({inline,cons/3}).
+cons(Elem, Acc, _TrUserData) -> [Elem | Acc].
+
+-compile({nowarn_unused_function,lists_reverse/2}).
+-compile({inline,lists_reverse/2}).
+'lists_reverse'(L, _TrUserData) -> lists:reverse(L).
+-compile({nowarn_unused_function,'erlang_++'/3}).
+-compile({inline,'erlang_++'/3}).
+'erlang_++'(A, B, _TrUserData) -> A ++ B.
+
+get_msg_defs() ->
+    [{{msg, 'Versions'},
+      [#{name => packages, fnum => 1, rnum => 2,
+	 type => {msg, 'Package'}, occurrence => repeated,
+	 opts => []},
+       #{name => repository, fnum => 2, rnum => 3,
+	 type => string, occurrence => required, opts => []}]},
+     {{msg, 'Package'},
+      [#{name => name, fnum => 1, rnum => 2, type => string,
+	 occurrence => required, opts => []},
+       #{name => versions, fnum => 2, rnum => 3,
+	 type => string, occurrence => repeated, opts => []},
+       #{name => retired, fnum => 3, rnum => 4, type => int32,
+	 occurrence => repeated, opts => [packed]}]}].
+
+
+get_msg_names() -> ['Versions', 'Package'].
+
+
+get_group_names() -> [].
+
+
+get_msg_or_group_names() -> ['Versions', 'Package'].
+
+
+get_enum_names() -> [].
+
+
+fetch_msg_def(MsgName) ->
+    case find_msg_def(MsgName) of
+      Fs when is_list(Fs) -> Fs;
+      error -> erlang:error({no_such_msg, MsgName})
+    end.
+
+
+-spec fetch_enum_def(_) -> no_return().
+fetch_enum_def(EnumName) ->
+    erlang:error({no_such_enum, EnumName}).
+
+
+find_msg_def('Versions') ->
+    [#{name => packages, fnum => 1, rnum => 2,
+       type => {msg, 'Package'}, occurrence => repeated,
+       opts => []},
+     #{name => repository, fnum => 2, rnum => 3,
+       type => string, occurrence => required, opts => []}];
+find_msg_def('Package') ->
+    [#{name => name, fnum => 1, rnum => 2, type => string,
+       occurrence => required, opts => []},
+     #{name => versions, fnum => 2, rnum => 3,
+       type => string, occurrence => repeated, opts => []},
+     #{name => retired, fnum => 3, rnum => 4, type => int32,
+       occurrence => repeated, opts => [packed]}];
+find_msg_def(_) -> error.
+
+
+find_enum_def(_) -> error.
+
+
+-spec enum_symbol_by_value(_, _) -> no_return().
+enum_symbol_by_value(E, V) ->
+    erlang:error({no_enum_defs, E, V}).
+
+
+-spec enum_value_by_symbol(_, _) -> no_return().
+enum_value_by_symbol(E, V) ->
+    erlang:error({no_enum_defs, E, V}).
+
+
+
+get_service_names() -> [].
+
+
+get_service_def(_) -> error.
+
+
+get_rpc_names(_) -> error.
+
+
+find_rpc_def(_, _) -> error.
+
+
+
+-spec fetch_rpc_def(_, _) -> no_return().
+fetch_rpc_def(ServiceName, RpcName) ->
+    erlang:error({no_such_rpc, ServiceName, RpcName}).
+
+
+get_package_name() -> undefined.
+
+
+
+gpb_version_as_string() ->
+    "4.3.1".
+
+gpb_version_as_list() ->
+    [4,3,1].