瀏覽代碼

chore: move frontend db namespaces to a dedicated parent ns

Moved these namespaces to logseq.db.frontend.* to make their purpose
explicit and make the namespaces easier to maintain
Gabriel Horner 2 年之前
父節點
當前提交
edaf9b286a
共有 48 個文件被更改,包括 72 次插入72 次删除
  1. 5 5
      .clj-kondo/config.edn
  2. 3 3
      deps/db/.carve/config.edn
  3. 4 4
      deps/db/.carve/ignore
  4. 5 5
      deps/db/README.md
  5. 1 1
      deps/db/bb.edn
  6. 1 1
      deps/db/script/query.cljs
  7. 2 2
      deps/db/script/validate_client_db.cljs
  8. 2 2
      deps/db/src/logseq/db.cljs
  9. 1 1
      deps/db/src/logseq/db/frontend/default.cljs
  10. 4 4
      deps/db/src/logseq/db/frontend/malli_schema.cljs
  11. 1 1
      deps/db/src/logseq/db/frontend/property.cljs
  12. 1 1
      deps/db/src/logseq/db/frontend/property/type.cljs
  13. 2 2
      deps/db/src/logseq/db/frontend/rules.cljc
  14. 1 1
      deps/db/src/logseq/db/frontend/schema.cljs
  15. 1 1
      deps/db/src/logseq/db/sqlite/restore.cljs
  16. 2 2
      deps/db/src/logseq/db/sqlite/util.cljs
  17. 1 1
      deps/graph-parser/src/logseq/graph_parser.cljs
  18. 1 1
      deps/graph-parser/test/logseq/graph_parser_test.cljs
  19. 1 1
      deps/outliner/src/logseq/outliner/pipeline.cljs
  20. 1 1
      deps/outliner/test/logseq/outliner/pipeline_test.cljs
  21. 1 1
      deps/publishing/src/logseq/publishing/db.cljs
  22. 1 1
      scripts/src/logseq/tasks/db_graph/update_graph_to_add_todos.cljs
  23. 1 1
      src/main/frontend/components/page.cljs
  24. 1 1
      src/main/frontend/components/page_menu.cljs
  25. 2 2
      src/main/frontend/components/property.cljs
  26. 1 1
      src/main/frontend/components/query/builder.cljs
  27. 1 1
      src/main/frontend/components/query_table.cljs
  28. 2 2
      src/main/frontend/db.cljs
  29. 1 1
      src/main/frontend/db/conn.cljs
  30. 1 1
      src/main/frontend/db/migrate.cljs
  31. 2 2
      src/main/frontend/db/model.cljs
  32. 1 1
      src/main/frontend/db/query_custom.cljs
  33. 1 1
      src/main/frontend/db/query_dsl.cljs
  34. 2 2
      src/main/frontend/db/restore.cljs
  35. 1 1
      src/main/frontend/db/rtc/full_upload_download_graph.cljs
  36. 1 1
      src/main/frontend/handler/common/page.cljs
  37. 1 1
      src/main/frontend/handler/db_based/property.cljs
  38. 1 1
      src/main/frontend/handler/editor.cljs
  39. 1 1
      src/main/frontend/handler/events.cljs
  40. 1 1
      src/main/frontend/handler/file_based/editor.cljs
  41. 1 1
      src/main/frontend/handler/graph.cljs
  42. 1 1
      src/main/frontend/handler/page.cljs
  43. 1 1
      src/main/frontend/handler/property/util.cljs
  44. 1 1
      src/main/frontend/modules/outliner/core.cljs
  45. 1 1
      src/main/frontend/search.cljs
  46. 1 1
      src/test/frontend/handler/export_test.cljs
  47. 1 1
      src/test/frontend/test/fixtures.cljs
  48. 1 1
      src/test/frontend/util/datalog_test.cljs

+ 5 - 5
.clj-kondo/config.edn

