graphlyte 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a541bce9d787c84cbb85652dfaebced77765a79ef1256f016a723d574e389313
-  data.tar.gz: 2b1e62293e73d388bb539fcec90f7f6f1269d843db8cd0410176ff4d90426a82
+  metadata.gz: 25e9370260ac88d2a810c879bf663c4965340c6838e8e19b18f19309d81ffec1
+  data.tar.gz: dc7c5ba7909fb9f4615021e07e819771f66a0d73ba8cc5772928cb896808b2e8
 SHA512:
-  metadata.gz: 2dc601050babce04c958e6bb6f3bfcf84d55962f8164ffbb1452e69105795961e570c247f8af303baee982173c77eebd049027381a86573780408516a059e1ee
-  data.tar.gz: 05d5f0acce7bb921cd721125eb63728c347f136eaf6a552385d53eb537578a341707d454be924e82a9b35d13acf9af77874d5c9731ad0215159401f6407f3873
+  metadata.gz: 77b742ef11daf4270c22e9ede3ae848dfb0d81a6ad4717c7a6a75ffa88ecf9f688630aa1348d7b8092d0096314596ccef9a34d95ef87486f2292481795763669
+  data.tar.gz: 53c19eab7a95e2ee2b4d5f2d9412560035c511c5be12bc8af443cad6f742aea36aa34ffffc5242cc58fe9ab685f0465f1e67344905f5baadd196a4b0552148d2

data/lib/graphlyte/schema/parser.rb

@@ -205,6 +205,7 @@ module Graphlyte
 
       def parse_fragment
         if token = expect(:START_FRAGMENT)
+          parse_args
           builder = Builder.new parse_fields
           fragment = Fragment.new(token[0][1], token[0][2], builder: builder)
           @fragments_dictionary[token[0][1]] = fragment
@@ -300,12 +301,12 @@ module Graphlyte
               @tokens << [:END_FRAGMENT]
               pop_state
               pop_context
-            elsif scanner.check /^\s*\{\s*$/
+            elsif scanner.check /^\s*\{\s*/
               if get_context == :field
                 push_state :field
                 push_context :field
               else
-                scanner.scan /^\s*\{\s*$/
+                scanner.scan /^\s*\{\s*/
                 push_context :field
               end
             else
@@ -327,16 +328,16 @@ module Graphlyte
               handle_field
             end
           when :query
-            if scanner.scan /\}/
+            if scanner.scan /\s*\}\s*/
               @tokens << [:END_QUERY]
               pop_state
               pop_context
-            elsif scanner.check /^\s*\{\s*$/
+            elsif scanner.check /^\s*\{\s*/
               if get_context == :field
                 push_state :field
                 push_context :field
               else
-                scanner.scan /^\s*\{\s*$/
+                scanner.scan /^\s*\{\s*/
                 push_context :field
               end
             else
@@ -397,7 +398,8 @@ module Graphlyte
           scanner.scan /\.{3}(\w+)/
           @tokens << [:FRAGMENT_REF, scanner[1]]
           pop_context
-          pop_state if scanner.check /\s*\}\s*\}/
+          # we need to pop state if we are nested in a field, and not in the query context
+          pop_state if get_context == :field
         elsif scanner.scan /\.{3}(\w+)/
           @tokens << [:FRAGMENT_REF, scanner[1]]
         elsif scanner.scan /\s*(\w+):\s*/
@@ -406,7 +408,8 @@ module Graphlyte
           scanner.scan /\s*(\w+)\s*/
           @tokens << [:FIELD_NAME, scanner[1]]
           pop_context
-          pop_state if scanner.check /\s*\}\s*\}/
+          # we need to pop state if we are nested in a field, and not in the query context
+          pop_state if get_context == :field
         elsif scanner.scan /\s*(\w+)\s*/
           @tokens << [:FIELD_NAME, scanner[1]]
         elsif scanner.scan /^\s*\(/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphlyte
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sean Gregory