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

chore: cleanup schema mapping spread across the app

Browse Source 
Now that schema is no longer a persisted concept there is no need
to spread built-in-properties keyword mappings across the app.
Doing so makes built-in-properties more rigid as it would be
needlessly coupled to the frontend, exporter and migrations.
With this cleanup it'll be easy to deprecate :schema from
built-in-properties when we need to
This commit is contained in:
Gabriel Horner
2025-01-21 12:49:49 -05:00
parent 878f0f869b
commit 9ca0ca1523
8 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
deps/graph-parser/src/logseq/graph_parser/exporter.cljs vendored
View File

@@ -370,7 +370,7 @@
(defn- infer-property-schema-and-get-property-change
"Infers a property's schema from the given _user_ property value and adds new ones to
the property-schemas atom. If a property's :type changes, returns a map of
the property-schemas atom. If a property's :logseq.property/type changes, returns a map of
the schema attribute changed and how it changed e.g. `{:type {:from :default :to :url}}`"
[db prop-val prop prop-val-text refs {:keys [property-schemas all-idents]} macros]
;; Explicitly fail an unexpected case rather than cause silent downstream failures
@@ -390,15 +390,15 @@
:else
(db-property-type/infer-property-type-from-value
(macro-util/expand-value-if-macro prop-val macros)))
prev-type (get-in @property-schemas [prop :type])]
prev-type (get-in @property-schemas [prop :logseq.property/type])]
;; Create new property
(when-not (get @property-schemas prop)
(create-property-ident db all-idents prop)
(let [schema (cond-> {:type prop-type}
(let [schema (cond-> {:logseq.property/type prop-type}
(#{:node :date} prop-type)
;; Assume :many for now as detecting that detecting property values across files are consistent
;; isn't possible yet
(assoc :cardinality :many))]
(assoc :db/cardinality :many))]
(swap! property-schemas assoc prop schema)))
(when (and prev-type (not= prev-type prop-type))
{:type {:from prev-type :to prop-type}})))
@@ -555,7 +555,7 @@
;; Change to :node as dates can be pages but pages can't be dates
(= {:from :date :to :node} type-change)
(do
(swap! property-schemas assoc-in [prop :type] :node)
(swap! property-schemas assoc-in [prop :logseq.property/type] :node)
(update-page-or-date-values page-names-to-uuids val))
;; Unlike the other property changes, this one changes all the previous values of a property
@@ -568,9 +568,9 @@
(swap! ignored-properties conj {:property prop :value val :schema (get property-changes prop)})
nil)
(do
(swap! upstream-properties assoc prop {:schema {:type :default}
(swap! upstream-properties assoc prop {:schema {:logseq.property/type :default}
:from-type (:from type-change)})
(swap! property-schemas assoc prop {:type :default})
(swap! property-schemas assoc prop {:logseq.property/type :default})
(get properties-text-values prop)))
:else
@@ -590,7 +590,7 @@
[prop val'])
[prop
(if (set? val)
(if (= :default (:type (get @property-schemas prop)))
(if (= :default (:logseq.property/type (get @property-schemas prop)))
(get properties-text-values prop)
(update-page-or-date-values page-names-to-uuids val))
val)])))
@@ -609,12 +609,11 @@
(let [property-map {:db/ident k
:logseq.property/type built-in-type}]
[property-map v]))
(when (db-property-type/value-ref-property-types (:type (get-schema-fn k)))
(let [schema (get-schema-fn k)
property-map (merge
(when (db-property-type/value-ref-property-types (:logseq.property/type (get-schema-fn k)))
(let [property-map (merge
{:db/ident (get-ident all-idents k)
:original-property-id k}
(sqlite-util/schema->qualified-property-keyword schema))]
(get-schema-fn k))]
[property-map v])))))
(db-property-build/build-property-values-tx-m new-block)))
@@ -1095,11 +1094,9 @@
(fn [[prop {:keys [schema from-type]}]]
(let [prop-ident (get-ident all-idents prop)
upstream-tx
(when (= :default (:type schema))
(when (= :default (:logseq.property/type schema))
(build-upstream-properties-tx-for-default db prop prop-ident from-type block-properties-text-values))
property-pages-tx [(merge
{:db/ident prop-ident}
(sqlite-util/schema->qualified-property-keyword schema))]]
property-pages-tx [(merge {:db/ident prop-ident} schema)]]
;; If we handle cardinality changes we would need to return these separately
;; as property-pages would need to be transacted separately
(concat property-pages-tx upstream-tx)))
@@ -1117,7 +1114,7 @@
:ignored-properties (atom [])
;; Vec of maps with keys :path and :reason
:ignored-files (atom [])
;; Map of property names (keyword) and their current schemas (map).
;; Map of property names (keyword) and their current schemas (map of qualified properties).
;; Used for adding schemas to properties and detecting changes across a property's usage
:property-schemas (atom {})
;; Map of property or class names (keyword) to db-ident keywords