ash-project/ash
1
0
Fork 0
mirror of https://github.com/ash-project/ash.git synced 2024-09-20 05:23:03 +12:00
Code Issues Projects Releases Packages Wiki Activity

chore: follow up fixes for optimized embed creation

Browse source
This commit is contained in:
Zach Daniel 2024-08-07 22:16:19 -04:00
parent 9a9e0c4e32
commit e86c5bce56
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ash/embeddable_type.ex
View file

@ -241,9 +241,9 @@ defmodule Ash.EmbeddableType do
Enum.empty?(Ash.Resource.Info.validations(__MODULE__, action.type)) && Enum.empty?(Ash.Resource.Info.validations(__MODULE__, action.type)) &&
Enum.empty?(Ash.Resource.Info.notifiers(__MODULE__)) && Enum.empty?(Ash.Resource.Info.notifiers(__MODULE__)) &&
Enum.empty?(Ash.Resource.Info.relationships(__MODULE__)) do Enum.empty?(Ash.Resource.Info.relationships(__MODULE__)) do
has_structs? = Enum.empty?(structs) has_structs? = not Enum.empty?(structs)
attributes = Ash.Resource.Info.attributes(__MODULE__) attributes = Ash.Resource.Info.attributes(__MODULE__)
base = base =
attributes attributes
@ -259,7 +259,7 @@ defmodule Ash.EmbeddableType do
Map.put(acc, attribute.name, value) Map.put(acc, attribute.name, value)
end) end)
Enum.reduce_while(values, {:ok, structs}, fn {value, index}, {:ok, results} -> Enum.reduce_while(values, {:ok, []}, fn {value, index}, {:ok, results} ->
base = base =
attributes attributes
|> Enum.filter(&(not is_nil(&1.default) && !&1.match_other_defaults?)) |> Enum.filter(&(not is_nil(&1.default) && !&1.match_other_defaults?))
@ -277,7 +277,7 @@ defmodule Ash.EmbeddableType do
Enum.reduce_while(value, {:ok, index, base}, fn {key, value}, {:ok, index, acc} -> Enum.reduce_while(value, {:ok, index, base}, fn {key, value}, {:ok, index, acc} ->
case Ash.Resource.Info.attribute(__MODULE__, key) do case Ash.Resource.Info.attribute(__MODULE__, key) do
nil -> nil ->
{:cont, {:ok, acc}} {:cont, {:ok, index, acc}}
attribute -> attribute ->
if attribute.name in action.accept do if attribute.name in action.accept do
@ -350,7 +350,14 @@ defmodule Ash.EmbeddableType do
|> case do |> case do
{:ok, values} -> {:ok, values} ->
if has_structs? do if has_structs? do
{:ok, values |> Enum.sort_by(&elem(&1, 1)) |> Enum.map(&elem(&1, 0))} values =
values
|> Enum.sort_by(&elem(&1, 1))
|> Enum.map(&elem(&1, 0))
Enum.reduce(structs, {:ok, values}, fn {struct, index}, {:ok, values} ->
{:ok, List.insert_at(values, index, struct)}
end)
else else
{:ok, Enum.reverse(values)} {:ok, Enum.reverse(values)}
end end