clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-19 18:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): normalize block content tree

Browse Source
This commit is contained in:
Tienson Qin
2026-05-18 19:37:39 +08:00
parent e9d66de128
commit 4cdb14ef8f
2 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/logseq/cli/command/add.cljs
View File

@@ -155,6 +155,19 @@
block)))
blocks))
(defn- normalize-block-content-keys
[blocks]
(mapv (fn normalize-block-content-key [block]
(let [content (:block/content block)
block (cond-> (dissoc block :block/content)
(and (contains? block :block/content)
(not (contains? block :block/title)))
(assoc :block/title content))]
(if (seq (:block/children block))
(update block :block/children normalize-block-content-keys)
block)))
blocks))
(defn- normalize-created-ids
[ids]
(->> ids
@@ -1151,15 +1164,16 @@
[action config]
(-> (p/let [cfg (cli-server/ensure-server! config (:repo action))
target-block-uuid (resolve-add-target cfg action)
ref-values (collect-page-refs (:blocks action))
action-blocks (normalize-block-content-keys (:blocks action))
ref-values (collect-page-refs action-blocks)
{:keys [uuid-refs page-refs id-refs]} (partition-ref-values ref-values)
_ (ensure-block-refs-exist! cfg (:repo action) uuid-refs)
page-refs' (or (resolve-page-ref-entities cfg (:repo action) page-refs) [])
id-refs' (or (resolve-id-ref-entities cfg (:repo action) id-refs) [])
refs (into page-refs' id-refs')
blocks (if (seq refs)
(normalize-block-title-refs (:blocks action) refs)
(:blocks action))
(normalize-block-title-refs action-blocks refs)
action-blocks)
blocks-for-insert (flatten-block-tree blocks)
status (:status action)
tags (if (contains? action :resolved-tags)

67
src/test/logseq/cli/command/upsert_test.cljs
View File

@@ -240,6 +240,72 @@
(is false (str "unexpected error: " e))))
(p/finally done)))))
(deftest test-execute-upsert-block-create-normalizes-content-block-tree
(async done
(let [page-uuid (random-uuid)
parent-uuid (random-uuid)
child-uuid (random-uuid)
inserted-blocks* (atom nil)
action {:type :upsert-block
:mode :create
:repo "demo-repo"
:graph "demo-graph"
:target-page-name "TestPage"
:blocks [{:block/content "Parent"
:block/uuid parent-uuid
:block/children [{:block/content "Child"
:block/uuid child-uuid}]}]
:pos "last-child"}]
(-> (p/with-redefs [cli-server/ensure-server! (fn [config _repo]
(p/resolved (assoc config :base-url "http://example")))
transport/invoke (fn [_ method args]
(case method
:thread-api/q
(p/resolved [{:db/id 10
:block/uuid page-uuid
:block/name "testpage"
:block/title "TestPage"}])
:thread-api/apply-outliner-ops
(let [[_ ops _] args
blocks (get-in ops [0 1 0])]
(reset! inserted-blocks* blocks)
(if (every? (fn [block]
(and (:block/title block)
(not (contains? block :block/content))))
blocks)
(p/resolved {:tx-data blocks})
(p/rejected (ex-info "DB write failed with invalid data"
{:code :exception}))))
:thread-api/pull
(let [[_ _ lookup] args]
(p/resolved
(cond
(= lookup [:block/uuid parent-uuid])
{:db/id 101 :block/uuid parent-uuid}
(= lookup [:block/uuid child-uuid])
{:db/id 102 :block/uuid child-uuid}
:else {})))
(throw (ex-info "unexpected invoke"
{:method method
:args args}))))]
(p/let [result (upsert-command/execute-upsert-block action {})]
(is (= :ok (:status result)))
(is (= [101 102] (get-in result [:data :result])))
(is (= [{:block/title "Parent"
:block/uuid parent-uuid}
{:block/title "Child"
:block/uuid child-uuid
:block/parent [:block/uuid parent-uuid]}]
@inserted-blocks*))))
(p/catch (fn [e]
(is false (str "unexpected error: " e))))
(p/finally done)))))
(deftest test-build-task-action-validation
(testing "upsert task requires target selector or content/page"
(let [result (upsert-command/build-task-action {} "logseq_db_demo")]
@@ -708,4 +774,3 @@
(is false (str "unexpected error: " e))))
(p/finally done)))))