@@ -7,7 +7,7 @@
   ;; false positive with match/match and _
   ;; false positive with match/match and _
   frontend.handler.paste {:linters {:used-underscored-binding {:level :off}}}
   frontend.handler.paste {:linters {:used-underscored-binding {:level :off}}}
   frontend.db {:linters {:aliased-namespace-symbol
   frontend.db {:linters {:aliased-namespace-symbol
-                         {:exclude [frontend.db.conn frontend.db.react logseq.db.default]}}}}
+                         {:exclude [frontend.db.conn frontend.db.react logseq.db.frontend.default]}}}}
 
 
  :linters
  :linters
  {:path-invalid-construct/string-join {:level :info}
  {:path-invalid-construct/string-join {:level :info}
@@ -117,10 +117,10 @@
              logseq.common.path path
              logseq.common.path path
              logseq.common.graph common-graph
              logseq.common.graph common-graph
              logseq.common.config common-config
              logseq.common.config common-config
-             logseq.db.property db-property
-             logseq.db.property.type db-property-type
-             logseq.db.rules rules
-             logseq.db.schema db-schema
+             logseq.db.frontend.property db-property
+             logseq.db.frontend.property.type db-property-type
+             logseq.db.frontend.rules rules
+             logseq.db.frontend.schema db-schema
              logseq.db.sqlite.db sqlite-db
              logseq.db.sqlite.db sqlite-db
              logseq.db.sqlite.util sqlite-util
              logseq.db.sqlite.util sqlite-util
              logseq.graph-parser graph-parser
              logseq.graph-parser graph-parser

+ 3 - 3
deps/db/.carve/config.edn

@@ -4,8 +4,8 @@
                   logseq.db.sqlite.rtc
                   logseq.db.sqlite.rtc
                   logseq.db.sqlite.util
                   logseq.db.sqlite.util
                   logseq.db.sqlite.cli
                   logseq.db.sqlite.cli
-                  logseq.db.property
-                  logseq.db.malli-schema
+                  logseq.db.frontend.property
+                  logseq.db.frontend.malli-schema
                   ;; Some fns are used by frontend but not worth moving over yet
                   ;; Some fns are used by frontend but not worth moving over yet
-                  logseq.db.schema]
+                  logseq.db.frontend.schema]
  :report {:format :ignore}}
  :report {:format :ignore}}

+ 4 - 4
deps/db/.carve/ignore

@@ -1,10 +1,10 @@
 ;; API
 ;; API
 logseq.db/start-conn
 logseq.db/start-conn
 ;; API
 ;; API
-logseq.db.rules/query-dsl-rules
+logseq.db.frontend.rules/query-dsl-rules
 ;; API
 ;; API
-logseq.db.rules/db-query-dsl-rules
+logseq.db.frontend.rules/db-query-dsl-rules
 ;; API
 ;; API
-logseq.db.rules/extract-rules
+logseq.db.frontend.rules/extract-rules
 ;; Internal API
 ;; Internal API
-logseq.db.rules/rules
+logseq.db.frontend.rules/rules

+ 5 - 5
deps/db/README.md

@@ -1,16 +1,16 @@
 ## Description
 ## Description
 
 
