Prevent refs from being expanded (fixes #107)

weavejester · Jan 20, 2024 · cb17d44 · cb17d44
1 parent d2a3f93
commit cb17d44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/integrant/core.cljc b/src/integrant/core.cljc
@@ -467,7 +467,7 @@
   (let [m         (expand-key k v)
         override? (:override (meta m))]
     (letfn [(gen-expansions [idx [kn vn] override?]
-              (if (and (map? vn) (seq vn))
+              (if (and (map? vn) (not (reflike? vn)) (seq vn))
                 (let [override? (or override? (:override (meta vn)))]
                   (mapcat #(gen-expansions (conj idx kn) % override?) vn))
                 (list {:key       k

diff --git a/test/integrant/core_test.cljc b/test/integrant/core_test.cljc
@@ -288,7 +288,12 @@
     (is (= (ig/expand {[::one ::mod-c] 1
                        [::two ::mod-c] 2
                        ::c ^:override {:x {:y {:z 3}}}})
-           {::c {:x {:y {:z 3}}}}))))
+           {::c {:x {:y {:z 3}}}})))
+  (testing "expand with refs"
+    (let [m {::a (ig/ref ::b) ::b 1}]
+      (is (= m (ig/expand m))))
+    (let [m {::a (ig/refset ::b) ::b 1}]
+      (is (= m (ig/expand m))))))
 
 (deftest init-test
   (testing "without keys"