From 99b2e0c0cbbefa88ea9cf8a02a454428c67ed708 Mon Sep 17 00:00:00 2001
From: Peter Taoussanis <peter@taoensso.com>
Date: Fri, 5 Apr 2024 15:32:03 +0200
Subject: [PATCH] [mod] Remove Clj `enc/pr-json`

---
 project.clj                       |  3 +--
 src/taoensso/telemere/utils.cljc  | 15 ++++++++-------
 test/taoensso/telemere_tests.cljc | 24 ++++++++++++------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/project.clj b/project.clj
index 8945d18..49142c3 100644
--- a/project.clj
+++ b/project.clj
@@ -48,8 +48,7 @@
      [com.taoensso/slf4j-telemere  "1.0.0-alpha2"]
      ;; [org.slf4j/slf4j-simple          "2.0.12"]
      ;; [org.slf4j/slf4j-nop             "2.0.12"]
-     [io.opentelemetry/opentelemetry-api "1.36.0"]
-     [metosin/jsonista                    "0.3.8"]]
+     [io.opentelemetry/opentelemetry-api "1.36.0"]]
 
     :plugins
     [[lein-pprint                     "1.3.2"]
diff --git a/src/taoensso/telemere/utils.cljc b/src/taoensso/telemere/utils.cljc
index 6fefa32..639744a 100644
--- a/src/taoensso/telemere/utils.cljc
+++ b/src/taoensso/telemere/utils.cljc
@@ -50,7 +50,7 @@
 
 ;;;; Public misc
 
-(enc/defaliases enc/newline enc/pr-edn enc/pr-json)
+(enc/defaliases enc/newline enc/pr-edn #?(:cljs enc/pr-json))
 
 #?(:clj (defn thread-name "Returns string name of current thread." ^String [] (.getName (Thread/currentThread))))
 #?(:clj (defn thread-id   "Returns long id of current thread."       ^long [] (.getId   (Thread/currentThread))))
@@ -401,17 +401,18 @@
   "Experimental, subject to change.
   Returns a (fn format->json [signal]) that:
     - Takes a Telemere signal.
-    - Returns JSON string of the (minified) signal."
+    - Returns JSON string of the (minified) signal.
+
+  (Clj only): An appropriate `:pr-json-fn` MUST be provided."
   ([] (format-signal->json-fn nil))
   ([{:keys [pr-json-fn prep-fn]
      :or
-     {pr-json-fn pr-json
+     {#?@(:cljs [pr-json-fn pr-json])
       prep-fn (comp error-in-signal->maps minify-signal)}}]
 
-   (enc/try*
-     (pr-json-fn "telemere/auto-test")
-     (catch :all t
-       (throw (ex-info (str "`" `format-signal->json-fn "` `:pr-json` test failed") {} t))))
+   (when-not pr-json-fn
+     (throw
+       (ex-info (str "No `" `format-signal->json-fn "` `:pr-json-fn` was provided") {})))
 
    (fn format-signal->json [signal]
      (let [signal* (if prep-fn (prep-fn signal) signal)]
diff --git a/test/taoensso/telemere_tests.cljc b/test/taoensso/telemere_tests.cljc
index 7cfe906..6d31c93 100644
--- a/test/taoensso/telemere_tests.cljc
+++ b/test/taoensso/telemere_tests.cljc
@@ -13,8 +13,7 @@
    [taoensso.telemere.handlers    :as handlers]
    #?(:clj [taoensso.telemere.handlers.file-handler :as fh])
    #?(:clj [taoensso.telemere.slf4j :as slf4j])
-   #?(:clj [clojure.tools.logging   :as ctl])
-   #?(:clj [jsonista.core           :as jsonista])))
+   #?(:clj [clojure.tools.logging   :as ctl])))
 
 (comment
   (remove-ns      'taoensso.telemere-tests)
@@ -673,16 +672,17 @@
                :line    pnat-int?
                :column  pnat-int?}))))
 
-      (testing "format-signal->json-fn"
-        (let [sig  (with-sig (tel/event! ::ev-id {:inst t0}))
-              sig* (enc/read-json ((utils/format-signal->json-fn) sig))]
-          (is
-            (enc/submap? sig*
-              {"schema" 1, "kind" "event", "id" "taoensso.telemere-tests/ev-id",
-               "level" "info", "ns" "taoensso.telemere-tests",
-               "inst"    t0s
-               "line"    pnat-int?
-               "column"  pnat-int?}))))
+      #?(:cljs
+         (testing "format-signal->json-fn"
+           (let [sig  (with-sig (tel/event! ::ev-id {:inst t0}))
+                 sig* (enc/read-json ((utils/format-signal->json-fn) sig))]
+             (is
+               (enc/submap? sig*
+                 {"schema" 1, "kind" "event", "id" "taoensso.telemere-tests/ev-id",
+                  "level" "info", "ns" "taoensso.telemere-tests",
+                  "inst"    t0s
+                  "line"    pnat-int?
+                  "column"  pnat-int?})))))
 
       (testing "format-signal->str-fn"
         (let [sig (with-sig (tel/event! ::ev-id {:inst t0}))]