fipp with zoneddatetime

Author: awb99

demo/deps.edn

@@ -0,0 +1,54 @@
+{:paths ["src"]
+ :deps
+ {org.clojure/clojure    {:mvn/version "1.11.3"}
+  org.pinkgorilla/modular {:local/root ".." :deps/manifest :deps}}
+
+ :aliases
+ {:demo-log-default
+  {:extra-paths ["demo"]
+   :exec-args {:custom-config false}
+   :exec-fn logging/demo}
+
+  :demo-log-custom
+  {:extra-paths ["demo"]
+   :exec-args {:custom-config true}
+   :exec-fn logging/demo}
+
+    ;; SYSTEM RUNNER DEMOS
+
+  :demo-config
+  {:extra-paths ["demo" "test/resources" "test/src"]
+   :exec-args {:custom-config true}
+   :exec-fn config/demo}
+
+  :demo-system ; run a system with deps.edn:  clj -X:demo-system :run '[1 2 3]'
+  {:extra-deps {nrepl/nrepl {:mvn/version "0.9.0"}}
+   :extra-paths ["src-demo" "test/resources" "test/src"]
+   :exec-fn modular.system/start!
+   :exec-args {:services "services.edn"
+               :config ["webly/config.edn" {:ns-clj [demo.super]}]}}
+
+  :run {:exec-args {:run demo.run/run27}}
+
+  :demo-system-main
+  {:extra-deps {nrepl/nrepl {:mvn/version "0.9.0"}}
+   :extra-paths ["src-demo" "test/resources" "test/src"]
+   :main-opts  ["-m" "modular.system"
+                "--services" "services.edn"
+                "--config" "[\"webly/config.edn\" ]"]}
+
+  ; tree and list are here just because tools.deps.alpha does not work on my machine
+    ;:tree {:extra-deps {org.clojure/tools.deps.alpha {:mvn/version "0.14.1178"}}
+    ;       :exec-fn clojure.tools.cli.api/tree}
+    ;:list {:extra-deps {org.clojure/tools.deps.alpha {:mvn/version "0.14.1178"}}
+    ;       :exec-fn clojure.tools.cli.api/list}
+
+  :nrepl
+  {:extra-deps {nrepl/nrepl {:mvn/version "0.8.3"}
+                cider/cider-nrepl {:mvn/version,"0.27.2"}
+                cider/piggieback {:mvn/version "0.4.2"}}
+   :main-opts ["-m" "nrepl.cmdline"
+               "-b" "0.0.0.0"
+               "-p" "9100"
+                          ;"--middleware" "[cider.nrepl/cider-middleware,refactor-nrepl.middleware/wrap-refactor]"
+               ]}}}

src-demo/config.clj demo/src/config.clj

