alias now accepts namespace objects in addition to symbols

Author: borkdude

CHANGELOG.md

@@ -14,6 +14,7 @@ SCI is used in [babashka](https://github.com/babashka/babashka),
 
 - Add `ns` field to `sci.lang.Var` for compatibility with code that accesses `.ns` on vars
 - `ns-aliases` now returns identical namespace objects as `find-ns`
+- `alias` now accepts namespace objects in addition to symbols
 - `copy-var` and `copy-var*` now preserve `:private` metadata
 - Add `proxy-super`, `proxy-call-with-super`, `update-proxy` and `proxy-mappings`
 - Support functional interface (FI) adaptation for instance targets (e.g. `(let [^Predicate p even?] (.test p 42))`)

src/sci/impl/namespaces.cljc

@@ -415,13 +415,6 @@
 
 ;;;; Namespaces / vars
 
-(defn sci-alias [alias-sym ns-sym]
-  (swap! (:env (store/get-ctx))
-         (fn [env]
-           (let [current-ns (sci.impl.utils/current-ns-name)]
-             (assoc-in env [:namespaces current-ns :aliases alias-sym] ns-sym))))
-  nil)
-
 (defn sci-create-ns [ns-sym]
   (sci.impl.utils/namespace-object (:env (store/get-ctx)) ns-sym true nil))
 
@@ -457,6 +450,16 @@
   (let [ctx (store/get-ctx)]
     (sci-ns-name* ctx ns)))
 
+(defn sci-alias [alias-sym ns-sym]
+  (let [ctx (store/get-ctx)
+        ns-sym (if (symbol? ns-sym) ns-sym
+                   (sci-ns-name* ctx ns-sym))]
+    (swap! (:env ctx)
+           (fn [env]
+             (let [current-ns (sci.impl.utils/current-ns-name)]
+               (assoc-in env [:namespaces current-ns :aliases alias-sym] ns-sym)))))
+  nil)
+
 (defn sci-ns-aliases* [ctx sci-ns]
   (let [name (sci-ns-name* ctx sci-ns)
         aliases (get-in @(:env ctx) [:namespaces name :aliases])]

test/sci/namespaces_test.cljc

@@ -94,6 +94,9 @@
   (is (= 'clojure.set (eval* "(ns-name (the-ns (the-ns 'clojure.set)))")))
   (is (= 'clojure.core (eval* "(alias 'c 'clojure.core) (ns-name (get (ns-aliases *ns*) 'c))")))
   (is (true? (eval* "(alias 'c 'clojure.core) (identical? (find-ns 'clojure.core) (get (ns-aliases *ns*) 'c))")))
+  (testing "alias accepts namespace objects"
+    (is (= 'clojure.core (eval* "(alias 'c (find-ns 'clojure.core)) (ns-name (get (ns-aliases *ns*) 'c))")))
+    (is (= 'my.new.ns (eval* "(alias 'mns (create-ns 'my.new.ns)) (ns-name (get (ns-aliases *ns*) 'mns))"))))
   (is (contains? (set (eval* "(clojure.repl/dir-fn 'clojure.string)"))
                  'last-index-of))
   (is (true? (eval* "(def foo-ns (create-ns 'foo)) (def another-foo-ns (create-ns 'foo))