Make Formulae dep optional

am-kantox · Mar 1, 2024 · 67eaa7e · 67eaa7e
1 parent a3c8981
commit 67eaa7e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/lib/estructura.ex b/lib/estructura.ex
@@ -304,8 +304,9 @@ defmodule Estructura do
       fn {field, formula}, acc ->
         value =
           case formula do
-            %Formulae{} = f ->
-              Formulae.eval(f, acc |> Map.from_struct() |> Map.to_list())
+            %{__struct__: Formulae} = f ->
+              # credo:disable-for-next-line
+              apply(Formulae, :eval, [f, acc |> Map.from_struct() |> Map.to_list()])
 
             f when is_function(f, 1) ->
               f.(acc)

diff --git a/lib/estructura/hooks.ex b/lib/estructura/hooks.ex
@@ -18,11 +18,18 @@ defmodule Estructura.Hooks do
                                         :calculated,
                                         unquote(calculated)
                                         |> Enum.map(fn
-                                          {k, %Formulae{} = formula} ->
+                                          {k, %{__struct__: Formulae} = formula} ->
                                             {k, formula}
 
                                           {k, formula} when is_binary(formula) ->
-                                            {k, Formulae.compile(formula, imports: :none)}
+                                            {
+                                              k,
+                                              # credo:disable-for-next-line
+                                              apply(Formulae, :compile, [
+                                                formula,
+                                                [imports: :none]
+                                              ])
+                                            }
 
                                           {k, formula} when is_function(formula, 1) ->
                                             {k, formula}

diff --git a/mix.exs b/mix.exs
@@ -45,8 +45,8 @@ defmodule Estructura.MixProject do
 
   defp deps do
     [
-      {:formulae, "~> 0.14"},
       {:stream_data, "~> 0.5"},
+      {:formulae, "~> 0.14", optional: true},
       {:jason, "~> 1.0", optional: true},
       {:excoveralls, "~> 0.14", only: [:test, :ci], runtime: false},
       {:credo, "~> 1.0", only: [:dev, :test, :ci]},