greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move initial namespaces to start outliner dep

pull/10438/head
Gabriel Horner 2023-09-01 17:23:34 -04:00
parent d17c9a21f5
commit b3efb93335
10 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clj-kondo/config.edn
View File

@ -123,6 +123,8 @@
logseq.graph-parser.util.block-ref block-ref
logseq.graph-parser.util.db db-util
logseq.graph-parser.date-time-util date-time-util
logseq.outliner.pipeline outliner-pipeline
logseq.outliner.datascript-report ds-report
medley.core medley
"path" node-path
promesa.core p}}

1
deps.edn
View File

@ -30,6 +30,7 @@
fipp/fipp {:mvn/version "0.6.26"}
logseq/common {:local/root "deps/common"}
logseq/graph-parser {:local/root "deps/graph-parser"}
logseq/outliner {:local/root "deps/outliner"}
logseq/publishing {:local/root "deps/publishing"}
logseq/shui {:local/root "deps/shui"}
metosin/malli {:mvn/version "0.10.0"}

9
deps/outliner/deps.edn vendored Normal file
View File

@ -0,0 +1,9 @@
{:deps
;; External deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn
{datascript/datascript {:mvn/version "1.3.8"}
logseq/db {:local/root "../db"}
com.cognitect/transit-cljs {:mvn/version "0.8.280"}}
:aliases
{:clj-kondo
{:replace-deps {clj-kondo/clj-kondo {:mvn/version "2023.05.26"}}
:main-opts ["-m" "clj-kondo.main"]}}}

4
deps/outliner/nbb.edn vendored Normal file
View File

@ -0,0 +1,4 @@
{:paths ["src"]
:deps
{logseq/db
{:local/root "../db"}}}

2
src/main/frontend/modules/datascript_report/core.cljs → deps/outliner/src/logseq/outliner/datascript_report.cljs vendored
View File

@ -1,4 +1,4 @@
(ns ^:nbb-compatible frontend.modules.datascript-report.core
(ns logseq.outliner.datascript-report
(:require [clojure.set :as set]
[datascript.core :as d]))

4
src/main/frontend/modules/outliner/pipeline_util.cljs → deps/outliner/src/logseq/outliner/pipeline.cljs vendored
View File

@ -1,5 +1,5 @@
(ns ^:nbb-compatible frontend.modules.outliner.pipeline-util
"Util fns for frontend.modules.outliner.pipeline"
(ns logseq.outliner.pipeline
"Core fns for use with frontend.modules.outliner.pipeline"
(:require [logseq.db.schema :as db-schema]
[datascript.core :as d]
[cognitect.transit :as t]))

2
scripts/nbb.edn
View File

@ -2,6 +2,8 @@
:deps
{logseq/graph-parser
{:local/root "../deps/graph-parser"}
logseq/outliner
{:local/root "../deps/outliner"}
logseq/publishing
{:local/root "../deps/publishing"}
logseq/frontend

9
scripts/src/logseq/tasks/db_graph/persist_graph.cljs
View File

@ -7,17 +7,16 @@
[logseq.db.sqlite.db :as sqlite-db]
[logseq.db.sqlite.util :as sqlite-util]
[cljs-bean.core :as bean]
;; TODO: Move these namespaces to more stable deps/ namespaces
[frontend.modules.datascript-report.core :as ds-report]
[frontend.modules.outliner.pipeline-util :as pipeline-util]))
[logseq.outliner.datascript-report :as ds-report]
[logseq.outliner.pipeline :as outliner-pipeline]))
(defn- invoke-hooks
"Modified copy frontend.modules.outliner.pipeline/invoke-hooks that doesn't
handle :block/path-refs recalculation"
[{:keys [db-after] :as tx-report}]
(let [{:keys [blocks]} (ds-report/get-blocks-and-pages tx-report)
deleted-block-uuids (set (pipeline-util/filter-deleted-blocks (:tx-data tx-report)))
upsert-blocks (pipeline-util/build-upsert-blocks blocks deleted-block-uuids db-after)]
deleted-block-uuids (set (outliner-pipeline/filter-deleted-blocks (:tx-data tx-report)))
upsert-blocks (outliner-pipeline/build-upsert-blocks blocks deleted-block-uuids db-after)]
{:blocks upsert-blocks
:deleted-block-uuids deleted-block-uuids}))

8
src/main/frontend/modules/editor/undo_redo.cljs
View File

@ -1,9 +1,7 @@
(ns frontend.modules.editor.undo-redo
(:require [datascript.core :as d]
[frontend.db :as db]
[frontend.db.conn :as conn]
(:require [frontend.db :as db]
[frontend.handler.notification :as notification]
[frontend.modules.datascript-report.core :as db-report]
[logseq.outliner.datascript-report :as ds-report]
[frontend.util.page :as page-util]
[frontend.state :as state]
[clojure.set :as set]
@ -255,7 +253,7 @@
(let [removed-e (pop-undo)
entity (update removed-e :txs concat tx-data)]
(push-undo entity))
(let [updated-blocks (db-report/get-blocks tx-report)
(let [updated-blocks (ds-report/get-blocks tx-report)
entity {:tx-id (get-in tx-report [:tempids :db/current-tx])
:blocks updated-blocks
:txs tx-data

8
src/main/frontend/modules/outliner/pipeline.cljs
View File

@ -5,9 +5,9 @@
[frontend.db :as db]
[frontend.db.model :as db-model]
[frontend.db.react :as react]
[frontend.modules.datascript-report.core :as ds-report]
[frontend.modules.outliner.file :as file]
[frontend.modules.outliner.pipeline-util :as pipeline-util]
[logseq.outliner.datascript-report :as ds-report]
[logseq.outliner.pipeline :as outliner-pipeline]
[frontend.state :as state]
[frontend.util :as util]
[promesa.core :as p]
@ -108,13 +108,13 @@
(assoc tx-report :tx-data (concat (:tx-data tx-report) refs-tx-data')))
tx-report)
importing? (:graph/importing @state/state)
deleted-block-uuids (set (pipeline-util/filter-deleted-blocks (:tx-data tx-report)))]
deleted-block-uuids (set (outliner-pipeline/filter-deleted-blocks (:tx-data tx-report)))]
(when-not importing?
(react/refresh! repo tx-report'))
(when (and (config/db-based-graph? repo) (not (:skip-persist? tx-meta)))
(let [upsert-blocks (pipeline-util/build-upsert-blocks blocks deleted-block-uuids (:db-after tx-report'))]
(let [upsert-blocks (outliner-pipeline/build-upsert-blocks blocks deleted-block-uuids (:db-after tx-report'))]
(p/let [_transact-result (persist-db/<transact-data repo upsert-blocks deleted-block-uuids)
_ipc-result (comment ipc/ipc :db-transact-data repo
(pr-str