chore: move existing decode files to combine backend folder

Author: thomas9911

lib/json5/decode.ex

@@ -2,40 +2,12 @@ defmodule Json5.Decode do
   @moduledoc """
   Decode Json5 string to Elixir term
   """
-  import Combine.Parsers.Base
-  import Json5.Decode.Helper
-
-  alias Json5.Decode
 
   def parse(input, config \\ %{}) do
-    case Combine.parse(input, parser(config)) do
-      {:error, error} -> {:error, error}
-      [val] -> {:ok, val}
-    end
-  end
-
-  def parser(config) do
-    ignore_whitespace()
-    |> json5_value(config)
-    |> ignore_whitespace()
-    |> eof()
+    backend().parse(input, config)
   end
 
-  def json5_value(prev \\ nil, config \\ %{}) do
-    choice(prev, [
-      json5_null(),
-      json5_boolean(),
-      json5_string(),
-      json5_number(),
-      json5_array(),
-      json5_object(config)
-    ])
+  defp backend do
+    Json5.Decode.Backend.Combine
   end
-
-  defp json5_null, do: Decode.Null.null()
-  defp json5_boolean, do: Decode.Boolean.boolean()
-  defp json5_string, do: Decode.String.string()
-  defp json5_number, do: Decode.Number.number()
-  defp json5_array, do: Decode.Array.array()
-  defp json5_object(config), do: Decode.Object.object(config)
 end

lib/json5/decode/backend/combine.ex

@@ -0,0 +1,46 @@
+defmodule Json5.Decode.Backend.Combine do
+  @moduledoc """
+  Decode Json5 string to Elixir term
+  """
+  import Combine.Parsers.Base
+  import Json5.Decode.Backend.Combine.Helper
+
+  alias Json5.Decode.Backend.Combine.Array
+  alias Json5.Decode.Backend.Combine.Boolean
+  alias Json5.Decode.Backend.Combine.Null
+  alias Json5.Decode.Backend.Combine.Number
+  alias Json5.Decode.Backend.Combine.Object
+  alias Json5.Decode.Backend.Combine.String
+
+  def parse(input, config \\ %{}) do
+    case Combine.parse(input, parser(config)) do
+      {:error, error} -> {:error, error}
+      [val] -> {:ok, val}
+    end
+  end
+
+  def parser(config) do
+    ignore_whitespace()
+    |> json5_value(config)
+    |> ignore_whitespace()
+    |> eof()
+  end
+
+  def json5_value(prev \\ nil, config \\ %{}) do
+    choice(prev, [
+      json5_null(),
+      json5_boolean(),
+      json5_string(),
+      json5_number(),
+      json5_array(),
+      json5_object(config)
+    ])
+  end
+
+  defp json5_null, do: Null.null()
+  defp json5_boolean, do: Boolean.boolean()
+  defp json5_string, do: String.string()
+  defp json5_number, do: Number.number()
+  defp json5_array, do: Array.array()
+  defp json5_object(config), do: Object.object(config)
+end

lib/json5/decode/array.ex lib/json5/decode/backend/combine/array.ex

@@ -1,10 +1,10 @@
-defmodule Json5.Decode.Array do
+defmodule Json5.Decode.Backend.Combine.Array do
   @moduledoc """
   Documentation for `Json5`.
   """
   import Combine.Parsers.Base
   import Combine.Parsers.Text
