[clojure-emacs#209] include node-babashka and fix PR remarks

Author: Mike Bruce

CHANGELOG.md

@@ -4,7 +4,7 @@
 * [#202](https://github.com/clojure-emacs/inf-clojure/issues/202): Add ClojureCLR support.
 * [#204](https://github.com/clojure-emacs/inf-clojure/issues/204): Scroll repl buffer on insert commands
 * [#208](https://github.com/clojure-emacs/inf-clojure/pull/208) Display message after setting repl.
-* [#210](https://github.com/clojure-emacs/inf-clojure/pull/210) Include `inf-clojure-socket` to create a socket REPL and connect to it from inside Emacs. 
+* [#210](https://github.com/clojure-emacs/inf-clojure/pull/210) Include `inf-clojure-socket-repl` to create a socket REPL and connect to it from inside Emacs. 
 
 
 ## 3.2.1 (2022-07-22)

inf-clojure.el

@@ -78,6 +78,7 @@
                                     (lein-clr . "lein clr repl")
                                     (planck . "planck -d")
                                     (babashka . "bb")
+                                    (node-babashka . "nbb")
                                     (lumo . "lumo -d")
                                     (joker . "joker")))
 
@@ -140,6 +141,17 @@
                  (set-ns . "(clojure.core/in-ns '%s)")
                  (macroexpand . "(clojure.core/macroexpand '%s)")
                  (macroexpand-1 . "(clojure.core/macroexpand-1 '%s)")))
+    (node-babashka . ((load . "(clojure.core/load-file \"%s\")")
+                 (doc . "(clojure.repl/doc %s)")
+                 (source . "(clojure.repl/source %s)")
+                 (arglists .
+                           "(try (-> '%s clojure.core/resolve clojure.core/meta :arglists)
+                              (catch Throwable e nil))")
+                 (apropos . "(doseq [var (sort (clojure.repl/apropos \"%s\"))] (println (str var)))")
+                 (ns-vars . "(clojure.repl/dir %s)")
+                 (set-ns . "(clojure.core/in-ns '%s)")
+                 (macroexpand . "(clojure.core/macroexpand '%s)")
+                 (macroexpand-1 . "(clojure.core/macroexpand-1 '%s)")))
     (clojure . ((load . "(clojure.core/load-file \"%s\")")
                 (doc . "(clojure.repl/doc %s)")
                 (source . "(clojure.repl/source %s)")
@@ -853,6 +865,9 @@ HOST is the host the process is running on, PORT is where it's listening."
 (defvar-local inf-clojure-socket-buffer nil
   "Used to kill the associated socket buffer when it's REPL buffer is killed.")
 
+(defvar inf-clojure-socket-repl-startup-message "Socket REPL listening"
+  "Used to detect when nbb socket REPL has started since it does not print `=>'.")
+
 (defun inf-clojure-socket-filter (process output)
   "A filter that gets triggered each time the socket receives new OUTPUT.
 This function prints out the output received but also
@@ -869,14 +884,15 @@ OUTPUT is the latest data received from the process"
     (when (buffer-live-p server-buffer)
       (with-current-buffer server-buffer
         (insert output)))
-    (let ((prompt-displayed (string-match inf-clojure-prompt output)))
-      (when prompt-displayed
-	(message (format "REPL prompt found for %s" (process-name process)))
+    (let ((prompt-displayed (string-match inf-clojure-prompt output))
+          (startup-displayed (string-match inf-clojure-socket-repl-startup-message output)))
+      (when (or prompt-displayed startup-displayed)
+	(message (format "Socket REPL startup detected for %s" (process-name process)))
 	(with-current-buffer server-buffer
 	  (when inf-clojure-socket-callback
 	    (funcall inf-clojure-socket-callback)))))))
 
-(defun inf-clojure-repl-sentinel (process event)
+(defun inf-clojure-socket-repl-sentinel (process event)
   "Ensures socket REPL are cleaned up when the REPL buffer is closed.
 
 PROCESS is the process object that is connected to a socket REPL.
@@ -889,19 +905,21 @@ EVENT is the event that triggered this function to be called."
           (kill-buffer inf-clojure-socket-buffer))))))
 
 (defvar inf-clojure-socket-repl-startup-forms
-  '((lein . "JVM_OPTS='-Dclojure.server.repl={:port %s :accept clojure.core.server/repl}' lein repl")
-    (boot . "export BOOT_JVM_OPTIONS='-Dclojure.server.repl=\"{:port %s :accept clojure.core.server/repl}\"' boot repl")
-    (clojure . "clojure -J-Dclojure.server.repl=\"{:port %s :accept clojure.core.server/repl}\"")
-    (cljs . "clojure -J-Dclojure.server.repl=\"{:port %s :accept cljs.server.browser/repl}\"")
-    (lein-clr . "JVM_OPTS='-Dclojure.server.repl={:port %s :accept clojure.core.server/repl}' lein clr repl")
-    (planck . "planck -n %s")
-    (babashka . "bb socket-repl %s")))
+  '((lein . "JVM_OPTS='-Dclojure.server.repl={:port %d :accept clojure.core.server/repl}' lein repl")
+    (boot . "export BOOT_JVM_OPTIONS='-Dclojure.server.repl=\"{:port %d :accept clojure.core.server/repl}\"' boot repl")
+    (clojure . "clojure -J-Dclojure.server.repl=\"{:port %d :accept clojure.core.server/repl}\"")
+    (cljs . "clojure -J-Dclojure.server.repl=\"{:port %d :accept cljs.server.browser/repl}\"")
+    (lein-clr . "JVM_OPTS='-Dclojure.server.repl={:port %d :accept clojure.core.server/repl}' lein clr repl")
+    (planck . "planck -n %d")
+    (babashka . "bb socket-repl %d")
+    (node-babashka . "nbb socket-repl :port %d")))
 
 (defcustom inf-clojure-socket-repl-port
   nil
   "Port to be used when creating a socket REPL via `inf-clojure-socket-repl'.
 If left as nil a random port will be selected between 5500-6000."
-  :type '(choice integer (const nil)))
+  :type '(choice integer (const nil))
+  :package-version '(inf-clojure . "3.2.1"))
 
 ;;;###autoload
 (defun inf-clojure-socket-repl (cmd)
@@ -912,26 +930,27 @@ provided in `inf-clojure-socket-repl-startup-forms' or
 `inf-clojure-custom-startup' if this is defined."
   (interactive (list (or (unless current-prefix-arg
                            inf-clojure-custom-startup)
-                         (completing-read "Select Clojure REPL startup command: "
+                         (completing-read "Select Clojure socket REPL startup command: "
                                           (mapcar #'cdr inf-clojure-socket-repl-startup-forms)
                                           nil
                                           'confirm-after-completion))))
   (let* ((host "localhost")
          (port (or inf-clojure-socket-repl-port (+ 5500 (random 500))))
+         (project-dir (clojure-project-dir))
          (repl-type (or (unless prefix-arg
                           inf-clojure-custom-repl-type)
                         (car (rassoc cmd inf-clojure-socket-repl-startup-forms))
                         (inf-clojure--prompt-repl-type)))
-         (project-name (inf-clojure--project-name (or (clojure-project-dir) "standalone")))
+         (project-name (inf-clojure--project-name (or project-dir "standalone")))
          (socket-process-name (format "*%s-%s-socket-server*" project-name repl-type))
          (socket-buffer-name (format "*%s-%s-socket*" project-name repl-type))
          (socket-buffer (get-buffer-create socket-buffer-name))
          (repl-buffer-name (format "%s-%s-repl" project-name repl-type))
          (socket-form (or (cdr (assoc repl-type inf-clojure-socket-repl-startup-forms))
                           inf-clojure-custom-startup
                           cmd))
-         (socket-cmd (format socket-form (number-to-string port)))
-         (sock (let ((default-directory (or (clojure-project-dir) default-directory)))
+         (socket-cmd (format socket-form port))
+         (sock (let ((default-directory (or project-dir default-directory)))
                  (start-file-process-shell-command
                   socket-process-name socket-buffer
                   socket-cmd))))
@@ -942,7 +961,6 @@ provided in `inf-clojure-socket-repl-startup-forms' or
          (setq inf-clojure-socket-repl-type
                repl-type
                inf-clojure-custom-repl-name
-               ;; comint mode includes the ** chars
                repl-buffer-name
                repl-buffer
                (get-buffer-create repl-buffer-name))
@@ -951,9 +969,9 @@ provided in `inf-clojure-socket-repl-startup-forms' or
            (setq inf-clojure-socket-buffer socket-buffer))
          (set-process-sentinel
           (get-buffer-process (get-buffer (concat "*" repl-buffer-name "*")))
-          #'inf-clojure-repl-sentinel))))
+          #'inf-clojure-socket-repl-sentinel))))
     (set-process-filter sock #'inf-clojure-socket-filter)
-    (message "Starting %s socket REPL server at %s:%s with %s" repl-type host port socket-cmd)))
+    (message "Starting %s socket REPL server at %s:%d with %s" repl-type host port socket-cmd)))
 
 
 (defun inf-clojure--forms-without-newlines (str)