|
|
@@ -6,32 +6,25 @@
|
|
|
[logseq.db.frontend.class :as db-class]
|
|
|
[logseq.db.frontend.property.util :as db-property-util]
|
|
|
[logseq.common.util :as common-util]
|
|
|
- [datascript.core :as d]
|
|
|
- [logseq.db.frontend.default :as default-db]))
|
|
|
+ [datascript.core :as d]))
|
|
|
|
|
|
(defn- build-initial-properties
|
|
|
[]
|
|
|
- (let [built-in-properties (->>
|
|
|
- (map (fn [[k v]]
|
|
|
- (assert (keyword? k))
|
|
|
- [k v])
|
|
|
- db-property/built-in-properties)
|
|
|
- (into {}))]
|
|
|
- (mapcat
|
|
|
- (fn [[db-ident {:keys [schema original-name closed-values] :as m}]]
|
|
|
- (let [prop-name (or original-name (name (:name m)))
|
|
|
- blocks (if closed-values
|
|
|
- (db-property-util/build-closed-values
|
|
|
- db-ident
|
|
|
- prop-name
|
|
|
- {:db/ident db-ident :block/schema schema :closed-values closed-values}
|
|
|
- {})
|
|
|
- [(sqlite-util/build-new-property
|
|
|
- db-ident
|
|
|
- schema
|
|
|
- {:original-name prop-name})])]
|
|
|
- (update blocks 0 default-db/mark-block-as-built-in)))
|
|
|
- built-in-properties)))
|
|
|
+ (mapcat
|
|
|
+ (fn [[db-ident {:keys [schema original-name closed-values] :as m}]]
|
|
|
+ (let [prop-name (or original-name (name (:name m)))
|
|
|
+ blocks (if closed-values
|
|
|
+ (db-property-util/build-closed-values
|
|
|
+ db-ident
|
|
|
+ prop-name
|
|
|
+ {:db/ident db-ident :block/schema schema :closed-values closed-values}
|
|
|
+ {})
|
|
|
+ [(sqlite-util/build-new-property
|
|
|
+ db-ident
|
|
|
+ schema
|
|
|
+ {:original-name prop-name})])]
|
|
|
+ (update blocks 0 sqlite-util/mark-block-as-built-in)))
|
|
|
+ db-property/built-in-properties))
|
|
|
|
|
|
|
|
|
(defn kv
|
|
|
@@ -65,7 +58,7 @@
|
|
|
:file/content ""
|
|
|
:file/last-modified-at (js/Date.)}]
|
|
|
default-pages (->> (map sqlite-util/build-new-page built-in-pages-names)
|
|
|
- (map default-db/mark-block-as-built-in))
|
|
|
+ (map sqlite-util/mark-block-as-built-in))
|
|
|
default-properties (build-initial-properties)
|
|
|
db-ident->properties (zipmap
|
|
|
(map :db/ident default-properties)
|
|
|
@@ -73,7 +66,7 @@
|
|
|
default-classes (map
|
|
|
(fn [[db-ident {:keys [schema original-name]}]]
|
|
|
(let [original-name' (or original-name (name db-ident))]
|
|
|
- (default-db/mark-block-as-built-in
|
|
|
+ (sqlite-util/mark-block-as-built-in
|
|
|
(sqlite-util/build-new-class
|
|
|
(let [properties (mapv
|
|
|
(fn [db-ident]
|