From 2bce63f94d67ee7fae56d97e48a87a43aa2faf68 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 10 Apr 2026 02:37:28 +0800 Subject: [PATCH] fix: catch deps clj-kondo warnings in lint-test-deps --- .../src/logseq/outliner/op/construct.cljc | 10 +++---- .../src/logseq/tasks/dev/lint_test_deps.clj | 30 ++++++++++++++----- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/deps/outliner/src/logseq/outliner/op/construct.cljc b/deps/outliner/src/logseq/outliner/op/construct.cljc index a29f5461b4..e3cab11080 100644 --- a/deps/outliner/src/logseq/outliner/op/construct.cljc +++ b/deps/outliner/src/logseq/outliner/op/construct.cljc @@ -76,16 +76,16 @@ (defn- stable-block-ref-with-tx-data [db tx-data x] - (let [ref (stable-entity-ref db x)] - (if (and (integer? ref) (not (neg? ref))) + (let [entity-ref (stable-entity-ref db x)] + (if (and (integer? entity-ref) (not (neg? entity-ref))) (or (some (fn [item] - (when (and (= ref (:e item)) + (when (and (= entity-ref (:e item)) (= :block/uuid (:a item)) (uuid? (:v item))) [:block/uuid (:v item)])) tx-data) - ref) - ref))) + entity-ref) + entity-ref))) (defn- sanitize-ref-value [db v] diff --git a/scripts/src/logseq/tasks/dev/lint_test_deps.clj b/scripts/src/logseq/tasks/dev/lint_test_deps.clj index 77dbbd0f76..368bf34de9 100644 --- a/scripts/src/logseq/tasks/dev/lint_test_deps.clj +++ b/scripts/src/logseq/tasks/dev/lint_test_deps.clj @@ -2,20 +2,29 @@ "Runs lint/test tasks for selected deps with readable progress output." (:require [babashka.process :refer [shell]])) +(def ^:private kondo-src-test-step + {:runner :cmd :name "clj-kondo (src test)" :cmd "clojure -M:clj-kondo --lint src test --cache false"}) + +(def ^:private kondo-src-step + {:runner :cmd :name "clj-kondo (src)" :cmd "clojure -M:clj-kondo --lint src --cache false"}) + (def ^:private dep-plan [{:dep "deps/common" - :steps [{:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} + :steps [kondo-src-test-step + {:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} {:runner :bb :name "lint:carve" :cmd "lint:carve"} {:runner :bb :name "lint:ns-docstrings" :cmd "lint:ns-docstrings"} {:runner :cmd :name "yarn test (-e long)" :cmd "yarn test -e long"}]} {:dep "deps/db" - :steps [{:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} + :steps [kondo-src-test-step + {:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} {:runner :bb :name "lint:carve" :cmd "lint:carve"} {:runner :bb :name "lint:ns-docstrings" :cmd "lint:ns-docstrings"} {:runner :bb :name "lint:rules" :cmd "lint:rules"} {:runner :cmd :name "yarn test (-e long)" :cmd "yarn test -e long"}]} {:dep "deps/db-sync" - :steps [{:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} + :steps [kondo-src-test-step + {:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} {:runner :bb :name "lint:carve" :cmd "lint:carve"} ;; {:runner :bb :name "lint:ns-docstrings" :cmd "lint:ns-docstrings"} ;; {:runner :bb :name "lint:minimize-public-vars" :cmd "lint:minimize-public-vars"} @@ -23,30 +32,35 @@ {:dep "." :steps [{:runner :bb :name "dev:db-sync-test" :cmd "dev:db-sync-test"}]} {:dep "deps/outliner" - :steps [{:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} + :steps [kondo-src-test-step + {:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} {:runner :bb :name "lint:carve" :cmd "lint:carve"} {:runner :bb :name "lint:ns-docstrings" :cmd "lint:ns-docstrings"} {:runner :bb :name "lint:minimize-public-vars" :cmd "lint:minimize-public-vars"} {:runner :cmd :name "yarn test (-e long)" :cmd "yarn test -e long"}]} {:dep "deps/graph-parser" - :steps [{:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} + :steps [kondo-src-test-step + {:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} {:runner :bb :name "lint:carve" :cmd "lint:carve"} {:runner :bb :name "lint:ns-docstrings" :cmd "lint:ns-docstrings"} ;; {:runner :bb :name "lint:minimize-public-vars" :cmd "lint:minimize-public-vars"} {:runner :cmd :name "yarn test (-e long)" :cmd "yarn test -e long"}]} {:dep "deps/cli" - :steps [{:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} + :steps [kondo-src-test-step + {:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} {:runner :bb :name "lint:carve" :cmd "lint:carve"} {:runner :bb :name "lint:ns-docstrings" :cmd "lint:ns-docstrings"} {:runner :bb :name "lint:minimize-public-vars" :cmd "lint:minimize-public-vars"} {:runner :cmd :name "yarn test (-e long)" :cmd "yarn test -e long"}]} {:dep "deps/publish" - :steps [{:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} + :steps [kondo-src-step + {:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} {:runner :bb :name "lint:carve" :cmd "lint:carve"} {:runner :bb :name "lint:ns-docstrings" :cmd "lint:ns-docstrings"} {:runner :skip :name "tests" :reason "no test script in deps/publish/package.json"}]} {:dep "deps/publishing" - :steps [{:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} + :steps [kondo-src-test-step + {:runner :bb :name "lint:large-vars" :cmd "lint:large-vars"} {:runner :bb :name "lint:carve" :cmd "lint:carve"} {:runner :bb :name "lint:ns-docstrings" :cmd "lint:ns-docstrings"} {:runner :bb :name "lint:minimize-public-vars" :cmd "lint:minimize-public-vars"}]}])