@@ -0,0 +1,32 @@
+(ns demo.fipp
+  (:require
+   [modular.fipp :refer [pprint-str]]
+   [tick.core :as t]))
+
+(def data
+  {:a 1
+   :b [1 2 3]
+   :c [1.0 2.0 3.0]
+   :inst (t/instant)
+   :zdt (t/zoned-date-time)})
+
+data
+;; => {:a 1,
+;;     :b [1 2 3],
+;;     :c [1.0 2.0 3.0],
+;;     :inst #time/instant "2024-10-11T17:18:54.857927482Z",
+;;     :zdt #time/zoned-date-time "2024-10-11T12:18:54.858196816-05:00[America/Panama]"}
+
+(-> data pr-str read-string)
+;; => {:a 1,
+;;     :b [1 2 3],
+;;     :c [1.0 2.0 3.0],
+;;     :inst #time/instant "2024-10-11T17:18:54.857927482Z",
+;;     :zdt #time/zoned-date-time "2024-10-11T12:18:54.858196816-05:00[America/Panama]"}
+
+(-> data pprint-str read-string)
+;; => {:a 1,
+;;     :b [1 2 3],
+;;     :c [1.0 2.0 3.0],
+;;     :inst #time/instant "2024-10-11T17:18:54.857927482Z",
+;;     :zdt #time/zoned-date-time "2024-10-11T12:18:54.858196816-05:00[America/Panama]"}

demo/src/demo/fipp.clj

@@ -86,56 +86,5 @@
 ;  :build-cljs-test 
 
 
-  :demo-log-default
-  {:extra-paths ["demo"]
-   :exec-args {:custom-config false}
-   :exec-fn logging/demo}
-
-  :demo-log-custom
-  {:extra-paths ["demo"]
-   :exec-args {:custom-config true}
-   :exec-fn logging/demo}
-
-  ;; SYSTEM RUNNER DEMOS
-
-  :demo-config
-  {:extra-paths ["demo" "test/resources" "test/src"]
-   :exec-args {:custom-config true}
-   :exec-fn config/demo}
-
-  :demo-system ; run a system with deps.edn:  clj -X:demo-system :run '[1 2 3]'
-  {:extra-deps {nrepl/nrepl {:mvn/version "0.9.0"}}
-   :extra-paths ["src-demo" "test/resources" "test/src"]
-   :exec-fn modular.system/start!
-   :exec-args {:services "services.edn"
-               :config ["webly/config.edn" {:ns-clj [demo.super]}]}}
-
-  :run {:exec-args {:run demo.run/run27}}
-
-  :demo-system-main
-  {:extra-deps {nrepl/nrepl {:mvn/version "0.9.0"}}
-   :extra-paths ["src-demo" "test/resources" "test/src"]
-   :main-opts  ["-m" "modular.system"
-                "--services" "services.edn"
-                "--config" "[\"webly/config.edn\" ]"
-                        ]}
-
-   ; tree and list are here just because tools.deps.alpha does not work on my machine
-  ;:tree {:extra-deps {org.clojure/tools.deps.alpha {:mvn/version "0.14.1178"}}
-  ;       :exec-fn clojure.tools.cli.api/tree}
-  ;:list {:extra-deps {org.clojure/tools.deps.alpha {:mvn/version "0.14.1178"}}
-  ;       :exec-fn clojure.tools.cli.api/list}
-
-  
- :nrepl
-{:extra-deps {nrepl/nrepl {:mvn/version "0.8.3"}
-              cider/cider-nrepl {:mvn/version,"0.27.2"}
-              cider/piggieback {:mvn/version "0.4.2"}}
- :main-opts ["-m" "nrepl.cmdline"
-             "-b" "0.0.0.0"
-             "-p" "9100"
-                        ;"--middleware" "[cider.nrepl/cider-middleware,refactor-nrepl.middleware/wrap-refactor]"
-             ]}
-
 ;
   }}

src-demo/demo/keybindings.clj demo/src/demo/keybindings.clj

@@ -2,15 +2,34 @@
   (:require
    [time-literals.data-readers] ;; For literals
    [time-literals.read-write] ;; For printing/writing
-   [fipp.ednize]))
+   [fipp.ednize])
+  (:import
+   [java.time Period
+    LocalDate
+    LocalDateTime
+    ZonedDateTime
+    OffsetTime
+    Instant
+    OffsetDateTime
+    ZoneId
+    DayOfWeek
+    LocalTime
+    Month
+    Duration
+    Year
+    YearMonth
+    MonthDay]))
 
 (extend-protocol fipp.ednize/IEdn
-  java.time.LocalDate
+  LocalDate
   (fipp.ednize/-edn [x]
     (tagged-literal 'time/date (str x)))
-  java.time.LocalDateTime
+  LocalDateTime
   (fipp.ednize/-edn [x]
     (tagged-literal 'time/date-time (str x)))
-  java.time.Instant
+  ZonedDateTime
+  (fipp.ednize/-edn [x]
+    (tagged-literal 'time/zoned-date-time (str x)))
+  Instant
   (fipp.ednize/-edn [x]
     (tagged-literal 'time/instant (str x))))

src-demo/demo/run.clj demo/src/demo/run.clj

@@ -0,0 +1,17 @@
+(ns modular.fipp
+  (:require
+   [modular.encoding.fipp] ; side-effects
+   [fipp.clojure])
+  (:import
+   [java.io StringWriter]))
+
+; redirect std out is NOT a good idea in an edn writer
+; because every console output will be printed to the edn doucment
+(defn pprint [data opts]
+  (with-out-str
+    (fipp.clojure/pprint data opts)))
+
+(defn pprint-str [data]
+  (let [sw (StringWriter.)]
+    (fipp.clojure/pprint data {:width 60 :writer sw :print-meta true})
+    (str sw)))