graphql 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e39609ec3ac4ee1756f3dcbd618785468f05d895
-  data.tar.gz: 96aac564a69c22795a299ea4430b1bb95542a788
+  metadata.gz: 3686533835888eeb91ed91024ede7ea3f2937d5c
+  data.tar.gz: 767760791707ac1722002fc7e8b6b182686abeaa
 SHA512:
-  metadata.gz: 4ad5ecccde050131fe70cb6a33d6fdc1acb574a8e13e63af82da209313388f53fc042627f0ca32c00999e35fb227b0e1fd7068f69d7209ed5c2b20beb45a19cf
-  data.tar.gz: 8cecd7002d9067f04e5ac6a7381aab405d6e2acd9df5baf45976b994e49615e1fe9d94585df62e9728c7d8c8788ac7b408a40273308221f56e11af315816d74c
+  metadata.gz: 514195ebd2aff35a181e013af868e78af66fa0ca5cceaafe318c92d30d200241f9531cd630d6c36155dd521cab3cf1f7a4b8fee600dc6bbbd8c8f6430d3dd47f
+  data.tar.gz: 3f5018af47c4e5225eb5f2c00ba8e4a1335e0ac56723908bb7bf8feffde7e567d7ac51f8eca8153249ec56a377b94ac257754694533727537b9d22403a3f12d9

data/lib/graphql/define/assign_argument.rb

@@ -2,18 +2,16 @@ module GraphQL
   module Define
     # Turn argument configs into a {GraphQL::Argument}.
     module AssignArgument
-      def self.call(target, name, type, description = nil, default_value: nil, &block)
+      def self.call(target, name, type = nil, description = nil, default_value: nil, &block)
         argument = if block_given?
           GraphQL::Argument.define(&block)
         else
           GraphQL::Argument.new
         end
         argument.name = name.to_s
-        argument.type = type
-
+        type && argument.type = type
         description && argument.description = description
-        # check nil because false is a valid value
-        default_value != nil && argument.default_value = default_value
+        !default_value.nil? && argument.default_value = default_value
 
         target.arguments[name.to_s] = argument
       end

data/lib/graphql/field.rb

@@ -90,9 +90,7 @@ module GraphQL
     #
     # This is important because {#name} may be used by {#resolve}.
     def name=(new_name)
-      if !new_name.is_a?(String)
-        raise ArgumentError.new("GraphQL field names must be strings; cannot use #{new_name.inspect} (#{new_name.class.name}) as a field name.") unless new_name.is_a?(String)
-      elsif @name.nil?
+      if @name.nil?
         @name = new_name
       else
         raise("Can't rename an already-named field. (Tried to rename \"#{@name}\" to \"#{new_name}\".) If you're passing a field with the `field:` argument, make sure it's an unused instance of GraphQL::Field.")

data/lib/graphql/input_object_type.rb

@@ -9,7 +9,10 @@ module GraphQL
   #   end
   #
   class InputObjectType < GraphQL::BaseType
-    accepts_definitions input_field: GraphQL::Define::AssignArgument
+    accepts_definitions(
+      input_field: GraphQL::Define::AssignArgument,
+      argument: GraphQL::Define::AssignArgument
+    )
 
     # @return [Hash<String, GraphQL::Argument>] Map String argument names to their {GraphQL::Argument} implementations
     attr_accessor :arguments

data/lib/graphql/language.rb

@@ -1,3 +1,4 @@
+require "graphql/language/generation"
 require "graphql/language/lexer"
 require "graphql/language/nodes"
 require "graphql/language/parser"

data/lib/graphql/language/generation.rb

