Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #937: throw when copying non-existent namespace #938

Merged
merged 3 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ SCI is used in [babashka](https://github.com/babashka/babashka),
- Support `aset` on primitive array using reflection
- Fix [#928](https://github.com/babashka/sci/issues/928): record constructor supports optional meta + ext map
- Fix [#934](https://github.com/babashka/sci/issues/934): `:allow` may contain namespaced symbols
- Fix [#937](https://github.com/babashka/sci/issues/937): throw when copying non-existent namespace

## 0.8.43 (2024-08-06)

Expand Down
4 changes: 2 additions & 2 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
:dev {:extra-paths ["reflector/src-java11"]}
:test {:extra-paths ["test" "test-resources"]
:extra-deps {org.clojure/clojure {:mvn/version "1.9.0"}
org.clojure/clojurescript {:mvn/version "1.10.866"}
org.clojure/clojurescript {:mvn/version "1.11.132"}
clj-commons/conch {:mvn/version "0.9.2"}
funcool/promesa {:mvn/version "8.0.450"}}}
:shadow {:extra-deps {thheller/shadow-cljs {:mvn/version "2.28.11"}}}
:shadow {:extra-deps {thheller/shadow-cljs {:mvn/version "2.28.16"}}}
:cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "1.11.54"}}}
:clj-test-runner
{:extra-deps {com.cognitect/test-runner
Expand Down
13 changes: 11 additions & 2 deletions src/sci/core.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,11 @@
;; this branch is hit by macroexpanding within the CLJS
;; compiler on the JVM. At ths point, cljs-ns-publics
;; refers to the right var.
(let [publics-map
(let [ns? #_:clj-kondo/ignore
(sci.impl.cljs/cljs-find-ns ns-sym)
_ (when-not ns?
(throw (ex-info (str "Copying non-existent namespace: " ns-sym) {:ns ns-sym})))
publics-map
#_:clj-kondo/ignore
(sci.impl.cljs/cljs-ns-publics ns-sym)
publics-map (process-publics publics-map opts)
Expand All @@ -473,7 +477,12 @@
`(-copy-ns ~publics-map ~sci-ns))
:cljs
;; this branch is hit by self-hosted
(let [publics-map
(let [ns?
#_:clj-kondo/ignore
(cljs.analyzer.api/find-ns ns-sym)
_ (when-not ns?
(throw (ex-info (str "Copying non-existent namespace: " ns-sym) {:ns ns-sym})))
publics-map
#_:clj-kondo/ignore
(cljs.analyzer.api/ns-publics ns-sym)
publics-map (process-publics publics-map opts)
Expand Down
6 changes: 4 additions & 2 deletions src/sci/impl/cljs.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
#?(:cljs (:require-macros [sci.impl.cljs :refer [require-cljs-analyzer-api when-not-var-exists]])))

(macros/deftime
#?(:clj (def cljs-ns-publics (resolve 'cljs.analyzer.api/ns-publics)))
#?(:clj (do (def cljs-ns-publics (resolve 'cljs.analyzer.api/ns-publics))
(def cljs-find-ns (resolve 'cljs.analyzer.api/find-ns))))
#_:clj-kondo/ignore
(defmacro ^:private require-cljs-analyzer-api []
(macros/? :clj
Expand All @@ -13,7 +14,8 @@
:cljs #?(;; macro executed from JVM Clojure, within CLJS compiler
:clj
(do (require '[cljs.analyzer.api])
(def cljs-ns-publics (resolve 'cljs.analyzer.api/ns-publics)))
(def cljs-ns-publics (resolve 'cljs.analyzer.api/ns-publics))
(def cljs-find-ns (resolve 'cljs.analyzer.api/find-ns)))
;; self-hosted CLJS, no require supported but also not necessary
:cljs nil)))

Expand Down
4 changes: 3 additions & 1 deletion test/sci/core_test.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -1525,7 +1525,9 @@
(is (= "YOLO" (:doc (meta (get sci-ns 'foo)))))
(is (:copy-this (meta (get sci-ns 'foo))))
(is (:awesome-meta (meta (get sci-ns 'baz))))
(is (= [1 1] (sci/eval-string "(vec-macro 1)" {:namespaces {'user sci-ns}})))))
(is (= [1 1] (sci/eval-string "(vec-macro 1)" {:namespaces {'user sci-ns}}))))
;; throws at compile time, so it's difficult to test this:
#_(is (thrown? Exception (sci/copy-ns #_:clj-kondo/ignore non-existent.namespace nil))))

(deftest copy-ns-default-meta-test
(testing "copy-ns default meta includes name"
Expand Down
Loading