-This library provides a minimal API for using a
-[datascript](https://github.com/tonsky/datascript) or
-[SQLite](https://www.sqlite.org/index.html) database from the Logseq app and the
-CLI. This library is compatible with ClojureScript and with
+This library provides a minimal API to access the
+frontend([datascript](https://github.com/tonsky/datascript)) and
+backend([SQLite](https://www.sqlite.org/index.html)) databases from the Logseq
+app and the CLI. This library is compatible with ClojureScript and with
 [nbb-logseq](https://github.com/logseq/nbb-logseq) to respectively provide
 [nbb-logseq](https://github.com/logseq/nbb-logseq) to respectively provide
 frontend and commandline functionality.
 frontend and commandline functionality.
 
 
 ## API
 ## API
 
 
 This library is under the parent namespace `logseq.db`. This library provides
 This library is under the parent namespace `logseq.db`. This library provides
-three main namespaces, `logseq.db`, `logseq.db.rules` and `logseq.db.sqlite.db`.
+three main namespaces, `logseq.db`, `logseq.db.frontend.rules` and `logseq.db.sqlite.db`.
 
 
 ## Usage
 ## Usage
 
 

+ 1 - 1
deps/db/bb.edn

@@ -24,7 +24,7 @@
 
 
   lint:rules
   lint:rules
   {:requires ([logseq.bb-tasks.lint.datalog :as datalog]
   {:requires ([logseq.bb-tasks.lint.datalog :as datalog]
-              [logseq.db.rules :as rules])
+              [logseq.db.frontend.rules :as rules])
    :doc "Lint datalog rules for parsability and unbound variables"
    :doc "Lint datalog rules for parsability and unbound variables"
    :task (datalog/lint-rules
    :task (datalog/lint-rules
           (set
           (set

+ 1 - 1
deps/db/script/query.cljs

@@ -6,7 +6,7 @@
               [clojure.edn :as edn]
               [clojure.edn :as edn]
               [logseq.db.sqlite.db :as sqlite-db]
               [logseq.db.sqlite.db :as sqlite-db]
               [logseq.db.sqlite.cli :as sqlite-cli]
               [logseq.db.sqlite.cli :as sqlite-cli]
-              [logseq.db.rules :as rules]
+              [logseq.db.frontend.rules :as rules]
               [nbb.core :as nbb]
               [nbb.core :as nbb]
               ["path" :as path]
               ["path" :as path]
               ["os" :as os]))
               ["os" :as os]))

+ 2 - 2
deps/db/script/validate_client_db.cljs

@@ -3,8 +3,8 @@
    NOTE: This script is also used in CI to confirm our db's schema is up to date"
    NOTE: This script is also used in CI to confirm our db's schema is up to date"
   (:require [logseq.db.sqlite.cli :as sqlite-cli]
   (:require [logseq.db.sqlite.cli :as sqlite-cli]
             [logseq.db.sqlite.db :as sqlite-db]
             [logseq.db.sqlite.db :as sqlite-db]
-            [logseq.db.schema :as db-schema]
-            [logseq.db.malli-schema :as db-malli-schema]
+            [logseq.db.frontend.schema :as db-schema]
+            [logseq.db.frontend.malli-schema :as db-malli-schema]
             [datascript.core :as d]
             [datascript.core :as d]
             [clojure.string :as string]
             [clojure.string :as string]
             [nbb.core :as nbb]
             [nbb.core :as nbb]

+ 2 - 2
deps/db/src/logseq/db.cljs

@@ -1,7 +1,7 @@
 (ns logseq.db
 (ns logseq.db
   "Main namespace for public db fns"
   "Main namespace for public db fns"
-  (:require [logseq.db.default :as default-db]
-            [logseq.db.schema :as db-schema]
+  (:require [logseq.db.frontend.default :as default-db]
+            [logseq.db.frontend.schema :as db-schema]
             [datascript.core :as d]
             [datascript.core :as d]
             [cljs-time.core :as t]
             [cljs-time.core :as t]
             [cljs-time.coerce :as tc]))
             [cljs-time.coerce :as tc]))

+ 1 - 1
deps/db/src/logseq/db/default.cljs → deps/db/src/logseq/db/frontend/default.cljs

@@ -1,4 +1,4 @@
-(ns logseq.db.default
+(ns logseq.db.frontend.default
   "Provides fns for seeding default data in a logseq db"
   "Provides fns for seeding default data in a logseq db"
   (:require [clojure.string :as string]
   (:require [clojure.string :as string]
             [clojure.set :as set]))
             [clojure.set :as set]))

+ 4 - 4
deps/db/src/logseq/db/malli_schema.cljs → deps/db/src/logseq/db/frontend/malli_schema.cljs

@@ -1,9 +1,9 @@
-(ns logseq.db.malli-schema
-  "Malli schemas and fns for logseq.db.*"
+(ns logseq.db.frontend.malli-schema
+  "Malli schemas and fns for logseq.db.frontend.*"
   (:require [clojure.walk :as walk]
   (:require [clojure.walk :as walk]
             [datascript.core :as d]
             [datascript.core :as d]
-            [logseq.db.property :as db-property]
-            [logseq.db.property.type :as db-property-type]))
+            [logseq.db.frontend.property :as db-property]
+            [logseq.db.frontend.property.type :as db-property-type]))
 
 
 ;; Helper fns
 ;; Helper fns
 ;; ==========
 ;; ==========

+ 1 - 1
deps/db/src/logseq/db/property.cljs → deps/db/src/logseq/db/frontend/property.cljs

@@ -1,4 +1,4 @@
-(ns logseq.db.property
+(ns logseq.db.frontend.property
   "Property related fns for DB graphs and frontend/datascript usage"
   "Property related fns for DB graphs and frontend/datascript usage"
   (:require [clojure.set :as set]))
   (:require [clojure.set :as set]))
 
 

+ 1 - 1
deps/db/src/logseq/db/property/type.cljs → deps/db/src/logseq/db/frontend/property/type.cljs

@@ -1,4 +1,4 @@
-(ns logseq.db.property.type
+(ns logseq.db.frontend.property.type
   "Provides property types including fns to validate them"
   "Provides property types including fns to validate them"
   (:require [datascript.core :as d]))
   (:require [datascript.core :as d]))
 
 

+ 2 - 2
deps/db/src/logseq/db/rules.cljc → deps/db/src/logseq/db/frontend/rules.cljc

@@ -1,5 +1,5 @@
-(ns ^:bb-compatible logseq.db.rules
-  "Datalog rules for use with logseq.db.schema")
+(ns ^:bb-compatible logseq.db.frontend.rules
+  "Datalog rules for use with logseq.db.frontend.schema")
 
 
 (def ^:large-vars/data-var rules
 (def ^:large-vars/data-var rules
   "Rules used mainly in frontend.db.model"
   "Rules used mainly in frontend.db.model"

+ 1 - 1
deps/db/src/logseq/db/schema.cljs → deps/db/src/logseq/db/frontend/schema.cljs

@@ -1,4 +1,4 @@
-(ns logseq.db.schema
+(ns logseq.db.frontend.schema
   "Main datascript schemas for the Logseq app"
   "Main datascript schemas for the Logseq app"
   (:require [clojure.set :as set]))
   (:require [clojure.set :as set]))
 
 

+ 1 - 1
deps/db/src/logseq/db/sqlite/restore.cljs

@@ -5,7 +5,7 @@
             [clojure.string :as string]
             [clojure.string :as string]
             [datascript.core :as d]
             [datascript.core :as d]
             [goog.object :as gobj]
             [goog.object :as gobj]
-            [logseq.db.schema :as db-schema]))
+            [logseq.db.frontend.schema :as db-schema]))
 
 
 (def ^:private t-reader (transit/reader :json))
 (def ^:private t-reader (transit/reader :json))
 
 

+ 2 - 2
deps/db/src/logseq/db/sqlite/util.cljs

@@ -5,8 +5,8 @@
             [clojure.string :as string]
             [clojure.string :as string]
             [cognitect.transit :as transit]
             [cognitect.transit :as transit]
             [datascript.core :as d]
             [datascript.core :as d]
-            [logseq.db.schema :as db-schema]
-            [logseq.db.property :as db-property]))
+            [logseq.db.frontend.schema :as db-schema]
+            [logseq.db.frontend.property :as db-property]))
 
 
 (defn- type-of-block
 (defn- type-of-block
   "
   "

+ 1 - 1
deps/graph-parser/src/logseq/graph_parser.cljs

@@ -6,7 +6,7 @@
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.date-time-util :as date-time-util]
             [logseq.graph-parser.date-time-util :as date-time-util]
             [logseq.graph-parser.config :as gp-config]
             [logseq.graph-parser.config :as gp-config]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [clojure.string :as string]
             [clojure.string :as string]
             [clojure.set :as set]))
             [clojure.set :as set]))
 
 

+ 1 - 1
deps/graph-parser/test/logseq/graph_parser_test.cljs

@@ -3,7 +3,7 @@
             [clojure.string :as string]
             [clojure.string :as string]
             [logseq.graph-parser :as graph-parser]
             [logseq.graph-parser :as graph-parser]
             [logseq.db :as ldb]
             [logseq.db :as ldb]
-            [logseq.db.default :as default-db]
+            [logseq.db.frontend.default :as default-db]
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.property :as gp-property]
             [logseq.graph-parser.property :as gp-property]
             [datascript.core :as d]))
             [datascript.core :as d]))

