chore: remove some unused db fns and aliases

and some aliases that were barely used

.clj-kondo/config.edn

@@ -60,6 +60,7 @@
              frontend.db-mixins db-mixins
              frontend.db.query-dsl query-dsl
              frontend.db.react react
+             frontend.db.query-custom query-custom
              frontend.db.query-react query-react
              frontend.db.util db-utils
              frontend.diff diff

src/main/frontend/components/query/result.cljs

@@ -4,6 +4,8 @@
             [frontend.search :as search]
             [frontend.db :as db]
             [frontend.db.query-dsl :as query-dsl]
+            [frontend.db.query-custom :as query-custom]
+            [frontend.db.query-react :as query-react]
             [frontend.state :as state]
             [logseq.common.util :as common-util]
             [frontend.util :as util]
@@ -45,7 +47,7 @@
                            (query-dsl/query (state/get-current-repo) q)))
 
                        :else
-                       (db/custom-query query {:current-block-uuid current-block-uuid}))
+                       (query-custom/custom-query query {:current-block-uuid current-block-uuid}))
                      (catch :default e
                        (reset! *query-error e)
                        (atom nil)))]
@@ -69,7 +71,7 @@
         ;; exclude the current one, otherwise it'll loop forever
         remove-blocks (if current-block-uuid [current-block-uuid] nil)
         transformed-query-result (when query-result
-                                   (let [result (db/custom-query-result-transform query-result remove-blocks query-m)]
+                                   (let [result (query-react/custom-query-result-transform query-result remove-blocks query-m)]
                                      (if (and query-result (coll? result) (:block/uuid (first result)))
                                        (cond-> result
                                          (get query-m :remove-block-children? true)

src/main/frontend/db.cljs

@@ -2,8 +2,6 @@
   "Main entry ns for db related fns"
   (:require [frontend.db.conn :as conn]
             [frontend.db.model]
-            [frontend.db.query-custom]
-            [frontend.db.query-react]
             [frontend.db.react :as react]
             [frontend.db.utils]
             [frontend.namespaces :refer [import-vars]]
@@ -16,17 +14,14 @@
 (import-vars
  [frontend.db.conn
   ;; TODO: remove later
-  conns
   get-repo-path
   get-repo-name
   get-short-repo-name
-  datascript-db
   get-db
   remove-conn!]
 
  [frontend.db.utils
-  group-by-page seq-flatten
-  entity pull pull-many get-key-value]
+  entity pull pull-many]
 
  [frontend.db.model
   delete-blocks get-pre-block
@@ -50,13 +45,7 @@
   get-current-page
   remove-q! remove-query-component! add-q! add-query-component! clear-query-state!
   q
-  query-state query-components remove-custom-query! set-new-result! sub-key-value]
-
- [frontend.db.query-custom
-  custom-query]
-
- [frontend.db.query-react
-  react-query custom-query-result-transform])
+  query-state query-components remove-custom-query! set-new-result!])
 
 (defn start-db-conn!
   ([repo]

src/main/frontend/db/react.cljs

@@ -8,7 +8,7 @@
             [frontend.db.conn :as conn]
             [frontend.db.utils :as db-utils]
             [frontend.state :as state]
-            [frontend.util :as util :refer [react]]
+            [frontend.util :as util]
             [clojure.core.async :as async]
             [frontend.db.async.util :as db-async-util]
             [promesa.core :as p]
@@ -199,16 +199,6 @@
   (when (and repo-url (seq affected-keys))
     (refresh-affected-queries! repo-url affected-keys)))
 
-(defn sub-key-value
-  ([key]
-   (sub-key-value (state/get-current-repo) key))
-  ([repo-url key]
-   (when (conn/get-db repo-url)
-     (let [m (some-> (q repo-url [:kv key] {} key key) react)]
-       (if-let [result (get m key)]
-         result
-         m)))))
-
 (defn run-custom-queries-when-idle!
   []
   (let [chan (state/get-reactive-custom-queries-chan)]

src/main/frontend/db/utils.cljs

@@ -62,14 +62,6 @@
        (->> (d/pull-many db selector eids)
             (map #(update-block-content % (:db/id %))))))))
 
-(defn get-key-value
-  ([key]
-   (get-key-value (state/get-current-repo) key))
-  ([repo-url key]
-   (when-let [db (conn/get-db repo-url)]
-     (some-> (d/entity db key)
-             key))))
-
 (defn q
   [query & inputs]
   (when-let [repo (state/get-current-repo)]

src/main/logseq/api.cljs

@@ -20,6 +20,7 @@
             [frontend.db :as db]
             [frontend.db.async :as db-async]
             [frontend.db.model :as db-model]
+            [frontend.db.query-custom :as query-custom]
             [frontend.db.query-dsl :as query-dsl]
             [frontend.db.utils :as db-utils]
             [frontend.db.query-react :as query-react]
@@ -1034,9 +1035,9 @@
 (defn ^:export custom_query
   [query-string]
   (p/let [result (let [query (cljs.reader/read-string query-string)]
-                   (db/custom-query {:query query
-                                     :disable-reactive? true
-                                     :return-promise? true}))]
+                   (query-custom/custom-query {:query query
+                                               :disable-reactive? true
+                                               :return-promise? true}))]
     (bean/->js (sdk-utils/normalize-keyword-for-json (flatten result)))))
 
 (defn ^:export download_graph_db

src/test/frontend/components/query/result_test.cljs

@@ -1,7 +1,7 @@
 (ns frontend.components.query.result-test
   (:require [clojure.test :refer [deftest are testing is]]
             [rum.core :as rum]
-            [frontend.db :as db]
+            [frontend.db.query-custom :as query-custom]
             [frontend.db.model :as model]
             [frontend.components.query.result :as query-result]))
 
@@ -9,7 +9,7 @@
   "Mocks get-query-result assuming custom queries are being tested. Db calls are
   mocked to minimize setup"
   [result query-m {:keys [table? current-block-uuid config] :or {config {}}}]
-  (with-redefs [db/custom-query (constantly (atom result))
+  (with-redefs [query-custom/custom-query (constantly (atom result))
                 model/with-pages identity]
     (binding [rum/*reactions* (volatile! #{})]
       (#'query-result/get-query-result config query-m (atom nil) (atom nil) current-block-uuid {:table? table?}))))