Przeglądaj źródła

fix extra exported property for graph

and add import option to diff script
Gabriel Horner 7 miesięcy temu
rodzic
commit
c215617a0f

+ 1 - 1
deps/db/script/create_graph.cljs

@@ -4,12 +4,12 @@
   (:require ["fs" :as fs]
             ["os" :as os]
             ["path" :as node-path]
-            #_:clj-kondo/ignore
             [babashka.cli :as cli]
             [clojure.edn :as edn]
             [clojure.string :as string]
             [datascript.core :as d]
             [logseq.db.sqlite.export :as sqlite-export]
+            #_:clj-kondo/ignore
             [logseq.outliner.cli :as outliner-cli]
             [nbb.classpath :as cp]
             [nbb.core :as nbb]

+ 3 - 1
deps/db/script/diff_graphs.cljs

@@ -28,6 +28,8 @@
    :exclude-namespaces {:alias :e
                         :coerce #{}
                         :desc "Namespaces to exclude from properties and classes"}
+   :ignore-built-ins? {:alias :i
+                       :desc "Ignore built-in pages"}
    :include-timestamps? {:alias :t
                          :desc "Include timestamps in export"}})
 
@@ -40,7 +42,7 @@
             (js/process.exit 1))
         conn (apply sqlite-cli/open-db! (get-dir-and-db-name graph-dir))
         conn2 (apply sqlite-cli/open-db! (get-dir-and-db-name graph-dir2))
-        export-options (select-keys options [:include-timestamps? :exclude-namespaces])
+        export-options (select-keys options [:include-timestamps? :exclude-namespaces :ignore-built-ins?])
         export-map (sqlite-export/build-export @conn {:export-type :graph :graph-options export-options})
         export-map2 (sqlite-export/build-export @conn2 {:export-type :graph :graph-options export-options})
         prepare-export-to-diff

+ 3 - 1
deps/db/src/logseq/db/sqlite/export.cljs

@@ -490,7 +490,9 @@
                       (vector (:db/ident ent)
                               (cond-> (build-export-class ent options)
                                 (seq ent-properties)
-                                (assoc :build/properties (buildable-properties db ent-properties properties options)))))))
+                                (assoc :build/properties
+                                       (-> (buildable-properties db ent-properties properties options)
+                                           (dissoc :logseq.property.class/properties))))))))
              (into {}))]
     (cond-> {}
       (seq properties)