+ 1 - 1
deps/outliner/src/logseq/outliner/pipeline.cljs

@@ -1,6 +1,6 @@
 (ns logseq.outliner.pipeline
 (ns logseq.outliner.pipeline
   "Core fns for use with frontend.modules.outliner.pipeline"
   "Core fns for use with frontend.modules.outliner.pipeline"
-  (:require [logseq.db.schema :as db-schema]
+  (:require [logseq.db.frontend.schema :as db-schema]
             [datascript.core :as d]
             [datascript.core :as d]
             [cognitect.transit :as t]
             [cognitect.transit :as t]
             [clojure.set :as set]))
             [clojure.set :as set]))

+ 1 - 1
deps/outliner/test/logseq/outliner/pipeline_test.cljs

@@ -1,6 +1,6 @@
 (ns logseq.outliner.pipeline-test
 (ns logseq.outliner.pipeline-test
   (:require [cljs.test :refer [deftest is]]
   (:require [cljs.test :refer [deftest is]]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [datascript.core :as d]
             [datascript.core :as d]
             [logseq.outliner.pipeline :as outliner-pipeline]))
             [logseq.outliner.pipeline :as outliner-pipeline]))
 
 

+ 1 - 1
deps/publishing/src/logseq/publishing/db.cljs

@@ -1,7 +1,7 @@
 (ns logseq.publishing.db
 (ns logseq.publishing.db
   "Provides db fns and associated util fns for publishing"
   "Provides db fns and associated util fns for publishing"
   (:require [datascript.core :as d]
   (:require [datascript.core :as d]
-            [logseq.db.rules :as rules]
+            [logseq.db.frontend.rules :as rules]
             [clojure.set :as set]
             [clojure.set :as set]
             [clojure.string :as string]))
             [clojure.string :as string]))
 
 

