From a6b119dfb3798cbfb4b715f5d754e0a9596eb07c Mon Sep 17 00:00:00 2001
From: dmitry-loves-elixir-not <dverkhovsky@intrivo.com>
Date: Fri, 3 May 2024 17:56:15 -0600
Subject: [PATCH] List[String] should by default raise an error when a string
 is passed

---
 lib/maru/params/runtime.ex       |  2 +-
 lib/maru/params/types/atom.ex    |  6 ++++--
 lib/maru/params/types/boolean.ex |  4 +++-
 lib/maru/params/types/list.ex    | 10 +++++-----
 test/mixed_test.exs              | 16 ++++++++++++++--
 test/types_test.exs              |  4 ++--
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/lib/maru/params/runtime.ex b/lib/maru/params/runtime.ex
index 19a7a7d..dc537b6 100644
--- a/lib/maru/params/runtime.ex
+++ b/lib/maru/params/runtime.ex
@@ -34,7 +34,7 @@ defmodule Maru.Params.Runtime do
     nested = h.nested
 
     parsed =
-      if value in [nil, "", '', %{}] do
+      if value in [nil, "", ~c"", %{}] do
         h.blank_func.({value, passed?})
       else
         h.parser_func.({:ok, value}, options)
diff --git a/lib/maru/params/types/atom.ex b/lib/maru/params/types/atom.ex
index 739b6cc..38facf2 100644
--- a/lib/maru/params/types/atom.ex
+++ b/lib/maru/params/types/atom.ex
@@ -25,7 +25,8 @@ defmodule Maru.Params.Types.Atom do
     if input in values do
       {:ok, input |> to_string |> String.to_existing_atom()}
     else
-      {:error, :validate, "allowed values: #{Enum.join(values, ", ")}"}
+      {:error, :validate,
+       "Given input `#{input}` not in allowed values: #{Enum.join(values, ", ")}"}
     end
   rescue
     ArgumentError -> {:error, :parse, "not an already existing atom"}
@@ -41,7 +42,8 @@ defmodule Maru.Params.Types.Atom do
     if parsed in values do
       {:ok, parsed}
     else
-      {:error, :validate, "allowed values: #{Enum.join(values, ", ")}"}
+      {:error, :validate,
+       "Given input `#{parsed}` not in allowed values: #{Enum.join(values, ", ")}"}
     end
   end
 
diff --git a/lib/maru/params/types/boolean.ex b/lib/maru/params/types/boolean.ex
index f43f4a6..a84ce1b 100644
--- a/lib/maru/params/types/boolean.ex
+++ b/lib/maru/params/types/boolean.ex
@@ -14,5 +14,7 @@ defmodule Maru.Params.Types.Boolean do
   def parse(nil, _), do: {:ok, false}
   def parse(false, _), do: {:ok, false}
   def parse("false", _), do: {:ok, false}
-  def parse(input, _), do: {:error, :parse, "unknown format, expected Boolean, got: #{inspect(input)}"}
+
+  def parse(input, _),
+    do: {:error, :parse, "unknown format, expected Boolean, got: #{inspect(input)}"}
 end
diff --git a/lib/maru/params/types/list.ex b/lib/maru/params/types/list.ex
index 7a36048..bb4a744 100644
--- a/lib/maru/params/types/list.ex
+++ b/lib/maru/params/types/list.ex
@@ -38,13 +38,13 @@ defmodule Maru.Params.Types.List do
 
   def parse(input, args) when is_binary(input) do
     args
-    |> Map.get(:string_strategy, :codepoints)
+    |> Map.get(:string_strategy, :error)
     |> case do
-      :codepoints -> String.codepoints(input)
-      :charlist -> String.to_charlist(input)
-      :wrap -> List.wrap(input)
+      :codepoints -> parse(String.codepoints(input), args)
+      :charlist -> parse(String.to_charlist(input), args)
+      :error -> {:error, :parse, "expected list, got string: #{inspect(input)}"}
+      :wrap -> parse(List.wrap(input), args)
     end
-    |> parse(args)
   end
 
   def parse(input, _) do
diff --git a/test/mixed_test.exs b/test/mixed_test.exs
index 9d18f84..d2b4431 100644
--- a/test/mixed_test.exs
+++ b/test/mixed_test.exs
@@ -17,6 +17,8 @@ defmodule Maru.Params.MixedTest do
           optional :d1, String
           optional :d2, Integer
         end
+
+        optional :list_of_strings, List[String]
       end
     end
 
@@ -121,15 +123,25 @@ defmodule Maru.Params.MixedTest do
     assert %{
              map: %{
                m1: %{d1: "d1", d2: 22},
-               m2: [%{d1: "d1", d2: 22}, %{d1: "dx", d2: 222}]
+               m2: [%{d1: "d1", d2: 22}, %{d1: "dx", d2: 222}],
+               list_of_strings: ["1", "2", "3"]
              }
            } =
              T.nested(%{
                "map" => %{
                  "m1" => %{"d1" => "d1", "d2" => 22},
-                 "m2" => [%{"d1" => "d1", "d2" => 22}, %{"d1" => "dx", "d2" => 222}]
+                 "m2" => [%{"d1" => "d1", "d2" => 22}, %{"d1" => "dx", "d2" => 222}],
+                 "list_of_strings" => ["1", "2", "3"]
                }
              })
+
+    assert_raise ParseError,
+                 ~r/Error Parsing Parameter `list_of_strings`: expected list, got string:/,
+                 fn ->
+                   T.nested(%{
+                     "map" => %{"list_of_strings" => "bf4be93a-7d5b-11ec-90d6-0242ac120003"}
+                   })
+                 end
   end
 
   test "pipeline" do
diff --git a/test/types_test.exs b/test/types_test.exs
index 091b8cc..945d4b3 100644
--- a/test/types_test.exs
+++ b/test/types_test.exs
@@ -183,7 +183,7 @@ defmodule Maru.Params.TypesTest do
 
   test "integer" do
     assert %{i1: 314, i2: 3, i3: -1, i4: 6, i5: 0} =
-             T.integer(%{"i1" => 314, "i2" => "3", "i3" => "-1", "i4" => '6'})
+             T.integer(%{"i1" => 314, "i2" => "3", "i3" => "-1", "i4" => ~c"6"})
 
     assert_raise ParseError, ~r/Error Validating Parameter `i2`/, fn ->
       T.integer(%{"i2" => 0})
@@ -216,7 +216,7 @@ defmodule Maru.Params.TypesTest do
     assert %{
              l1: [1],
              l2: [1, 2, 3],
-             l3: '123',
+             l3: ~c"123",
              l4: ["1", "2"],
              l5: ["1", "2"],
              l6: ["1", "2"],