Trying out Standard Clojure formatter

.joyride/src/portal/format.cljs

@@ -0,0 +1,59 @@
+(ns portal.format
+  (:require
+   ["path" :as path]
+   ["vscode" :as vscode]))
+
+(defn- get-workspace-folder []
+  (let [^js uri (-> vscode/workspace .-workspaceFolders (aget 0) .-uri)
+        fs-path (.-fsPath uri)]
+    (if-not (undefined? fs-path) fs-path (.-path uri))))
+
+(defn- get-standard-npm-path []
+  (path/join (get-workspace-folder)
+    "node_modules"
+    "@chrisoakman/standard-clojure-style"
+    "dist/standard-clojure-style.js"))
+
+(def ^:private standard (js/require (get-standard-npm-path)))
+
+;; (js/require "@chrisoakman/standard-clojure-style")
+
+;; ("./package.json")
+
+;; (defn- require-string [src file-name]
+;;   (let [Module (js/require "module")
+;;         ^js m (Module. file-name (some-> js/module .-parent))]
+;;     (set! (.-filename m) file-name)
+;;     (._compile m src file-name)
+;;     (.-exports m)))
+
+;; (defn require-url [url]
+;;   (-> (js/fetch url)
+;;       (.then #(.text %))
+;;       (.then #(require-string % "standard-clojure-style.js"))))
+
+;; (defonce lib (atom nil))
+
+;; (when-not @lib
+;;   (-> (require-url "https://raw.githubusercontent.com/oakmac/standard-clojure-style-js/refs/heads/master/lib/standard-clojure-style.js")
+;;       (.then #(reset! lib %))))
+
+(defn formatter [model _options _token]
+  (let [code (.-out (.format standard (.getText model)))]
+    #js [(.replace vscode/TextEdit
+           (vscode.Range.
+             (.. (.lineAt model 0) -range -start)
+             (.. (.lineAt model (dec (.-lineCount model))) -range -end))
+           code)]))
+
+(comment
+  (.registerDocumentFormattingEditProvider
+    vscode/languages "clojure"
+    #js {:displayName "Clojure Standard Formatter"
+         :provideDocumentFormattingEdits (fn [& args] (apply formatter args))})
+
+  (require '[portal.api :as p])
+  (p/open {:launcher :vs-code})
+  (add-tap #'p/submit)
+
+  ,)

deps.edn

@@ -56,9 +56,6 @@
   {:extra-paths ["dev"]
    :main-opts   ["-m" "tasks.kondo"]
    :extra-deps  {clj-kondo/clj-kondo {:mvn/version "2024.08.01"}}}
-  :cljfmt
-  {:main-opts  ["-m" "cljfmt.main"]
-   :extra-deps {cljfmt/cljfmt {:mvn/version "0.9.2"}}}
   :cider
   {:extra-deps
    {nrepl/nrepl       {:mvn/version "1.3.0"}

dev/cljs/user.cljs

@@ -24,4 +24,4 @@
   (require '[examples.data :refer [data]])
   (dotimes [_i 25] (tap> data))
 
-  comment)
+  comment)

dev/notebook/ci.clj

@@ -1,10 +1,11 @@
 (ns notebook.ci
-  (:require [tasks.build :refer [build install]]
-            [tasks.check :as check]
-            [tasks.format :as fmt]
-            [tasks.parallel :refer [with-out-data]]
-            [tasks.test :as test]
-            [tasks.tools :as tool]))
+  (:require
+   [tasks.build :refer [build install]]
+   [tasks.check :as check]
+   [tasks.format :as fmt]
+   [tasks.parallel :refer [with-out-data]]
+   [tasks.test :as test]
+   [tasks.tools :as tool]))
 (check/cloc)
 (with-out-data (fmt/check))
 (with-out-data (check/clj-kondo))

dev/notebook/data.clj

@@ -1,7 +1,8 @@
 (ns notebook.data
-  (:require [examples.data :as d]
-            [portal.colors :as c]
-            [portal.viewer :as v]))
+  (:require
+   [examples.data :as d]
+   [portal.colors :as c]
+   [portal.viewer :as v]))
 
 (::d/hacker-news d/data)
 
@@ -24,7 +25,7 @@
 (v/tree d/hiccup)
 
 (v/hiccup
- [:portal.viewer/markdown (::d/markdown d/string-data)])
+  [:portal.viewer/markdown (::d/markdown d/string-data)])
 
 (-> d/exception-data)
 

dev/notebook/scittle.clj

@@ -1,9 +1,10 @@
 (ns notebook.scittle
-  (:require [clojure.java.browse :as browse]
-            [clojure.string :as str]
-            [hiccup.page :as page]
-            [portal.api :as p]
-            [portal.viewer :as v]))
+  (:require
+   [clojure.java.browse :as browse]
+   [clojure.string :as str]
+   [hiccup.page :as page]
+   [portal.api :as p]
+   [portal.viewer :as v]))
 
 (def portal-dev (p/open {:mode :dev :launcher false}))
 
@@ -21,8 +22,8 @@
 (defn div-and-script [id widget]
   [[:div {:id id}]
    (scittle-script
-    (list 'dom/render (list 'fn [] widget)
-          (list '.getElementById 'js/document id)))])
+     (list 'dom/render (list 'fn [] widget)
+           (list '.getElementById 'js/document id)))])
 
 (defn pr-str-with-meta [value]
   (binding [*print-meta* true]
@@ -33,51 +34,51 @@
 
 (defn page [widgets]
   (page/html5
-   [:head]
-   (into
-    [:body
-     (page/include-js "https://unpkg.com/react@18/umd/react.production.min.js"
-                      "https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"
-                      "https://scicloj.github.io/scittle/js/scittle.js"
-                      "https://scicloj.github.io/scittle/js/scittle.reagent.js"
-                      (portal-main-url portal-dev))
-     (scittle-script '(ns main
-                        (:require [reagent.core :as r]
-                                  [reagent.dom :as dom]))
-                     '(defn portal-viewer [{:keys [edn-str]}]
-                        (let [embed (js/portal_api.embed)]
-                          [:div
-                           [:div
-                            {:ref (fn [el]
-                                    (.renderOutputItem embed
-                                                       (clj->js {:mime "x-application/edn"
-                                                                 :theme "portal.colors/nord-light"
-                                                                 :text (fn [] edn-str)})
-                                                       el))}]])))]
-    (->> widgets
-         (map-indexed (fn [i widget]
-                        (div-and-script (str "widget" i)
-                                        widget)))
-         (apply concat)))))
+    [:head]
+    (into
+      [:body
+       (page/include-js "https://unpkg.com/react@18/umd/react.production.min.js"
+                        "https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"
+                        "https://scicloj.github.io/scittle/js/scittle.js"
+                        "https://scicloj.github.io/scittle/js/scittle.reagent.js"
+                        (portal-main-url portal-dev))
+       (scittle-script '(ns main
+                          (:require [reagent.core :as r]
+                                    [reagent.dom :as dom]))
+                       '(defn portal-viewer [{:keys [edn-str]}]
+                          (let [embed (js/portal_api.embed)]
+                            [:div
+                             [:div
+                              {:ref (fn [el]
+                                      (.renderOutputItem embed
+                                                         (clj->js {:mime "x-application/edn"
+                                                                   :theme "portal.colors/nord-light"
+                                                                   :text (fn [] edn-str)})
+                                                         el))}]])))]
+      (->> widgets
+           (map-indexed (fn [i widget]
+                          (div-and-script (str "widget" i)
+                                          widget)))
+           (apply concat)))))
 
 (defn img [url]
   (v/hiccup
-   [:img {:height 50 :width 50
-          :src url}]))
+    [:img {:height 50 :width 50
+           :src url}]))
 
 (defn md [text]
   (v/hiccup [:portal.viewer/markdown text]))
 
 (defn vega-lite-point-plot [data]
   (v/hiccup
-   [:portal.viewer/vega-lite
-    (-> {:data {:values data},
-         :mark "point"
-         :encoding
-         {:size {:field "w" :type "quantitative"}
-          :x {:field "x", :type "quantitative"},
-          :y {:field "y", :type "quantitative"},
-          :fill {:field "z", :type "nominal"}}})]))
+    [:portal.viewer/vega-lite
+     (-> {:data {:values data}
+          :mark "point"
+          :encoding
+          {:size {:field "w" :type "quantitative"}
+           :x {:field "x", :type "quantitative"}
+           :y {:field "y", :type "quantitative"}
+           :fill {:field "z", :type "nominal"}}})]))
 
 (defn random-data [n]
   (->> (repeatedly n #(- (rand) 0.5))
@@ -110,4 +111,4 @@
        (map portal-widget)
        page
        (spit "target/scittle.html"))
-  (browse/browse-url "target/scittle.html"))
+  (browse/browse-url "target/scittle.html"))

