Use data-printers.auto

Author: plexus

CHANGELOG.md

@@ -1,11 +1,9 @@
 # Unreleased
 
-## Added
-
-## Fixed
-
 ## Changed
 
+- Bump data-printers, and use the new `auto` functionality
+
 # 0.4.17 (2024-12-26 / 139a028)
 
 ## Added

bb.edn

@@ -1,3 +1,3 @@
-{:deps {com.lambdaisland/launchpad {:mvn/version "0.33.149-alpha"}
+{:deps {com.lambdaisland/launchpad {:mvn/version "0.35.156-alpha"}
         lambdaisland/open-source {:git/url "https://github.com/lambdaisland/open-source"
                                   :git/sha "4cb6231e7df947ee8f5434e7ad48ffd8e273bcf5"}}}

bin/proj

@@ -6,7 +6,8 @@
  {:license        :mpl
   :group-id       "com.lambdaisland"
   :inception-year 2024
-  :description    "Configuration library"})
+  :description    "Configuration library"
+  :aliases-as-scope-provided #{:provided}})
 
 ;; Local Variables:
 ;; mode:clojure

deps.edn

@@ -1,10 +1,14 @@
 {:paths ["src"]
 
  :deps
- {aero/aero {:mvn/version "1.1.6"}
-  lambdaisland/data-printers {:mvn/version "0.7.47"}}
+ {aero/aero                  {:mvn/version "1.1.6"}
+  lambdaisland/data-printers {:mvn/version "0.9.58"}}
 
  :aliases
- {:test
+ {:aliases
+  {:provided
+   {com.lambdaisland/cli {:mvn/version "0.19.78"}}}
+
+  :test
   {:extra-paths ["test"]
    :extra-deps  {lambdaisland/kaocha {:mvn/version "1.91.1392"}}}}}

src/lambdaisland/config.clj

@@ -5,7 +5,7 @@
    [clojure.core :as c]
    [clojure.java.io :as io]
    [clojure.string :as str]
-   [lambdaisland.data-printers :as printers]))
+   [lambdaisland.data-printers.auto :as printers]))
 
 (defn- env-case [s]
   (-> s str/upper-case (str/replace #"[-/]" "_")))
@@ -53,6 +53,9 @@
   (-source [this k])
   (-reload [this]))
 
+(defn register-print [klz data-fn]
+  (printers/register-printer klz (symbol (.getName klz)) data-fn))
+
 (defn ensure-aero [path cache opts]
   (when-not @cache
     (reset! cache (aero/read-config path opts))))
@@ -74,12 +77,16 @@
   (-reload [this]
     (reset! cache (aero/read-config path opts))))
 
+(register-print AeroProvider #(do {:path (.-path %)}))
+
 (deftype EnvProvider [prefix]
   ConfigProvider
   (-value [this k] (System/getenv (key->env-var prefix k)))
   (-source [this k] (str "$" (key->env-var prefix k) " environment variable"))
   (-reload [this]))
 
+(register-print EnvProvider #(do {:prefix (.-prefix %)}))
+
 (defn- property-key [prefix k]
   (str (when prefix
          (str prefix "."))
@@ -91,25 +98,23 @@
   (-source [this k] (str (property-key prefix k) " java system property"))
   (-reload [this]))
 
+(register-print PropertiesProvider #(do {:prefix (.-prefix %)}))
+
 (deftype MapProvider [m desc]
   ConfigProvider
   (-value [this k] (c/get m k))
   (-source [this k] (str k " " desc))
   (-reload [this]))
 
+(register-print MapProvider #(do {:desc (.-desc %)}))
+
 (deftype DerefMapProvider [m desc]
   ConfigProvider
   (-value [this k] (c/get @m k))
   (-source [this k] (str k " " desc))
   (-reload [this]))
 
-(doseq [c [AeroProvider
-           EnvProvider
-           PropertiesProvider
-           MapProvider
-           DerefMapProvider]]
-  (printers/register-print c (.getName c) meta)
-  (printers/register-pprint c (.getName c) meta))
+(register-print DerefMapProvider #(do {:desc (.-desc %)}))
 
 (defn new-config [env providers]
   {:env env