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

fix(cli): --update-{tags|properties} can't distinguish

Browse Source 
between tags/properties with same name. Same bug as
0809a53e79
This commit is contained in:
Gabriel Horner
2026-04-01 09:51:16 -04:00
parent 0e834140c0
commit f9edbb0874
3 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,32 @@
(transport/invoke config :thread-api/pull false
[repo [:db/id :block/uuid :block/name :block/title] [:block/name page-name-lc]]))))))
(defn pull-tag-by-name
"Look up a tag by name, constrained to entities tagged with :logseq.class/Tag."
[config repo tag-name selector]
(p/let [result (transport/invoke config :thread-api/q false
[repo
[{:find [[(list 'pull '?e selector) '...]]
:in '[$ ?name]
:where '[[?e :block/name ?name]
[?e :block/tags ?t]
[?t :db/ident :logseq.class/Tag]]}
(common-util/page-name-sanity-lc tag-name)]])]
(first result)))
(defn pull-property-by-name
"Look up a property by name, constrained to entities tagged with :logseq.class/Property."
[config repo property-name selector]
(p/let [result (transport/invoke config :thread-api/q false
[repo
[{:find [[(list 'pull '?e selector) '...]]
:in '[$ ?name]
:where '[[?e :block/name ?name]
[?e :block/tags ?t]
[?t :db/ident :logseq.class/Property]]}
(common-util/page-name-sanity-lc property-name)]])]
(first result)))
(def ^:private add-positions
#{"first-child" "last-child" "sibling"})
@@ -626,19 +652,18 @@
(uuid? tag) [:block/uuid tag]
(and (string? tag) (common-util/uuid-string? (string/trim tag))) [:block/uuid (uuid (string/trim tag))]
(keyword? tag) [:db/ident tag]
(string? tag) [:block/name (common-util/page-name-sanity-lc tag)]
:else nil))
(defn- resolve-tag-entity
[config repo tag]
(let [lookup (tag-lookup-ref tag)]
(when-not lookup
(throw (ex-info "invalid tag value" {:code :invalid-tag :tag tag})))
(p/let [entity (pull-entity config repo
[:db/id :block/name :block/title :block/uuid
{:block/tags [:db/ident]}
:logseq.property/public? :logseq.property/built-in?]
lookup)]
(let [tag-selector [:db/id :block/name :block/title :block/uuid
{:block/tags [:db/ident]}
:logseq.property/public? :logseq.property/built-in?]]
(p/let [entity (if (string? tag)
(pull-tag-by-name config repo tag tag-selector)
(let [lookup (or (tag-lookup-ref tag)
(throw (ex-info "invalid tag value" {:code :invalid-tag :tag tag})))]
(pull-entity config repo tag-selector lookup)))]
(cond
(nil? (:db/id entity))
(throw (ex-info (str "tag not found: " (pr-str tag)) {:code :tag-not-found :tag tag}))
@@ -761,8 +786,7 @@
(defn- lookup-property-entity
[config repo property-key]
(let [lookup-by-title (fn [title]
(pull-entity config repo property-entity-selector
[:block/name (common-util/page-name-sanity-lc title)]))]
(pull-property-by-name config repo title property-entity-selector))]
(cond
(number? property-key)
(pull-entity config repo property-entity-selector property-key)

25
src/main/logseq/cli/command/upsert.cljs
View File

@@ -345,29 +345,8 @@
(transport/invoke config :thread-api/pull false
[repo selector [:block/name (common-util/page-name-sanity-lc page-name)]]))
(defn- pull-tag-by-name
[config repo tag-name selector]
(p/let [result (transport/invoke config :thread-api/q false
[repo
[{:find [[(list 'pull '?e selector) '...]]
:in '[$ ?name]
:where '[[?e :block/name ?name]
[?e :block/tags ?t]
[?t :db/ident :logseq.class/Tag]]}
(common-util/page-name-sanity-lc tag-name)]])]
(first result)))
(defn- pull-property-by-name
[config repo property-name selector]
(p/let [result (transport/invoke config :thread-api/q false
[repo
[{:find [[(list 'pull '?e selector) '...]]
:in '[$ ?name]
:where '[[?e :block/name ?name]
[?e :block/tags ?t]
[?t :db/ident :logseq.class/Property]]}
(common-util/page-name-sanity-lc property-name)]])]
(first result)))
(def ^:private pull-tag-by-name add-command/pull-tag-by-name)
(def ^:private pull-property-by-name add-command/pull-property-by-name)
(defn- ensure-property-identifiers-exist!
[config repo property-idents]

41
src/test/logseq/cli/command/add_test.cljs
View File

@@ -48,19 +48,34 @@
(is (= [uuid-b] (-> error ex-data :missing-uuids))))))
(def ^:private mock-transport-invoke
(fn [_ _ _ args]
(let [[_ _ lookup] args]
(p/resolved
(cond
(= lookup [:block/name "plainpage"])
{:db/id 42 :block/name "plainpage" :block/title "PlainPage"
:block/tags [{:db/ident :logseq.class/Page}]}
(fn [_ method _ args]
(case method
;; pull-tag-by-name uses :thread-api/q
:thread-api/q
(let [[_ [_ name-arg]] args]
(p/resolved
(cond
(= name-arg "realtag")
[{:db/id 99 :block/name "realtag" :block/title "RealTag"
:block/tags [{:db/ident :logseq.class/Tag}]}]
:else [])))
(= lookup [:block/name "realtag"])
{:db/id 99 :block/name "realtag" :block/title "RealTag"
:block/tags [{:db/ident :logseq.class/Tag}]}
;; pull-entity uses :thread-api/pull
:thread-api/pull
(let [[_ _ lookup] args]
(p/resolved
(cond
(= lookup [:block/name "plainpage"])
{:db/id 42 :block/name "plainpage" :block/title "PlainPage"
:block/tags [{:db/ident :logseq.class/Page}]}
:else {})))))
(= lookup [:block/name "realtag"])
{:db/id 99 :block/name "realtag" :block/title "RealTag"
:block/tags [{:db/ident :logseq.class/Tag}]}
:else {})))
(p/rejected (ex-info "unexpected method" {:method method :args args})))))
(deftest test-resolve-tags-accepts-valid-tag
(async done
@@ -76,7 +91,9 @@
(-> (add-command/resolve-tags {} "demo" ["PlainPage"])
(p/then (fn [_] (is false "expected error for non-tag page")))
(p/catch (fn [e]
(is (= :not-a-tag (-> e ex-data :code)))
;; String lookup uses pull-tag-by-name which only finds tags,
;; so a non-tag page results in :tag-not-found
(is (= :tag-not-found (-> e ex-data :code)))
(is (string/includes? (ex-message e) "PlainPage"))))))
(p/catch (fn [e] (is false (str "unexpected error: " e))))
(p/finally done))))