chore: move 2 more db namespaces to db.common

b/c they are used by both graph types

.clj-kondo/config.edn

@@ -184,7 +184,7 @@
              logseq.db.frontend.validate db-validate
              logseq.db.sqlite.build sqlite-build
              logseq.db.sqlite.cli sqlite-cli
-             logseq.db.sqlite.common-db sqlite-common-db
+             logseq.db.common.sqlite sqlite-common-db
              logseq.db.sqlite.create-graph sqlite-create-graph
              logseq.db.sqlite.export sqlite-export
              logseq.db.sqlite.util sqlite-util

deps/db/.carve/config.edn

@@ -1,5 +1,5 @@
 {:paths ["src"]
- :api-namespaces [logseq.db.sqlite.common-db
+ :api-namespaces [logseq.db.common.sqlite
                   logseq.db.sqlite.util
                   logseq.db.sqlite.cli
                   logseq.db.frontend.property

deps/db/.clj-kondo/config.edn

@@ -26,7 +26,7 @@
              logseq.db.frontend.validate db-validate
              logseq.db.sqlite.build sqlite-build
              logseq.db.sqlite.cli sqlite-cli
-             logseq.db.sqlite.common-db sqlite-common-db
+             logseq.db.common.sqlite sqlite-common-db
              logseq.db.sqlite.create-graph sqlite-create-graph
              logseq.db.sqlite.export sqlite-export
              logseq.db.sqlite.util sqlite-util}}}

deps/db/src/logseq/db.cljs

@@ -12,12 +12,12 @@
             [logseq.common.util.page-ref :as page-ref]
             [logseq.common.uuid :as common-uuid]
             [logseq.db.frontend.class :as db-class]
-            [logseq.db.frontend.delete-blocks :as delete-blocks] ;; Load entity extensions
+            [logseq.db.common.delete-blocks :as delete-blocks] ;; Load entity extensions
             [logseq.db.frontend.entity-plus :as entity-plus]
             [logseq.db.frontend.entity-util :as entity-util]
             [logseq.db.frontend.property :as db-property]
             [logseq.db.frontend.rules :as rules]
-            [logseq.db.sqlite.common-db :as sqlite-common-db]
+            [logseq.db.common.sqlite :as sqlite-common-db]
             [logseq.db.sqlite.util :as sqlite-util]
             [logseq.db.file-based.rules :as file-rules])
   (:refer-clojure :exclude [object?]))

deps/db/src/logseq/db/frontend/delete_blocks.cljs → deps/db/src/logseq/db/common/delete_blocks.cljs

@@ -1,5 +1,5 @@
-(ns logseq.db.frontend.delete-blocks
-  "Delete refs/macros when deleting blocks"
+(ns logseq.db.common.delete-blocks
+  "For file and DB graphs, provides fn to handle any deletion to occur per ldb/transact!"
   (:require [clojure.string :as string]
             [datascript.core :as d]
             [logseq.common.util :as common-util]

deps/db/src/logseq/db/sqlite/common_db.cljs → deps/db/src/logseq/db/common/sqlite.cljs

@@ -1,5 +1,6 @@
-(ns logseq.db.sqlite.common-db
-  "Common sqlite db fns for browser and node"
+(ns logseq.db.common.sqlite
+  "Provides common sqlite db fns for file and DB graphs. These fns work on
+  browser and node"
   (:require ["path" :as node-path]
             [clojure.set :as set]
             [clojure.string :as string]

deps/db/src/logseq/db/sqlite/cli.cljs

@@ -1,7 +1,7 @@
 (ns ^:node-only logseq.db.sqlite.cli
   "Primary ns to interact with DB files for DB and file graphs with node.js based CLIs"
   (:require ["better-sqlite3" :as sqlite3]
-            [logseq.db.sqlite.common-db :as sqlite-common-db]
+            [logseq.db.common.sqlite :as sqlite-common-db]
             ;; FIXME: datascript.core has to come before datascript.storage or else nbb fails
             #_:clj-kondo/ignore
             [datascript.core :as d]

deps/db/test/logseq/db/sqlite/common_db_test.cljs → deps/db/test/logseq/db/common/sqlite_test.cljs

@@ -1,9 +1,9 @@
-(ns logseq.db.sqlite.common-db-test
+(ns logseq.db.common.sqlite-test
   (:require [cljs.test :refer [deftest async use-fixtures is testing]]
             ["fs" :as fs]
             ["path" :as node-path]
             [datascript.core :as d]
-            [logseq.db.sqlite.common-db :as sqlite-common-db]
+            [logseq.db.common.sqlite :as sqlite-common-db]
             [logseq.common.util.date-time :as date-time-util]
             [logseq.db.sqlite.cli :as sqlite-cli]
             [clojure.string :as string]))

src/electron/electron/db.cljs

@@ -3,7 +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.common.sqlite :as sqlite-common-db]))
 
 (defn get-graphs-dir
   []

src/electron/electron/handler.cljs

@@ -31,7 +31,7 @@
             [electron.window :as win]
             [goog.functions :refer [debounce]]
             [logseq.common.graph :as common-graph]
-            [logseq.db.sqlite.common-db :as sqlite-common-db]
+            [logseq.db.common.sqlite :as sqlite-common-db]
             [logseq.db.sqlite.util :as sqlite-util]
             [promesa.core :as p]))
 

src/main/frontend/db/restore.cljs

@@ -5,7 +5,7 @@
             [frontend.persist-db :as persist-db]
             [promesa.core :as p]
             [cljs-time.core :as t]
-            [logseq.db.sqlite.common-db :as sqlite-common-db]
+            [logseq.db.common.sqlite :as sqlite-common-db]
             [datascript.transit :as dt]))
 
 (defn restore-graph!

src/main/frontend/handler/db_based/rtc.cljs

@@ -12,7 +12,7 @@
             [frontend.util :as util]
             [logseq.common.util :as common-util]
             [logseq.db :as ldb]
-            [logseq.db.sqlite.common-db :as sqlite-common-db]
+            [logseq.db.common.sqlite :as sqlite-common-db]
             [logseq.shui.ui :as shui]
             [missionary.core :as m]
             [promesa.core :as p]))

src/main/frontend/handler/export.cljs

@@ -24,7 +24,7 @@
    [goog.dom :as gdom]
    [lambdaisland.glogi :as log]
    [logseq.db :as ldb]
-   [logseq.db.sqlite.common-db :as sqlite-common-db]
+   [logseq.db.common.sqlite :as sqlite-common-db]
    [logseq.publishing.html :as publish-html]
    [promesa.core :as p])
   (:import

src/main/frontend/worker/db_worker.cljs

@@ -34,7 +34,7 @@
             [logseq.db :as ldb]
             [logseq.db.common.order :as db-order]
             [logseq.db.frontend.schema :as db-schema]
-            [logseq.db.sqlite.common-db :as sqlite-common-db]
+            [logseq.db.common.sqlite :as sqlite-common-db]
             [logseq.db.sqlite.create-graph :as sqlite-create-graph]
             [logseq.db.sqlite.export :as sqlite-export]
             [logseq.db.sqlite.util :as sqlite-util]

src/main/frontend/worker/util.cljc

@@ -6,7 +6,7 @@
                      [goog.crypt :as crypt]
                      [goog.crypt.Hmac]
                      [goog.crypt.Sha256]
-                     [logseq.db.sqlite.common-db :as sqlite-common-db]
+                     [logseq.db.common.sqlite :as sqlite-common-db]
                      [frontend.common.file.util :as wfu])))
 
 ;; Copied from https://github.com/tonsky/datascript-todo