From f50484cf989a1f09372102c3f2127fc12cc5cfe6 Mon Sep 17 00:00:00 2001 From: Zach Daniel Date: Thu, 18 Aug 2022 15:33:24 -0400 Subject: [PATCH] fix: properly get entries registry DSL structure --- .../transformers/ensure_resources_compiled.ex | 1 + .../transformers/validate_related_resource_inclusion.ex | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/ash/registry/extensions/resource_validations/transformers/ensure_resources_compiled.ex b/lib/ash/registry/extensions/resource_validations/transformers/ensure_resources_compiled.ex index c9e2497f..2fb3dac7 100644 --- a/lib/ash/registry/extensions/resource_validations/transformers/ensure_resources_compiled.ex +++ b/lib/ash/registry/extensions/resource_validations/transformers/ensure_resources_compiled.ex @@ -14,6 +14,7 @@ defmodule Ash.Registry.ResourceValidations.Transformers.EnsureResourcesCompiled def transform(dsl) do dsl |> Transformer.get_entities([:entries]) + |> Enum.map(& &1.entry) |> Enum.map(fn resource -> try do # This is to get the compiler to ensure that the resource is compiled diff --git a/lib/ash/registry/extensions/resource_validations/transformers/validate_related_resource_inclusion.ex b/lib/ash/registry/extensions/resource_validations/transformers/validate_related_resource_inclusion.ex index 1b142fc1..0bd70f08 100644 --- a/lib/ash/registry/extensions/resource_validations/transformers/validate_related_resource_inclusion.ex +++ b/lib/ash/registry/extensions/resource_validations/transformers/validate_related_resource_inclusion.ex @@ -14,7 +14,10 @@ defmodule Ash.Registry.ResourceValidations.Transformers.ValidateRelatedResourceI @impl true def transform(dsl) do - resources = Transformer.get_entities(dsl, [:entries]) + resources = + dsl + |> Transformer.get_entities([:entries]) + |> Enum.map(& &1.entry) resources |> Enum.flat_map(&get_all_related_resources(&1, resources))