luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use tagged-literal for unknown EDN tags when creating *input* (#975) (#976)

Browse source 
* use tagged-literal as default for unknown tags when using -I (or --stream without -i)

* use tagged-literal as default for unknown tags
This commit is contained in:
Bob 2021-08-25 11:57:17 -04:00 committed by GitHub
parent a85d593767
commit 4ee84947c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/babashka/main.clj
View file

@ -424,7 +424,7 @@ Use bb run --help to show this help output.
(defn edn-seq* (defn edn-seq*
[^java.io.BufferedReader rdr] [^java.io.BufferedReader rdr]
(let [edn-val (edn/read {:eof ::EOF :readers edn-readers} rdr)] (let [edn-val (edn/read {:eof ::EOF :readers edn-readers :default tagged-literal} rdr)]
(when (not (identical? ::EOF edn-val)) (when (not (identical? ::EOF edn-val))
(cons edn-val (lazy-seq (edn-seq* rdr)))))) (cons edn-val (lazy-seq (edn-seq* rdr))))))
@ -676,13 +676,15 @@ Use bb run --help to show this help output.
(if stream? (if stream?
(if shell-in (or (read-line) ::EOF) (if shell-in (or (read-line) ::EOF)
(edn/read {:readers edn-readers (edn/read {:readers edn-readers
:default tagged-literal
:eof ::EOF} *in*)) :eof ::EOF} *in*))
(delay (cond shell-in (delay (cond shell-in
(shell-seq *in*) (shell-seq *in*)
edn-in edn-in
(edn-seq *in*) (edn-seq *in*)
:else :else
(edn/read {:readers edn-readers} *in*)))))) (edn/read {:readers edn-readers
:default tagged-literal} *in*))))))
uberscript-sources (atom ()) uberscript-sources (atom ())
classpath (or classpath classpath (or classpath
(System/getenv "BABASHKA_CLASSPATH")) (System/getenv "BABASHKA_CLASSPATH"))

22
test/babashka/main_test.clj
View file

@ -719,6 +719,28 @@ true")))
(let [first-doc (test-utils/bb nil "(doc first)")] (let [first-doc (test-utils/bb nil "(doc first)")]
(is (every? #(str/includes? first-doc %) ["---" "clojure.core/first" "first item"]))))) (is (every? #(str/includes? first-doc %) ["---" "clojure.core/first" "first item"])))))
(deftest edn-input-test
(testing "clojure's default readers"
(is (= '(#inst "2021-08-24T00:56:02.014-00:00")
(bb "#inst \"2021-08-24T00:56:02.014-00:00\"" "-I" "(println *input*)")))
(is (= '(#uuid "00000000-0000-0000-0000-000000000000")
(bb "#uuid \"00000000-0000-0000-0000-000000000000\"" "-I" "(println *input*)"))))
(testing "use tagged-literal as default data reader fn..."
(testing "when using the -I option"
(is (= "(#made-up-tag 42)\n"
(test-utils/normalize (test-utils/bb "#made-up-tag 42" "-I" "(println *input*)"))))
(is (= "(#abc 123 #cde 789)\n"
(test-utils/normalize (test-utils/bb "{:a #abc 123}{:a #cde 789}" "-I" "(map :a *input*)")))))
(testing "when using --stream and -I"
(is (= "#abc 123\n#cde 789\n"
(test-utils/normalize (test-utils/bb "{:a #abc 123}{:a #cde 789}" "--stream" "-I" "-e" "(println (:a *input*))")))))
(testing "when using --stream (-I is sort of implied if no -i)"
(is (= "#abc 123\n#cde 789\n"
(test-utils/normalize (test-utils/bb "{:a #abc 123}{:a #cde 789}" "--stream" "-e" "(println (:a *input*))")))))
(testing "when reading one EDN form from stdin (no --stream or -I or -i)"
(is (= "#abc 123\n"
(test-utils/normalize (test-utils/bb "{:a #abc 123}{:a #cde 789}" "-e" "(println (:a *input*))")))))))
;;;; Scratch ;;;; Scratch
(comment (comment