+ 1 - 1
scripts/src/logseq/tasks/db_graph/update_graph_to_add_todos.cljs

@@ -3,7 +3,7 @@
   (:require [logseq.tasks.db-graph.persist-graph :as persist-graph]
   (:require [logseq.tasks.db-graph.persist-graph :as persist-graph]
             [logseq.db.sqlite.cli :as sqlite-cli]
             [logseq.db.sqlite.cli :as sqlite-cli]
             [logseq.db.sqlite.db :as sqlite-db]
             [logseq.db.sqlite.db :as sqlite-db]
-            [logseq.db.rules :as rules]
+            [logseq.db.frontend.rules :as rules]
             [datascript.core :as d]
             [datascript.core :as d]
             [clojure.edn :as edn]
             [clojure.edn :as edn]
             [clojure.string :as string]
             [clojure.string :as string]

+ 1 - 1
src/main/frontend/components/page.cljs

@@ -42,7 +42,7 @@
             [logseq.graph-parser.mldoc :as gp-mldoc]
             [logseq.graph-parser.mldoc :as gp-mldoc]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util.page-ref :as page-ref]
             [logseq.graph-parser.util.page-ref :as page-ref]
-            [logseq.db.property :as db-property]
+            [logseq.db.frontend.property :as db-property]
             [medley.core :as medley]
             [medley.core :as medley]
             [promesa.core :as p]
             [promesa.core :as p]
             [reitit.frontend.easy :as rfe]
             [reitit.frontend.easy :as rfe]

+ 1 - 1
src/main/frontend/components/page_menu.cljs

@@ -19,7 +19,7 @@
             [frontend.handler.file-sync :as file-sync-handler]
             [frontend.handler.file-sync :as file-sync-handler]
             [logseq.common.path :as path]
             [logseq.common.path :as path]
             [frontend.handler.property.util :as pu]
             [frontend.handler.property.util :as pu]
-            [logseq.db.property :as db-property]))
+            [logseq.db.frontend.property :as db-property]))
 
 
 (defn- delete-page!
 (defn- delete-page!
   [page-name]
   [page-name]

+ 2 - 2
src/main/frontend/components/property.cljs

@@ -19,8 +19,8 @@
             [frontend.state :as state]
             [frontend.state :as state]
             [frontend.ui :as ui]
             [frontend.ui :as ui]
             [frontend.util :as util]
             [frontend.util :as util]
-            [logseq.db.property :as db-property]
-            [logseq.db.property.type :as db-property-type]
+            [logseq.db.frontend.property :as db-property]
+            [logseq.db.frontend.property.type :as db-property-type]
             [rum.core :as rum]
             [rum.core :as rum]
             [frontend.handler.route :as route-handler]
             [frontend.handler.route :as route-handler]
             [frontend.components.icon :as icon-component]
             [frontend.components.icon :as icon-component]

+ 1 - 1
src/main/frontend/components/query/builder.cljs

@@ -12,7 +12,7 @@
             [frontend.util :as util]
             [frontend.util :as util]
             [frontend.search :as search]
             [frontend.search :as search]
             [frontend.mixins :as mixins]
             [frontend.mixins :as mixins]
-            [logseq.db.default :as db-default]
+            [logseq.db.frontend.default :as db-default]
             [rum.core :as rum]
             [rum.core :as rum]
             [clojure.string :as string]
             [clojure.string :as string]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util :as gp-util]

+ 1 - 1
src/main/frontend/components/query_table.cljs

@@ -17,7 +17,7 @@
             [medley.core :as medley]
             [medley.core :as medley]
             [rum.core :as rum]
             [rum.core :as rum]
             [logseq.graph-parser.text :as text]
             [logseq.graph-parser.text :as text]
-            [logseq.db.property :as db-property]
+            [logseq.db.frontend.property :as db-property]
             [frontend.handler.property.util :as pu]))
             [frontend.handler.property.util :as pu]))
 
 
 ;; Util fns
 ;; Util fns

+ 2 - 2
src/main/frontend/db.cljs

@@ -8,7 +8,7 @@
             [frontend.db.react :as react]
             [frontend.db.react :as react]
             [frontend.db.utils]
             [frontend.db.utils]
             [frontend.namespaces :refer [import-vars]]
             [frontend.namespaces :refer [import-vars]]
