wip: narrowing in on some osx hangs

plus some clj-kondo configs

Author: russmatney

.clj-kondo/com.github.seancorfield/next.jdbc/config.edn

@@ -0,0 +1,8 @@
+{:hooks
+ {:analyze-call
+  {next.jdbc/with-transaction
+   hooks.com.github.seancorfield.next-jdbc/with-transaction
+   next.jdbc/with-transaction+options
+   hooks.com.github.seancorfield.next-jdbc/with-transaction+options}}
+ :lint-as {next.jdbc/on-connection clojure.core/with-open
+           next.jdbc/on-connection+options clojure.core/with-open}}

.clj-kondo/com.github.seancorfield/next.jdbc/hooks/com/github/seancorfield/next_jdbc.clj_kondo

@@ -0,0 +1,34 @@
+(ns hooks.com.github.seancorfield.next-jdbc
+  (:require [clj-kondo.hooks-api :as api]))
+
+(defn with-transaction
+  "Expands (with-transaction [tx expr opts] body)
+  to (let [tx expr] opts body) per clj-kondo examples."
+  [{:keys [:node]}]
+  (let [[binding-vec & body] (rest (:children node))
+        [sym val opts] (:children binding-vec)]
+    (when-not (and sym val)
+      (throw (ex-info "No sym and val provided" {})))
+    (let [new-node (api/list-node
+                    (list*
+                     (api/token-node 'let)
+                     (api/vector-node [sym val])
+                     opts
+                     body))]
+      {:node new-node})))
+
+(defn with-transaction+options
+  "Expands (with-transaction+options [tx expr opts] body)
+  to (let [tx expr] opts body) per clj-kondo examples."
+  [{:keys [:node]}]
+  (let [[binding-vec & body] (rest (:children node))
+        [sym val opts] (:children binding-vec)]
+    (when-not (and sym val)
+      (throw (ex-info "No sym and val provided" {})))
+    (let [new-node (api/list-node
+                    (list*
+                     (api/token-node 'let)
+                     (api/vector-node [sym val])
+                     opts
+                     body))]
+      {:node new-node})))

src/clawe/wm.clj

@@ -137,6 +137,7 @@
 (defn current-workspaces
   ([] (current-workspaces nil))
   ([opts]
+   (timer/print-since "current-workspaces start")
    (sys/start! `*wm*)
    (->>
      (wm.protocol/-current-workspaces *wm* opts)
@@ -148,6 +149,7 @@
 (defn current-workspace
   ([] (current-workspace nil))
   ([opts]
+   (timer/print-since "current-workspace start")
    (sys/start! `*wm*)
    (some->> (current-workspaces opts) first)))
 
@@ -203,7 +205,11 @@
 (defn active-clients
   ([] (active-clients nil))
   ([opts]
+   (timer/print-since "clawe.wm/active-clients started")
+
    (sys/start! `*wm*)
+
+   (timer/print-since "*wm* started")
    (->>
      (wm.protocol/-active-clients *wm* opts)
      (map merge-with-client-def))))

src/clawe/yabai.clj

@@ -7,9 +7,9 @@
 
 ;; TODO refactor into malli transforms?
 (defn window->clawe-client
-  [{:yabai.window/keys [has-focus app title window-id] :as window}]
+  [{:yabai.window/keys [has-focus app title id] :as window}]
   (-> window
-      (assoc :client/id window-id)
+      (assoc :client/id id)
       (assoc :client/focused has-focus)
       (assoc :client/window-title (some-> title string/lower-case))
       (assoc :client/app-name (some-> app string/lower-case))))

src/ralphie/yabai.clj

@@ -201,17 +201,37 @@
    [:yabai.window/has-border boolean?]
    [:yabai.window/can-resize boolean?]])
 
+(def minimal-wm-fields
+  (string/join
+    " " ["id"
+         "app"
+         "has-focus"
+         "space"
+         "is-sticky"
+         "title"
+         "is-floating"]))
+
 ;; TODO does this have a format-string/read-edn style?
 ;; TODO refactor to use these malli schemas
-(defn query-windows []
-  (try
-    (->
-      ^{:out :string}
-      (process/$ yabai -m query --windows)
-      process/check
-      :out
-      (json/parse-string (fn [k] (keyword "yabai.window" k))))
-    (catch Exception _e nil)))
+(defn query-windows
+  ([] (query-windows nil))
+  ([{:keys [fields]}]
+   (println "yabai query-windows start")
+   (let [fields (if (nil? fields) nil minimal-wm-fields)
+         windows
+         (try
+           (->
+             ^{:out :string}
+             (process/$ yabai -m query --windows ~fields)
+             process/check
+             :out
+             (json/parse-string (fn [k] (keyword "yabai.window" k))))
+           (catch Exception e
+             (println "yabai query-windows exception" e)
+             nil))]
+     (println "yabai query-windows found dows" windows)
+     windows
+     )))
 
 (comment
   (query-windows)