fix: compilation time improvements (hopefully)

ash-project · Apr 12, 2024 · 0e2b392 · 0e2b392
1 parent 10e3722
commit 0e2b392
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/ash/domain/dsl.ex b/lib/ash/domain/dsl.ex
@@ -126,7 +126,7 @@ defmodule Ash.Domain.Dsl do
       definitions: [@define, @define_calculation]
     ],
     args: [:resource],
-    no_depend_modules: [:resource],
+    modules: [:resource],
     schema: [
       resource: [
         type: {:spark, Ash.Resource},

diff --git a/lib/ash/resource/dsl.ex b/lib/ash/resource/dsl.ex
@@ -210,7 +210,7 @@ defmodule Ash.Resource.Dsl do
       end
       """
     ],
-    no_depend_modules: [:destination, :manual],
+    no_depend_modules: [:destination, :manual, :domain],
     target: Ash.Resource.Relationships.HasOne,
     schema: Ash.Resource.Relationships.HasOne.opt_schema(),
     transform: {Ash.Resource.Relationships.HasOne, :transform, []},
@@ -237,7 +237,7 @@ defmodule Ash.Resource.Dsl do
       """
     ],
     target: Ash.Resource.Relationships.HasMany,
-    no_depend_modules: [:destination, :manual],
+    no_depend_modules: [:destination, :manual, :domain],
     schema: Ash.Resource.Relationships.HasMany.opt_schema(),
     args: [:name, :destination],
     transform: {Ash.Resource.Relationships.HasMany, :transform, []},
@@ -271,7 +271,7 @@ defmodule Ash.Resource.Dsl do
       belongs_to :word, Word, primary_key?: true, allow_nil?: false
       """
     ],
-    no_depend_modules: [:destination, :through],
+    no_depend_modules: [:destination, :through, :domain],
     target: Ash.Resource.Relationships.ManyToMany,
     schema: Ash.Resource.Relationships.ManyToMany.opt_schema(),
     transform: {Ash.Resource.Relationships.ManyToMany, :transform, []},
@@ -299,7 +299,7 @@ defmodule Ash.Resource.Dsl do
       end
       """
     ],
-    no_depend_modules: [:destination],
+    no_depend_modules: [:destination, :domain],
     target: Ash.Resource.Relationships.BelongsTo,
     schema: Ash.Resource.Relationships.BelongsTo.opt_schema(),
     transform: {Ash.Resource.Relationships.BelongsTo, :transform, []},

diff --git a/mix.exs b/mix.exs
@@ -367,7 +367,7 @@ defmodule Ash.MixProject do
   defp deps do
     [
       # DSLs
-      {:spark, "~> 2.1 and >= 2.1.7"},
+      {:spark, "~> 2.1 and >= 2.1.18"},
       # Ash resources are backed by ecto scheams
       {:ecto, "~> 3.7"},
       # Used by the ETS data layer

diff --git a/mix.lock b/mix.lock
@@ -34,8 +34,8 @@
   "reactor": {:hex, :reactor, "0.8.1", "1aec71d16083901277727c8162f6dd0f07e80f5ca98911b6ef4f2c95e6e62758", [:mix], [{:libgraph, "~> 0.16", [hex: :libgraph, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.2", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ae3936d97a3e4a316744f70c77b85345b08b70da334024c26e6b5eb8ede1246b"},
   "simple_sat": {:hex, :simple_sat, "0.1.3", "f650fc3c184a5fe741868b5ac56dc77fdbb428468f6dbf1978e14d0334497578", [:mix], [], "hexpm", "a54305066a356b7194dc81db2a89232bacdc0b3edaef68ed9aba28dcbc34887b"},
   "sobelow": {:hex, :sobelow, "0.13.0", "218afe9075904793f5c64b8837cc356e493d88fddde126a463839351870b8d1e", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"},
-  "sourceror": {:hex, :sourceror, "1.0.2", "c5e86fdc14881f797749d1fe5df017ca66727a8146e7ee3e736605a3df78f3e6", [:mix], [], "hexpm", "832335e87d0913658f129d58b2a7dc0490ddd4487b02de6d85bca0169ec2bd79"},
-  "spark": {:hex, :spark, "2.1.17", "9fd6a77182f81cfbe9cfd35717be5d65e60d8960201051972be4c8e78eda834b", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}], "hexpm", "1c3fcedc0d9252d64a2613b0da10b82538bfea088b8b8d5fd53ad5ecb3f9f8bd"},
+  "sourceror": {:hex, :sourceror, "1.0.3", "111711c147f4f1414c07a67b45ad0064a7a41569037355407eda635649507f1d", [:mix], [], "hexpm", "56c21ef146c00b51bc3bb78d1f047cb732d193256a7c4ba91eaf828d3ae826af"},
+  "spark": {:hex, :spark, "2.1.18", "2836a5a4b2874e5493a80fdcb84cfe9f1b89a45382e042e40d117d10000bb83e", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}], "hexpm", "f0060725e20b8d330734ac16da048022e2f37df03b74334725c40cab43c3fa6d"},
   "splode": {:hex, :splode, "0.2.2", "cda6709f829e3fe39a9550e8c8bc11821f994ecd660b5a0d60452770f227b9ca", [:mix], [], "hexpm", "8e02f47fac4bff7cfd29a65611ee3ab728dcc9c70a5c2e438addb8f25713265a"},
   "statistex": {:hex, :statistex, "1.0.0", "f3dc93f3c0c6c92e5f291704cf62b99b553253d7969e9a5fa713e5481cd858a5", [:mix], [], "hexpm", "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"},
   "stream_data": {:hex, :stream_data, "0.6.0", "e87a9a79d7ec23d10ff83eb025141ef4915eeb09d4491f79e52f2562b73e5f47", [:mix], [], "hexpm", "b92b5031b650ca480ced047578f1d57ea6dd563f5b57464ad274718c9c29501c"},