-  import Json5.Decode.Helper
+  import Json5.Decode.Backend.Combine.Helper
 
   def array do
     either(

lib/json5/decode/boolean.ex lib/json5/decode/backend/combine/boolean.ex

@@ -1,20 +1,20 @@
-defmodule Json5.Decode.Boolean do
+defmodule Json5.Decode.Backend.Combine.Boolean do
   @moduledoc """
   Documentation for `Json5`.
   """
   import Combine.Parsers.Base
   import Combine.Parsers.Text
 
-  def boolean(), do: either(boolean_true(), boolean_false())
+  def boolean, do: either(boolean_true(), boolean_false())
 
-  defp boolean_true() do
+  defp boolean_true do
     "true"
     |> string()
     |> label("true")
     |> map(fn _ -> true end)
   end
 
-  defp boolean_false() do
+  defp boolean_false do
     "false"
     |> string()
     |> label("false")

lib/json5/decode/helper.ex lib/json5/decode/backend/combine/helper.ex

@@ -1,10 +1,13 @@
-defmodule Json5.Decode.Helper do
+defmodule Json5.Decode.Backend.Combine.Helper do
+  @moduledoc """
+  General helper functions
+  """
   import Combine.Helpers
   import Combine.Parsers.Base
   import Combine.Parsers.Text
 
   alias Combine.ParserState
-  alias Json5.Decode
+  alias Json5.Decode.Backend.Combine, as: Decode
 
   @elements [
     :remove_white_space,
@@ -36,7 +39,7 @@ defmodule Json5.Decode.Helper do
 
   defguard is_line_terminator(ch) when ch in @line_terminator_chars
 
-  def lazy_json5_value() do
+  def lazy_json5_value do
     lazy(fn -> Decode.json5_value() end)
   end
 

lib/json5/decode/null.ex lib/json5/decode/backend/combine/null.ex

@@ -1,11 +1,11 @@
-defmodule Json5.Decode.Null do
+defmodule Json5.Decode.Backend.Combine.Null do
   @moduledoc """
   Documentation for `Json5`.
   """
   import Combine.Parsers.Base
   import Combine.Parsers.Text
 
-  def null() do
+  def null do
     "null"
     |> string()
     |> label("null")

lib/json5/decode/number.ex lib/json5/decode/backend/combine/number.ex

@@ -1,15 +1,15 @@
-defmodule Json5.Decode.Number do
+defmodule Json5.Decode.Backend.Combine.Number do
   @moduledoc """
   Documentation for `Json5`.
   """
   import Combine.Parsers.Base
   import Combine.Parsers.Text
 
-  def number() do
+  def number do
     either(ecma_hex_integer_literal(), ecma_decimal_literal())
   end
 
-  defp ecma_hex_integer_literal() do
+  defp ecma_hex_integer_literal do
     pipe(
       [
         ignore(either(string("0x"), string("0X"))),
@@ -68,7 +68,7 @@ defmodule Json5.Decode.Number do
     prev |> many1(digit()) |> map(&Enum.join/1)
   end
 
-  defp ecma_exponent_part() do
+  defp ecma_exponent_part do
     both(either(char("e"), char("E")), ecma_signed_integer(), &"#{&1}#{&2}")
   end
 

lib/json5/decode/object.ex lib/json5/decode/backend/combine/object.ex

@@ -1,12 +1,12 @@
-defmodule Json5.Decode.Object do
+defmodule Json5.Decode.Backend.Combine.Object do
   @moduledoc """
   Documentation for `Json5`.
   """
   import Combine.Parsers.Base
   import Combine.Parsers.Text
-  import Json5.Decode.Helper
+  import Json5.Decode.Backend.Combine.Helper
 
-  alias Json5.Decode
+  alias Json5.Decode.Backend.Combine.String, as: Json5String
   alias Json5.ECMA
 
   require Json5.ECMA
@@ -63,19 +63,19 @@ defmodule Json5.Decode.Object do
     )
   end
 
-  defp json5_member_name() do
+  defp json5_member_name do
     either(
       ecma_identifier(),
-      Decode.String.string()
+      Json5String.string()
     )
   end
 
-  defp ecma_identifier() do
+  defp ecma_identifier do
     if_not(ecma_reserved_word(), ECMA.ecma_identifier_name())
   end
 
-  defp ecma_reserved_word() do
-    choice(Enum.map(Json5.ECMA.reserved_words(), &string/1))
+  defp ecma_reserved_word do
+    choice(Enum.map(ECMA.reserved_words(), &string/1))
   end
 
   defp cast_json5_member([key, value], %{object_key_function: func})

lib/json5/decode/string.ex lib/json5/decode/backend/combine/string.ex

@@ -1,12 +1,12 @@
-defmodule Json5.Decode.String do
+defmodule Json5.Decode.Backend.Combine.String do
   @moduledoc """
   Documentation for `Json5`.
   """
   import Combine.Parsers.Base
   import Combine.Parsers.Text
-  alias Json5.Decode.Helper
+  alias Json5.Decode.Backend.Combine.Helper
 
-  def string() do
+  def string do
     either(
       between(char("'"), json5_single_string_characters(), char("'")),
       between(char("\""), json5_double_string_characters(), char("\""))
@@ -19,7 +19,7 @@ defmodule Json5.Decode.String do
     |> map(&:erlang.iolist_to_binary/1)
   end
 
-  defp json5_single_string_character() do
+  defp json5_single_string_character do
     if_not(char("'"), escape_new_line_char())
   end
 
@@ -29,11 +29,11 @@ defmodule Json5.Decode.String do
     |> map(&:erlang.iolist_to_binary/1)
   end
 
-  defp json5_double_string_character() do
+  defp json5_double_string_character do
     if_not(char("\""), escape_new_line_char())
   end
 
-  defp escape_new_line_char() do
+  defp escape_new_line_char do
     either(
       ignore(sequence([char("\\"), Helper.ecma_line_terminator()])),
       char()

lib/json5/ecma.ex

@@ -79,7 +79,7 @@ defmodule Json5.ECMA do
     end
   end
 
-  def ecma_identifier_name() do
+  def ecma_identifier_name do
     pipe(
       [
         ecma_identifier_start(),
@@ -89,7 +89,7 @@ defmodule Json5.ECMA do
     )
   end
 
-  defp ecma_identifier_start() do
+  defp ecma_identifier_start do
     choice([
       char("$"),
       char("_"),
@@ -98,14 +98,14 @@ defmodule Json5.ECMA do
     ])
   end
 
-  defp ecma_identifier_part() do
+  defp ecma_identifier_part do
     either(
       ecma_identifier_start(),
       satisfy(char(), &is_unicode_identifier_letter/1)
     )
   end
 
-  defp ecma_unicode_letter() do
+  defp ecma_unicode_letter do
     satisfy(char(), fn
       <<ch>> when is_unicode_letter(ch) -> true
       _ -> false

lib/json5/encode.ex

@@ -5,7 +5,9 @@ defmodule Json5.Encode do
   require Decimal
   require Json5.ECMA
 
-  alias Json5.Encode
+  alias Json5.Encode.Array
+  alias Json5.Encode.Error
+  alias Json5.Encode.Object
 
   defguardp is_to_string(input)
             when input in [true, false] or is_float(input) or is_integer(input) or
@@ -35,15 +37,14 @@ defmodule Json5.Encode do
   end
 
   def do_dump(input, config) when is_list(input) do
-    Encode.Array.dump(input, config)
+    Array.dump(input, config)
   end
 
   def do_dump(input, config) when is_map(input) and not is_struct(input) do
-    Encode.Object.dump(input, config)
+    Object.dump(input, config)
   end
 
   def do_dump(input, _) do
-    {:error,
-     Json5.Encode.Error.exception(%{type: :invalid_input, input: input})}
+    {:error, Error.exception(%{type: :invalid_input, input: input})}
   end
 end