fix: selector could cause circular dependency error

kepler16 · Jun 10, 2022 · 663bd59 · 663bd59 · vercel · Jun 10, 2022
1 parent e15dd90
commit 663bd59
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/src/k16/gx/beta/core.cljc b/src/k16/gx/beta/core.cljc
@@ -320,15 +320,26 @@
    (with-err-ctx {:error-type :deps-sort :signal-key signal-key}
      (try
        (if-let [signal-config (get-in context [:signals signal-key])]
-         (let [deps-from (or (:deps-from signal-config)
-                             signal-key)
-               graph-deps (->> deps-from
-                               (graph-dependencies graph)
-                               (map (fn [[k deps :as signal-deps]]
-                                      (if (contains? priority-selector k)
-                                        signal-deps
-                                        [k (into deps priority-selector)])))
-                               (into {}))
+         (let [deps-from (or (:deps-from signal-config) signal-key)
+               selector-deps (reduce (fn [acc k]
+                                       (->> [k deps-from :gx/deps]
+                                            (get-in graph)
+                                            (set)
+                                            (assoc acc k)))
+                                     {} priority-selector)
+               graph-deps
+               (->> deps-from
+                    (graph-dependencies graph)
+                    (map (fn [[k deps :as signal-deps]]
+                           (let [node-selector
+                                 (->> selector-deps
+                                      (filter (fn [[_ d]] (not (contains? d k))))
+                                      (map first)
+                                      (set))]
+                             (if (contains? node-selector k)
+                               signal-deps
+                               [k (into deps node-selector)]))))
+                    (into {}))
                sorted-raw (impl/sccs graph-deps)]
            (when-let [errors (->> sorted-raw
                                   (impl/dependency-errors graph-deps)

diff --git a/test/k16/gx/beta/core_test.cljc b/test/k16/gx/beta/core_test.cljc
@@ -465,8 +465,10 @@
 
 (deftest signal-selector-test
   (let [flow (atom [])
-        graph {:logger {:gx/component 'k16.gx.beta.core-test/logger-component
-                        :gx/props {:flow flow}}
+        graph {:logger-config {:foo "bar"}
+               :logger {:gx/component 'k16.gx.beta.core-test/logger-component
+                        :gx/props {:flow flow
+                                   :config '(gx/ref :logger-config)}}
                :options {:port 8080}
                :db {:gx/component 'k16.gx.beta.core-test/db-component
                     :gx/props {:flow flow}}
@@ -475,6 +477,7 @@
                                    :flow flow}}}
         norm (gx/normalize {:graph graph})
         gx-started (gx/signal norm :gx/start #{:logger})]
+    (is (= nil (:failures norm)))
     #?@(:clj [@gx-started
               (is (= [:logger :db :server] @flow))
               (reset! flow [])