clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-29 16:36:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/var-sizes-linter

Browse Source
This commit is contained in:
Gabriel Horner
2022-02-08 12:02:39 -05:00
parent a3ff4442e8 165a563f96
commit c6d03b67ab
72 changed files with 4617 additions and 4814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/frontend/db/query_dsl.cljs
View File

@@ -141,6 +141,31 @@
l)
@vars))
;; TODO: Convert -> fns to rules
(defn ->property-query
([k v]
(->property-query k v '?v))
([k v sym]
[['?b :block/properties '?prop]
[(list 'missing? '$ '?b :block/name)]
[(list 'get '?prop (keyword k)) sym]
(list
'or
[(list '= sym v)]
[(list 'contains? sym v)]
;; For integer pages that aren't strings
[(list 'contains? sym (str v))])]))
(defn ->page-property-query
[k v]
[['?p :block/name]
['?p :block/properties '?prop]
[(list 'get '?prop (keyword k)) '?v]
(list
'or
[(list '= '?v v)]
[(list 'contains? '?v v)])])
(defn ^:large-vars/cleanup-todo build-query
([repo e env]
(build-query repo e (assoc env :vars (atom {})) 0))
@@ -269,13 +294,7 @@
sym (if (= current-filter 'or)
'?v
(uniq-symbol counter "?v"))]
[['?b :block/properties '?prop]
[(list 'missing? '$ '?b :block/name)]
[(list 'get '?prop (keyword k)) sym]
(list
'or
[(list '= sym v)]
[(list 'contains? sym v)])])
(->property-query k v sym))
(and (= 'property fe)
(= 2 (count e)))
@@ -346,15 +365,8 @@
k (string/replace (name k) "_" "-")]
(if-not (nil? v)
(let [v (text/parse-property k v)
v (if (coll? v) (first v) v)
sym '?v]
[['?p :block/name]
['?p :block/properties '?prop]
[(list 'get '?prop (keyword k)) sym]
(list
'or
[(list '= sym v)]
[(list 'contains? sym v)])])
v (if (coll? v) (first v) v)]
(->page-property-query k v))
[['?p :block/name]
['?p :block/properties '?prop]
[(list 'get '?prop (keyword k)) '?prop-v]