Move common uses of page-ref to its own ns

By having a specific ns for page-ref utils, our code is more readable
and intention revealing. Also found that
text/{get-page-name,page-ref-un-brackets!} was getting called in
contexts that didn't make sense e.g. query layer was checking for
markdown and org page-refs
This commit is contained in:
Gabriel Horner
2022-08-01 14:49:27 -04:00
committed by Tienson Qin
parent 8be0deecd0
commit e0b1f6b2de
25 changed files with 201 additions and 145 deletions

View File

@@ -2,17 +2,16 @@
(:require [clojure.string :as string]
[frontend.date :as date]
[frontend.state :as state]
[frontend.util :as util]))
[logseq.graph-parser.util.page-ref :as page-ref]))
(defn- variable-rules
[]
{"today" (util/format "[[%s]]" (date/today))
"yesterday" (util/format "[[%s]]" (date/yesterday))
"tomorrow" (util/format "[[%s]]" (date/tomorrow))
{"today" (page-ref/->page-ref (date/today))
"yesterday" (page-ref/->page-ref (date/yesterday))
"tomorrow" (page-ref/->page-ref (date/tomorrow))
"time" (date/get-current-time)
"current page" (util/format "[[%s]]"
(or (state/get-current-page)
(date/today)))})
"current page" (page-ref/->page-ref (or (state/get-current-page)
(date/today)))})
;; TODO: programmable
;; context information, date, current page
@@ -31,5 +30,5 @@
(let [;; NOTE: This following cannot handle timezones
;; date (tc/to-local-date-time nld)
date (doto (goog.date.DateTime.) (.setTime (.getTime nld)))]
(util/format "[[%s]]" (date/journal-name date)))
(page-ref/->page-ref (date/journal-name date)))
match))))))