@@ -0,0 +1,94 @@
+module GraphQL
+  module Language
+    module Generation
+      def self.generate(node, indent: "")
+        case node
+        when Nodes::Document
+          node.definitions.map { |d| generate(d) }.join("\n")
+        when Nodes::Argument
+          "#{node.name}: #{generate(node.value)}"
+        when Nodes::Directive
+          "@#{node.name}(#{node.arguments.map { |a| generate(a) }.join(", ")})"
+        when Nodes::Enum
+          "#{node.name}"
+        when Nodes::Field
+          out = "#{indent}"
+          out << "#{node.alias}: " if node.alias
+          out << "#{node.name}"
+          out << "(#{node.arguments.map { |a| generate(a) }.join(", ")})" if node.arguments.any?
+          out << generate_directives(node.directives)
+          out << generate_selections(node.selections, indent: indent)
+          out
+        when Nodes::FragmentDefinition
+          out = "#{indent}fragment #{node.name}"
+          out << " on #{node.type}" if node.type
+          out << generate_directives(node.directives)
+          out << generate_selections(node.selections, indent: indent)
+          out
+
+        when Nodes::FragmentSpread
+          out = "#{indent}... #{node.name}"
+          out << generate_directives(node.directives)
+          out
+        when Nodes::InlineFragment
+          out = "#{indent}..."
+          out << " on #{node.type}" if node.type
+          out << generate_directives(node.directives)
+          out << generate_selections(node.selections, indent: indent)
+          out
+        when Nodes::InputObject
+          generate(node.to_h)
+        when Nodes::ListType
+          "[#{generate(node.of_type)}]"
+        when Nodes::NonNullType
+          "#{generate(node.of_type)}!"
+        when Nodes::OperationDefinition
+          out = "#{indent}#{node.operation_type}"
+          out << " #{node.name}" if node.name
+          out << "(#{node.variables.map { |v| generate(v) }.join(", ")})" if node.variables.any?
+          out << generate_directives(node.directives)
+          out << generate_selections(node.selections, indent: indent)
+          out
+        when Nodes::TypeName
+          "#{node.name}"
+        when Nodes::VariableDefinition
+          out = "$#{node.name}: #{generate(node.type)}"
+          out << " = #{generate(node.default_value)}" if node.default_value
+          out
+        when Nodes::VariableIdentifier
+          "$#{node.name}"
+        when Nodes::AbstractNode
+          node.to_query_string(indent: indent)
+        when FalseClass, Float, Integer, NilClass, String, TrueClass
+          JSON.generate(node, quirks_mode: true)
+        when Array
+          "[#{node.map { |v| generate(v) }.join(", ")}]"
+        when Hash
+          "{#{node.map { |k, v| "#{k}: #{generate(v)}" }.join(", ")}}"
+        else
+          raise TypeError
+        end
+      end
+
+      def self.generate_directives(directives)
+        if directives.any?
+          directives.map { |d| " #{generate(d)}" }.join
+        else
+          ""
+        end
+      end
+
+      def self.generate_selections(selections, indent: "")
+        if selections.any?
+          out = " {\n"
+          selections.each do |selection|
+            out << generate(selection, indent: indent + "  ") << "\n"
+          end
+          out << "#{indent}}"
+        else
+          ""
+        end
+      end
+    end
+  end
+end

data/lib/graphql/language/lexer.rb

@@ -1,7 +1,7 @@
 
 # line 1 "lib/graphql/language/lexer.rl"
 
-# line 65 "lib/graphql/language/lexer.rl"
+# line 72 "lib/graphql/language/lexer.rl"
 
 
 
@@ -29,16 +29,17 @@ class << self
 	private :_graphql_lexer_actions, :_graphql_lexer_actions=
 end
 self._graphql_lexer_actions = [
-	0, 1, 2, 1, 12, 1, 13, 1, 
-	14, 1, 15, 1, 16, 1, 17, 1, 
-	18, 1, 19, 1, 20, 1, 21, 1, 
-	22, 1, 23, 1, 24, 1, 25, 1, 
-	26, 1, 27, 1, 28, 1, 29, 1, 
-	30, 1, 31, 1, 32, 1, 33, 2, 
-	0, 1, 2, 3, 4, 2, 3, 5, 
-	2, 3, 6, 2, 3, 7, 2, 3, 
-	8, 2, 3, 9, 2, 3, 10, 2, 
-	3, 11
+	0, 1, 0, 1, 1, 1, 2, 1, 
+	13, 1, 14, 1, 15, 1, 16, 1, 
+	17, 1, 18, 1, 19, 1, 20, 1, 
+	21, 1, 22, 1, 23, 1, 24, 1, 
+	25, 1, 26, 1, 27, 1, 28, 1, 
+	29, 1, 30, 1, 31, 1, 32, 1, 
+	33, 1, 34, 1, 35, 1, 36, 2, 
+	2, 3, 2, 2, 4, 2, 2, 5, 
+	2, 2, 6, 2, 2, 7, 2, 2, 
+	8, 2, 2, 9, 2, 2, 10, 2, 
+	2, 11, 2, 2, 12
 ]
 
 class << self