-            [logseq.db.default :as default-db]))
+            [logseq.db.frontend.default :as default-db]))
 
 
 (import-vars
 (import-vars
  [frontend.db.conn
  [frontend.db.conn
@@ -58,7 +58,7 @@
  [frontend.db.query-react
  [frontend.db.query-react
   react-query custom-query-result-transform]
   react-query custom-query-result-transform]
 
 
- [logseq.db.default built-in-pages-names built-in-pages])
+ [logseq.db.frontend.default built-in-pages-names built-in-pages])
 
 
 (defn start-db-conn!
 (defn start-db-conn!
   ([repo]
   ([repo]

+ 1 - 1
src/main/frontend/db/conn.cljs

@@ -8,7 +8,7 @@
             [frontend.util.text :as text-util]
             [frontend.util.text :as text-util]
             [logseq.graph-parser.text :as text]
             [logseq.graph-parser.text :as text]
             [logseq.db :as ldb]
             [logseq.db :as ldb]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [logseq.graph-parser.util :as gp-util]))
             [logseq.graph-parser.util :as gp-util]))
 
 
 (defonce conns (atom {}))
 (defonce conns (atom {}))

+ 1 - 1
src/main/frontend/db/migrate.cljs

@@ -7,7 +7,7 @@
             [frontend.config :as config]
             [frontend.config :as config]
             [frontend.state :as state]
             [frontend.state :as state]
             [logseq.common.path :as path]
             [logseq.common.path :as path]
-            [logseq.db.schema :as db-schema]))
+            [logseq.db.frontend.schema :as db-schema]))
 
 
 
 
 (defn get-schema-version
 (defn get-schema-version

+ 2 - 2
src/main/frontend/db/model.cljs

@@ -13,8 +13,8 @@
             [frontend.state :as state]
             [frontend.state :as state]
             [frontend.util :as util :refer [react]]
             [frontend.util :as util :refer [react]]
             [frontend.util.drawer :as drawer]
             [frontend.util.drawer :as drawer]
-            [logseq.db.default :as default-db]
-            [logseq.db.rules :as rules]
+            [logseq.db.frontend.default :as default-db]
+            [logseq.db.frontend.rules :as rules]
             [logseq.graph-parser.config :as gp-config]
             [logseq.graph-parser.config :as gp-config]
             [logseq.graph-parser.text :as text]
             [logseq.graph-parser.text :as text]
             [logseq.graph-parser.util.page-ref :as page-ref]
             [logseq.graph-parser.util.page-ref :as page-ref]

+ 1 - 1
src/main/frontend/db/query_custom.cljs

@@ -4,7 +4,7 @@
             [frontend.db.query-react :as query-react]
             [frontend.db.query-react :as query-react]
             [frontend.db.query-dsl :as query-dsl]
             [frontend.db.query-dsl :as query-dsl]
             [frontend.db.model :as model]
             [frontend.db.model :as model]
-            [logseq.db.rules :as rules]
+            [logseq.db.frontend.rules :as rules]
             [frontend.util.datalog :as datalog-util]
             [frontend.util.datalog :as datalog-util]
             [clojure.walk :as walk]
             [clojure.walk :as walk]
             [frontend.config :as config]))
             [frontend.config :as config]))

+ 1 - 1
src/main/frontend/db/query_dsl.cljs

@@ -13,7 +13,7 @@
             [frontend.db.conn :as conn]
             [frontend.db.conn :as conn]
             [datascript.core :as d]
             [datascript.core :as d]
             [logseq.graph-parser.util.db :as db-util]
             [logseq.graph-parser.util.db :as db-util]
-            [logseq.db.rules :as rules]
+            [logseq.db.frontend.rules :as rules]
             [frontend.template :as template]
             [frontend.template :as template]
             [logseq.graph-parser.text :as text]
             [logseq.graph-parser.text :as text]
             [logseq.graph-parser.util.page-ref :as page-ref]
             [logseq.graph-parser.util.page-ref :as page-ref]

+ 2 - 2
src/main/frontend/db/restore.cljs

@@ -12,13 +12,13 @@
             [frontend.state :as state]
             [frontend.state :as state]
             [frontend.persist-db :as persist-db]
             [frontend.persist-db :as persist-db]
             [goog.object :as gobj]
             [goog.object :as gobj]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [logseq.db.sqlite.restore :as sqlite-restore]
             [logseq.db.sqlite.restore :as sqlite-restore]
             [logseq.db.sqlite.util :as sqlite-util]
             [logseq.db.sqlite.util :as sqlite-util]
             [promesa.core :as p]
             [promesa.core :as p]
             [frontend.util :as util]
             [frontend.util :as util]
             [cljs-time.core :as t]
             [cljs-time.core :as t]
