compat

Author: borkdude

CHANGELOG.md

@@ -12,6 +12,8 @@ SCI is used in [babashka](https://github.com/babashka/babashka),
 
 ## Unreleased
 
+- Add `ns` field to `sci.lang.Var` for compatibility with code that accesses `.ns` on vars
+- `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))`)
 - Infer type tags from let binding values to binding names (e.g. `(let [^String s "foo", q s] (.length q))`)

src/sci/core.cljc

@@ -82,11 +82,13 @@
             m# (-> var# meta)
             name# (or ~nm (:name m#))
             tag# (:tag m#)
+            private# (:private m#)
             new-m# (cond-> {:doc (:doc m#)
                             :name name#
                             :arglists (:arglists m#)
                             :ns ns#}
-                     tag# (assoc :tag tag#))]
+                     tag# (assoc :tag tag#)
+                     private# (assoc :private private#))]
         (cond (:dynamic m#)
               (new-dynamic-var name# val# new-m#)
               (or (:macro m#) (:sci/macro m#))
@@ -102,13 +104,15 @@
         arglists (:arglists m)
         dynamic (:dynamic m)
         macro (:macro m)
+        private (:private m)
         tag (:tag m)
     new-m (cond-> {:ns sci-ns
                        :name nm}
                 macro (assoc :macro true)
                 doc (assoc :doc doc)
                 arglists (assoc :arglists arglists)
                 dynamic (assoc :dynamic dynamic)
+                private (assoc :private private)
                 tag (assoc :tag tag))]
     (new-var nm @clojure-var new-m)))
 

src/sci/impl/copy_vars.cljc

@@ -55,10 +55,12 @@
                                                     :cljs (atom nil))])]
                     (macros/? :clj #?(:clj  (let [m (meta the-var)
                                                   dyn (:dynamic m)
+                                                  private (:private m)
                                                   arglists (:arglists m)
                                                   tag (:tag m)]
                                               (cond-> (if elide-vars {} {:doc (:doc m)})
                                                 dyn (assoc :dynamic dyn)
+                                                private (assoc :private private)
                                                 (if elide-vars false arglists)
                                                 (assoc :arglists (list 'quote (:arglists m)))
                                                 tag (assoc :tag tag)

test/sci/core_test.cljc

@@ -1321,6 +1321,12 @@
     (is (= "-------------------------\nfoo/do-twice\n([x])\nMacro\n" do-twice-doc))
     (is (= "-------------------------\nfoo/always-foo\n([& _args])\n" always-foo-doc))))
 
+(defn- private-fn [] :private)
+
+(deftest copy-var-private-test
+  (is (true? (:private (meta (sci/copy-var private-fn (sci/create-ns 'foo)))))
+      "copy-var preserves :private metadata"))
+
 (defn update-vals*
   "Same as `update-vals` from clojure 1.11 but included here so tests
   can run with older versions of Clojure/Script."