@@ -46,10 +47,11 @@ class << self
 	private :_graphql_lexer_key_offsets, :_graphql_lexer_key_offsets=
 end
 self._graphql_lexer_key_offsets = [
-	0, 0, 2, 4, 7, 9, 11, 15, 
-	16, 17, 48, 51, 53, 55, 62, 64, 
-	70, 77, 84, 93, 101, 109, 117, 125, 
-	133, 141, 149, 157, 165, 173, 181, 189
+	0, 2, 4, 6, 8, 12, 13, 45, 
+	48, 50, 52, 55, 62, 64, 70, 77, 
+	78, 85, 94, 102, 110, 118, 126, 134, 
+	142, 150, 158, 166, 174, 182, 190, 198, 
+	206, 214
 ]
 
 class << self
@@ -57,31 +59,34 @@ class << self
 	private :_graphql_lexer_trans_keys, :_graphql_lexer_trans_keys=
 end
 self._graphql_lexer_trans_keys = [
-	34, 92, 34, 92, 48, 49, 57, 48, 
-	57, 48, 57, 43, 45, 48, 57, 46, 
-	46, 9, 10, 13, 32, 33, 34, 35, 
-	36, 40, 41, 44, 45, 46, 48, 58, 
-	61, 64, 91, 93, 95, 102, 111, 116, 
-	123, 125, 49, 57, 65, 90, 97, 122, 
-	9, 32, 44, 34, 92, 10, 13, 43, 
+	34, 92, 34, 92, 48, 57, 48, 57, 
+	43, 45, 48, 57, 46, 9, 10, 13, 
+	32, 33, 34, 35, 36, 40, 41, 44, 
+	45, 46, 48, 58, 61, 64, 91, 93, 
+	95, 102, 110, 111, 116, 123, 125, 49, 
+	57, 65, 90, 97, 122, 9, 32, 44, 
+	34, 92, 10, 13, 48, 49, 57, 43, 
 	45, 46, 69, 101, 48, 57, 48, 57, 
 	43, 45, 69, 101, 48, 57, 43, 45, 
-	46, 69, 101, 48, 57, 95, 48, 57, 
-	65, 90, 97, 122, 95, 97, 114, 48, 
-	57, 65, 90, 98, 122, 95, 108, 48, 
-	57, 65, 90, 97, 122, 95, 115, 48, 
-	57, 65, 90, 97, 122, 95, 101, 48, 
-	57, 65, 90, 97, 122, 95, 97, 48, 
-	57, 65, 90, 98, 122, 95, 103, 48, 
-	57, 65, 90, 97, 122, 95, 109, 48, 
-	57, 65, 90, 97, 122, 95, 101, 48, 
-	57, 65, 90, 97, 122, 95, 110, 48, 
-	57, 65, 90, 97, 122, 95, 116, 48, 
-	57, 65, 90, 97, 122, 95, 110, 48, 
-	57, 65, 90, 97, 122, 95, 114, 48, 
-	57, 65, 90, 97, 122, 95, 117, 48, 
-	57, 65, 90, 97, 122, 95, 101, 48, 
-	57, 65, 90, 97, 122, 0
+	46, 69, 101, 48, 57, 46, 95, 48, 
+	57, 65, 90, 97, 122, 95, 97, 114, 
+	48, 57, 65, 90, 98, 122, 95, 108, 
+	48, 57, 65, 90, 97, 122, 95, 115, 
+	48, 57, 65, 90, 97, 122, 95, 101, 
+	48, 57, 65, 90, 97, 122, 95, 97, 
+	48, 57, 65, 90, 98, 122, 95, 103, 
+	48, 57, 65, 90, 97, 122, 95, 109, 
+	48, 57, 65, 90, 97, 122, 95, 101, 
+	48, 57, 65, 90, 97, 122, 95, 110, 
+	48, 57, 65, 90, 97, 122, 95, 116, 
+	48, 57, 65, 90, 97, 122, 95, 117, 
+	48, 57, 65, 90, 97, 122, 95, 108, 
+	48, 57, 65, 90, 97, 122, 95, 108, 
+	48, 57, 65, 90, 97, 122, 95, 110, 
+	48, 57, 65, 90, 97, 122, 95, 114, 
+	48, 57, 65, 90, 97, 122, 95, 117, 
+	48, 57, 65, 90, 97, 122, 95, 101, 
+	48, 57, 65, 90, 97, 122, 0
 ]
 
 class << self
