Fix computation of tool argmap when both aliases and -T are used

Author: puredanger

CHANGELOG.md

@@ -3,7 +3,9 @@ Changelog
 
 *Also see [Tools and installer changelog](https://github.com/clojure/brew-install/blob/1.12.0/CHANGELOG.md)*
 
-* next on Mar 5, 2025
+* next
+  * Fix computation of tool argmap when both aliases and -T are used
+* 0.22.1507 on Mar 5, 2025
   * Better error on missing -Sdeps file
 * 0.22.1503 on Mar 5, 2025
   * Error on missing -Sdeps file

src/main/clojure/clojure/tools/deps.clj

@@ -851,7 +851,7 @@
           argmap-data (->> aliases
                         (remove nil?)
                         (map #(get alias-data %)))
-          argmap (apply merge-alias-maps (conj argmap-data args))
+          argmap (apply merge-alias-maps (concat argmap-data [args]))
 
           project-tooled-edn (tool project-edn argmap)
           merged-edn (merge-edns [root-edn user-edn project-tooled-edn extra-edn])
@@ -953,6 +953,9 @@
                :mvn/repos (merge mvn/standard-repos {"datomic-cloud" {:url "s3://datomic-releases-1fc2183a/maven/releases"}})}
     nil)
 
+  (create-basis
+    {:user {} :project {} :aliases [:deps] :args {:ns-default 'foo}})
+
   (print-tree
     (resolve-deps {:deps {'org.clojure/clojure {:mvn/version "1.8.0"}
                           'org.clojure/core.memoize {:mvn/version "0.5.8"}}

src/test/clojure/clojure/tools/deps/script/test_make_classpath2.clj

@@ -245,7 +245,7 @@
         paths (filter #(get-in classpath [% :path-key]) classpath-roots)]
     ;; tool deps, not project deps
     (is (not (contains? libs 'cheshire/cheshire)))
-    (is (= (map #(.getCanonicalPath (jio/file %)) ["." "x" "y"])
+    (is (= (map #(.getCanonicalPath (jio/file %)) ["x" "y" "."])
           (map #(.getCanonicalPath (jio/file %)) paths)))))
 
 (deftest config-data