From eabee3fe1c21bba6ee8d158aa0f4af08324e4e76 Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Wed, 9 Jul 2025 13:26:12 -0400 Subject: [PATCH] chore: mv db only fns to db ns Also add related names to linter --- deps/db/src/logseq/db.cljs | 8 ++------ deps/db/src/logseq/db/common/initial_data.cljs | 10 ++-------- deps/db/src/logseq/db/frontend/db.cljs | 12 ++++++++++++ scripts/src/logseq/tasks/dev/db_and_file_graphs.clj | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/deps/db/src/logseq/db.cljs b/deps/db/src/logseq/db.cljs index a90180c029..a67c275ab5 100644 --- a/deps/db/src/logseq/db.cljs +++ b/deps/db/src/logseq/db.cljs @@ -7,7 +7,6 @@ [clojure.walk :as walk] [datascript.core :as d] [datascript.impl.entity :as de] - [logseq.common.config :as common-config] [logseq.common.util :as common-util] [logseq.common.uuid :as common-uuid] [logseq.db.common.delete-blocks :as delete-blocks] ;; Load entity extensions @@ -262,12 +261,9 @@ (d/entity db [:block/uuid id]) (d/entity db (get-first-page-by-name db (name page-id-name-or-uuid))))))) -(def get-built-in-page common-initial-data/get-built-in-page) +(def get-built-in-page db-db/get-built-in-page) -(defn library? - [page] - (and (built-in? page) - (= common-config/library-page-name (:block/title page)))) +(def library? db-db/library?) (defn get-case-page "Case sensitive version of get-page. For use with DB graphs" diff --git a/deps/db/src/logseq/db/common/initial_data.cljs b/deps/db/src/logseq/db/common/initial_data.cljs index 33ad1789d5..ab5b29869f 100644 --- a/deps/db/src/logseq/db/common/initial_data.cljs +++ b/deps/db/src/logseq/db/common/initial_data.cljs @@ -6,11 +6,11 @@ [logseq.common.config :as common-config] [logseq.common.util :as common-util] [logseq.common.util.date-time :as date-time-util] - [logseq.common.uuid :as common-uuid] [logseq.db.common.entity-plus :as entity-plus] [logseq.db.common.entity-util :as common-entity-util] [logseq.db.common.order :as db-order] [logseq.db.frontend.class :as db-class] + [logseq.db.frontend.db :as db-db] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.rules :as rules])) @@ -330,12 +330,6 @@ (d/datoms db :eavt (:e d))) (d/datoms db :avet :logseq.property.user/email)))) -(defn get-built-in-page - [db title] - (when db - (let [id (common-uuid/gen-uuid :builtin-block-uuid title)] - (d/entity db [:block/uuid id])))) - (defn get-initial-data "Returns current database schema and initial data. NOTE: This fn is called by DB and file graphs" @@ -363,7 +357,7 @@ user-datoms (get-all-user-datoms db) pages-datoms (if db-graph? (let [contents-id (get-first-page-by-title db "Contents") - capture-page-id (:db/id (get-built-in-page db common-config/quick-add-page-name)) + capture-page-id (:db/id (db-db/get-built-in-page db common-config/quick-add-page-name)) views-id (get-first-page-by-title db common-config/views-page-name)] (mapcat #(d/datoms db :eavt %) (remove nil? [contents-id capture-page-id views-id]))) diff --git a/deps/db/src/logseq/db/frontend/db.cljs b/deps/db/src/logseq/db/frontend/db.cljs index c4aafa45b1..f72bfb0971 100644 --- a/deps/db/src/logseq/db/frontend/db.cljs +++ b/deps/db/src/logseq/db/frontend/db.cljs @@ -6,6 +6,7 @@ [logseq.common.config :as common-config] [logseq.common.util.namespace :as ns-util] [logseq.common.util.page-ref :as page-ref] + [logseq.common.uuid :as common-uuid] [logseq.db.frontend.class :as db-class] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.property :as db-property])) @@ -120,3 +121,14 @@ :logseq.class/Math-block :math :logseq.class/Quote-block :quote nil)) + +(defn get-built-in-page + [db title] + (when db + (let [id (common-uuid/gen-uuid :builtin-block-uuid title)] + (d/entity db [:block/uuid id])))) + +(defn library? + [page] + (and (entity-util/built-in? page) + (= common-config/library-page-name (:block/title page)))) \ No newline at end of file diff --git a/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj b/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj index 66392dd297..f80055e130 100644 --- a/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj +++ b/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj @@ -173,7 +173,7 @@ (let [db-concepts ;; from logseq.db.frontend.schema ["closed-value" "class/properties" "classes" "property/parent" - "logseq.property" "logseq.class" "db-based"] + "logseq.property" "logseq.class" "db-based" "library" "quick-add"] res (grep-many db-concepts file-graph-paths)] (when-not (and (= 1 (:exit res)) (= "" (:out res))) (println "The following files should not have contained db specific concepts:")