@@ -89,10 +94,11 @@ class << self
 	private :_graphql_lexer_single_lengths, :_graphql_lexer_single_lengths=
 end
 self._graphql_lexer_single_lengths = [
-	0, 2, 2, 1, 0, 0, 2, 1, 
-	1, 25, 3, 2, 2, 5, 0, 4, 
-	5, 1, 3, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2
+	2, 2, 0, 0, 2, 1, 26, 3, 
+	2, 2, 1, 5, 0, 4, 5, 1, 
+	1, 3, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2
 ]
 
 class << self
@@ -100,10 +106,11 @@ class << self
 	private :_graphql_lexer_range_lengths, :_graphql_lexer_range_lengths=
 end
 self._graphql_lexer_range_lengths = [
-	0, 0, 0, 1, 1, 1, 1, 0, 
-	0, 3, 0, 0, 0, 1, 1, 1, 
-	1, 3, 3, 3, 3, 3, 3, 3, 
-	3, 3, 3, 3, 3, 3, 3, 3
+	0, 0, 1, 1, 1, 0, 3, 0, 
+	0, 0, 1, 1, 1, 1, 1, 0, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3
 ]
 
 class << self
@@ -111,10 +118,11 @@ class << self
 	private :_graphql_lexer_index_offsets, :_graphql_lexer_index_offsets=
 end
 self._graphql_lexer_index_offsets = [
-	0, 0, 3, 6, 9, 11, 13, 17, 
-	19, 21, 50, 54, 57, 60, 67, 69, 
-	75, 82, 87, 94, 100, 106, 112, 118, 
-	124, 130, 136, 142, 148, 154, 160, 166
+	0, 3, 6, 8, 10, 14, 16, 46, 
+	50, 53, 56, 59, 66, 68, 74, 81, 
+	83, 88, 95, 101, 107, 113, 119, 125, 
+	131, 137, 143, 149, 155, 161, 167, 173, 
+	179, 185
 ]
 
 class << self
@@ -122,28 +130,30 @@ class << self
 	private :_graphql_lexer_indicies, :_graphql_lexer_indicies=
 end
 self._graphql_lexer_indicies = [
-	2, 3, 1, 4, 3, 1, 5, 7, 
-	6, 8, 0, 10, 9, 11, 11, 8, 
-	0, 12, 6, 13, 6, 14, 15, 15, 
-	14, 16, 1, 17, 18, 19, 20, 14, 
-	21, 22, 5, 23, 24, 25, 27, 28, 
-	26, 29, 30, 31, 32, 33, 7, 26, 
-	26, 6, 14, 14, 14, 34, 2, 3, 
-	1, 36, 36, 17, 11, 11, 38, 39, 
-	39, 8, 37, 8, 40, 11, 11, 39, 
-	39, 10, 40, 11, 11, 38, 39, 39, 
-	7, 37, 26, 26, 26, 26, 0, 26, 
-	42, 43, 26, 26, 26, 41, 26, 44, 
-	26, 26, 26, 41, 26, 45, 26, 26, 
-	26, 41, 26, 46, 26, 26, 26, 41, 
-	26, 47, 26, 26, 26, 41, 26, 48, 
-	26, 26, 26, 41, 26, 49, 26, 26, 
-	26, 41, 26, 50, 26, 26, 26, 41, 
-	26, 51, 26, 26, 26, 41, 26, 52, 
-	26, 26, 26, 41, 26, 53, 26, 26, 
-	26, 41, 26, 54, 26, 26, 26, 41, 
-	26, 55, 26, 26, 26, 41, 26, 56, 
-	26, 26, 26, 41, 0
+	2, 3, 1, 4, 3, 1, 5, 0, 
+	7, 6, 8, 8, 5, 0, 10, 9, 
+	12, 13, 13, 12, 14, 15, 16, 17, 
+	18, 19, 12, 20, 21, 22, 24, 25, 
+	26, 28, 29, 27, 30, 31, 32, 33, 
+	34, 35, 23, 27, 27, 11, 12, 12, 
+	12, 36, 2, 3, 1, 37, 37, 16, 
+	22, 23, 38, 8, 8, 40, 41, 41, 
+	5, 39, 5, 42, 8, 8, 41, 41, 
+	7, 42, 8, 8, 40, 41, 41, 23, 
+	39, 43, 38, 27, 27, 27, 27, 0, 
+	27, 45, 46, 27, 27, 27, 44, 27, 
+	47, 27, 27, 27, 44, 27, 48, 27, 
+	27, 27, 44, 27, 49, 27, 27, 27, 
+	44, 27, 50, 27, 27, 27, 44, 27, 
+	51, 27, 27, 27, 44, 27, 52, 27, 
+	27, 27, 44, 27, 53, 27, 27, 27, 
+	44, 27, 54, 27, 27, 27, 44, 27, 
+	55, 27, 27, 27, 44, 27, 56, 27, 
+	27, 27, 44, 27, 57, 27, 27, 27, 
+	44, 27, 58, 27, 27, 27, 44, 27, 
+	59, 27, 27, 27, 44, 27, 60, 27, 
+	27, 27, 44, 27, 61, 27, 27, 27, 
+	44, 27, 62, 27, 27, 27, 44, 0
 ]
 
 class << self
