feat: signal flow control via :gx/after

kepler16 · Jun 9, 2022 · a799018 · a799018 · vercel · Jun 9, 2022
1 parent 9ad2e27
commit a799018
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/k16/gx/beta/core.cljc b/src/k16/gx/beta/core.cljc
@@ -147,7 +147,7 @@
         def? (and (map? signal-def)
                   (some #{:gx/props :gx/props-fn
                           :gx/processor :gx/deps
-                          :gx/resolved-props}
+                          :gx/resolved-props :gx/after}
                         (keys signal-def)))
         with-pushed-down-form
         (if def?
@@ -326,7 +326,10 @@
 (defn graph-dependencies [graph signal-key]
   (->> graph
        (map (fn [[k node]]
-              (let [deps (-> node signal-key :gx/deps)]
+              (let [deps (-> node
+                             signal-key
+                             :gx/deps
+                             (concat (or (:gx/after node) [])))]
                 [k (into #{} deps)])))
        (into {})))
 

diff --git a/src/k16/gx/beta/schema.cljc b/src/k16/gx/beta/schema.cljc
@@ -40,6 +40,7 @@
    [:gx/props-schema {:optional true} any?]
    [:gx/resolved-props-fn {:optional true} [:maybe fn?]]
    [:gx/deps {:optional true} coll?]
+   [:gx/after {:optional true} set?]
    [:gx/resolved-props {:optional true} [:maybe any?]]])
 
 (def ?NormalizedNodeDefinition

diff --git a/test/k16/gx/beta/core_test.cljc b/test/k16/gx/beta/core_test.cljc
@@ -443,3 +443,24 @@
                  :failures
                  first
                  (update :internal-data dissoc :component-schema)))))))
+
+(def server-component
+  {:gx/start {:gx/processor (fn [_] :http-server)}
+   :gx/stop {:gx/processor (fn [_] nil)}})
+
+(def logger-component
+  {:gx/start {:gx/processor (fn [_] :logger)}
+   :gx/stop {:gx/processor (fn [_] nil)}})
+
+(deftest signal-flow-dependency-test
+  (let [graph {:logger {:gx/component 'k16.gx.beta.core-test/logger-component}
+               :options {:port 8080}
+               :other {:gx/after #{:server}}
+               :server {:gx/component 'k16.gx.beta.core-test/server-component
+                        :gx/props '(gx/ref :options)
+                        :gx/after #{:logger}}}
+        norm (gx/normalize {:graph graph})]
+    (is (= '(:server :other :options :logger)
+           (second (gx/topo-sort norm :gx/stop))))
+    (is (= '(:logger :options :other :server)
+           (second (gx/topo-sort norm :gx/start))))))