Introduce --no-namespace-maps, version bumps, etc.

plexus · plexus · commit eafa135a5222 · 2025-02-09T14:37:35.000+01:00
Introduce a new option, --no-namespace-map (or in :launchpad/options :
`:namespace-maps false`), which adds an nrepl middleware that turns
off *print-namespace-maps*.

Add negative versions of the booleans flags `(--no-go, --no-emacs, etc)`, useful
for overriding local/global/per-project defaults.

Bump dependency versions.

Add a release hook to keep the internal launchpad version in sync.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,14 @@
 
 ## Added
 
-## Fixed
+- `--[no-]namespace-maps` option (disable `*print-namespace-maps*`)
 
 ## Changed
 
+- Boolean flags are now defined as `--[no-]...`, so that you can override
+  local/global/project defaults from the command line, e.g. `bin/launchpad
+  --no-go`
+
 # 0.35.156-alpha (2025-01-09 / 0592491)
 
 ## Fixed
@@ -268,4 +272,4 @@ Initial release
 - lambdaisland.classpath integration
 - Support for cider-nrepl, refactor-nrepl
 - Basic support for shadow-cljs cljs nREPL-base REPL
-- Auto-connect for Emacs
+- Auto-connect for Emacs
diff --git a/bb.edn b/bb.edn
@@ -1,5 +1,7 @@
 {:paths ["src" "resources"]
  :deps
- {lambdaisland/open-source {:git/url "https://github.com/lambdaisland/open-source"
-                            :git/sha "7ce125cbd14888590742da7ab3b6be9bba46fc7a"}
-  com.lambdaisland/launchpad {:local/root "."}}}
+ {borkdude/rewrite-edn       {:mvn/version "0.4.8"}
+  com.lambdaisland/launchpad {:local/root "."}
+  com.lambdaisland/cli       {:mvn/version "0.22.87"}
+  lambdaisland/open-source   {:git/url "https://github.com/lambdaisland/open-source"
+                              :git/sha "6cb675d2adae284021f8cd94dcfbd078986b39bd"}}}
diff --git a/bin/proj b/bin/proj
@@ -1,14 +1,27 @@
 #!/usr/bin/env bb
 
 (ns proj
-  (:require [lioss.main :as lioss]))
+  (:require
+   [borkdude.rewrite-edn :as re]
+   [lioss.main :as lioss]))
+
+(def versions-file "resources/launchpad/deps.edn")
+
+(defn set-launchpad-version [{:keys [version] :as opts}]
+  (spit versions-file
+        (-> versions-file
+            slurp
+            re/parse-string
+            (re/assoc-in [:deps 'com.lambdaisland/launchpad :mvn/version] version)))
+  opts)
 
 (lioss/main
- {:license           :mpl
-  :inception-year    2022
-  :description       "Clojure dev process launcher"
-  :group-id          "com.lambdaisland"
-  :version-qualifier "alpha"
+ {:license                   :mpl
+  :inception-year            2022
+  :description               "Clojure dev process launcher"
+  :group-id                  "com.lambdaisland"
+  :version-qualifier         "alpha"
+  :pre-release-hook          set-launchpad-version
   :aliases-as-scope-provided [:clojure]})
 
 ;; Local Variables:
diff --git a/deps.edn b/deps.edn
@@ -1,26 +1,23 @@
 {:paths ["src" "resources"]
 
  :deps
- {org.clojure/clojure {:mvn/version "1.11.2"}
+ {org.clojure/clojure {:mvn/version "1.12.0"}
   com.lambdaisland/dotenv {:mvn/version "0.2.5"}
-  com.lambdaisland/cli {:mvn/version "0.18.74"}}
+  com.lambdaisland/cli {:mvn/version "0.22.87"}}
 
  :aliases
  {:clojure
-  {:extra-deps {babashka/babashka {:mvn/version "1.3.190" :scope "provided"}
+  {:extra-deps {babashka/babashka {:mvn/version "1.12.196" :scope "provided"}
                 org.clojure/tools.deps.alpha {:mvn/version "0.15.1254"}
                 com.nextjournal/beholder {:mvn/version "1.0.2"}
-                thheller/shadow-cljs {:mvn/version "2.28.3"}
+                thheller/shadow-cljs {:mvn/version "2.28.20"}
                 ;; prevent tools.deps.alpha from dragging in an old guava
-                com.google.guava/guava {:mvn/version "33.1.0-jre"}
-                com.lambdaisland/classpath {:mvn/version "0.5.48"}}}
-  :dev
-  {:extra-paths ["dev"]
-   :extra-deps  {djblue/portal {:mvn/version "RELEASE"}}}
+                com.google.guava/guava {:mvn/version "33.4.0-jre"}
+                com.lambdaisland/classpath {:mvn/version "0.6.58"}}}
 
   :test
   {:extra-paths ["test"]
-   :extra-deps  {lambdaisland/kaocha {:mvn/version "1.88.1376"}}}
+   :extra-deps  {lambdaisland/kaocha {:mvn/version "1.91.1392"}}}
 
   :self-deps
   {:extra-deps {com.lambdaisland/launchpad-deps {:local/root "resources/launchpad"}}}
diff --git a/resources/launchpad/deps.edn b/resources/launchpad/deps.edn
@@ -1,16 +1,16 @@
 ;; This file is just a lookup file for Launchpad to find the version of various
-;; things to use. We keep it in deps.edn format so antq can automatically
-;; upgrade versions.
+;; things to use. We keep it in deps.edn format so we can automatically upgrade
+;; versions.
 {:deps
- {com.lambdaisland/launchpad    {:mvn/version "0.33.149-alpha"}
+ {com.lambdaisland/launchpad    {:mvn/version "0.35.156-alpha"}
   com.lambdaisland/classpath    {:mvn/version "0.6.58"}
-  com.github.jnr/jnr-posix      {:mvn/version "3.1.19"}
+  com.github.jnr/jnr-posix      {:mvn/version "3.1.20"}
   thheller/shadow-cljs          {:mvn/version "2.28.20"}
-  com.google.guava/guava        {:mvn/version "33.1.0-jre"}
-  cider/cider-nrepl             {:mvn/version "0.50.3"}
-  nrepl/nrepl                   {:mvn/version "1.3.0"}
+  com.google.guava/guava        {:mvn/version "33.4.0-jre"}
+  cider/cider-nrepl             {:mvn/version "0.52.0"}
+  nrepl/nrepl                   {:mvn/version "1.3.1"}
   refactor-nrepl/refactor-nrepl {:mvn/version "3.10.0"}
-  djblue/portal                 {:mvn/version "0.58.3"}
+  djblue/portal                 {:mvn/version "0.58.5"}
   com.billpiel/sayid            {:mvn/version "0.1.0"}
   com.gfredericks/debug-repl    {:mvn/version "0.3.1-p1"}
   }}
diff --git a/src/lambdaisland/launchpad.clj b/src/lambdaisland/launchpad.clj
@@ -39,25 +39,35 @@
 (set-signal-handler! "TERM" cleanup)
 
 (def flags
-  ["-v,--verbose" "Print debug information"
-   "-p,--nrepl-port PORT" {:doc "Start nrepl on port. Defaults to 0 (= random)"
-                           :parse-fn #(Integer/parseInt %)}
-   "-b,--nrepl-bind ADDR" {:doc "Bind address of nrepl, by default \"127.0.0.1\"."
-                           :default "127.0.0.1"}
-   "--emacs" {:doc "Shorthand for --cider-nrepl --refactor-nrepl --cider-connect"
-              :handler (fn [ctx] (assoc ctx
-                                        :cider-nrepl true
-                                        :refactor-nrepl true
-                                        :cider-connect true))}
-   "--vs-code" {:doc "Alias for --cider-nrepl"
-                :handler (fn [ctx] (assoc ctx :cider-nrepl true))}
-   "--cider-nrepl" "Include CIDER nREPL dependency and middleware"
-   "--refactor-nrepl" "Include refactor-nrepl dependency and middleware"
-   "--cider-connect" "Automatically connect Emacs CIDER"
-   "--portal" "Include djblue/portal as a dependency, and define (user/portal)"
-   "--sayid" "Include Sayid dependency and middleware"
-   "--debug-repl" "Include gfredericks/debug-repl dependency and middleware"
-   "--go" "Call (user/go) on boot"])
+  ["-v,--verbose"          {:doc   "Print debug information"
+                            :value true}
+   "-p,--nrepl-port PORT"  {:doc      "Start nrepl on port. Defaults to 0 (= random)"
+                            :parse-fn #(Integer/parseInt %)}
+   "-b,--nrepl-bind ADDR"  {:doc     "Bind address of nrepl, by default \"127.0.0.1\"."
+                            :default "127.0.0.1"}
+   "--[no-]emacs"          {:doc     "Shorthand for --cider-nrepl --refactor-nrepl --cider-connect"
+                            :handler (fn [ctx v]
+                                       (assoc ctx
+                                              :cider-nrepl v
+                                              :refactor-nrepl v
+                                              :cider-connect v))}
+   "--[no-]vs-code"        {:doc     "Alias for --cider-nrepl"
+                            :handler (fn [ctx] (assoc ctx :cider-nrepl true))}
+   "--[no-]cider-nrepl"    {:doc   "Include CIDER nREPL dependency and middleware"
+                            :value true}
+   "--[no-]refactor-nrepl" {:doc   "Include refactor-nrepl dependency and middleware"
+                            :value true}
+   "--[no-]cider-connect"  {:doc   "Automatically connect Emacs CIDER"
+                            :value true}
+   "--[no-]portal"         {:doc   "Include djblue/portal as a dependency, and define (user/portal)"
+                            :value true}
+   "--[no-]sayid"          {:doc   "Include Sayid dependency and middleware"
+                            :value true}
+   "--[no-]debug-repl"     {:doc   "Include gfredericks/debug-repl dependency and middleware"
+                            :value true}
+   "--[no-]go"             {:doc "Call (user/go) on boot"}
+   "--[no-]namespace-maps" {:doc   "Disable *print-namespace-maps* through nREPL middleware"
+                            :value true}])
 
 (def library-versions
   (:deps (edn/read-string (slurp (io/resource "launchpad/deps.edn")))))
@@ -210,6 +220,9 @@
     (-> (assoc-extra-dep 'com.gfredericks/debug-repl)
         ((add-nrepl-middleware 'com.gfredericks.debug-repl/wrap-debug-repl)))
 
+    (false? (:namespace-maps ctx))
+    ((add-nrepl-middleware 'lambdaisland.launchpad.middleware/wrap-no-print-namespace-maps))
+
     (:portal ctx)
     (-> (assoc-extra-dep 'djblue/portal)
         (update :eval-forms (fnil conj [])
@@ -544,8 +557,7 @@
                    :background? true
                    :show-command? false}) ctx)))
 
-(def before-steps [read-deps-edn
-                   handle-cli-args
+(def before-steps [handle-cli-args
                    get-nrepl-port
                    get-nrepl-bind
                    ;; inject dependencies and enable behavior
@@ -580,19 +592,19 @@
 
 (defn initial-context [ctx]
   (let [project-root (:project-root ctx (find-project-root))]
-    (merge
-     {:main-opts *command-line-args*
-      :executable (or (:executable ctx)
-                      (str/replace *file*
-                                   (str project-root "/")
-                                   ""))
-      :env (into {} (System/getenv))
-      :steps (:default-steps ctx)
-      :project-root project-root
-      :middleware []
-      :java-args []
-      :eval-forms []}
-     ctx)))
+    (-> {:main-opts *command-line-args*
+         :executable (or (:executable ctx)
+                         (str/replace *file*
+                                      (str project-root "/")
+                                      ""))
+         :env (into {} (System/getenv))
+         :steps (:default-steps ctx)
+         :project-root project-root
+         :middleware []
+         :java-args []
+         :eval-forms []}
+        (merge ctx)
+        read-deps-edn)))
 
 (defn process-steps [ctx steps]
   (reduce #(%2 %1) ctx steps))
diff --git a/src/lambdaisland/launchpad/middleware.clj b/src/lambdaisland/launchpad/middleware.clj
@@ -0,0 +1,11 @@
+(ns lambdaisland.launchpad.middleware
+  "Launchpad-specific nREPL middleware")
+
+;; [NOTE] This approach via middleware is the only way I've found to ensure that
+;; this setting is off from the start.
+(defn wrap-no-print-namespace-maps
+  "Bind *print-namespace-maps* to false during nREPL requests"
+  [h]
+  (fn [msg]
+    (binding [*print-namespace-maps* false]
+      (h msg))))
