fix: tests

deps/db-sync/deps.edn

@@ -11,8 +11,7 @@
   com.lambdaisland/glogi                {:git/url "https://github.com/lambdaisland/glogi"
                                          :git/sha "30328a045141717aadbbb693465aed55f0904976"}
   logseq/common                         {:local/root "../common"}
-  logseq/db                             {:local/root "../db"}
-  logseq/outliner                       {:local/root "../outliner"}}
+  logseq/db                             {:local/root "../db"}}
  :aliases
  {:cljs {:extra-deps {org.clojure/tools.namespace      {:mvn/version "0.2.11"}
                       cider/cider-nrepl                {:mvn/version "0.55.1"}

deps/db-sync/src/logseq/db_sync/cycle.cljs

@@ -161,8 +161,8 @@
 
   Preference:
   1) touched by local rebase (prefer remote value)
-  2) untouched by remote/local (keep remote value)
-  3) touched by remote
+  2) touched by remote (detach the remote-changed edge)
+  3) untouched by remote/local
   4) first node"
   [cycle {:keys [local-touched remote-touched]}]
   (let [nodes (vec (distinct (butlast cycle)))
@@ -170,8 +170,8 @@
         remote? (fn [e] (contains? (or remote-touched #{}) e))
         untouched? (fn [e] (and (not (local? e)) (not (remote? e))))]
     (or (some (fn [e] (when (local? e) e)) nodes)
-        (some (fn [e] (when (untouched? e) e)) nodes)
         (some (fn [e] (when (remote? e) e)) nodes)
+        (some (fn [e] (when (untouched? e) e)) nodes)
         (first nodes))))
 
 (defn- break-cycle-edge!

deps/db-sync/src/logseq/db_sync/worker.cljs

@@ -1,7 +1,6 @@
 (ns logseq.db-sync.worker
   (:require ["cloudflare:workers" :refer [DurableObject]]
             [clojure.string :as string]
-            [datascript.core :as d]
             [lambdaisland.glogi :as log]
             [lambdaisland.glogi.console :as glogi-console]
             [logseq.common.authorization :as authorization]

deps/db-sync/test/logseq/db_sync/worker_test.cljs

@@ -23,7 +23,7 @@
                         :block/parent [:block/uuid parent]
                         :block/order order-b}])
     (let [tx [[:db/add [:block/uuid block-b] :block/order order-a]]
-          _ (sync-order/fix-duplicate-orders! @conn tx {})
+          _ (sync-order/fix-duplicate-orders! conn tx {})
           order-a' (:block/order (d/entity @conn [:block/uuid block-a]))
           order-b' (:block/order (d/entity @conn [:block/uuid block-b]))]
       (is (= order-a order-a'))