Add native Elixir JSON support

.github/workflows/main.yml

@@ -16,7 +16,9 @@ jobs:
       matrix:
         include:
           - otp: 27.0
-            elixir: 1.17.0
+            elixir: 1.18.1
+          - otp: 27.0
+            elixir: 1.17.3
           - otp: 24.3
             elixir: 1.12.3
 

lib/protobuf/json.ex

@@ -99,7 +99,7 @@ defmodule Protobuf.JSON do
   exist, decoding will raise an error.
   """
 
-  alias Protobuf.JSON.{Encode, EncodeError, Decode, DecodeError}
+  alias Protobuf.JSON.{Encode, EncodeError, Decode, DecodeError, JSONLibrary}
 
   @type encode_opt() ::
           {:use_proto_names, boolean()}
@@ -202,11 +202,7 @@ defmodule Protobuf.JSON do
   @spec encode_to_iodata(struct, [encode_opt]) ::
           {:ok, iodata()} | {:error, EncodeError.t() | Exception.t()}
   def encode_to_iodata(%_{} = struct, opts \\ []) when is_list(opts) do
-    if jason = load_jason() do
-      with {:ok, map} <- to_encodable(struct, opts), do: jason.encode_to_iodata(map)
-    else
-      {:error, EncodeError.new(:no_json_lib)}
-    end
+    with {:ok, map} <- to_encodable(struct, opts), do: JSONLibrary.encode_to_iodata(map)
   end
 
   @doc """
@@ -273,8 +269,11 @@ defmodule Protobuf.JSON do
   @spec decode!(iodata, module) :: struct | no_return
   def decode!(iodata, module) do
     case decode(iodata, module) do
-      {:ok, json} -> json
-      {:error, error} -> raise error
+      {:ok, json} ->
+        json
+
+      {:error, error} ->
+        raise error
     end
   end
 
