Skip to content

Commit

Permalink
Enable two disabled linters and bump kondo dep
Browse files Browse the repository at this point in the history
All the fixes were on used-underscored-binding
  • Loading branch information
logseq-cldwalker authored and tiensonqin committed Sep 9, 2022
1 parent dda2c9c commit 51c318e
Show file tree
Hide file tree
Showing 16 changed files with 75 additions and 63 deletions.
20 changes: 16 additions & 4 deletions .clj-kondo/config.edn
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
{:linters
{:ns-groups [{:pattern "frontend.components.*" :name all-components}]

:config-in-ns
;; :used-underscored-binding is turned off for components because of false positive
;; for rum/defcs and _state.
{all-components {:linters {:used-underscored-binding {:level :off}}}
;; false positive with match/match and _
frontend.handler.paste {:linters {:used-underscored-binding {:level :off}}}}

:linters
{:unresolved-symbol {:exclude [goog.DEBUG
goog.string.unescapeEntities
;; TODO:lint: Fix when fixing all type hints
Expand Down Expand Up @@ -39,12 +48,15 @@
logseq.graph-parser.util gp-util
logseq.graph-parser.property gp-property
logseq.graph-parser.config gp-config
logseq.graph-parser.date-time-util date-time-util
logseq.graph-parser.util.page-ref page-ref
logseq.graph-parser.util.block-ref block-ref}}}
logseq.graph-parser.util.block-ref block-ref
logseq.graph-parser.date-time-util date-time-util}}

:namespace-name-mismatch {:level :warning}
:used-underscored-binding {:level :warning}}

:hooks {:analyze-call {rum.core/defc hooks.rum/defc
rum.core/defcs hooks.rum/defcs}}
rum.core/defcs hooks.rum/defcs}}
:lint-as {promesa.core/let clojure.core/let
promesa.core/loop clojure.core/loop
promesa.core/recur clojure.core/recur
Expand Down
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@
:main-opts ["-m" "shadow.cljs.devtools.cli"]}

;; Use :replace-deps for tools. See https://github.com/clj-kondo/clj-kondo/issues/1536#issuecomment-1013006889
:clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.05.31"}}
:clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.09.08"}}
:main-opts ["-m" "clj-kondo.main"]}}}
2 changes: 1 addition & 1 deletion deps/db/deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
{datascript/datascript {:mvn/version "1.3.8"}}
:aliases
{:clj-kondo
{:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.05.31"}}
{:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.09.08"}}
:main-opts ["-m" "clj-kondo.main"]}}}
2 changes: 1 addition & 1 deletion deps/graph-parser/deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
org.clojure/clojurescript {:mvn/version "1.11.54"}}
:main-opts ["-m" "cljs-test-runner.main"]}

:clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.05.31"}}
:clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.09.08"}}
:main-opts ["-m" "clj-kondo.main"]}}}
14 changes: 7 additions & 7 deletions src/electron/electron/handler.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@
(when-let [sync-meta (and (not (string/blank? root))
(.toString (.readFileSync fs txid-path)))]
(reader/read-string sync-meta))))
(catch js/Error _e
(js/console.debug "[read txid meta] #" root (.-message _e)))))
(catch js/Error e
(js/console.debug "[read txid meta] #" root (.-message e)))))

(defmethod handle :inflateGraphsInfo [_win [_ graphs]]
(if (seq graphs)
Expand Down Expand Up @@ -408,7 +408,7 @@

(def *request-abort-signals (atom {}))

(defmethod handle :httpRequest [_ [_ _req-id opts]]
(defmethod handle :httpRequest [_ [_ req-id opts]]
(let [{:keys [url abortable method data returnType headers]} opts]
(when-let [[method type] (and (not (string/blank? url))
[(keyword (string/upper-case (or method "GET")))
Expand All @@ -421,7 +421,7 @@
{:body (js/JSON.stringify (bean/->js data))})

(when-let [^js controller (and abortable (AbortController.))]
(swap! *request-abort-signals assoc _req-id controller)
(swap! *request-abort-signals assoc req-id controller)
{:signal (.-signal controller)}))))
(p/then (fn [^js res]
(case type
Expand All @@ -443,10 +443,10 @@
(throw e)))
(p/finally
(fn []
(swap! *request-abort-signals dissoc _req-id)))))))
(swap! *request-abort-signals dissoc req-id)))))))

