During dep expansion, only consider lib to be omitted if all parent paths to root are omitted

Author: puredanger

Diff for: CHANGELOG.md

@@ -3,6 +3,8 @@ Changelog
 
 *Also see [Tools and installer changelog](https://github.com/clojure/brew-install/blob/1.12.0/CHANGELOG.md)*
 
+* next on Feb 7, 2025
+  * During dep expansion, only consider lib to be omitted if all parent paths to root are omitted
 * 0.22.1480 on Feb 6, 2025
   * Rollback modifying the dep expansion for same version children
 * 0.22.1476 on Feb 6, 2025

Diff for: src/main/clojure/clojure/tools/deps.clj

@@ -283,16 +283,21 @@
   "Is any part of the parent path missing from the selected lib/versions?
   This can happen if a newer version was found, orphaning previously selected children."
   [vmap parent-path]
-  (when (seq parent-path)
-    (loop [path parent-path]
-      (if (seq path)
-        (let [lib (last path)
-              check-path (vec (butlast path))
-              {:keys [paths select]} (get vmap lib)]
-          (if (contains? (get paths select) check-path)
-            (recur check-path)
-            true))
-        false))))
+  (loop [path parent-path
+         more-paths nil]
+    (if (seq path)
+      (let [lib (last path)
+            check-path (vec (butlast path))
+            {:keys [paths select]} (get vmap lib)]
+        (let [paths-to-selected (get paths select)]
+          (if (contains? paths-to-selected check-path)
+            ;; add alternative paths to root that include the selected lib
+            (recur check-path (concat more-paths (remove #(= % check-path) paths-to-selected)))
+            (if (seq more-paths)
+              ;; consider alternative paths before considering lib to be omitted
+              (recur (first more-paths) (rest more-paths))
+              true))))
+      false)))
 
 (defn- deselect-orphans
   "For the given paths, deselect any libs whose only selected version paths are in omitted-paths"

Diff for: src/test/clojure/clojure/tools/deps/test_deps.clj

@@ -240,20 +240,18 @@
 ;; +b1 -> +e1 -> +c1 -> +d1
 ;;            -> +h2 -> c1 -> d1
 ;; h2 supersedes previous h1, but need to ensure d1 is included via c1 somewhere
-;(deftest test-cut-previously-selected-child-3
-;  (fkn/with-libs {'ex/a {{:fkn/version "1"} [['ex/h {:fkn/version "1"}]]}
-;                  'ex/b {{:fkn/version "1"} [['ex/e {:fkn/version "1"}]]}
-;                  'ex/c {{:fkn/version "1"} [['ex/d {:fkn/version "1"}]]}
-;                  'ex/d {{:fkn/version "1"} nil}
-;                  'ex/e {{:fkn/version "1"} [['ex/c {:fkn/version "1"}] ['ex/h {:fkn/version "2"}]]}
-;                  'ex/h {{:fkn/version "1"} [['ex/c {:fkn/version "1"}]]
-;                         {:fkn/version "2"} [['ex/c {:fkn/version "1"}]]}}
-;    (is (= {:a "1", :b "1", :c "1", :d "1", :e "1", :h "2"}
-;          (let [res (deps/resolve-deps {:deps {'ex/a {:fkn/version "1"}
-;                                               'ex/b {:fkn/version "1"}}} {:threads 1})]
-;            (libs->lib-ver res))))))
-;
-;(comment (test-cut-previously-selected-child-3) )
+(deftest test-cut-previously-selected-child-3
+  (fkn/with-libs {'ex/a {{:fkn/version "1"} [['ex/h {:fkn/version "1"}]]}
+                  'ex/b {{:fkn/version "1"} [['ex/e {:fkn/version "1"}]]}
+                  'ex/c {{:fkn/version "1"} [['ex/d {:fkn/version "1"}]]}
+                  'ex/d {{:fkn/version "1"} nil}
+                  'ex/e {{:fkn/version "1"} [['ex/c {:fkn/version "1"}] ['ex/h {:fkn/version "2"}]]}
+                  'ex/h {{:fkn/version "1"} [['ex/c {:fkn/version "1"}]]
+                         {:fkn/version "2"} [['ex/c {:fkn/version "1"}]]}}
+    (is (= {:a "1", :b "1", :c "1", :d "1", :e "1", :h "2"}
+          (let [res (deps/resolve-deps {:deps {'ex/a {:fkn/version "1"}
+                                               'ex/b {:fkn/version "1"}}} nil)]
+            (libs->lib-ver res))))))
 
 ;; +a -> +b -> -x2 -> -y2 -> -z2
 ;;    -> +c -> +d -> +x3 -> +y2 -> +z2