@@ -311,11 +310,12 @@ defmodule Protobuf.JSON do
   """
   @spec decode(iodata, module) :: {:ok, struct} | {:error, DecodeError.t() | Exception.t()}
   def decode(iodata, module) when is_atom(module) do
-    if jason = load_jason() do
-      with {:ok, json_data} <- jason.decode(iodata),
-           do: from_decoded(json_data, module)
-    else
-      {:error, DecodeError.new(:no_json_lib)}
+    case JSONLibrary.decode(iodata) do
+      {:ok, json_data} ->
+        from_decoded(json_data, module)
+
+      {:error, exception} ->
+        {:error, exception}
     end
   end
 
@@ -344,6 +344,4 @@ defmodule Protobuf.JSON do
   catch
     error -> {:error, DecodeError.new(error)}
   end
-
-  defp load_jason, do: Code.ensure_loaded?(Jason) and Jason
 end

lib/protobuf/json/decode_error.ex

@@ -69,4 +69,19 @@ defmodule Protobuf.JSON.DecodeError do
   def new({:bad_repeated, field, value}) do
     %__MODULE__{message: "Repeated field '#{field}' expected a list, got #{inspect(value)}"}
   end
+
+  def new({:unexpected_end, position}) do
+    %__MODULE__{message: "Unexpected end at position #{inspect(position)}"}
+  end
+
+  def new({:invalid_byte, position, byte}) do
+    %__MODULE__{message: "Invalid byte at position #{inspect(position)}, byte: #{inspect(byte)}"}
+  end
+
+  def new({:unexpected_sequence, position, sequence}) do
+    %__MODULE__{
+      message:
+        "Unexpected sequence at position #{inspect(position)}, sequence: #{inspect(sequence)}"
+    }
+  end
 end

lib/protobuf/json/json_library.ex

@@ -0,0 +1,32 @@
+defmodule Protobuf.JSON.JSONLibrary do
+  @moduledoc false
+  # Uses `JSON` for Elixir >= 1.18, Jason if Elixir < 1.18 and Jason available,
+  # or returns error otherwise
+
+  cond do
+    Code.ensure_loaded?(JSON) ->
+      def encode_to_iodata(encodable) do
+        try do
+          {:ok, JSON.encode_to_iodata!(encodable)}
+        rescue
+          exception ->
+            {:error, exception}
+        end
+      end
+
+      def decode(data) do
+        case JSON.decode(data) do
+          {:ok, decoded} -> {:ok, decoded}
+          {:error, error} -> {:error, Protobuf.JSON.DecodeError.new(error)}
+        end
+      end
+
+    Code.ensure_loaded?(Jason) ->
+      def encode_to_iodata(encodable), do: Jason.encode_to_iodata(encodable)
+      def decode(data), do: Jason.decode(data)
+
+    true ->
+      def encode_to_iodata(_), do: {:error, EncodeError.new(:no_json_lib)}
+      def decode(_), do: {:error, EncodeError.new(:no_json_lib)}
+  end
+end

test/protobuf/builder_test.exs

@@ -45,15 +45,21 @@
     end
 
     test "raises an error for non-list repeated embedded msgs" do
-      assert_raise Protocol.UndefinedError,
-                   ~r/protocol Enumerable not implemented for %TestMsg.Foo.Bar/,
-                   fn ->
-                     Foo.new(h: Foo.Bar.new())
-                   end
+      # TODO: remove conditional once we support only Elixir 1.18+
+      message =
+        if System.version() >= "1.18.0" do
+          ~r/protocol Enumerable not implemented for type TestMsg.Foo.Ba/
+        else
+          ~r/protocol Enumerable not implemented for %TestMsg.Foo.Bar/
+        end
+
+      assert_raise Protocol.UndefinedError, message, fn ->
+        Foo.new(h: Foo.Bar.new())
+      end
     end
 
     test "builds correct message for non matched struct" do
       foo = Foo.new(Foo2.new(non_matched: 1))
 
       assert_raise Protobuf.EncodeError, fn ->
         Foo.encode(foo)
@@ -61,7 +67,7 @@
     end
 
     test "ignores structs with transform modules" do
       assert ContainsTransformModule.new(field: 123) == %ContainsTransformModule{field: 123}
     end
   end
 

test/protobuf/encoder_test.exs

@@ -283,7 +283,9 @@ defmodule Protobuf.EncoderTest do
       Encoder.encode(%TestMsg.Foo{c: 123})
     end
 
-    message = ~r/protocol Enumerable not implemented for 123/
+    # For Elixir 1.18+ it's `type Integer`, before, it was just `123`
+    # TODO: fix once we require Elixir 1.18+
+    message = ~r/protocol Enumerable not implemented for (123|type Integer)/
 
     assert_raise Protobuf.EncodeError, message, fn ->
       Encoder.encode(%TestMsg.Foo{e: 123})

test/protobuf/json_test.exs

@@ -16,20 +16,33 @@ defmodule Protobuf.JSONTest do
 
   test "encoding string field with invalid UTF-8 data" do
     message = %Scalars{string: "   \xff   "}
-    assert {:error, %Jason.EncodeError{}} = Protobuf.JSON.encode(message)
+    assert {:error, exception} = Protobuf.JSON.encode(message)
+    assert is_exception(exception)
   end
 
   test "decoding string field with invalid UTF-8 data" do
     json = ~S|{"string":"   \xff   "}|
-    assert {:error, %Jason.DecodeError{}} = Protobuf.JSON.decode(json, Scalars)
+    assert {:error, exception} = Protobuf.JSON.decode(json, Scalars)
+    assert is_exception(exception)
   end
 
   describe "bang variants of encode and decode" do
-    test "decode!/2" do
-      json = ~S|{"string":"   \xff   "}|
+    # TODO: remove Jason when we require Elixir 1.18
+    if Code.ensure_loaded?(JSON) do
+      test "decode!/2" do
+        json = ~S|{"string":"   \xff   "}|
 
-      assert_raise Jason.DecodeError, fn ->
-        Protobuf.JSON.decode!(json, Scalars)
+        assert_raise Protobuf.JSON.DecodeError, fn ->
+          Protobuf.JSON.decode!(json, Scalars)
+        end
+      end
+    else
+      test "decode!/2" do
+        json = ~S|{"string":"   \xff   "}|
+
+        assert_raise Jason.DecodeError, fn ->
+          Protobuf.JSON.decode!(json, Scalars)
+        end
       end
     end
   end