-            [logseq.db.property :as db-property]))
+            [logseq.db.frontend.property :as db-property]))
 
 
 (defn- old-schema?
 (defn- old-schema?
   "Requires migration if the schema version is older than db-schema/version"
   "Requires migration if the schema version is older than db-schema/version"

+ 1 - 1
src/main/frontend/db/rtc/full_upload_download_graph.cljs

@@ -9,7 +9,7 @@
             [cljs.core.async.interop :refer [p->c]]
             [cljs.core.async.interop :refer [p->c]]
             [cljs-http.client :as http]
             [cljs-http.client :as http]
             [cognitect.transit :as transit]
             [cognitect.transit :as transit]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [frontend.persist-db :as persist-db]
             [frontend.persist-db :as persist-db]
             [frontend.db.rtc.op :as op]
             [frontend.db.rtc.op :as op]
             [logseq.outliner.pipeline :as outliner-pipeline]
             [logseq.outliner.pipeline :as outliner-pipeline]

+ 1 - 1
src/main/frontend/handler/common/page.cljs

@@ -18,7 +18,7 @@
             [frontend.handler.ui :as ui-handler]
             [frontend.handler.ui :as ui-handler]
             [frontend.util.fs :as fs-util]
             [frontend.util.fs :as fs-util]
             [frontend.util :as util]
             [frontend.util :as util]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.text :as text]
             [logseq.graph-parser.text :as text]

+ 1 - 1
src/main/frontend/handler/db_based/property.cljs

@@ -9,7 +9,7 @@
             [frontend.util :as util]
             [frontend.util :as util]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util :as gp-util]
             [logseq.db.sqlite.util :as sqlite-util]
             [logseq.db.sqlite.util :as sqlite-util]
-            [logseq.db.property.type :as db-property-type]
+            [logseq.db.frontend.property.type :as db-property-type]
             [malli.util :as mu]
             [malli.util :as mu]
             [malli.error :as me]
             [malli.error :as me]
             [frontend.format.block :as block]
             [frontend.format.block :as block]

+ 1 - 1
src/main/frontend/handler/editor.cljs

@@ -50,7 +50,7 @@
             [goog.dom.classes :as gdom-classes]
             [goog.dom.classes :as gdom-classes]
             [goog.object :as gobj]
             [goog.object :as gobj]
             [lambdaisland.glogi :as log]
             [lambdaisland.glogi :as log]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.mldoc :as gp-mldoc]
             [logseq.graph-parser.mldoc :as gp-mldoc]
             [logseq.graph-parser.property :as gp-property]
             [logseq.graph-parser.property :as gp-property]

+ 1 - 1
src/main/frontend/handler/events.cljs

@@ -69,7 +69,7 @@
             [frontend.util :as util]
             [frontend.util :as util]
             [frontend.util.persist-var :as persist-var]
             [frontend.util.persist-var :as persist-var]
             [goog.dom :as gdom]
             [goog.dom :as gdom]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [logseq.graph-parser.config :as gp-config]
             [logseq.graph-parser.config :as gp-config]
             [promesa.core :as p]
             [promesa.core :as p]
             [rum.core :as rum]
             [rum.core :as rum]

+ 1 - 1
src/main/frontend/handler/file_based/editor.cljs

@@ -11,7 +11,7 @@
             [frontend.util.drawer :as drawer]
             [frontend.util.drawer :as drawer]
             [frontend.util.marker :as marker]
             [frontend.util.marker :as marker]
             [frontend.handler.file-based.property :as file-property]
             [frontend.handler.file-based.property :as file-property]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.mldoc :as gp-mldoc]
             [logseq.graph-parser.mldoc :as gp-mldoc]
             [logseq.graph-parser.util.block-ref :as block-ref]))
             [logseq.graph-parser.util.block-ref :as block-ref]))

+ 1 - 1
src/main/frontend/handler/graph.cljs

