Browse Source

fix: remove a few more file-graph fns in db graph only namespaces

Found by configuring separate linter for most of remaining deps
Gabriel Horner 7 tháng trước cách đây
mục cha
commit
3d34224143

+ 2 - 1
deps/outliner/src/logseq/outliner/property.cljs

@@ -9,6 +9,7 @@
             [logseq.db.common.order :as db-order]
             [logseq.db.frontend.db-ident :as db-ident]
             [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.property :as db-property]
             [logseq.db.frontend.property.build :as db-property-build]
@@ -358,7 +359,7 @@
                                               (fn [value]
                                                 (and
                                                  (:logseq.property/created-from-property value)
-                                                 (not (or (ldb/page? value) (ldb/closed-value? value)))
+                                                 (not (or (entity-util/page? value) (ldb/closed-value? value)))
                                                  (empty? (set/difference (set (map :e (d/datoms @conn :avet (:db/ident property) (:db/id value)))) block-id-set))))
                                               entities)
                            ;; Delete property value block if it's no longer used by other blocks

+ 3 - 2
deps/outliner/src/logseq/outliner/validate.cljs

@@ -4,6 +4,7 @@
   (:require [clojure.string :as string]
             [datascript.core :as d]
             [logseq.db :as ldb]
+            [logseq.db.frontend.entity-util :as entity-util]
             [logseq.common.date :as common-date]
             [logseq.common.util.namespace :as ns-util]
             [clojure.set :as set]
@@ -110,13 +111,13 @@
    - Page names are unique for a tag e.g. their can be Apple #Company and Apple #Fruit
    - Page names are unique for a :logseq.property/parent"
   [db new-title entity]
-  (when (ldb/page? entity)
+  (when (entity-util/page? entity)
     (validate-unique-for-page db new-title entity)))
 
 (defn ^:api validate-disallow-page-with-journal-name
   "Validates a non-journal page renamed to journal format"
   [new-title entity]
-  (when (and (ldb/page? entity) (not (ldb/journal? entity))
+  (when (and (entity-util/page? entity) (not (entity-util/journal? entity))
              (common-date/normalize-date new-title nil))
     (throw (ex-info "Page can't be renamed to a journal"
                     {:type :notification

+ 12 - 4
scripts/src/logseq/tasks/dev/db_and_file_graphs.clj

@@ -14,6 +14,7 @@
   "Namespaces or parent namespaces _only_ for DB graphs. Use a '.' at end of a namespace for parent namespaces"
   (mapv escape-shell-regex
         ["logseq.db.sqlite." "logseq.db.frontend."
+         "logseq.outliner.property" "logseq.outliner.validate" "logseq.outliner.cli" "logseq.outliner.db-pipeline"
          "electron.db"
          "frontend.handler.db-based."
          "frontend.worker.handler.page.db-based"
@@ -23,7 +24,8 @@
 (def file-graph-ns
   "Namespaces or parent namespaces _only_ for file graphs"
   (mapv escape-shell-regex
-        ["frontend.handler.file-based" "frontend.handler.file-sync"
+        ["logseq.graph-parser.db" "logseq.graph-parser.property"
+         "frontend.handler.file-based" "frontend.handler.file-sync"
          "frontend.db.file-based"
          "frontend.util.file-based"
          "frontend.common.file-based"
@@ -39,12 +41,16 @@
   "DB graph paths with :block/name"
   ["deps/db/src/logseq/db/frontend"
    "deps/db/src/logseq/db/sqlite"
+   "deps/outliner/src/logseq/outliner/property.cljs"
    "src/main/frontend/worker/handler/page/db_based"])
 
 (def db-graph-paths
   "Paths _only_ for DB graphs"
   (into block-name-db-graph-paths
-        ["src/main/frontend/handler/db_based"
+        ["deps/outliner/src/logseq/outliner/cli.cljs"
+         "deps/outliner/src/logseq/outliner/db_pipeline.cljs"
+         "deps/outliner/src/logseq/outliner/validate.cljs"
+         "src/main/frontend/handler/db_based"
          "src/main/frontend/components/class.cljs"
          "src/main/frontend/components/property.cljs"
          "src/main/frontend/components/property"
@@ -55,7 +61,9 @@
 
 (def file-graph-paths
   "Paths _only_ for file graphs"
-  ["src/main/frontend/handler/file_based" "src/main/frontend/handler/file_sync.cljs" "src/main/frontend/db/file_based"
+  ["deps/graph-parser/src/logseq/graph_parser/db.cljs"
+   "deps/graph-parser/src/logseq/graph_parser/property.cljs"
+   "src/main/frontend/handler/file_based" "src/main/frontend/handler/file_sync.cljs" "src/main/frontend/db/file_based"
    "src/main/frontend/util/file_based" "src/main/frontend/worker/handler/page/file_based" "src/main/frontend/worker/file.cljs"
    "src/main/frontend/common/file_based"
    "src/main/frontend/fs"
@@ -131,7 +139,7 @@
             (System/exit 1))
 
         ;; :block/name isn't used in db graphs except for fns with journal or internal-page
-        block-name-file-concepts #{"block/name" "/page-name-sanity-lc" "db/get-page"}
+        block-name-file-concepts #{"block/name" "/page-name-sanity-lc" "db/get-page "}
         no-block-name-db-graph-paths (set/difference (set db-graph-paths) (set block-name-db-graph-paths))
         block-name-res (grep-many block-name-file-concepts no-block-name-db-graph-paths)
         block-name-invalid-lines (when (= 0 (:exit block-name-res))