Skip to content

redefine-deps #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
darkleaf wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

redefine-deps #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions src/darkleaf/di/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,20 +806,28 @@
:cmap cmap}))
(registry key))))))

;; (defn rename-deps [target rmap]
;; (let [inverted-rmap (set/map-invert rmap)]
;; (fn [registry]
;; (fn [key]
;; (let [factory (registry key)]
;; (if (= target key)
;; (reify p/Factory
;; (dependencies [_]
;; (let [deps (p/dependencies factory)]
;; (set/rename-keys deps rmap)))
;; (build [this deps]
;; (let [deps (set/rename-keys deps inverted-rmap)]
;; (p/build factory deps))))
;; factory))))))
(defn redefine-deps [target & {:as mapping}]
(fn [registry]
(fn [key]
(let [factory (registry key)]
(if (= target key)
(reify p/Factory
(dependencies [_]
(let [deps (into {}
(remove (fn [[k _]] (contains? mapping k)))
(p/dependencies factory))
mapping-deps (transduce (map p/dependencies)
combine-dependencies
(vals mapping))]
(combine-dependencies deps mapping-deps)))
Comment on lines +816 to +822
Copy link
Owner Author

@darkleaf darkleaf May 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Может быть можно как-то компактнее записать?

Тут нужно только из deps удалить ключи из mappings, а сами mappings по идее могут содержать удаляемые зависимости

наверное стоит тестами обмазать, то, что я имею в виду

(build [_ deps add-stop]
(let [mapping-deps (update-vals mapping #(p/build % deps add-stop))
deps (merge deps mapping-deps)]
(p/build factory deps add-stop)))
(description [_]
;; todo: add description
(p/description factory)))
factory)))))


(defn- usefull-var? [var]
Expand Down
35 changes: 19 additions & 16 deletions test/darkleaf/di/tutorial/x_override_deps_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,24 @@
[clojure.test :as t]
Copy link
Owner Author

@darkleaf darkleaf May 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

override-deps vs redefine-deps ? или что-то еще/

[darkleaf.di.core :as di]))

;; (defn a [{dep ::dep
;; common ::common}]
;; [:a dep common])
(defn a
{::di/kind :component}
[{dep ::dep
common ::common}]
[:a dep common])

;; (defn b [{dep ::dep
;; common ::common}]
;; [:b dep common])
(defn b
{::di/kind :component}
[{dep ::dep
common ::common}]
[:b dep common])

;; (t/deftest ok
;; (with-open [root (di/start [`a `b]
;; {::dep-a :dep-a
;; ::dep-b :dep-b
;; ::common :c}
;; (di/rename-deps `a {::dep ::dep-a})
;; (di/rename-deps `b {::dep ::dep-b}))]
;; (let [[a b] root]
;; (t/is (= [:a :dep-a :c] a))
;; (t/is (= [:b :dep-b :c] b)))))
(t/deftest ok
(with-open [root (di/start [`a `b]
{::dep-a :dep-a
::common :c}
(di/redefine-deps `a ::dep (di/ref ::dep-a))
(di/redefine-deps `b ::dep :dep-b))]
(let [[a b] root]
(t/is (= [:a :dep-a :c] a))
(t/is (= [:b :dep-b :c] b)))))