@@ -151,14 +161,14 @@ class << self
 	private :_graphql_lexer_trans_targs, :_graphql_lexer_trans_targs=
 end
 self._graphql_lexer_trans_targs = [
-	9, 1, 9, 2, 11, 13, 0, 16, 
-	14, 9, 15, 4, 8, 9, 10, 9, 
-	9, 12, 9, 9, 9, 3, 7, 9, 
-	9, 9, 17, 9, 9, 18, 28, 29, 
-	9, 9, 9, 9, 9, 9, 5, 6, 
-	9, 9, 19, 22, 20, 21, 17, 23, 
-	24, 25, 26, 27, 17, 17, 30, 31, 
-	17
+	6, 0, 6, 1, 8, 12, 6, 13, 
+	2, 6, 6, 6, 7, 6, 6, 8, 
+	9, 6, 6, 6, 10, 15, 11, 14, 
+	6, 6, 6, 16, 6, 6, 17, 27, 
+	30, 31, 6, 6, 6, 6, 6, 6, 
+	3, 4, 6, 5, 6, 18, 21, 19, 
+	20, 16, 22, 23, 24, 25, 26, 16, 
+	28, 29, 16, 16, 32, 33, 16
 ]
 
 class << self
@@ -166,14 +176,14 @@ class << self
 	private :_graphql_lexer_trans_actions, :_graphql_lexer_trans_actions=
 end
 self._graphql_lexer_trans_actions = [
-	45, 0, 17, 0, 68, 50, 0, 50, 
-	0, 43, 53, 0, 0, 23, 0, 29, 
-	27, 0, 19, 7, 9, 0, 0, 15, 
-	25, 21, 71, 11, 13, 0, 0, 0, 
-	3, 5, 39, 35, 41, 31, 0, 0, 
-	33, 37, 0, 0, 0, 0, 65, 0, 
-	0, 0, 0, 0, 59, 56, 0, 0, 
-	62
+	53, 0, 21, 0, 76, 0, 49, 58, 
+	0, 51, 27, 35, 0, 33, 31, 82, 
+	0, 23, 11, 13, 0, 5, 55, 55, 
+	19, 29, 25, 79, 15, 17, 0, 0, 
+	0, 0, 7, 9, 43, 45, 47, 37, 
+	0, 0, 39, 0, 41, 0, 0, 0, 
+	0, 70, 0, 0, 0, 0, 0, 64, 
+	0, 0, 73, 61, 0, 0, 67
 ]
 
 class << self
@@ -181,10 +191,11 @@ class << self
 	private :_graphql_lexer_to_state_actions, :_graphql_lexer_to_state_actions=
 end
 self._graphql_lexer_to_state_actions = [
+	0, 0, 0, 0, 0, 0, 1, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 47, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0
 ]
 
 class << self
