Move most logic to jsonrpc4clj

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Move most logic to jsonrpc4clj library.
+
 ## v1.13.1
 
 - Fix coercers

deps.edn

@@ -2,7 +2,8 @@
         org.clojure/core.async {:mvn/version "1.5.648"}
         camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}
         cheshire/cheshire {:mvn/version "5.11.0"}
-        funcool/promesa {:mvn/version "10.0.594"}}
+        funcool/promesa {:mvn/version "10.0.594"}
+        com.github.clojure-lsp/jsonrpc4clj {:mvn/version "1.0.1"}}
  :paths ["src" "resources"]
  :aliases {:dev {:extra-paths ["test"]}
            :test {:extra-deps {lambdaisland/kaocha {:mvn/version "1.64.1010"}}

scripts/lsp4clj/ci.clj

@@ -8,7 +8,7 @@
     (string/replace $ regex content)
     (spit file $)))
 
-#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
+#_{:clojure-lsp/ignore [:clojure-lsp/unused-public-var]}
 (defn tag [& [tag]]
   (shell "git fetch origin")
   (shell "git pull origin HEAD")

src/lsp4clj/coercer.clj

@@ -479,51 +479,3 @@
                    :server-capabilities/semantic-tokens-provider
                    :server-capabilities/signature-help-provider
                    :server-capabilities/text-document-sync]))
-
-(s/def :json-rpc.message/jsonrpc #{"2.0"})
-(s/def :json-rpc.message/method string?)
-(s/def :json-rpc.message/id (s/and (s/or :s string? :i nat-int? :n nil?)
-                                   (s/conformer second)))
-
-(s/def ::json-rpc.request
-  (s/keys :req-un [:json-rpc.message/jsonrpc
-                   :json-rpc.message/id
-                   :json-rpc.message/method]
-          :opt-un [:json-rpc.message/params]))
-(s/def ::json-rpc.notification
-  (s/keys :req-un [:json-rpc.message/jsonrpc
-                   :json-rpc.message/method]
-          :opt-un [:json-rpc.message/params]))
-(s/def ::json-rpc.response.result
-  (s/keys :req-un [:json-rpc.message/jsonrpc
-                   :json-rpc.message/id
-                   :json-rpc.message/result]))
-(s/def ::json-rpc.response.error
-  (s/keys :req-un [:json-rpc.message/jsonrpc
-                   :json-rpc.message/id
-                   ::error]))
-
-(s/def ::json-rpc.input
-  (s/or :request ::json-rpc.request
-        :notification ::json-rpc.notification
-        :response.result ::json-rpc.response.result
-        :response.error ::json-rpc.response.error))
-
-(defn input-message-type [message]
-  (if (identical? :parse-error message)
-    :parse-error
-    (let [conformed-message (s/conform ::json-rpc.input message)]
-      (if (identical? ::s/invalid conformed-message)
-        :invalid-request
-        (first conformed-message)))))
-
-#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
-(defn conform-or-log [log spec value]
-  (when value
-    (try
-      (let [result (s/conform spec value)]
-        (if (identical? ::s/invalid result)
-          (log "Conformation error" (s/explain-data spec value))
-          result))
-      (catch Exception ex
-        (log ex "Conformation exception" spec value)))))

src/lsp4clj/io_chan.clj

@@ -1,21 +1,12 @@
-(ns lsp4clj.lsp.errors)
+(ns lsp4clj.lsp.errors
+  (:require
+   [jsonrpc4clj.errors :as errors]))
 
 (set! *warn-on-reflection* true)
 
 (def by-key
   ;; https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#errorCodes
-  {;; JSON-RPC errors
-   ;; Is it possible to respond if you have a parse error? How could you reply
-   ;; to a request if you weren't able to parse it?
-   :parse-error      {:code -32700, :message "Parse error"}
-   ;; Similarly for invalid-request. How could you reply to a request if it
-   ;; doesn't look like a request?
-   :invalid-request  {:code -32600, :message "Invalid Request"}
-   :method-not-found {:code -32601, :message "Method not found"}
-   :invalid-params   {:code -32602, :message "Invalid params"}
-   :internal-error   {:code -32603, :message "Internal error"}
-
-   ;; LSP errors
+  {;; LSP errors
    :server-not-initialized {:code -32002, :message "Server not initialized"}
    :unknown-error-code     {:code -32001, :message "Unknown error"}
    :request-failed         {:code -32803, :message "Request failed"}
@@ -33,7 +24,8 @@
   be an integer, excluding the ranges -32000 to -32099 and -32800 to -32899,
   which are reserved."
   [code-or-key]
-  (or (get by-key code-or-key)
+  (or (get errors/by-key code-or-key)
+      (get by-key code-or-key)
       {:code code-or-key}))
 
 (defn body
@@ -45,11 +37,3 @@
   (cond-> (by-code code)
     message (assoc :message message)
     data (assoc :data data)))
-
-(defn internal-error [data]
-  (-> (by-code :internal-error)
-      (assoc :data data)))
-
-(defn not-found [method]
-  (-> (by-code :method-not-found)
-      (assoc :data {:method method})))

src/lsp4clj/io_server.clj

@@ -2,24 +2,10 @@
 
 (set! *warn-on-reflection* true)
 
-(defn request [id method params]
-  {:jsonrpc "2.0"
-   :method method
-   :params params
-   :id id})
-
-(defn notification [method params]
-  {:jsonrpc "2.0"
-   :method method
-   :params params})
-
-;; TODO: The following are helpers used by servers, but not by lsp4clj itself.
-;; Perhaps they belong in a utils namespace.
-
-(defn clamp [n n-min n-max]
+(defn ^:private clamp [n n-min n-max]
   (-> n (max n-min) (min n-max)))
 
-#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
+#_{:clojure-lsp/ignore [:clojure-lsp/unused-public-var]}
 (defn work-done-progress
   "Returns the params for a WorkDone $/progress notification.