Merge pull request #376 from clojure-emacs/374

Support Clojure 1.11's new `:as-alias` namespace directive

Author: vemv

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 3.5.0
+
+* [#374](https://github.com/clojure-emacs/refactor-nrepl/issues/374): support Clojure 1.11's new `:as-alias` namespace directive. 
+
 ## 3.4.2
 
 * [#373](https://github.com/clojure-emacs/refactor-nrepl/issues/373): revert accidentally-changed `namespace-aliases` error handling default.

README.md

@@ -26,7 +26,7 @@ Be aware that this isn't the case if you connect to an already running REPL proc
 Add the following, either in your project's `project.clj`,  or in the `:user` profile found at `~/.lein/profiles.clj`:
 
 ```clojure
-:plugins [[refactor-nrepl "3.4.2"]
+:plugins [[refactor-nrepl "3.5.0"]
           [cider/cider-nrepl "0.28.3"]]
 ```
 
@@ -360,12 +360,12 @@ If you want to use `mranderson` while developing locally with the REPL, the sour
 
 When you want to release locally to the following:
 
-    PROJECT_VERSION=3.4.2 make install
+    PROJECT_VERSION=3.5.0 make install
 
 And here's how to deploy to Clojars:
 
 ```bash
-git tag -a v3.4.2 -m "3.4.2"
+git tag -a v3.5.0 -m "3.5.0"
 git push --tags
 ```
 

src/refactor_nrepl/ns/rebuild.clj

@@ -16,11 +16,10 @@
              " and " libspec-alias)))))
   alias)
 
-(defn- get-libspec-alias [libspecs]
+(defn- get-libspec-alias [k libspecs]
   (->> libspecs
-       (map :as)
-       (filter (complement nil?))
-       first
+       (keep k)
+       (first)
        (assert-single-alias libspecs)))
 
 (defn- merge-referred-symbols [libspecs key]
@@ -32,17 +31,18 @@
       (when (seq referred)
         (-> referred concat flatten distinct)))))
 
