From d26aa89ae2574574e97bb898c6d2cb41e2efc97d Mon Sep 17 00:00:00 2001 From: clyfe <> Date: Sat, 5 Dec 2020 18:54:34 +0200 Subject: [PATCH] Rename :include-refsets? to :optional-deps Related to: #77 --- src/integrant/core.cljc | 10 +++++----- test/integrant/core_test.cljc | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/integrant/core.cljc b/src/integrant/core.cljc index aa44e67..2c00757 100644 --- a/src/integrant/core.cljc +++ b/src/integrant/core.cljc @@ -133,13 +133,13 @@ "Return a dependency graph of all the refs and refsets in a config. Resolves derived dependencies. Takes the following options: - `:include-refsets?` - : whether to include refsets in the dependency graph (defaults to true)" + `:optional-deps?` + : whether to include optional deps in the dependency graph (defaults to true)" ([config] (dependency-graph config {})) - ([config {:keys [include-refsets?] :or {include-refsets? true}}] + ([config {:keys [optional-deps?] :or {optional-deps? true}}] (letfn [(find-refs [v] - (find-derived-refs config v include-refsets?))] + (find-derived-refs config v optional-deps?))] (reduce-kv (fn [g k v] (reduce #(dep/depend %1 k %2) g (find-refs v))) (dep/graph) config)))) @@ -152,7 +152,7 @@ (dep/topo-comparator #(compare (str %1) (str %2)) graph)) (defn- find-keys [config keys f] - (let [graph (dependency-graph config {:include-refsets? false}) + (let [graph (dependency-graph config {:optional-deps? false}) keyset (set (mapcat #(map key (find-derived config %)) keys))] (->> (f graph keyset) (set/union keyset) diff --git a/test/integrant/core_test.cljc b/test/integrant/core_test.cljc index 653d0ce..6cf66bc 100644 --- a/test/integrant/core_test.cljc +++ b/test/integrant/core_test.cljc @@ -162,7 +162,7 @@ (is (dep/depends? g ::b ::pp)))) (testing "graph without refsets" - (let [g (ig/dependency-graph m {:include-refsets? false})] + (let [g (ig/dependency-graph m {:optional-deps? false})] (is (dep/depends? g ::a ::p)) (is (not (dep/depends? g ::b ::p))) (is (not (dep/depends? g ::b ::pp)))))))