@@ -3,7 +3,7 @@
   (:require [clojure.set :as set]
   (:require [clojure.set :as set]
             [clojure.string :as string]
             [clojure.string :as string]
             [frontend.db :as db]
             [frontend.db :as db]
-            [logseq.db.default :as default-db]
+            [logseq.db.frontend.default :as default-db]
             [frontend.state :as state]
             [frontend.state :as state]
             [frontend.util :as util]
             [frontend.util :as util]
             [frontend.handler.property.util :as pu]
             [frontend.handler.property.util :as pu]

+ 1 - 1
src/main/frontend/handler/page.cljs

@@ -28,7 +28,7 @@
             [goog.functions :refer [debounce]]
             [goog.functions :refer [debounce]]
             [goog.object :as gobj]
             [goog.object :as gobj]
             [lambdaisland.glogi :as log]
             [lambdaisland.glogi :as log]
-            [logseq.db.property :as db-property]
+            [logseq.db.frontend.property :as db-property]
             [logseq.graph-parser.config :as gp-config]
             [logseq.graph-parser.config :as gp-config]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util.page-ref :as page-ref]
             [logseq.graph-parser.util.page-ref :as page-ref]

+ 1 - 1
src/main/frontend/handler/property/util.cljs

@@ -4,7 +4,7 @@
   compatible with file graphs"
   compatible with file graphs"
   (:require [frontend.config :as config]
   (:require [frontend.config :as config]
             [frontend.state :as state]
             [frontend.state :as state]
-            [logseq.db.property :as db-property]
+            [logseq.db.frontend.property :as db-property]
             [logseq.graph-parser.util :as gp-util]
             [logseq.graph-parser.util :as gp-util]
             [frontend.db :as db]
             [frontend.db :as db]
             [clojure.set :as set]
             [clojure.set :as set]

+ 1 - 1
src/main/frontend/modules/outliner/core.cljs

@@ -4,7 +4,7 @@
             [datascript.impl.entity :as de]
             [datascript.impl.entity :as de]
             [frontend.db :as db]
             [frontend.db :as db]
             [frontend.db.model :as db-model]
             [frontend.db.model :as db-model]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [frontend.db.conn :as conn]
             [frontend.db.conn :as conn]
             [frontend.db.outliner :as db-outliner]
             [frontend.db.outliner :as db-outliner]
             [frontend.modules.outliner.datascript :as ds]
             [frontend.modules.outliner.datascript :as ds]

+ 1 - 1
src/main/frontend/search.cljs

@@ -18,7 +18,7 @@
             [datascript.core :as d]
             [datascript.core :as d]
             [frontend.handler.file-based.property.util :as property-util]
             [frontend.handler.file-based.property.util :as property-util]
             [frontend.config :as config]
             [frontend.config :as config]
-            [logseq.db.property :as db-property]))
+            [logseq.db.frontend.property :as db-property]))
 
 
 (defn get-engine
 (defn get-engine
   [repo]
   [repo]

+ 1 - 1
src/test/frontend/handler/export_test.cljs

@@ -6,7 +6,7 @@
             [frontend.handler.export.text :as export-text]
             [frontend.handler.export.text :as export-text]
             [frontend.state :as state]
             [frontend.state :as state]
             [frontend.test.helper :as test-helper :include-macros true :refer [deftest-async]]
             [frontend.test.helper :as test-helper :include-macros true :refer [deftest-async]]
-            [logseq.db.default :as default-db]
+            [logseq.db.frontend.default :as default-db]
             [promesa.core :as p]))
             [promesa.core :as p]))
 
 
 (def test-files
 (def test-files

+ 1 - 1
src/test/frontend/test/fixtures.cljs

@@ -1,6 +1,6 @@
 (ns frontend.test.fixtures
 (ns frontend.test.fixtures
   (:require [datascript.core :as d]
   (:require [datascript.core :as d]
-            [logseq.db.schema :as db-schema]
+            [logseq.db.frontend.schema :as db-schema]
             [frontend.db.conn :as conn]
             [frontend.db.conn :as conn]
             [frontend.db.react :as react]
             [frontend.db.react :as react]
             [frontend.state :as state]
             [frontend.state :as state]

+ 1 - 1
src/test/frontend/util/datalog_test.cljs

@@ -1,7 +1,7 @@
 (ns frontend.util.datalog-test
 (ns frontend.util.datalog-test
   (:require [cljs.test :refer [deftest is]]
   (:require [cljs.test :refer [deftest is]]
             [frontend.util.datalog :as datalog-util]
             [frontend.util.datalog :as datalog-util]
-            [logseq.db.rules :as rules]))
+            [logseq.db.frontend.rules :as rules]))
 
 
 (deftest add-to-end-of-query-in
 (deftest add-to-end-of-query-in
   (is (= '[:find ?b
   (is (= '[:find ?b