Check __spark_metadata__ presence in nested entities

Author: maennchen

lib/spark/dsl/extension.ex

@@ -2153,7 +2153,7 @@ defmodule Spark.Dsl.Extension do
 
   def __after_verify__(module) do
     dsl_patch_structs =
-      for %Spark.Dsl.Patch.AddEntity{entity: entity} <- module.dsl_patches(), do: entity.target
+      for patch <- module.dsl_patches(), entity <- patch_entities(patch), do: entity.target
 
     section_structs =
       for section <- module.sections(), entity <- section_entities(section), do: entity.target
@@ -2173,10 +2173,29 @@ defmodule Spark.Dsl.Extension do
     :ok
   end
 
+  defp patch_entities(%Spark.Dsl.Patch.AddEntity{entity: entity}) do
+    nested_entities(entity)
+  end
+
   defp section_entities(%Spark.Dsl.Section{
          entities: entities,
          sections: sections
        }) do
-    entities ++ Enum.flat_map(sections, &section_entities/1)
+    [
+      entities,
+      Enum.flat_map(sections, &section_entities/1)
+    ]
+    |> Enum.concat()
+    |> Enum.flat_map(&nested_entities/1)
+  end
+
+  defp nested_entities(%Spark.Dsl.Entity{entities: entities} = entity) do
+    [
+      entity
+      | Enum.flat_map(entities, fn
+          {_key, nested_entities} -> List.wrap(nested_entities)
+          other -> List.wrap(other)
+        end)
+    ]
   end
 end

test/dsl_test.exs

@@ -917,7 +917,11 @@ defmodule Spark.DslTest do
   describe "missing spark metadata warnings" do
     test "warns when entity does not have __spark_metadata__ field" do
       # Create an entity struct without __spark_metadata__ field
-      defmodule WarningStruct do
+      defmodule WarningStructOuter do
+        defstruct [:name]
+      end
+
+      defmodule WarningStructNested do
         defstruct [:name]
       end
 
@@ -927,9 +931,21 @@ defmodule Spark.DslTest do
             @entity_without_metadata %Spark.Dsl.Entity{
               name: :entity_without_metadata,
               args: [:name],
-              target: WarningStruct,
+              target: WarningStructOuter,
               schema: [
                 name: [type: :atom]
+              ],
+              entities: [
+                nested: [
+                  %Spark.Dsl.Entity{
+                    name: :entity_without_metadata,
+                    args: [:name],
+                    target: WarningStructNested,
+                    schema: [
+                      name: [type: :atom]
+                    ]
+                  }
+                ]
               ]
             }
 
@@ -943,7 +959,8 @@ defmodule Spark.DslTest do
         end)
 
       assert warning_output =~ "Entity without __spark_metadata__ field"
-      assert warning_output =~ "WarningStruct"
+      assert warning_output =~ "WarningStructOuter"
+      assert warning_output =~ "WarningStructNested"
       assert warning_output =~ "__spark_metadata__: nil"
     end
   end