Просмотр исходного кода

no need to run db-sync tests in build CI

because it's already handled by its own dep ci test
Tienson Qin 1 неделя назад
Родитель
Сommit
54844ff95f

+ 1 - 1
.github/workflows/build.yml

@@ -82,7 +82,7 @@ jobs:
         run: DB_QUERY_TYPE=basic node static/tests.js -r frontend.db.query-dsl-test
 
       - name: Run ClojureScript tests
-        run: node static/tests.js -e fix-me
+        run: yarn cljs:run-test
 
   lint:
     runs-on: ubuntu-22.04

+ 8 - 23
deps/db-sync/src/logseq/db_sync/cycle.cljs

@@ -245,19 +245,6 @@
                               (ancestor? db victim safe))
                        (safe-target-for-block-parent db victim attr bad-v)
                        safe)]
-            (prn :debug
-                 :victim victim
-                 :page-id (:db/id (:block/page (d/entity db victim)))
-                 :attr attr
-                 :safe safe
-                 :bad-v bad-v
-                 :fix-tx (cond
-                           (and safe (not= safe bad-v))
-                           [[:db/retract victim attr bad-v]
-                            [:db/add     victim attr safe]]
-
-                           :else
-                           [[:db/retract victim attr bad-v]]))
             (cond
               (and safe (not= safe bad-v))
               [[:db/retract victim attr bad-v]
@@ -308,17 +295,15 @@
                    (reduce
                     (fn [{:keys [tx seen] :as acc2} e]
                       (if-let [cycle (reachable-cycle db e attr opts)]
-                        (do
-                          (prn :debug :cycle-detected cycle)
-                          (if-let [t (break-cycle-edge! db cycle attr opts touched)]
-                            (let [[_op e2 a2 v2] (first t)
-                                  edge [e2 a2 v2]]
+                        (if-let [t (break-cycle-edge! db cycle attr opts touched)]
+                          (let [[_op e2 a2 v2] (first t)
+                                edge [e2 a2 v2]]
                               ;; Skip if we've already retracted this exact edge.
-                              (if (contains? seen edge)
-                                acc2
-                                {:tx (into tx t)
-                                 :seen (conj seen edge)}))
-                            acc2))
+                            (if (contains? seen edge)
+                              acc2
+                              {:tx (into tx t)
+                               :seen (conj seen edge)}))
+                          acc2)
                         acc2))
                     acc
                     es)))

+ 0 - 1
deps/db-sync/test/logseq/db_sync/cycle_test.cljs

@@ -179,7 +179,6 @@
                                               :logseq.property.class/extends :user.class/A}])
             tx-metas (fix-cycle! conn remote-report nil)]
         (let [b (d/entity @conn :user.class/B)
-              _ (prn :debug :extends (:logseq.property.class/extends b))
               extends (set (map :db/ident (:logseq.property.class/extends b)))]
           (is (not (contains? extends :user.class/A)))
           (is (contains? extends :logseq.class/Root)))

+ 1 - 1
package.json

@@ -95,7 +95,7 @@
         "cljs:release-app": "clojure -M:cljs release app db-worker inference-worker",
         "cljs:release-publishing": "clojure -M:cljs release app publishing",
         "cljs:test": "clojure -M:test compile test",
-        "cljs:run-test": "node static/tests.js",
+        "cljs:run-test": "node static/tests.js -r '^(?!logseq.db-sync.).*' -e fix-me",
         "cljs:test-no-worker": "clojure -M:test compile test-no-worker",
         "cljs:run-test-no-worker": "node static/tests-no-worker.js",
         "cljs:dev-release-app": "clojure -M:cljs release app db-worker inference-worker --config-merge \"{:closure-defines {frontend.config/DEV-RELEASE true}}\"",

+ 1 - 1
src/main/frontend/extensions/zip.cljs

@@ -20,6 +20,6 @@
                   :compression compression}]
     (p/let [zip-blob (.generateAsync zip opts
                                      (when progress-fn
-                                       (fn [metadata]
+                                       (fn [^js metadata]
                                          (progress-fn (.-percent metadata)))))]
       (make-file zip-blob (str zip-filename ".zip") {:type "application/zip"}))))

+ 5 - 5
src/main/frontend/ui.cljs

@@ -945,11 +945,11 @@
                      fade-in? true
                      root-margin 100}}]
    (let [[visible? set-visible!] (rum/use-state initial-state)
-         inViewState (useInView #js {:initialInView initial-state
-                                     :rootMargin (str root-margin "px")
-                                     :triggerOnce trigger-once?
-                                     :onChange (fn [in-view? _entry]
-                                                 (set-visible! in-view?))})
+         ^js inViewState (useInView #js {:initialInView initial-state
+                                         :rootMargin (str root-margin "px")
+                                         :triggerOnce trigger-once?
+                                         :onChange (fn [in-view? _entry]
+                                                     (set-visible! in-view?))})
          ref (.-ref inViewState)]
      (lazy-visible-inner visible? content-fn ref fade-in? placeholder))))