@@ -192,10 +203,11 @@ class << self
 	private :_graphql_lexer_from_state_actions, :_graphql_lexer_from_state_actions=
 end
 self._graphql_lexer_from_state_actions = [
+	0, 0, 0, 0, 0, 0, 3, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 1, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0
+	0, 0
 ]
 
 class << self
@@ -203,32 +215,33 @@ class << self
 	private :_graphql_lexer_eof_trans, :_graphql_lexer_eof_trans=
 end
 self._graphql_lexer_eof_trans = [
-	0, 1, 1, 0, 1, 10, 1, 0, 
-	0, 0, 35, 36, 37, 38, 41, 41, 
-	38, 1, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42
+	1, 1, 1, 7, 1, 10, 0, 37, 
+	1, 38, 39, 40, 43, 43, 40, 39, 
+	1, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45
 ]
 
 class << self
 	attr_accessor :graphql_lexer_start
 end
-self.graphql_lexer_start = 9;
+self.graphql_lexer_start = 6;
 class << self
 	attr_accessor :graphql_lexer_first_final
 end
-self.graphql_lexer_first_final = 9;
+self.graphql_lexer_first_final = 6;
 class << self
 	attr_accessor :graphql_lexer_error
 end
-self.graphql_lexer_error = 0;
+self.graphql_lexer_error = -1;
 
 class << self
 	attr_accessor :graphql_lexer_en_main
 end
-self.graphql_lexer_en_main = 9;
+self.graphql_lexer_en_main = 6;
 
 
-# line 86 "lib/graphql/language/lexer.rl"
+# line 93 "lib/graphql/language/lexer.rl"
 
       def self.run_lexer(query_string)
         data = query_string.unpack("c*")
@@ -242,7 +255,7 @@ self.graphql_lexer_en_main = 9;
         }
 
         
-# line 246 "lib/graphql/language/lexer.rb"
+# line 259 "lib/graphql/language/lexer.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -252,14 +265,14 @@ begin
 	act = 0
 end
 
-# line 99 "lib/graphql/language/lexer.rl"
+# line 106 "lib/graphql/language/lexer.rl"
 
         emit_token = -> (name) {
           emit(name, ts, te, meta)
         }
 
         
-# line 263 "lib/graphql/language/lexer.rb"
+# line 276 "lib/graphql/language/lexer.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -275,10 +288,6 @@ begin
 		_goto_level = _test_eof
 		next
 	end
-	if cs == 0
-		_goto_level = _out
-		next
-	end
 	end
 	if _goto_level <= _resume
 	_acts = _graphql_lexer_from_state_actions[cs]
@@ -288,12 +297,12 @@ begin
 		_nacts -= 1
 		_acts += 1
 		case _graphql_lexer_actions[_acts - 1]
-			when 2 then
+			when 1 then
 # line 1 "NONE"
 		begin
 ts = p
 		end
-# line 297 "lib/graphql/language/lexer.rb"
+# line 306 "lib/graphql/language/lexer.rb"
 		end # from state action switch
 	end
 	if _trigger_goto
@@ -360,123 +369,131 @@ ts = p
 			_nacts -= 1
 			_acts += 1
 			case _graphql_lexer_actions[_acts - 1]
-when 3 then
+when 2 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-when 4 then
-# line 35 "lib/graphql/language/lexer.rl"
+when 3 then
+# line 39 "lib/graphql/language/lexer.rl"
 		begin
 act = 1;		end
-when 5 then
-# line 36 "lib/graphql/language/lexer.rl"
+when 4 then
+# line 40 "lib/graphql/language/lexer.rl"
 		begin
 act = 2;		end
-when 6 then
-# line 37 "lib/graphql/language/lexer.rl"
+when 5 then
+# line 41 "lib/graphql/language/lexer.rl"
 		begin
 act = 3;		end
-when 7 then
-# line 38 "lib/graphql/language/lexer.rl"
+when 6 then
+# line 42 "lib/graphql/language/lexer.rl"
 		begin
 act = 4;		end
-when 8 then
-# line 39 "lib/graphql/language/lexer.rl"
+when 7 then
+# line 43 "lib/graphql/language/lexer.rl"
 		begin
 act = 5;		end