(defmethod handle :httpRequestAbort [_ [_ _req-id]]
(when-let [^js controller (get @*request-abort-signals _req-id)]
(defmethod handle :httpRequestAbort [_ [_ req-id]]
(when-let [^js controller (get @*request-abort-signals req-id)]
(.abort controller)))

(defmethod handle :quitAndInstall []
Expand Down
2 changes: 1 addition & 1 deletion src/main/electron/listener.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
;; Handle open new window in renderer, until the destination graph doesn't rely on setting local storage
;; No db cache persisting ensured. Should be handled by the caller
(fn [repo]
(ui-handler/open-new-window! nil repo))))
(ui-handler/open-new-window! repo))))

(defn listen!
[]
Expand Down
10 changes: 5 additions & 5 deletions src/main/frontend/components/block.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@
*exist? (::exist? state)]
(when (and sync-on? asset-file? (false? @*exist?))
(let [sync-state (state/sub [:file-sync/sync-state (state/get-current-repo)])
_downloading-files (:current-remote->local-files sync-state)
contain-url? (and (seq _downloading-files)
(some #(string/ends-with? src %) _downloading-files))]
downloading-files (:current-remote->local-files sync-state)
contain-url? (and (seq downloading-files)
(some #(string/ends-with? src %) downloading-files))]
(cond
(and (not @*loading?) contain-url?)
(reset! *loading? true)
Expand Down Expand Up @@ -247,8 +247,8 @@
(let [images (js/document.querySelectorAll ".asset-container img")
images (to-array images)
images (if-not (= (count images) 1)
(let [^js _image (.closest (.-target e) ".asset-container")
image (. _image querySelector "img")]
(let [^js image (.closest (.-target e) ".asset-container")
image (. image querySelector "img")]
(->> images
(sort-by (juxt #(.-y %) #(.-x %)))
(split-with (complement #{image}))
Expand Down
6 changes: 3 additions & 3 deletions src/main/frontend/components/encryption.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,11 @@
(defn input-password
([repo-url close-fn] (input-password repo-url close-fn {:type :local}))
([repo-url close-fn opts]
(fn [_close-fn]
(fn [close-fn']
(let [close-fn' (if (fn? close-fn)
#(do (close-fn %)
(_close-fn))
_close-fn)]
(close-fn'))
close-fn')]
(input-password-inner repo-url close-fn' opts)))))

(rum/defcs encryption-setup-dialog-inner
Expand Down
4 changes: 2 additions & 2 deletions src/main/frontend/components/file_sync.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@
[:div.p-4 (ui/loading "Loading...")]
(for [version version-files]
(let [version-uuid (get-version-key version)
_local? (some? (:relative-path version))]
local? (some? (:relative-path version))]
[:div.version-list-item {:key version-uuid}
[:a.item-link.block.fade-link.flex.justify-between
{:title version-uuid
Expand All @@ -427,7 +427,7 @@
(or (:CreateTime version)
(:create-time version)) nil)]
[:small.opacity-50.translate-y-1
(if _local?
(if local?
[:<> (ui/icon "git-commit") " local"]
[:<> (ui/icon "cloud") " remote"])]]])))]))

Expand Down
12 changes: 6 additions & 6 deletions src/main/frontend/components/plugins_settings.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,18 @@

(rum/defc settings-container
[schema ^js pl]
(let [^js _settings (.-settings pl)
(let [^js settings (.-settings pl)
pid (.-id pl)
[settings, set-settings] (rum/use-state (bean/->clj (.toJSON _settings)))
update-setting! (fn [k v] (.set _settings (name k) (bean/->js v)))]
[settings, set-settings] (rum/use-state (bean/->clj (.toJSON settings)))
update-setting! (fn [k v] (.set settings (name k) (bean/->js v)))]

(rum/use-effect!
(fn []
(let [on-change (fn [^js s]
(when-let [s (bean/->clj s)]
(set-settings s)))]
(.on _settings "change" on-change)
#(.off _settings "change" on-change)))
(.on settings "change" on-change)
#(.off settings "change" on-change)))
[pid])

(if (seq schema)
Expand All @@ -123,4 +123,4 @@
[:p (str "#Not Handled#" key)]))]

;; no settings
[:h2.font-bold.text-lg.py-4.warning "No Settings Schema!"])))
[:h2.font-bold.text-lg.py-4.warning "No Settings Schema!"])))
30 changes: 15 additions & 15 deletions src/main/frontend/fs/sync.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@
(recur (dec n)))
r))))

(deftype RSAPI [^:mutable _graph-uuid ^:mutable _private-key ^:mutable _public-key]
(deftype RSAPI [^:mutable graph-uuid' ^:mutable private-key' ^:mutable public-key']
IToken
(<get-token [this]
(go
Expand All @@ -714,15 +714,15 @@
(state/get-auth-id-token)))

IRSAPI
(rsapi-ready? [_ graph-uuid] (and (= graph-uuid _graph-uuid) _private-key _public-key))
(rsapi-ready? [_ graph-uuid] (and (= graph-uuid graph-uuid') private-key' public-key'))
(<key-gen [_] (go (js->clj (<! (p->c (ipc/ipc "key-gen")))
:keywordize-keys true)))
(<set-env [_ prod? private-key public-key graph-uuid]
(when (not-empty private-key)
(print (util/format "[%s] setting sync age-encryption passphrase..." graph-uuid)))
(set! _graph-uuid graph-uuid)
(set! _private-key private-key)
(set! _public-key public-key)
(set! graph-uuid' graph-uuid)
(set! private-key' private-key)
(set! public-key' public-key)
(p->c (ipc/ipc "set-env" (if prod? "prod" "dev") private-key public-key)))
(<get-local-all-files-meta [_ graph-uuid base-path]
(go
Expand Down Expand Up @@ -786,7 +786,7 @@
(js->clj r))))))


(deftype ^:large-vars/cleanup-todo CapacitorAPI [^:mutable _graph-uuid ^:mutable _private-key ^:mutable _public-key]
(deftype ^:large-vars/cleanup-todo CapacitorAPI [^:mutable graph-uuid' ^:mutable private-key ^:mutable public-key']
IToken
(<get-token [this]
(go
Expand All @@ -798,15 +798,15 @@
(state/get-auth-id-token)))

IRSAPI
(rsapi-ready? [_ graph-uuid] (and (= graph-uuid _graph-uuid) _private-key _public-key))
(rsapi-ready? [_ graph-uuid] (and (= graph-uuid graph-uuid') private-key public-key'))
(<key-gen [_]
(go (let [r (<! (p->c (.keygen mobile-util/file-sync #js {})))]
(-> r
(js->clj :keywordize-keys true)))))
(<set-env [_ prod? secret-key public-key graph-uuid]
(set! _graph-uuid graph-uuid)
(set! _private-key secret-key)
(set! _public-key public-key)
(set! graph-uuid' graph-uuid)
(set! private-key secret-key)
(set! public-key' public-key)
(p->c (.setEnv mobile-util/file-sync (clj->js {:env (if prod? "prod" "dev")
:secretKey secret-key
:publicKey public-key}))))
Expand Down Expand Up @@ -2356,7 +2356,7 @@
SyncManager [graph-uuid base-path *sync-state
^Local->RemoteSyncer local->remote-syncer ^Remote->LocalSyncer remote->local-syncer remoteapi
^:mutable ratelimit-local-changes-chan
*txid ^:mutable state ^:mutable _remote-change-chan ^:mutable _*ws *stopped? *paused?
*txid ^:mutable state ^:mutable remote-change-chan ^:mutable *ws *stopped? *paused?
^:mutable ops-chan
;; control chans
private-full-sync-chan private-stop-sync-chan private-remote->local-sync-chan
Expand Down Expand Up @@ -2389,8 +2389,8 @@

(start [this]
(set! ops-chan (chan (async/dropping-buffer 10)))
(set! _*ws (atom nil))
(set! _remote-change-chan (ws-listen! graph-uuid _*ws))
(set! *ws (atom nil))
(set! remote-change-chan (ws-listen! graph-uuid *ws))
(set! ratelimit-local-changes-chan (<ratelimit local->remote-syncer local-changes-revised-chan))
(setup-local->remote! local->remote-syncer)
(async/tap full-sync-mult private-full-sync-chan)
Expand All @@ -2406,7 +2406,7 @@
private-remote->local-sync-chan {:remote->local true}
private-full-sync-chan {:local->remote-full-sync true}
private-pause-resume-chan ([v] (if v {:resume true} {:pause true}))
_remote-change-chan ([v] (println "remote change:" v) {:remote->local v})
remote-change-chan ([v] (println "remote change:" v) {:remote->local v})
ratelimit-local-changes-chan ([v]
(let [rest-v (util/drain-chan ratelimit-local-changes-chan)
vs (cons v rest-v)]
Expand Down Expand Up @@ -2655,7 +2655,7 @@
(go
(when-not @*stopped?
(vreset! *stopped? true)
(ws-stop! _*ws)
(ws-stop! *ws)
(offer! private-stop-sync-chan true)
(async/untap full-sync-mult private-full-sync-chan)
(async/untap stop-sync-mult private-stop-sync-chan)
Expand Down
4 changes: 2 additions & 2 deletions src/main/frontend/handler/events.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,13 @@
(file-sync/pick-page-histories-panel graph-uuid page-name)
{:id :page-histories :label "modal-page-histories"}))

(defmethod handle :graph/open-new-window [[ev repo]]
(defmethod handle :graph/open-new-window [[_ev repo]]
(p/let [current-repo (state/get-current-repo)
target-repo (or repo current-repo)
_ (repo-handler/persist-db! current-repo persist-db-noti-m) ;; FIXME: redundant when opening non-current-graph window
_ (when-not (= current-repo target-repo)
(repo-handler/broadcast-persist-db! repo))]
(ui-handler/open-new-window! ev repo)))
(ui-handler/open-new-window! repo)))

(defmethod handle :graph/migrated [[_ _repo]]
(js/alert "Graph migrated."))
Expand Down
6 changes: 3 additions & 3 deletions src/main/frontend/handler/ui.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@
(defn open-new-window!
"Open a new Electron window.
No db cache persisting ensured. Should be handled by the caller."
([_e]
(open-new-window! _e nil))
([_e repo]
([]
(open-new-window! nil))
([repo]
;; TODO: find out a better way to open a new window with a different repo path. Using local storage for now
;; TODO: also write local storage with the current repo state, to make behavior consistent
;; then we can remove the `openNewWindowOfGraph` ipcMain call
Expand Down
16 changes: 8 additions & 8 deletions src/main/frontend/ui.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@
(textarea props)))

(rum/defc dropdown-content-wrapper
< {:did-mount (fn [_state]
< {:did-mount (fn [state]
(let [k (inc (count (state/sub :modal/dropdowns)))
args (:rum/args _state)]
args (:rum/args state)]
(state/set-state! [:modal/dropdowns k] (second args))
(assoc _state ::k k)))
:will-unmount (fn [_state]
(state/update-state! :modal/dropdowns #(dissoc % (::k _state)))
_state)}
(assoc state ::k k)))
:will-unmount (fn [state]
(state/update-state! :modal/dropdowns #(dissoc % (::k state)))
state)}
[dropdown-state _close-fn content class]
(let [class (or class
(util/hiccup->class "origin-top-right.absolute.right-0.mt-2"))]
Expand Down Expand Up @@ -288,8 +288,8 @@
(let [time-fn (fn []
(try
(util/time-ago input)
(catch js/Error _e
(js/console.error _e)
(catch js/Error e
(js/console.error e)
input)))
[time set-time] (rum/use-state (time-fn))]

Expand Down
4 changes: 2 additions & 2 deletions src/main/frontend/util/cursor.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
(util/nth-safe pos)
mock-char-pos
(assoc :rect rect))
(catch :default _e
(js/console.log "index error" _e)
(catch :default e
(js/console.log "index error" e)
{:pos pos
:rect rect
:left js/Number.MAX_SAFE_INTEGER
Expand Down
4 changes: 2 additions & 2 deletions src/main/logseq/api.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -852,9 +852,9 @@

(defn ^:export exper_request
[pid ^js options]
(when-let [^js _pl (plugin-handler/get-plugin-inst pid)]
(when-let [^js pl (plugin-handler/get-plugin-inst pid)]
(let [req-id (vreset! *request-k (inc @*request-k))
req-cb #(plugin-handler/request-callback _pl req-id %)]
req-cb #(plugin-handler/request-callback pl req-id %)]
(-> (ipc/ipc :httpRequest req-id options)
(p/then #(req-cb %))
(p/catch #(req-cb %)))
Expand Down

0 comments on commit 51c318e

Please sign in to comment.