Fix bug where map without rules returns empty map

.gitignore

@@ -8,3 +8,4 @@ erl_crash.dump
 *.beam
 /config/*.secret.exs
 .elixir_ls/
+.idea/

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.1
+
+- Fixes a regression where `:map` without rules returns an empty map instead of the user's input (https://github.com/martinthenth/goal/issues/112).
+
 # 1.1.0
 
 - Adds support for enum arrays (https://github.com/martinthenth/goal/pull/107 - by [@davorbadrov](https://github.com/davorbadrov))

lib/goal.ex

@@ -570,7 +570,11 @@ defmodule Goal do
     quote do
       properties = Enum.reduce(unquote(children), %{}, &Map.merge(&2, &1))
 
-      %{unquote(name) => [{:type, unquote(type)} | [properties: properties]]}
+      if properties == %{} do
+        %{unquote(name) => [type: unquote(type)]}
+      else
+        %{unquote(name) => [type: unquote(type), properties: properties]}
+      end
     end
   end
 
@@ -594,9 +598,15 @@ defmodule Goal do
     quote do
       properties = Enum.reduce(unquote(children), %{}, &Map.merge(&2, &1))
 
-      %{
-        unquote(name) => [{:type, unquote(type)} | [{:required, true} | [properties: properties]]]
-      }
+      if properties == %{} do
+        %{unquote(name) => [{:type, unquote(type)} | {:required, true}]}
+      else
+        %{
+          unquote(name) => [
+            {:type, unquote(type)} | [{:required, true} | [properties: properties]]
+          ]
+        }
+      end
     end
   end
 

mix.exs

@@ -1,7 +1,7 @@
 defmodule Goal.MixProject do
   use Mix.Project
 
-  @version "1.1.0"
+  @version "1.1.1"
   @source_url "https://github.com/martinthenth/goal"
   @changelog_url "https://github.com/martinthenth/goal/blob/main/CHANGELOG.md"
 

test/goal_test.exs

@@ -17,6 +17,7 @@ defmodule GoalTest do
     optional(:last_name, :string)
     required(:any_1)
     optional(:any_2)
+    optional(:fields, :map)
   end
 
   defparams :negatives do
@@ -91,7 +92,8 @@ defmodule GoalTest do
                first_name: [type: :string],
                last_name: [type: :string],
                any_1: [type: :any, required: true],
-               any_2: [type: :any]
+               any_2: [type: :any],
+               fields: [type: :map]
              }
 
       assert schema(:index) == %{
@@ -156,11 +158,11 @@ defmodule GoalTest do
     test "changeset/2" do
       assert %Ecto.Changeset{
                action: nil,
-               changes: %{},
+               changes: %{id: 123, any_1: 123, fields: %{"hello" => "world"}},
                errors: [],
                data: %{},
                valid?: true
-             } = changeset(:show, %{id: 123, any_1: 123})
+             } = changeset(:show, %{id: 123, any_1: 123, fields: %{"hello" => "world"}})
 
       assert %Ecto.Changeset{
                action: nil,
@@ -906,6 +908,26 @@ defmodule GoalTest do
              }
     end
 
+    test "unstructured map" do
+      data = %{
+        "map" => %{
+          "string" => "hello",
+          "integer" => 5
+        }
+      }
+
+      schema = %{map: [type: :map]}
+
+      changeset = Goal.build_changeset(schema, data)
+
+      assert changes_on(changeset) == %{
+               map: %{
+                 "string" => "hello",
+                 "integer" => 5
+               }
+             }
+    end
+
     test "invalid nested map" do
       schema = %{
         key_1: [type: :string],
@@ -1787,14 +1809,22 @@ defmodule GoalTest do
       assert Goal.recase_keys(schema, params, opts) == %{first_name: "Jane", last_name: "Doe"}
     end
 
-    test "map" do
+    test "empty map" do
       schema = %{description: [type: :map, required: true]}
       params = %{"description" => %{}}
       opts = [recase_keys: [from: :camel_case]]
 
       assert Goal.recase_keys(schema, params, opts) == %{description: %{}}
     end
 
+    test "non-empty map" do
+      schema = %{description: [type: :map]}
+      params = %{"description" => %{"hello" => "world"}}
+      opts = [recase_keys: [from: :camel_case]]
+
+      assert Goal.recase_keys(schema, params, opts) == %{description: %{"hello" => "world"}}
+    end
+
     test "nested map" do
       schema = %{
         first_name: [type: :string],