-when 9 then
-# line 40 "lib/graphql/language/lexer.rl"
+when 8 then
+# line 44 "lib/graphql/language/lexer.rl"
 		begin
 act = 6;		end
+when 9 then
+# line 45 "lib/graphql/language/lexer.rl"
+		begin
+act = 7;		end
 when 10 then
-# line 48 "lib/graphql/language/lexer.rl"
+# line 53 "lib/graphql/language/lexer.rl"
 		begin
-act = 14;		end
+act = 15;		end
 when 11 then
-# line 54 "lib/graphql/language/lexer.rl"
+# line 59 "lib/graphql/language/lexer.rl"
 		begin
-act = 20;		end
+act = 21;		end
 when 12 then
-# line 41 "lib/graphql/language/lexer.rl"
+# line 69 "lib/graphql/language/lexer.rl"
+		begin
+act = 25;		end
+when 13 then
+# line 46 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:RCURLY)  end
 		end
-when 13 then
-# line 42 "lib/graphql/language/lexer.rl"
+when 14 then
+# line 47 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:LCURLY)  end
 		end
-when 14 then
-# line 43 "lib/graphql/language/lexer.rl"
+when 15 then
+# line 48 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:RPAREN)  end
 		end
-when 15 then
-# line 44 "lib/graphql/language/lexer.rl"
+when 16 then
+# line 49 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:LPAREN)  end
 		end
-when 16 then
-# line 45 "lib/graphql/language/lexer.rl"
+when 17 then
+# line 50 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:RBRACKET)  end
 		end
-when 17 then
-# line 46 "lib/graphql/language/lexer.rl"
+when 18 then
+# line 51 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:LBRACKET)  end
 		end
-when 18 then
-# line 47 "lib/graphql/language/lexer.rl"
+when 19 then
+# line 52 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:COLON)  end
 		end
-when 19 then
-# line 48 "lib/graphql/language/lexer.rl"
+when 20 then
+# line 53 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_string(ts + 1, te - 1, meta)  end
 		end
-when 20 then
-# line 49 "lib/graphql/language/lexer.rl"
+when 21 then
+# line 54 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:VAR_SIGN)  end
 		end
-when 21 then
-# line 50 "lib/graphql/language/lexer.rl"
+when 22 then
+# line 55 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:DIR_SIGN)  end
 		end
-when 22 then
-# line 51 "lib/graphql/language/lexer.rl"
+when 23 then
+# line 56 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:ELLIPSIS)  end
 		end
-when 23 then
-# line 52 "lib/graphql/language/lexer.rl"
+when 24 then
+# line 57 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:EQUALS)  end
 		end
-when 24 then
-# line 53 "lib/graphql/language/lexer.rl"
+when 25 then
+# line 58 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin  emit_token.call(:BANG)  end
 		end
-when 25 then
-# line 56 "lib/graphql/language/lexer.rl"
+when 26 then
+# line 61 "lib/graphql/language/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -484,60 +501,64 @@ te = p+1
       meta[:col] = 1
      end
 		end
-when 26 then
-# line 35 "lib/graphql/language/lexer.rl"
-		begin
-te = p
-p = p - 1; begin  emit_token.call(:INT)  end
-		end
 when 27 then
-# line 36 "lib/graphql/language/lexer.rl"
+# line 69 "lib/graphql/language/lexer.rl"
 		begin
-te = p
-p = p - 1; begin  emit_token.call(:FLOAT)  end
+te = p+1
+ begin  emit_token.call(:UNKNOWN_CHAR)  end
 		end
 when 28 then
-# line 48 "lib/graphql/language/lexer.rl"
+# line 39 "lib/graphql/language/lexer.rl"
 		begin
 te = p
-p = p - 1; begin  emit_string(ts + 1, te - 1, meta)  end
+p = p - 1; begin  emit_token.call(:INT)  end
 		end
 when 29 then
-# line 54 "lib/graphql/language/lexer.rl"
+# line 40 "lib/graphql/language/lexer.rl"
 		begin
 te = p
-p = p - 1; begin  emit_token.call(:IDENTIFIER)  end
+p = p - 1; begin  emit_token.call(:FLOAT)  end
 		end
 when 30 then
