Check for data upon navigation to detect nested requirements

wilkerlucio · Feb 7, 2021 · d9a950c · d9a950c
1 parent 791a3bc
commit d9a950c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/src/main/com/wsscode/pathom3/connect/planner.cljc b/src/main/com/wsscode/pathom3/connect/planner.cljc
@@ -1327,7 +1327,9 @@
         (sub-required-input-reachable?* env sub available))
 
       ; there is no node from the graph, but still gonna look in current data
-      (sub-required-input-reachable?* env sub available-sub-data))))
+      (if (contains? available-data attr)
+        (sub-required-input-reachable?* env sub available-sub-data)
+        false))))
 
 (defn required-input-reachable?
   "After running a sub graph for dependencies, the planner checks if all required inputs

diff --git a/src/main/com/wsscode/pathom3/connect/runner.cljc b/src/main/com/wsscode/pathom3/connect/runner.cljc
@@ -364,6 +364,11 @@
                  ::node-resolver-input input-data
                  ::env                 env}})
 
+(defn valid-response? [x]
+  (or (map? x)
+      (nil? x)
+      (refs/kw-identical? x ::node-error)))
+
 (defn invoke-resolver-from-node
   "Evaluates a resolver using node information.
 
@@ -409,6 +414,8 @@
                             (mark-resolver-error-with-plugins env node e)
                             ::node-error))
         finish          (time/now-ms)]
+    (if-not (valid-response? result)
+      (l/warn ::invalid-resolver-response {::pco/op-name op-name :response result}))
     (merge-node-stats! env node
       (cond-> {::resolver-run-finish-ms finish}
         (not (::batch-hold result))

diff --git a/test/com/wsscode/pathom3/connect/planner_test.cljc b/test/com/wsscode/pathom3/connect/planner_test.cljc
@@ -2431,6 +2431,32 @@
                                                        {:users 2, :scores-sum 1},
              :com.wsscode.pathom3.connect.planner/root 2})))
 
+  (testing "self output reference in input"
+    (is (= (compute-run-graph
+             (-> {::eql/query [:b]
+                  ::resolvers '[{::pco/op-name x
+                                 ::pco/input   [{:a [:b]}]
+                                 ::pco/output  [:b]}]}))
+           '#:com.wsscode.pathom3.connect.planner{:nodes                 {},
+                                                  :index-ast             {:b {:type         :prop,
+                                                                              :dispatch-key :b,
+                                                                              :key          :b}},
+                                                  :unreachable-resolvers #{x},
+                                                  :unreachable-paths     {:a {:b {}}, :b {}}}))
+
+    (is (= (compute-run-graph
+             (-> {::eql/query          [:b]
+                  ::pcp/available-data {:a {}}
+                  ::resolvers          '[{::pco/op-name x
+                                          ::pco/input   [{:a [:b]}]
+                                          ::pco/output  [:b]}]}))
+           '#:com.wsscode.pathom3.connect.planner{:nodes                 {},
+                                                  :index-ast             {:b {:type         :prop,
+                                                                              :dispatch-key :b,
+                                                                              :key          :b}},
+                                                  :unreachable-resolvers #{x},
+                                                  :unreachable-paths     {:a {:b {}}, :b {}}})))
+
   (testing "multiple distinct nested details"
     (is (= (compute-run-graph
              (-> {::eql/query [:scores-sum :age-sum]