From f7815b487d04aa855fd109ea22b488e0b2682feb Mon Sep 17 00:00:00 2001
From: rcmerci <rcmerci@gmail.com>
Date: Sat, 28 Dec 2024 16:39:33 +0800
Subject: [PATCH] fix: nbb test

---
 .carve/ignore                                              | 4 +++-
 deps/db/src/logseq/db/frontend/entity_plus.cljc            | 7 +++++--
 src/main/frontend/background_tasks.cljs                    | 2 +-
 .../src/logseq => src/main/frontend}/common/missionary.clj | 2 +-
 .../logseq => src/main/frontend}/common/missionary.cljs    | 4 ++--
 src/main/frontend/components/header.cljs                   | 2 +-
 src/main/frontend/components/rtc/indicator.cljs            | 2 +-
 src/main/frontend/db/rtc/debug_ui.cljs                     | 2 +-
 src/main/frontend/extensions/fsrs.cljs                     | 2 +-
 src/main/frontend/handler/assets.cljs                      | 2 +-
 src/main/frontend/handler/db_based/rtc.cljs                | 2 +-
 src/main/frontend/handler/db_based/rtc_flows.cljs          | 2 +-
 src/main/frontend/handler/user.cljs                        | 2 +-
 src/main/frontend/worker/device.cljs                       | 2 +-
 src/main/frontend/worker/rtc/asset.cljs                    | 2 +-
 src/main/frontend/worker/rtc/client.cljs                   | 2 +-
 src/main/frontend/worker/rtc/client_op.cljs                | 2 +-
 src/main/frontend/worker/rtc/core.cljs                     | 2 +-
 .../frontend/worker/rtc/full_upload_download_graph.cljs    | 2 +-
 src/main/frontend/worker/rtc/log_and_state.cljs            | 2 +-
 src/main/frontend/worker/rtc/ws.cljs                       | 2 +-
 src/rtc_e2e_test/client_steps.cljs                         | 2 +-
 src/rtc_e2e_test/fixture.cljs                              | 2 +-
 src/rtc_e2e_test/helper.cljs                               | 2 +-
 src/test/frontend/db/db_based_model_test.cljs              | 2 +-
 25 files changed, 32 insertions(+), 27 deletions(-)
 rename {deps/common/src/logseq => src/main/frontend}/common/missionary.clj (86%)
 rename {deps/common/src/logseq => src/main/frontend}/common/missionary.cljs (98%)

diff --git a/.carve/ignore b/.carve/ignore
index 5caa352980..0fd5871b83 100644
--- a/.carve/ignore
+++ b/.carve/ignore
@@ -85,4 +85,6 @@ frontend.worker.rtc.hash/hash-blocks
 ;; Repl fn
 frontend.rum/use-atom-in
 ;; missionary utils
-frontend.common.missionary-util/<!
+frontend.common.missionary/<!
+;; only used in deps/common
+frontend.common.missionary/background-task-running?
\ No newline at end of file
diff --git a/deps/db/src/logseq/db/frontend/entity_plus.cljc b/deps/db/src/logseq/db/frontend/entity_plus.cljc
index 2a40011bbd..11de2bea08 100644
--- a/deps/db/src/logseq/db/frontend/entity_plus.cljc
+++ b/deps/db/src/logseq/db/frontend/entity_plus.cljc
@@ -10,7 +10,6 @@
             [datascript.core :as d]
             [datascript.impl.entity :as entity :refer [Entity]]
             [logseq.common.util.date-time :as date-time-util]
-            [logseq.common.missionary :as c.m]
             [logseq.db.frontend.entity-util :as entity-util]
             [logseq.db.frontend.property :as db-property]))
 
@@ -48,7 +47,11 @@
   (vreset! *seen-immutable-entities {}))
 
 (def ^:private *reset-cache-background-task-running?
-  (delay (c.m/background-task-running? :logseq.db.frontend.entity-plus/reset-immutable-entities-cache!)))
+  ;; missionary is not compatible with nbb, so enitity-memoized is disabled in nbb
+  (delay
+    #?(:org.babashka/nbb false
+       :cljs ((resolve 'frontend.common.missionary/background-task-running?)
+              :logseq.db.frontend.entity-plus/reset-immutable-entities-cache!))))
 
 (defn entity-memoized
   [db eid]
diff --git a/src/main/frontend/background_tasks.cljs b/src/main/frontend/background_tasks.cljs
index 723496e6d4..743c0cd11b 100644
--- a/src/main/frontend/background_tasks.cljs
+++ b/src/main/frontend/background_tasks.cljs
@@ -1,7 +1,7 @@
 (ns frontend.background-tasks
   "Some background tasks"
   (:require [frontend.flows :as flows]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db.frontend.entity-plus :as entity-plus]
             [missionary.core :as m]))
 
