fix: Restrict sequential selection sets

metosin · Apr 26, 2024 · 0211bc8 · 0211bc8
1 parent 34f8b4f
commit 0211bc8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/src/oksa/parse.cljc b/src/oksa/parse.cljc
@@ -154,11 +154,14 @@
                                 [:? [:schema [:ref ::TypeOpts]]]
                                 [:schema [:ref ::Type]]]
    ::SelectionSet [:orn
-                   [::SelectionSet [:+ [:catn
-                                        [::node [:schema [:ref ::Selection]]]
-                                        [::children [:? [:schema [:ref ::SelectionSet]]]]]]]]
+                   [::SelectionSet [:+ [:alt
+                                        [:catn
+                                         [::node [:schema [:ref ::Selection]]]
+                                         [::children [:? [:schema [:ref ::SelectionSet]]]]]
+                                        [:catn
+                                         [::node [:schema [:ref ::FieldSelection]]]]]]]]
+   ::FieldSelection [:orn [::WrappedField [:schema [:ref ::Field]]]]
    ::Selection [:orn
-                [::WrappedField [:schema [:ref ::Field]]]
                 [::NakedField [:schema [:ref ::NakedField]]]
                 [::FragmentSpread [:schema [:ref ::FragmentSpread]]]
                 [::InlineFragment [:schema [:ref ::InlineFragment]]]]

diff --git a/test/oksa/alpha/api_test.cljc b/test/oksa/alpha/api_test.cljc
@@ -1,6 +1,7 @@
 (ns oksa.alpha.api-test
   (:require [#?(:clj clojure.test
                 :cljs cljs.test) :as t]
+            [oksa.core :as oksa]
             [oksa.alpha.api :as api])
   #?(:clj (:import [graphql.parser Parser])))
 
@@ -98,9 +99,6 @@
              (unparse-and-validate (api/select :bar
                                      (api/select :qux
                                       (api/select :baz))))
-             (unparse-and-validate (api/select (api/field :bar)
-                                     (api/select (api/field :qux)
-                                       (api/select (api/field :baz)))))
              (unparse-and-validate (api/select
                                      (api/field :bar
                                        (api/select
@@ -469,4 +467,10 @@
     (t/is (= "query ($foo:Bar @fooDirective(fooArg:123)){fooField}"
              (unparse-and-validate (api/query (api/opts (api/variable :foo (api/opts (api/directive :fooDirective {:fooArg 123}))
                                                           :Bar))
-                                     (api/select :fooField)))))))
+                                     (api/select :fooField))))))
+  (t/testing "sequential selection sets should throw an exception"
+    (t/is (thrown? #?(:clj Exception :cljs js/Error)
+                   (oksa/gql
+                     (api/select (api/field :foo
+                                            (api/select :qux :baz))
+                                 (api/select :basho)))))))
diff --git a/test/oksa/core_test.cljc b/test/oksa/core_test.cljc
@@ -1,6 +1,7 @@
 (ns oksa.core-test
   (:require [#?(:clj clojure.test
                 :cljs cljs.test) :as t]
+            [oksa.core :as oksa]
             [oksa.test-util :refer [unparse-and-validate]]
             [oksa.alpha.api :as api])
   #?(:clj (:import [graphql.parser Parser])))
@@ -290,7 +291,10 @@
                                     [:fooField]])))
     (t/is (= "query ($foo:Bar @fooDirective(fooArg:123)){fooField}"
              (unparse-and-validate [:oksa/query {:variables [:foo {:directives [[:fooDirective {:arguments {:fooArg 123}}]]} :Bar]}
-                                    [:fooField]])))))
+                                    [:fooField]]))))
+  (t/testing "sequential selection sets should throw an exception"
+    (t/is (thrown? #?(:clj Exception :cljs js/Error)
+                   (oksa/gql [[:foo {} [:qux :baz]] [:basho]])))))
 
 (t/deftest gql-test
   (t/is (= "{foo}\nquery {bar}\nmutation {qux}\nsubscription {baz}\nfragment foo on Foo{bar}\n{foo2}\nquery {bar2}\nmutation {qux2}\nsubscription {baz2}\nfragment foo2 on Foo2{bar2}"