-(defn- remove-redundant-flags
-  [{:keys [reload reload-all] :as libspec}]
-  (if (and reload reload-all)
-    (dissoc libspec :reload)
-    libspec))
+(defn- remove-redundant-flags [{:keys [reload reload-all]
+                                :as libspec}]
+  (cond-> libspec
+    (and reload reload-all)
+    (dissoc :reload)))
 
 (defn- merge-libspecs
   [libspecs]
   (->
    (apply merge libspecs)
-   (merge {:as (get-libspec-alias libspecs)
+   (merge {:as (get-libspec-alias :as libspecs)
+           :as-alias (get-libspec-alias :as-alias libspecs)
            :refer (merge-referred-symbols libspecs :refer)
            :refer-macros (merge-referred-symbols libspecs :refer-macros)
            :rename (apply merge (map :rename libspecs))})
@@ -123,17 +123,22 @@
     @libspecs-by-prefix))
 
 (defn- create-libspec
-  [{:keys [ns as refer rename refer-macros] :as libspec} vectorize?]
+  [{:keys [ns as as-alias refer rename refer-macros] :as libspec} vectorize?]
   (let [all-flags #{:reload :reload-all :verbose :include-macros}
         flags (util/filter-map #(all-flags (first %)) libspec)
-        keep-as-is? (and (not as) (not refer)
-                         (empty? flags) (empty? rename) (empty? refer-macros))]
+        keep-as-is? (and (not as)
+                         (not as-alias)
+                         (not refer)
+                         (empty? flags)
+                         (empty? rename)
+                         (empty? refer-macros))]
     (cond-> ns
       (or vectorize? (not keep-as-is?))
       vector
 
       (not keep-as-is?)
       (into (concat (when as [:as as])
+                    (when as-alias [:as-alias as-alias])
                     (when refer
                       [:refer (if (sequential? refer)
                                 (vec (sort-referred-symbols refer))

test-resources/as_alias.clj

@@ -0,0 +1,3 @@
+(ns as-alias
+  (:require
+   [foo :as-alias f]))

test/refactor_nrepl/core_test.clj

@@ -72,3 +72,8 @@
     "a/.gitlibs"        true
     "a/.gitlibs/"       true
     "a/.gitlibs/b"      true))
+
+(deftest read-ns-form-with-meta
+  (testing "`:as-alias` directives are kept"
+    (is (= '(ns as-alias (:require [foo :as-alias f]))
+           (sut/read-ns-form-with-meta "test-resources/as_alias.clj")))))

test/refactor_nrepl/ns/ns_parser_test.clj

@@ -41,3 +41,8 @@
          (get-required-macros '(ns test
                                  (:use-macros [cljs.test :only [deftest is]])
                                  (:require-macros [cljs.test :refer [testing run-tests]]))))))
+
+(deftest as-alias
+  (is (= (list '{:ns compojure.core :as-alias c})
+         (get-libspecs '(ns refactor-nrepl.test
+                          (:require [compojure.core :as-alias c]))))))

test/refactor_nrepl/ns/rebuild_test.clj

@@ -1,20 +1,20 @@
 (ns refactor-nrepl.ns.rebuild-test
   (:require
-   [clojure.test :as t]
-   [refactor-nrepl.ns.rebuild :as rebuild]))
+   [clojure.test :as t :refer [deftest is testing]]
+   [refactor-nrepl.ns.rebuild :as sut]))
 
 (t/deftest build-cljc-dep-forms
   (t/testing "shared :requires only, no conditionals"
     (t/is (= '((:require [clojure.string :as str]))
-             (rebuild/build-cljc-dep-forms
+             (sut/build-cljc-dep-forms
               '{:clj            {:require ({:ns clojure.string, :as str, :rename {}})
                                  :import  ()}
                 :cljs           {:require ({:ns clojure.string, :as str, :rename {}})
                                  :import  ()}
                 :source-dialect :cljc}))))
   (t/testing "single segment namespaces"
     (t/is (= '((:require [single-segment-ns]))
-             (rebuild/build-cljc-dep-forms
+             (sut/build-cljc-dep-forms
               '{:clj            {:require ({:ns single-segment-ns :rename {}})
                                  :import  ()}
                 :cljs           {:require ({:ns single-segment-ns, :rename {}})
@@ -26,7 +26,7 @@
                                     :cljs
                                     [(:require [clojure.string :as str])
                                      (:require-macros [conditional-with-require-macros :refer [my-when]])]))
-             (rebuild/build-cljc-dep-forms
+             (sut/build-cljc-dep-forms
               '{:clj            {:require ({:ns clojure.string, :as str, :rename {}})
                                  :import  ()}
                 :cljs           {:require        ({:ns clojure.string, :as str, :rename {}})
@@ -37,7 +37,7 @@
   (t/testing "should rebuild cljc ns declarations that consist of only conditionals for a single language correctly (#296)"
     (t/is (= (list (symbol "#?@")
                    '(:cljs [(:require-macros [conditional-with-require-macros :refer [my-when]])]))
-             (rebuild/build-cljc-dep-forms
+             (sut/build-cljc-dep-forms
               '{:clj            {:require ()
                                  :import  ()}
                 :cljs           {:require        ()
@@ -47,9 +47,28 @@
 
   (t/testing "Empty declaration should be rebuilt as-is"
     (t/is (= nil
-             (rebuild/build-cljc-dep-forms
+             (sut/build-cljc-dep-forms
               '{:clj            {:require ()
                                  :import  ()}
                 :cljs           {:require ()
                                  :import  ()}
-                :source-dialect :cljc})))))
+                :source-dialect :cljc}))))
+
+  (testing "`:as-alias`"
+    (let [input '{:require ({:ns foo, :as-alias str})
+                  :import  ()}]
+      (t/testing "is kept"
+        (t/is (= '((:require [foo :as-alias str]))
+                 (sut/build-cljc-dep-forms
+                  {:clj            input
+                   :cljs           input
+                   :source-dialect :cljc})))))))
+
+(deftest rebuild-ns-form
+  (let [input '(ns refactor-nrepl.ns.clean-ns (:require [foo :as-alias f]))]
+    (is (= input (sut/rebuild-ns-form '{:clj {:require ({:ns foo, :as-alias f})
+                                              :import nil}
+                                        :ns refactor-nrepl.ns.clean-ns
+                                        :source-dialect :clj}
+                                      input))
+        "`:as-alias` directives are kept")))