diff --git a/deps/common/src/logseq/common/missionary.clj b/src/main/frontend/common/missionary.clj
similarity index 86%
rename from deps/common/src/logseq/common/missionary.clj
rename to src/main/frontend/common/missionary.clj
index cd13a8e2a3..5b9bcb2de1 100644
--- a/deps/common/src/logseq/common/missionary.clj
+++ b/src/main/frontend/common/missionary.clj
@@ -1,4 +1,4 @@
-(ns logseq.common.missionary
+(ns frontend.common.missionary
   "Macros for missionary"
   (:require [missionary.core :as m]))
 
diff --git a/deps/common/src/logseq/common/missionary.cljs b/src/main/frontend/common/missionary.cljs
similarity index 98%
rename from deps/common/src/logseq/common/missionary.cljs
rename to src/main/frontend/common/missionary.cljs
index ff329bc0eb..850910f219 100644
--- a/deps/common/src/logseq/common/missionary.cljs
+++ b/src/main/frontend/common/missionary.cljs
@@ -1,6 +1,6 @@
-(ns logseq.common.missionary
+(ns frontend.common.missionary
   "Utils based on missionary. Used by frontend and worker namespaces"
-  (:require-macros [logseq.common.missionary])
+  (:require-macros [frontend.common.missionary])
   (:require [cljs.core.async.impl.channels]
             [clojure.core.async :as a]
             [missionary.core :as m]
diff --git a/src/main/frontend/components/header.cljs b/src/main/frontend/components/header.cljs
index 37c59695a7..c16b2129e8 100644
--- a/src/main/frontend/components/header.cljs
+++ b/src/main/frontend/components/header.cljs
@@ -28,7 +28,7 @@
             [frontend.ui :as ui]
             [frontend.util :as util]
             [frontend.version :refer [version]]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db :as ldb]
             [logseq.shui.ui :as shui]
             [logseq.shui.util :as shui-util]
diff --git a/src/main/frontend/components/rtc/indicator.cljs b/src/main/frontend/components/rtc/indicator.cljs
index 21993a0ef3..e3617f7546 100644
--- a/src/main/frontend/components/rtc/indicator.cljs
+++ b/src/main/frontend/components/rtc/indicator.cljs
@@ -7,7 +7,7 @@
             [frontend.state :as state]
             [frontend.ui :as ui]
             [frontend.util :as util]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.shui.ui :as shui]
             [missionary.core :as m]
             [rum.core :as rum]))
diff --git a/src/main/frontend/db/rtc/debug_ui.cljs b/src/main/frontend/db/rtc/debug_ui.cljs
index 449a3b0fcd..1b503af1a1 100644
--- a/src/main/frontend/db/rtc/debug_ui.cljs
+++ b/src/main/frontend/db/rtc/debug_ui.cljs
@@ -8,7 +8,7 @@
             [frontend.state :as state]
             [frontend.ui :as ui]
             [frontend.util :as util]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db :as ldb]
             [logseq.shui.ui :as shui]
             [missionary.core :as m]
diff --git a/src/main/frontend/extensions/fsrs.cljs b/src/main/frontend/extensions/fsrs.cljs
index a5a1f0ef19..d06ef9c1c9 100644
--- a/src/main/frontend/extensions/fsrs.cljs
+++ b/src/main/frontend/extensions/fsrs.cljs
@@ -16,7 +16,7 @@
             [frontend.state :as state]
             [frontend.ui :as ui]
             [frontend.util :as util]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db :as ldb]
             [logseq.db.frontend.entity-plus :as entity-plus]
             [logseq.shui.ui :as shui]
diff --git a/src/main/frontend/handler/assets.cljs b/src/main/frontend/handler/assets.cljs
index 2985df58e0..ca9d90b0a8 100644
--- a/src/main/frontend/handler/assets.cljs
+++ b/src/main/frontend/handler/assets.cljs
@@ -8,7 +8,7 @@
             [frontend.state :as state]
             [frontend.util :as util]
             [logseq.common.config :as common-config]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.common.path :as path]
             [logseq.common.util :as common-util]
             [medley.core :as medley]
