Get field opts when blocks exist

lib/goal.ex

@@ -566,14 +566,19 @@ defmodule Goal do
 
   defmacro optional(name, type, opts) when type in [:map, {:array, :map}] do
     children = get_field_children(opts)
+    field_opts = get_field_options(opts)
 
     quote do
       properties = Enum.reduce(unquote(children), %{}, &Map.merge(&2, &1))
 
       if properties == %{} do
-        %{unquote(name) => [type: unquote(type)]}
+        %{unquote(name) => [{:type, unquote(type)} | unquote(field_opts)]}
       else
-        %{unquote(name) => [type: unquote(type), properties: properties]}
+        %{
+          unquote(name) => [
+            {:type, unquote(type)} | [{:properties, properties} | unquote(field_opts)]
+          ]
+        }
       end
     end
   end
@@ -594,15 +599,19 @@ defmodule Goal do
 
   defmacro required(name, type, opts) when type in [:map, {:array, :map}] do
     children = get_field_children(opts)
+    field_opts = get_field_options(opts)
 
     quote do
       properties = Enum.reduce(unquote(children), %{}, &Map.merge(&2, &1))
 
       if properties == %{} do
-        %{unquote(name) => [type: unquote(type), required: true]}
+        %{unquote(name) => [{:type, unquote(type)} | [{:required, true} | unquote(field_opts)]]}
       else
         %{
-          unquote(name) => [type: unquote(type), required: true, properties: properties]
+          unquote(name) => [
+            {:type, unquote(type)}
+            | [{:required, true} | [{:properties, properties} | unquote(field_opts)]]
+          ]
         }
       end
     end
@@ -622,6 +631,14 @@ defmodule Goal do
     end
   end
 
+  defp get_field_options(opts) do
+    if Keyword.has_key?(opts, :do) do
+      []
+    else
+      opts
+    end
+  end
+
   @doc ~S"""
   Validates parameters against a validation schema.
 

test/goal_test.exs

@@ -62,6 +62,8 @@ defmodule GoalTest do
         optional(:paws, :integer)
       end
     end
+
+    required(:list_of_maps, {:array, :map}, min: 1, max: 1)
   end
 
   defparams :enums do
@@ -144,7 +146,8 @@ defmodule GoalTest do
                      }
                    ]
                  }
-               ]
+               ],
+               list_of_maps: [type: {:array, :map}, required: true, min: 1, max: 1]
              }
     end
 
@@ -1165,7 +1168,8 @@ defmodule GoalTest do
       schema = %{
         list: [
           type: {:array, :map},
-          rules: [min: 1, max: 1]
+          rules: [min: 1, max: 1],
+          required: true
         ]
       }