-# line 61 "lib/graphql/language/lexer.rl"
+# line 59 "lib/graphql/language/lexer.rl"
 		begin
 te = p
-p = p - 1; begin  meta[:col] += te - ts  end
+p = p - 1; begin  emit_token.call(:IDENTIFIER)  end
 		end
 when 31 then
-# line 62 "lib/graphql/language/lexer.rl"
+# line 66 "lib/graphql/language/lexer.rl"
 		begin
 te = p
 p = p - 1; begin  meta[:col] += te - ts  end
 		end
 when 32 then
-# line 35 "lib/graphql/language/lexer.rl"
+# line 67 "lib/graphql/language/lexer.rl"
+		begin
+te = p
+p = p - 1; begin  meta[:col] += te - ts  end
+		end
+when 33 then
+# line 69 "lib/graphql/language/lexer.rl"
+		begin
+te = p
+p = p - 1; begin  emit_token.call(:UNKNOWN_CHAR)  end
+		end
+when 34 then
+# line 39 "lib/graphql/language/lexer.rl"
 		begin
  begin p = ((te))-1; end
  begin  emit_token.call(:INT)  end
 		end
-when 33 then
+when 35 then
+# line 69 "lib/graphql/language/lexer.rl"
+		begin
+ begin p = ((te))-1; end
+ begin  emit_token.call(:UNKNOWN_CHAR)  end
+		end
+when 36 then
 # line 1 "NONE"
 		begin
 	case act
-	when 0 then
-	begin	begin
-		cs = 0
-		_trigger_goto = true
-		_goto_level = _again
-		break
-	end
-end
 	when 1 then
 	begin begin p = ((te))-1; end
  emit_token.call(:INT) end
@@ -556,15 +577,21 @@ end
 	when 6 then
 	begin begin p = ((te))-1; end
  emit_token.call(:FALSE) end
-	when 14 then
+	when 7 then
+	begin begin p = ((te))-1; end
+ emit_token.call(:NULL) end
+	when 15 then
 	begin begin p = ((te))-1; end
  emit_string(ts + 1, te - 1, meta) end
-	when 20 then
+	when 21 then
 	begin begin p = ((te))-1; end
  emit_token.call(:IDENTIFIER) end
+	when 25 then
+	begin begin p = ((te))-1; end
+ emit_token.call(:UNKNOWN_CHAR) end
 end 
 			end
-# line 568 "lib/graphql/language/lexer.rb"
+# line 595 "lib/graphql/language/lexer.rb"
 			end # action switch
 		end
 	end
@@ -584,21 +611,12 @@ when 0 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
-when 1 then
-# line 1 "NONE"
-		begin
-act = 0
-		end
-# line 593 "lib/graphql/language/lexer.rb"
+# line 615 "lib/graphql/language/lexer.rb"
 		end # to state action switch
 	end
 	if _trigger_goto
 		next
 	end
-	if cs == 0
-		_goto_level = _out
-		next
-	end
 	p += 1
 	if p != pe
 		_goto_level = _resume
@@ -620,7 +638,7 @@ end
 	end
 	end
 
-# line 105 "lib/graphql/language/lexer.rl"
+# line 112 "lib/graphql/language/lexer.rl"
 
         meta[:tokens]
       end
@@ -653,14 +671,24 @@ end
 
       def self.emit_string(ts, te, meta)
         value = meta[:data][ts...te].pack("c*").force_encoding("UTF-8")
-        replace_escaped_characters_in_place(value)
+        if value =~ /\\u|\\./ && value !~ ESCAPES
+          meta[:tokens] << GraphQL::Language::Token.new(
+            name: :BAD_UNICODE_ESCAPE,
+            value: value,
+            line: meta[:line],
+            col: meta[:col],
+          )
+        else
+          replace_escaped_characters_in_place(value)
+
+          meta[:tokens] << GraphQL::Language::Token.new(
+            name: :STRING,
+            value: value,
+            line: meta[:line],
+            col: meta[:col],
+          )
+        end
 
-        meta[:tokens] << GraphQL::Language::Token.new(
-          name: :STRING,
-          value: value,
-          line: meta[:line],
-          col: meta[:col],
-        )
         meta[:col] += te - ts
       end
     end