dev/portal/runtime/debug.clj

@@ -1,6 +1,7 @@
 (ns portal.runtime.debug
-  (:require [portal.api :as p]
-            [portal.runtime :as rt]))
+  (:require
+   [portal.api :as p]
+   [portal.runtime :as rt]))
 
 (defn- section [title value]
   [(name title)
@@ -28,10 +29,10 @@
 
 (defn open [session]
   (p/inspect
-   (dashboard session)
-   (-> (:options session)
-       (dissoc :debug)
-       (assoc :window-title "portal-debug-server"))))
+    (dashboard session)
+    (-> (:options session)
+        (dissoc :debug)
+        (assoc :window-title "portal-debug-server"))))
 
 (defn close [instance]
-  (when instance (p/close instance)))
+  (when instance (p/close instance)))

dev/portal/setup.cljs

@@ -1,18 +1,19 @@
 (ns portal.setup
-  (:require [clojure.datafy :refer [datafy]]
-            [examples.data :refer [data]]
-            [portal.client.web :as remote]
-            [portal.console :as log]
-            [portal.runtime :as rt]
-            #_[portal.shadow.remote :as remote]
-            [portal.shortcuts :as shortcuts]
-            [portal.ui.api :as api]
-            [portal.ui.commands :as commands]
-            [portal.ui.inspector :as ins]
-            [portal.ui.rpc :as rpc]
-            [portal.ui.select :as select]
-            [portal.ui.state :as state]
-            [portal.web :as p]))
+  (:require
+   [clojure.datafy :refer [datafy]]
+   [examples.data :refer [data]]
+   [portal.client.web :as remote]
+   [portal.console :as log]
+   [portal.runtime :as rt]
+   #_[portal.shadow.remote :as remote]
+   [portal.shortcuts :as shortcuts]
+   [portal.ui.api :as api]
+   [portal.ui.commands :as commands]
+   [portal.ui.inspector :as ins]
+   [portal.ui.rpc :as rpc]
+   [portal.ui.select :as select]
+   [portal.ui.state :as state]
+   [portal.web :as p]))
 
 (defonce tap-list
   (atom (with-meta (list)
@@ -89,9 +90,9 @@
      (section "Selection Index" select/selection-index)]]})
 
 (p/set-defaults!
- {:mode :dev
-  :value (dashboard)
-  :window-title "portal-ui-runtime"})
+  {:mode :dev
+   :value (dashboard)
+   :window-title "portal-ui-runtime"})
 
 (defn- error-handler [event]
   #_(tap> (or (.-error event) (.-reason event)))

dev/portal/share.clj

@@ -1,25 +1,27 @@
 (ns portal.share
-  (:require [clojure.pprint :as pp]
-            [clojure.string :as str]
-            [org.httpkit.client :as http]
-            [portal.api :as p]
-            [portal.runtime.json :as json])
-  (:import [java.net URL]))
+  (:require
+   [clojure.pprint :as pp]
+   [clojure.string :as str]
+   [org.httpkit.client :as http]
+   [portal.api :as p]
+   [portal.runtime.json :as json])
+  (:import
+   (java.net URL)))
 
 (defn- pprint [value]
   (binding [*print-meta* true]
     (with-out-str (pp/pprint value))))
 
 (defn- create-gist [content]
   (-> @(http/post
-        "https://api.github.com/gists"
-        {:basic-auth [(System/getenv "GIT_USERNAME")
-                      (System/getenv "GIT_PASSWORD")]
-         :headers    {"Accept" "application/vnd.github.v3+json"}
-         :body       (json/write
-                      {:public      false
-                       :description "Portal Share"
-                       :files       {"data.clj" {:content content}}})})
+         "https://api.github.com/gists"
+         {:basic-auth [(System/getenv "GIT_USERNAME")
+                       (System/getenv "GIT_PASSWORD")]
+          :headers    {"Accept" "application/vnd.github.v3+json"}
+          :body       (json/write
+                        {:public      false
+                         :description "Portal Share"
+                         :files       {"data.clj" {:content content}}})})
       :body
       json/read
       (get-in [:files :data.clj :raw_url])))
@@ -34,9 +36,9 @@
 
 (defn- shorten-url [url]
   (-> @(http/post
-        "https://url.api.stdlib.com/[email protected]/create/"
-        {:headers {"Content-Type" "application/json"}
-         :body    (json/write {:url url :ttl 86400})})
+         "https://url.api.stdlib.com/[email protected]/create/"
+         {:headers {"Content-Type" "application/json"}
+          :body    (json/write {:url url :ttl 86400})})
       :body
       json/read
       :link_url))

dev/reveal.clj

@@ -1,4 +1,5 @@
 (ns reveal
-  (:require [vlaaad.reveal :as r]))
+  (:require
+   [vlaaad.reveal :as r]))
 
 (comment (r/tap-log))