diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn index c69520b267..b30e20ac38 100644 --- a/.clj-kondo/config.edn +++ b/.clj-kondo/config.edn @@ -172,11 +172,11 @@ logseq.db.frontend.entity-plus entity-plus logseq.db.frontend.entity-util entity-util logseq.db.frontend.inputs db-inputs - logseq.db.frontend.order db-order + logseq.db.common.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.common.property-util db-property-util logseq.db.frontend.rules rules logseq.db.frontend.schema db-schema logseq.db.frontend.validate db-validate diff --git a/deps/db/.carve/config.edn b/deps/db/.carve/config.edn index ffc15d1067..55ac4412f6 100644 --- a/deps/db/.carve/config.edn +++ b/deps/db/.carve/config.edn @@ -4,9 +4,9 @@ logseq.db.sqlite.cli logseq.db.frontend.property logseq.db.frontend.property.build - logseq.db.frontend.property.util + logseq.db.common.property-util logseq.db.frontend.content - logseq.db.frontend.order + logseq.db.common.order logseq.db.sqlite.create-graph logseq.db.frontend.malli-schema ;; Some fns are used by frontend but not worth moving over yet diff --git a/deps/db/.clj-kondo/config.edn b/deps/db/.clj-kondo/config.edn index 65be495e21..20b9501964 100644 --- a/deps/db/.clj-kondo/config.edn +++ b/deps/db/.clj-kondo/config.edn @@ -13,11 +13,11 @@ 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.common.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.common.property-util db-property-util logseq.db.frontend.entity-plus entity-plus logseq.db.frontend.rules rules logseq.db.frontend.schema db-schema diff --git a/deps/db/src/logseq/db/frontend/order.cljs b/deps/db/src/logseq/db/common/order.cljs similarity index 97% rename from deps/db/src/logseq/db/frontend/order.cljs rename to deps/db/src/logseq/db/common/order.cljs index 34008c48af..2ffd48cee9 100644 --- a/deps/db/src/logseq/db/frontend/order.cljs +++ b/deps/db/src/logseq/db/common/order.cljs @@ -1,5 +1,6 @@ -(ns logseq.db.frontend.order - "Use fractional-indexing order for blocks/properties/closed values/etc." +(ns logseq.db.common.order + "Use fractional-indexing order for blocks/properties/closed values/etc. + Used by DB and file graphs" (:require [logseq.clj-fractional-indexing :as index] [datascript.core :as d])) diff --git a/deps/db/src/logseq/db/frontend/property/util.cljs b/deps/db/src/logseq/db/common/property_util.cljs similarity index 97% rename from deps/db/src/logseq/db/frontend/property/util.cljs rename to deps/db/src/logseq/db/common/property_util.cljs index 9cc6b57909..ea2a24a37b 100644 --- a/deps/db/src/logseq/db/frontend/property/util.cljs +++ b/deps/db/src/logseq/db/common/property_util.cljs @@ -1,4 +1,4 @@ -(ns logseq.db.frontend.property.util +(ns logseq.db.common.property-util "Property related util fns. Fns used in both DB and file graphs should go here" (:require [datascript.core :as d] [logseq.db.frontend.property :as db-property] diff --git a/deps/db/src/logseq/db/frontend/malli_schema.cljs b/deps/db/src/logseq/db/frontend/malli_schema.cljs index a177be05a8..509b89bf2b 100644 --- a/deps/db/src/logseq/db/frontend/malli_schema.cljs +++ b/deps/db/src/logseq/db/frontend/malli_schema.cljs @@ -6,7 +6,7 @@ [logseq.db.frontend.class :as db-class] [logseq.db.frontend.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.type :as db-property-type] [logseq.db.frontend.schema :as db-schema])) diff --git a/deps/db/src/logseq/db/frontend/property/build.cljs b/deps/db/src/logseq/db/frontend/property/build.cljs index 68932d8f14..c1b8a6b7b4 100644 --- a/deps/db/src/logseq/db/frontend/property/build.cljs +++ b/deps/db/src/logseq/db/frontend/property/build.cljs @@ -2,7 +2,7 @@ "Builds core property concepts" (:require [datascript.core :as d] [logseq.common.util :as common-util] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.type :as db-property-type] [logseq.db.sqlite.util :as sqlite-util])) diff --git a/deps/db/src/logseq/db/sqlite/build.cljs b/deps/db/src/logseq/db/sqlite/build.cljs index d0d0054aaf..0c1d4c2f00 100644 --- a/deps/db/src/logseq/db/sqlite/build.cljs +++ b/deps/db/src/logseq/db/sqlite/build.cljs @@ -17,7 +17,7 @@ [logseq.db.frontend.content :as db-content] [logseq.db.frontend.db-ident :as db-ident] [logseq.db.frontend.malli-schema :as db-malli-schema] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.build :as db-property-build] [logseq.db.frontend.property.type :as db-property-type] diff --git a/deps/db/src/logseq/db/sqlite/common_db.cljs b/deps/db/src/logseq/db/sqlite/common_db.cljs index 4f8a5bdf2b..6bb3abd20e 100644 --- a/deps/db/src/logseq/db/sqlite/common_db.cljs +++ b/deps/db/src/logseq/db/sqlite/common_db.cljs @@ -9,7 +9,7 @@ [logseq.common.util.date-time :as date-time-util] [logseq.db.frontend.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.sqlite.util :as sqlite-util])) (defn- get-pages-by-name diff --git a/deps/db/src/logseq/db/sqlite/create_graph.cljs b/deps/db/src/logseq/db/sqlite/create_graph.cljs index 6662bb8399..d71321d27c 100644 --- a/deps/db/src/logseq/db/sqlite/create_graph.cljs +++ b/deps/db/src/logseq/db/sqlite/create_graph.cljs @@ -8,7 +8,7 @@ [logseq.db.frontend.class :as db-class] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.malli-schema :as db-malli-schema] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.build :as db-property-build] [logseq.db.frontend.property.type :as db-property-type] diff --git a/deps/db/src/logseq/db/sqlite/util.cljs b/deps/db/src/logseq/db/sqlite/util.cljs index 73b08e7af8..dc888556d8 100644 --- a/deps/db/src/logseq/db/sqlite/util.cljs +++ b/deps/db/src/logseq/db/sqlite/util.cljs @@ -8,7 +8,7 @@ [datascript.transit :as dt] [logseq.common.util :as common-util] [logseq.common.uuid :as common-uuid] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.type :as db-property-type] [logseq.db.frontend.schema :as db-schema])) diff --git a/deps/graph-parser/src/logseq/graph_parser/block.cljs b/deps/graph-parser/src/logseq/graph_parser/block.cljs index 746ed83a20..82290e6e74 100644 --- a/deps/graph-parser/src/logseq/graph_parser/block.cljs +++ b/deps/graph-parser/src/logseq/graph_parser/block.cljs @@ -15,7 +15,7 @@ [logseq.common.uuid :as common-uuid] [logseq.db :as ldb] [logseq.db.frontend.class :as db-class] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.graph-parser.mldoc :as gp-mldoc] [logseq.graph-parser.property :as gp-property] [logseq.graph-parser.text :as text] diff --git a/deps/graph-parser/src/logseq/graph_parser/exporter.cljs b/deps/graph-parser/src/logseq/graph_parser/exporter.cljs index 41b772e8c1..86bff050ea 100644 --- a/deps/graph-parser/src/logseq/graph_parser/exporter.cljs +++ b/deps/graph-parser/src/logseq/graph_parser/exporter.cljs @@ -20,7 +20,7 @@ [logseq.db.frontend.content :as db-content] [logseq.db.frontend.db-ident :as db-ident] [logseq.db.frontend.malli-schema :as db-malli-schema] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.build :as db-property-build] [logseq.db.frontend.property.type :as db-property-type] diff --git a/deps/graph-parser/src/logseq/graph_parser/whiteboard.cljs b/deps/graph-parser/src/logseq/graph_parser/whiteboard.cljs index d58d20014c..afb33270ac 100644 --- a/deps/graph-parser/src/logseq/graph_parser/whiteboard.cljs +++ b/deps/graph-parser/src/logseq/graph_parser/whiteboard.cljs @@ -1,6 +1,6 @@ (ns logseq.graph-parser.whiteboard "Whiteboard related parser utilities" - (:require [logseq.db.frontend.property.util :as db-property-util] + (:require [logseq.db.common.property-util :as db-property-util] [logseq.db.sqlite.util :as sqlite-util])) (defn block->shape [block] diff --git a/deps/outliner/src/logseq/outliner/core.cljs b/deps/outliner/src/logseq/outliner/core.cljs index 75d1c1a7c1..c83aeb1817 100644 --- a/deps/outliner/src/logseq/outliner/core.cljs +++ b/deps/outliner/src/logseq/outliner/core.cljs @@ -6,8 +6,7 @@ [datascript.impl.entity :as de :refer [Entity]] [logseq.common.util :as common-util] [logseq.db :as ldb] - [logseq.db.frontend.order :as db-order] - [logseq.db.frontend.property.util :as db-property-util] + [logseq.db.common.order :as db-order] [logseq.db.frontend.schema :as db-schema] [logseq.db.sqlite.create-graph :as sqlite-create-graph] [logseq.db.sqlite.util :as sqlite-util] @@ -444,7 +443,7 @@ (if (sqlite-util/db-based-graph? repo) ;; Get raw id since insert-blocks doesn't auto-handle raw property values (:db/id (:logseq.property/order-list-type block)) - (get (:block/properties block) (db-property-util/get-pid repo :logseq.property/order-list-type)))) + (get (:block/properties block) :logseq.order-list-type))) db-based? (sqlite-util/db-based-graph? repo)] (if-let [list-type (and target-block (list-type-fn target-block))] (mapv @@ -456,7 +455,7 @@ ((fn [b] (if db-based? (assoc b :logseq.property/order-list-type list-type) - (update b :block/properties assoc (db-property-util/get-pid repo :logseq.property/order-list-type) list-type)))) + (update b :block/properties assoc :logseq.order-list-type list-type)))) (not db-based?) (assoc :block/title (gp-property/insert-property repo format title :logseq.order-list-type list-type))))) diff --git a/deps/outliner/src/logseq/outliner/property.cljs b/deps/outliner/src/logseq/outliner/property.cljs index 04cfac0488..b6759021b8 100644 --- a/deps/outliner/src/logseq/outliner/property.cljs +++ b/deps/outliner/src/logseq/outliner/property.cljs @@ -9,7 +9,7 @@ [logseq.db.frontend.db-ident :as db-ident] [logseq.db.frontend.entity-plus :as entity-plus] [logseq.db.frontend.malli-schema :as db-malli-schema] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.build :as db-property-build] [logseq.db.frontend.property.type :as db-property-type] diff --git a/deps/outliner/src/logseq/outliner/tree.cljs b/deps/outliner/src/logseq/outliner/tree.cljs index 67b208b6c2..f32c59163f 100644 --- a/deps/outliner/src/logseq/outliner/tree.cljs +++ b/deps/outliner/src/logseq/outliner/tree.cljs @@ -1,7 +1,7 @@ (ns logseq.outliner.tree "Provides tree fns and INode protocol" (:require [logseq.db :as ldb] - [logseq.db.frontend.property.util :as db-property-util] + [logseq.db.common.property-util :as db-property-util] [datascript.core :as d] [datascript.impl.entity :as de])) diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs index 6480ed9270..f9167960d7 100644 --- a/src/main/frontend/components/property.cljs +++ b/src/main/frontend/components/property.cljs @@ -25,7 +25,7 @@ [frontend.ui :as ui] [frontend.util :as util] [logseq.db :as ldb] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.type :as db-property-type] [logseq.outliner.core :as outliner-core] diff --git a/src/main/frontend/components/property/config.cljs b/src/main/frontend/components/property/config.cljs index 3ac613451a..7bbb57fa65 100644 --- a/src/main/frontend/components/property/config.cljs +++ b/src/main/frontend/components/property/config.cljs @@ -21,7 +21,7 @@ [frontend.util :as util] [goog.dom :as gdom] [logseq.db :as ldb] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.type :as db-property-type] [logseq.outliner.core :as outliner-core] diff --git a/src/main/frontend/handler/property/util.cljs b/src/main/frontend/handler/property/util.cljs index 1a7545ea0a..1b73755ac1 100644 --- a/src/main/frontend/handler/property/util.cljs +++ b/src/main/frontend/handler/property/util.cljs @@ -4,7 +4,7 @@ compatible with file graphs" (:require [frontend.db.conn :as conn] [frontend.state :as state] - [logseq.db.frontend.property.util :as db-property-util])) + [logseq.db.common.property-util :as db-property-util])) (defn lookup "Get the property value by a built-in property's db-ident from block. For file and db graphs" diff --git a/src/main/frontend/handler/whiteboard.cljs b/src/main/frontend/handler/whiteboard.cljs index 30b83c0fdb..11d3355a56 100644 --- a/src/main/frontend/handler/whiteboard.cljs +++ b/src/main/frontend/handler/whiteboard.cljs @@ -19,7 +19,7 @@ [clojure.string :as string] [cljs-bean.core :as bean] [logseq.db.sqlite.util :as sqlite-util] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.outliner.core :as outliner-core])) (defn js->clj-keywordize diff --git a/src/main/frontend/worker/db/migrate.cljs b/src/main/frontend/worker/db/migrate.cljs index c95d1bf23f..21da310fb6 100644 --- a/src/main/frontend/worker/db/migrate.cljs +++ b/src/main/frontend/worker/db/migrate.cljs @@ -15,7 +15,7 @@ [logseq.db :as ldb] [logseq.db.frontend.class :as db-class] [logseq.db.frontend.content :as db-content] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.build :as db-property-build] [logseq.db.frontend.schema :as db-schema] diff --git a/src/main/frontend/worker/db_worker.cljs b/src/main/frontend/worker/db_worker.cljs index 7569c438d9..0e743b325e 100644 --- a/src/main/frontend/worker/db_worker.cljs +++ b/src/main/frontend/worker/db_worker.cljs @@ -32,7 +32,7 @@ [logseq.common.config :as common-config] [logseq.common.util :as common-util] [logseq.db :as ldb] - [logseq.db.frontend.order :as db-order] + [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.sqlite.create-graph :as sqlite-create-graph] diff --git a/src/main/frontend/worker/handler/page/db_based/page.cljs b/src/main/frontend/worker/handler/page/db_based/page.cljs index ef9be62e51..e2018e0f74 100644 --- a/src/main/frontend/worker/handler/page/db_based/page.cljs +++ b/src/main/frontend/worker/handler/page/db_based/page.cljs @@ -10,9 +10,9 @@ [logseq.db.frontend.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.malli-schema :as db-malli-schema] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.frontend.property.build :as db-property-build] - [logseq.db.frontend.property.util :as db-property-util] + [logseq.db.common.property-util :as db-property-util] [logseq.db.sqlite.util :as sqlite-util] [logseq.graph-parser.block :as gp-block] [logseq.graph-parser.text :as text] diff --git a/src/main/frontend/worker/handler/page/file_based/page.cljs b/src/main/frontend/worker/handler/page/file_based/page.cljs index 59d5eb7c7f..3f8d5b4cf3 100644 --- a/src/main/frontend/worker/handler/page/file_based/page.cljs +++ b/src/main/frontend/worker/handler/page/file_based/page.cljs @@ -10,7 +10,7 @@ [logseq.common.util :as common-util] [logseq.common.config :as common-config] [logseq.common.date :as common-date] - [logseq.db.frontend.order :as db-order])) + [logseq.db.common.order :as db-order])) (defn- file-based-properties-block [repo conn config date-formatter properties format page] diff --git a/src/main/frontend/worker/handler/page/file_based/rename.cljs b/src/main/frontend/worker/handler/page/file_based/rename.cljs index e0523c8eee..15b3939c52 100644 --- a/src/main/frontend/worker/handler/page/file_based/rename.cljs +++ b/src/main/frontend/worker/handler/page/file_based/rename.cljs @@ -11,7 +11,7 @@ [logseq.common.config :as common-config] [logseq.graph-parser.text :as text] [logseq.graph-parser.property :as gp-property] - [logseq.db.frontend.order :as db-order])) + [logseq.db.common.order :as db-order])) (defn- replace-page-ref-aux diff --git a/src/main/frontend/worker/rtc/remote_update.cljs b/src/main/frontend/worker/rtc/remote_update.cljs index 230865dd9b..f366410e00 100644 --- a/src/main/frontend/worker/rtc/remote_update.cljs +++ b/src/main/frontend/worker/rtc/remote_update.cljs @@ -18,7 +18,7 @@ [logseq.common.util :as common-util] [logseq.db :as ldb] [logseq.db.frontend.property :as db-property] - [logseq.db.frontend.property.util :as db-property-util] + [logseq.db.common.property-util :as db-property-util] [logseq.graph-parser.whiteboard :as gp-whiteboard] [logseq.outliner.batch-tx :as batch-tx] [logseq.outliner.core :as outliner-core] diff --git a/src/main/logseq/api.cljs b/src/main/logseq/api.cljs index a4b5ad3c38..3980c01ad1 100644 --- a/src/main/logseq/api.cljs +++ b/src/main/logseq/api.cljs @@ -49,7 +49,7 @@ [logseq.common.util :as common-util] [logseq.common.util.date-time :as date-time-util] [logseq.db :as ldb] - [logseq.db.frontend.property.util :as db-property-util] + [logseq.db.common.property-util :as db-property-util] [logseq.outliner.core :as outliner-core] [logseq.sdk.assets :as sdk-assets] [logseq.sdk.core] diff --git a/src/rtc_e2e_test/const.cljs b/src/rtc_e2e_test/const.cljs index c8c4d7b8e3..37aecd33e8 100644 --- a/src/rtc_e2e_test/const.cljs +++ b/src/rtc_e2e_test/const.cljs @@ -1,6 +1,6 @@ (ns const "Consts for rtc e2e tests" - (:require [logseq.db.frontend.order :as db-order])) + (:require [logseq.db.common.order :as db-order])) (assert (exists? js/__karma__)) (def seed js/__karma__.config.seed) diff --git a/src/rtc_e2e_test/helper.cljs b/src/rtc_e2e_test/helper.cljs index 10e725bfd2..afec11063c 100644 --- a/src/rtc_e2e_test/helper.cljs +++ b/src/rtc_e2e_test/helper.cljs @@ -10,7 +10,7 @@ [frontend.worker.rtc.log-and-state :as rtc-log-and-state] [frontend.worker.state :as worker-state] [logseq.db :as ldb] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.outliner.batch-tx :as batch-tx] [meander.epsilon :as me] [missionary.core :as m])) diff --git a/src/test/frontend/test/helper.cljs b/src/test/frontend/test/helper.cljs index e03e767fca..cf7f698b2b 100644 --- a/src/test/frontend/test/helper.cljs +++ b/src/test/frontend/test/helper.cljs @@ -13,7 +13,7 @@ [frontend.state :as state] [frontend.worker.handler.page :as worker-page] [frontend.worker.pipeline :as worker-pipeline] - [logseq.db.frontend.order :as db-order] + [logseq.db.common.order :as db-order] [logseq.db.sqlite.build :as sqlite-build] [logseq.db.sqlite.create-graph :as sqlite-create-graph] [logseq.db.sqlite.util :as sqlite-util]