compile-clj - fix ordering of namespaces not included in topo sort

Author: puredanger

CHANGELOG.md

@@ -1,6 +1,8 @@
 Changelog
 ===========
 
+* v0.10.4
+  * compile-clj - fix ordering of namespaces not included in topo sort
 * v0.10.3 15ead66 on May, 2024
   * compile-clj - add simple spec for :basis arg
 * v0.10.1 5e3b8f3 on Apr 28, 2024

src/main/clojure/clojure/tools/build/tasks/compile_clj.clj

@@ -67,7 +67,7 @@
     (->> graph
       dependency/topo-sort
       (filter ns-candidates) ;; only keep stuff in these dirs
-      (concat ns-candidates) ;; but make sure everything is in there at least once
+      (#(concat % ns-candidates)) ;; but make sure everything is in there at least once
       distinct)))
 
 (defn- basis-paths

src/test/clojure/clojure/tools/build/tasks/test_compile_clj.clj

@@ -12,8 +12,15 @@
     [clojure.java.io :as jio]
     [clojure.string :as str]
     [clojure.tools.build.api :as api]
+    [clojure.tools.build.tasks.compile-clj :as compile-clj]
     [clojure.tools.build.test-util :refer :all]))
 
+(deftest test-topo
+  ;; deps: a -> b -> c, d
+  ;; expect: c b a (reverse topo sort), then d at the end
+  (is (= '[c b a d]
+        (#'compile-clj/nses-in-topo [(jio/file "test-data/nses/src")]))))
+
 (deftest test-compile
   (with-test-dir "test-data/p1"
     (api/set-project-root! (.getAbsolutePath *test-dir*))

test-data/nses/src/a.clj

@@ -0,0 +1,2 @@
+(ns a
+  (:require b))

test-data/nses/src/b.clj

@@ -0,0 +1,2 @@
+(ns b
+  (:require c))

test-data/nses/src/c.clj

@@ -0,0 +1 @@
+(ns c)

test-data/nses/src/d.clj

@@ -0,0 +1 @@
+(ns d)