diff --git a/src/main/frontend/handler/db_based/rtc.cljs b/src/main/frontend/handler/db_based/rtc.cljs
index 2d71a9de84..eab7f6f144 100644
--- a/src/main/frontend/handler/db_based/rtc.cljs
+++ b/src/main/frontend/handler/db_based/rtc.cljs
@@ -7,7 +7,7 @@
             [frontend.handler.notification :as notification]
             [frontend.handler.user :as user-handler]
             [frontend.state :as state]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.common.util :as common-util]
             [logseq.db :as ldb]
             [logseq.db.sqlite.common-db :as sqlite-common-db]
diff --git a/src/main/frontend/handler/db_based/rtc_flows.cljs b/src/main/frontend/handler/db_based/rtc_flows.cljs
index 76456f4c3b..3319de83ae 100644
--- a/src/main/frontend/handler/db_based/rtc_flows.cljs
+++ b/src/main/frontend/handler/db_based/rtc_flows.cljs
@@ -1,7 +1,7 @@
 (ns frontend.handler.db-based.rtc-flows
   "Flows related to RTC"
   (:require [frontend.state :as state]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.common.util :as common-util]
             [missionary.core :as m]))
 
diff --git a/src/main/frontend/handler/user.cljs b/src/main/frontend/handler/user.cljs
index a916e52232..56e97f66c7 100644
--- a/src/main/frontend/handler/user.cljs
+++ b/src/main/frontend/handler/user.cljs
@@ -6,7 +6,7 @@
             [cljs-time.core :as t]
             [cljs.core.async :as async :refer [<! go]]
             [clojure.string :as string]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [frontend.config :as config]
             [frontend.debug :as debug]
             [frontend.handler.config :as config-handler]
diff --git a/src/main/frontend/worker/device.cljs b/src/main/frontend/worker/device.cljs
index 2f36c0591f..742a92f162 100644
--- a/src/main/frontend/worker/device.cljs
+++ b/src/main/frontend/worker/device.cljs
@@ -9,7 +9,7 @@
             [frontend.worker.rtc.ws-util :as ws-util]
             [frontend.worker.state :as worker-state]
             [goog.crypt.base64 :as base64]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db :as ldb]
             [missionary.core :as m]
             [promesa.core :as p]))
diff --git a/src/main/frontend/worker/rtc/asset.cljs b/src/main/frontend/worker/rtc/asset.cljs
index eedfbd519f..d721048306 100644
--- a/src/main/frontend/worker/rtc/asset.cljs
+++ b/src/main/frontend/worker/rtc/asset.cljs
@@ -11,7 +11,7 @@
             [frontend.worker.rtc.log-and-state :as rtc-log-and-state]
             [frontend.worker.rtc.ws-util :as ws-util]
             [frontend.worker.state :as worker-state]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.common.path :as path]
             [logseq.db :as ldb]
             [malli.core :as ma]
diff --git a/src/main/frontend/worker/rtc/client.cljs b/src/main/frontend/worker/rtc/client.cljs
index 41f9889df4..550ada9330 100644
--- a/src/main/frontend/worker/rtc/client.cljs
+++ b/src/main/frontend/worker/rtc/client.cljs
@@ -10,7 +10,7 @@
             [frontend.worker.rtc.skeleton :as r.skeleton]
             [frontend.worker.rtc.ws :as ws]
             [frontend.worker.rtc.ws-util :as ws-util]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [missionary.core :as m]))
 
 (defn- register-graph-updates
diff --git a/src/main/frontend/worker/rtc/client_op.cljs b/src/main/frontend/worker/rtc/client_op.cljs
index dcc9276b37..0ce929e2d7 100644
--- a/src/main/frontend/worker/rtc/client_op.cljs
+++ b/src/main/frontend/worker/rtc/client_op.cljs
@@ -3,7 +3,7 @@
   (:require [datascript.core :as d]
             [frontend.worker.rtc.const :as rtc-const]
             [frontend.worker.state :as worker-state]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db.sqlite.util :as sqlite-util]
             [malli.core :as ma]
             [malli.transform :as mt]
diff --git a/src/main/frontend/worker/rtc/core.cljs b/src/main/frontend/worker/rtc/core.cljs
index 2f580dfa88..28cf3c9fd3 100644
--- a/src/main/frontend/worker/rtc/core.cljs
+++ b/src/main/frontend/worker/rtc/core.cljs
@@ -16,7 +16,7 @@
             [frontend.worker.state :as worker-state]
             [frontend.worker.util :as worker-util]
             [logseq.common.config :as common-config]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db :as ldb]
             [malli.core :as ma]
             [missionary.core :as m])
