diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn index 4f2f187e0b..6a3fe5899f 100644 --- a/.clj-kondo/config.edn +++ b/.clj-kondo/config.edn @@ -22,6 +22,9 @@ ;; TODO:lint: Fix when fixing all type hints object]} + :discouraged-namespace + {logseq.db.sqlite.db {:message "frontend should not depend on CLI namespace with sqlite3 dependency"}} + :unused-namespace {:level :warning :exclude [logseq.db.frontend.entity-plus]} diff --git a/deps/db/.clj-kondo/config.edn b/deps/db/.clj-kondo/config.edn new file mode 100644 index 0000000000..0dcb7c216f --- /dev/null +++ b/deps/db/.clj-kondo/config.edn @@ -0,0 +1,25 @@ +{:linters + {:aliased-namespace-symbol {:level :warning} + :namespace-name-mismatch {:level :warning} + :used-underscored-binding {:level :warning} + + :consistent-alias + {:aliases {clojure.string string + logseq.db ldb + logseq.db.frontend.content db-content + logseq.db.frontend.class db-class + logseq.db.frontend.db-ident db-ident + logseq.db.frontend.inputs db-inputs + logseq.db.frontend.order db-order + logseq.db.frontend.property db-property + logseq.db.frontend.property.build db-property-build + logseq.db.frontend.property.type db-property-type + logseq.db.frontend.property.util db-property-util + logseq.db.frontend.entity-plus entity-plus + logseq.db.frontend.rules rules + logseq.db.frontend.schema db-schema + logseq.db.frontend.validate db-validate + logseq.db.sqlite.db sqlite-db + logseq.db.sqlite.util sqlite-util}}} + :skip-comments true + :output {:progress true}} diff --git a/deps/db/.gitignore b/deps/db/.gitignore new file mode 100644 index 0000000000..db8abf3a9e --- /dev/null +++ b/deps/db/.gitignore @@ -0,0 +1 @@ +/.clj-kondo/.cache diff --git a/deps/outliner/.clj-kondo/config.edn b/deps/outliner/.clj-kondo/config.edn new file mode 100644 index 0000000000..19d4a1eed2 --- /dev/null +++ b/deps/outliner/.clj-kondo/config.edn @@ -0,0 +1,13 @@ +{:linters + {:aliased-namespace-symbol {:level :warning} + :namespace-name-mismatch {:level :warning} + :used-underscored-binding {:level :warning} + + :consistent-alias + {:aliases {clojure.string string + logseq.outliner.core outliner-core + logseq.outliner.op outliner-op + logseq.outliner.pipeline outliner-pipeline + logseq.outliner.datascript-report ds-report}}} + :skip-comments true + :output {:progress true}} diff --git a/deps/outliner/.gitignore b/deps/outliner/.gitignore new file mode 100644 index 0000000000..db8abf3a9e --- /dev/null +++ b/deps/outliner/.gitignore @@ -0,0 +1 @@ +/.clj-kondo/.cache diff --git a/deps/outliner/src/logseq/outliner/transaction.cljc b/deps/outliner/src/logseq/outliner/transaction.cljc index 7296d21e4d..045b6c1f9e 100644 --- a/deps/outliner/src/logseq/outliner/transaction.cljc +++ b/deps/outliner/src/logseq/outliner/transaction.cljc @@ -1,14 +1,7 @@ (ns logseq.outliner.transaction "Provides a wrapper around logseq.outliner.datascript/transact! using transient state from logseq.outliner.core" - #?(:cljs (:require-macros [logseq.outliner.transaction])) - #?(:cljs (:require [malli.core :as m]))) - -#_:clj-kondo/ignore -(def ^:private transact-opts [:or :symbol :map]) - -#?(:org.babashka/nbb nil - :cljs (m/=> transact! [:=> [:cat transact-opts :any] :any])) + #?(:cljs (:require-macros [logseq.outliner.transaction]))) (defmacro ^:api transact! "Batch all the transactions in `body` to a single transaction, Support nested transact! calls. diff --git a/src/electron/electron/db.cljs b/src/electron/electron/db.cljs index 57156d30a0..5f703b96f3 100644 --- a/src/electron/electron/db.cljs +++ b/src/electron/electron/db.cljs @@ -3,8 +3,7 @@ (:require ["path" :as node-path] ["fs-extra" :as fs] ["electron" :refer [app]] - [logseq.db.sqlite.common-db :as sqlite-common-db] - [logseq.db.sqlite.db :as sqlite-db])) + [logseq.db.sqlite.common-db :as sqlite-common-db])) (defn get-graphs-dir [] @@ -30,7 +29,7 @@ (defn get-db [db-name] (let [_ (ensure-graph-dir! db-name) - [_db-name db-path] (sqlite-db/get-db-full-path (get-graphs-dir) db-name)] + [_db-name db-path] (sqlite-common-db/get-db-full-path (get-graphs-dir) db-name)] (when (fs/existsSync db-path) (fs/readFileSync db-path)))) diff --git a/src/electron/electron/handler.cljs b/src/electron/electron/handler.cljs index 3a69a55ac1..e5c23e525a 100644 --- a/src/electron/electron/handler.cljs +++ b/src/electron/electron/handler.cljs @@ -30,7 +30,7 @@ [electron.window :as win] [electron.handler-interface :refer [handle]] [logseq.db.sqlite.util :as sqlite-util] - [logseq.db.sqlite.db :as sqlite-db] + [logseq.db.sqlite.common-db :as sqlite-common-db] [goog.functions :refer [debounce]] [logseq.common.graph :as common-graph] [promesa.core :as p])) @@ -294,7 +294,7 @@ (defmethod handle :deleteGraph [_window [_ graph graph-name _db-based?]] (when graph-name (db/unlink-graph! graph) - (let [old-transit-path (node-path/join (get-graphs-dir) (str (sqlite-db/sanitize-db-name graph) ".transit"))] + (let [old-transit-path (node-path/join (get-graphs-dir) (str (sqlite-common-db/sanitize-db-name graph) ".transit"))] (when (fs/existsSync old-transit-path) (fs/unlinkSync old-transit-path)))))