Forráskód Böngészése

Fix commandline publishing not working e.g. bb dev:publishing

Also fix db dep having a circular dependency. frontend.* namespaces depend on deps/ dependencies
so we can't have frontend namespaces in deps/
Gabriel Horner 2 éve
szülő
commit
4e99e21642

+ 1 - 8
deps/db/src/logseq/db/schema.cljs

@@ -1,6 +1,5 @@
 (ns logseq.db.schema
-  "Main db schema for the Logseq app"
-  (:require [frontend.config :as config]))
+  "Main db schema for the Logseq app")
 
 (defonce version 2)
 (defonce ast-version 1)
@@ -110,12 +109,6 @@
    {:property/schema {}
     :property/name {:db/unique :db.unique/identity}}))
 
-(defn get-schema
-  [repo]
-  (if (config/db-based-graph? repo)
-    schema-for-db-based-graph
-    schema))
-
 (def retract-attributes
   #{
     :block/refs

+ 0 - 1
deps/publishing/src/logseq/publishing/db.cljs

@@ -1,7 +1,6 @@
 (ns logseq.publishing.db
   "Provides db fns and associated util fns for publishing"
   (:require [datascript.core :as d]
-            [logseq.db.schema :as db-schema]
             [logseq.db.rules :as rules]
             [clojure.set :as set]
             [clojure.string :as string]))

+ 9 - 1
src/main/frontend/db.cljs

@@ -1,6 +1,7 @@
 (ns frontend.db
   "Main entry ns for db related fns"
   (:require [datascript.core :as d]
+            [frontend.config :as config]
             [frontend.db.conn :as conn]
             [frontend.db.model]
             [frontend.db.query-custom]
@@ -8,7 +9,8 @@
             [frontend.db.react :as react]
             [frontend.db.utils]
             [frontend.namespaces :refer [import-vars]]
-            [logseq.db.default :as default-db]))
+            [logseq.db.default :as default-db]
+            [logseq.db.schema :as db-schema]))
 
 (import-vars
  [frontend.db.conn
@@ -69,3 +71,9 @@
 (defn new-block-id
   []
   (d/squuid))
+
+(defn get-schema
+  [repo]
+  (if (config/db-based-graph? repo)
+    db-schema/schema-for-db-based-graph
+    db-schema/schema))

+ 2 - 1
src/main/frontend/publishing.cljs

@@ -4,6 +4,7 @@
   (:require [frontend.state :as state]
             [datascript.core :as d]
             [frontend.db :as db]
+            [frontend.db.listener :as db-listener]
             [logseq.db.schema :as db-schema]
             [rum.core :as rum]
             [frontend.handler.route :as route-handler]
@@ -99,7 +100,7 @@
   (shortcut/refresh!)
   (events/run!)
   ;; actually, there's no persist for publishing
-  (db/listen-and-persist! (state/get-current-repo))
+  (db-listener/listen-and-persist! (state/get-current-repo))
   (start))
 
 (defn stop []