diff --git a/src/main/frontend/worker/rtc/full_upload_download_graph.cljs b/src/main/frontend/worker/rtc/full_upload_download_graph.cljs
index 6a2f501164..3dfc08aab9 100644
--- a/src/main/frontend/worker/rtc/full_upload_download_graph.cljs
+++ b/src/main/frontend/worker/rtc/full_upload_download_graph.cljs
@@ -12,7 +12,7 @@
             [frontend.worker.rtc.ws-util :as ws-util]
             [frontend.worker.state :as worker-state]
             [frontend.worker.util :as worker-util]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db :as ldb]
             [logseq.db.frontend.malli-schema :as db-malli-schema]
             [logseq.db.frontend.schema :as db-schema]
diff --git a/src/main/frontend/worker/rtc/log_and_state.cljs b/src/main/frontend/worker/rtc/log_and_state.cljs
index 61cd2835a0..c185ef6d18 100644
--- a/src/main/frontend/worker/rtc/log_and_state.cljs
+++ b/src/main/frontend/worker/rtc/log_and_state.cljs
@@ -2,7 +2,7 @@
   "Fns to generate rtc related logs"
   (:require [frontend.common.schema-register :as sr]
             [frontend.worker.util :as worker-util]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [malli.core :as ma]
             [missionary.core :as m]))
 
diff --git a/src/main/frontend/worker/rtc/ws.cljs b/src/main/frontend/worker/rtc/ws.cljs
index 7657620c91..bcb5d2c48b 100644
--- a/src/main/frontend/worker/rtc/ws.cljs
+++ b/src/main/frontend/worker/rtc/ws.cljs
@@ -5,7 +5,7 @@
   (:require [cljs-http-missionary.client :as http]
             [frontend.worker.rtc.const :as rtc-const]
             [frontend.worker.rtc.exception :as r.ex]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [missionary.core :as m]))
 
 (defn- get-state
diff --git a/src/rtc_e2e_test/client_steps.cljs b/src/rtc_e2e_test/client_steps.cljs
index 7331fcf3c6..d9d3062311 100644
--- a/src/rtc_e2e_test/client_steps.cljs
+++ b/src/rtc_e2e_test/client_steps.cljs
@@ -5,7 +5,7 @@
             [frontend.worker.rtc.client-op :as client-op]
             [frontend.worker.rtc.core :as rtc-core]
             [helper]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db :as ldb]
             [missionary.core :as m]))
 
diff --git a/src/rtc_e2e_test/fixture.cljs b/src/rtc_e2e_test/fixture.cljs
index bf823058af..8179c908db 100644
--- a/src/rtc_e2e_test/fixture.cljs
+++ b/src/rtc_e2e_test/fixture.cljs
@@ -7,7 +7,7 @@
             [frontend.worker.rtc.db-listener]
             [frontend.worker.state :as worker-state]
             [helper]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [missionary.core :as m]))
 
 (def install-some-consts
diff --git a/src/rtc_e2e_test/helper.cljs b/src/rtc_e2e_test/helper.cljs
index 080a207902..1127ed0ca5 100644
--- a/src/rtc_e2e_test/helper.cljs
+++ b/src/rtc_e2e_test/helper.cljs
@@ -7,7 +7,7 @@
             [frontend.worker.rtc.core :as rtc.core]
             [frontend.worker.rtc.log-and-state :as rtc-log-and-state]
             [frontend.worker.state :as worker-state]
-            [logseq.common.missionary :as c.m]
+            [frontend.common.missionary :as c.m]
             [logseq.db :as ldb]
             [logseq.db.frontend.order :as db-order]
             [logseq.outliner.batch-tx :as batch-tx]
diff --git a/src/test/frontend/db/db_based_model_test.cljs b/src/test/frontend/db/db_based_model_test.cljs
index 03d9350c9b..e66a7301f0 100644
--- a/src/test/frontend/db/db_based_model_test.cljs
+++ b/src/test/frontend/db/db_based_model_test.cljs
@@ -23,7 +23,7 @@
 
 (use-fixtures :each start-and-destroy-db)
 
-(deftest ^:xxx get-all-classes-test
+(deftest get-all-classes-test
   (let [opts {:redirect? false :create-first-block? false :class? true}
         _ (test-helper/create-page! "class1" opts)
         _ (test-helper/create-page! "class2" opts)]