graphql 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8eca19d9b215aed67ef5434bb5dab5cce3e8626
-  data.tar.gz: 66740ce037cbd8e4019ed7516503e430ebb0a34a
+  metadata.gz: 347eef5d121c7ccb7f0c217370e2a02285d36096
+  data.tar.gz: e2b7083f415d77f05dcb888c121075617c93e677
 SHA512:
-  metadata.gz: 6e34b8bce773c1304d9c4796a20a92c731de182ad1a144df2bb4a814295a2233b298d8817d24c96837540b57fd73ca3a9acb55b286308c1b7a3b3725f31c3e11
-  data.tar.gz: b9cce7a863dfaabcb7312a0844ef659504cf5adedfe7b22246ce4856ae78d71c6204535a1351b5d0c746161b5155d06cd25f845a0d8fdc3776a9ee27ed41160d
+  metadata.gz: 07a84a28ba76c6b7f0586b1c4e73745ae4d279482cab00b2a1ae6d087e566156359f993d325cc102c7af3ed23b0dc3f381d29635fef85ebe73d71ed103d7e0f2
+  data.tar.gz: d5b0dcfeb682086a666c839ebf4d0dcfd695201682016cc55d16d28d6f487012ac8f82e6360ea58780e3a6874c4eee52b49d0e8f44d37817e0672decdb27753f

data/lib/generators/graphql/install_generator.rb

@@ -68,6 +68,11 @@ module Graphql
         default: false,
         desc: "Include GraphQL::Batch installation"
 
+      # These two options are taken from Rails' own generators'
+      class_option :api,
+        type: :boolean,
+        desc: "Preconfigure smaller stack for API only apps"
+
 
       GRAPHIQL_ROUTE = <<-RUBY
 if Rails.env.development?
@@ -83,19 +88,40 @@ RUBY
         template("graphql_controller.erb", "app/controllers/graphql_controller.rb")
         route('post "/graphql", to: "graphql#execute"')
 
-        if !options[:skip_graphiql]
-          gem("graphiql-rails", group: :development)
-          route(GRAPHIQL_ROUTE)
-        end
-
         if options[:batch]
           gem("graphql-batch")
           create_dir("app/graphql/loaders")
         end
+
+        if options.api?
+          say("Skipped graphiql, as this rails project is API only")
+          say("  You may wish to use GraphiQL.app for development: https://github.com/skevy/graphiql-app")
+        elsif !options[:skip_graphiql]
+          gem("graphiql-rails", group: :development)
+
+          # This is a little cheat just to get cleaner shell output:
+          log :route, 'graphiql-rails'
+          shell.mute do
+            route(GRAPHIQL_ROUTE)
+          end
+        end
+
+        if gemfile_modified?
+          say "Gemfile has been modified, make sure you `bundle install`"
+        end
       end
 
       private
 
+      def gemfile_modified?
+        @gemfile_modified
+      end
+
+      def gem(*args)
+        @gemfile_modified = true
+        super(*args)
+      end
+
       def create_dir(dir)
         empty_directory(dir)
         if !options[:skip_keeps]

data/lib/generators/graphql/templates/graphql_controller.erb

@@ -2,11 +2,12 @@ class GraphqlController < ApplicationController
   def execute
     variables = ensure_hash(params[:variables])
     query = params[:query]
+    operation_name = params[:operationName]
     context = {
       # Query context goes here, for example:
       # current_user: current_user,
     }
-    result = <%= schema_name %>.execute(query, variables: variables, context: context)
+    result = <%= schema_name %>.execute(query, variables: variables, context: context, operation_name: operation_name)
     render json: result
   end
 

data/lib/graphql/query.rb

@@ -29,6 +29,9 @@ module GraphQL
 
     attr_reader :schema, :context, :root_value, :warden, :provided_variables, :operation_name
 
+    # @return [Boolean] if false, static validation is skipped (execution behavior for invalid queries is undefined)
+    attr_accessor :validate
+
     attr_accessor :query_string
 
     # @return [GraphQL::Language::Nodes::Document]
@@ -59,6 +62,7 @@ module GraphQL
       @root_value = root_value
       @fragments = nil
       @operations = nil
+      @validate = validate
 
       @analysis_errors = []
       if variables.is_a?(String)
@@ -270,6 +274,7 @@ module GraphQL
 
       @validation_pipeline = GraphQL::Query::ValidationPipeline.new(
         query: self,
+        validate: @validate,
         parse_error: parse_error,
         operation_name_error: operation_name_error,
         max_depth: @max_depth,

data/lib/graphql/query/literal_input.rb

@@ -77,6 +77,10 @@ module GraphQL
             # `context` isn't present when pre-calculating defaults
             if context
               value = arg_defn.prepare(value, context)
+              if value.is_a?(GraphQL::ExecutionError)
+                value.ast_node = ast_arg
+                raise value
+              end
             end
             values_hash[arg_name] = value
           end

data/lib/graphql/query/serial_execution/field_resolution.rb

@@ -24,7 +24,7 @@ module GraphQL
         def result
           result_name = irep_node.name
           raw_value = get_raw_value
-          if raw_value == GraphQL::Execution::Execute::SKIP
+          if raw_value.is_a?(GraphQL::Execution::Execute::Skip)
             {}
           else
             { result_name => get_finished_value(raw_value) }

data/lib/graphql/query/validation_pipeline.rb

@@ -14,10 +14,11 @@ module GraphQL
     #
     # @api private
     class ValidationPipeline
-      def initialize(query:, parse_error:, operation_name_error:, max_depth:, max_complexity:)
+      def initialize(query:, validate:, parse_error:, operation_name_error:, max_depth:, max_complexity:)
         @validation_errors = []
         @analysis_errors = []
         @internal_representation = nil
+        @validate = validate
         @parse_error = parse_error
         @operation_name_error = operation_name_error
         @query = query
@@ -76,7 +77,7 @@ module GraphQL
         elsif @operation_name_error
           @validation_errors << @operation_name_error
         else
-          validation_result = @schema.static_validator.validate(@query)
+          validation_result = @schema.static_validator.validate(@query, validate: @validate)
           @validation_errors.concat(validation_result[:errors])
           @internal_representation = validation_result[:irep]
 

data/lib/graphql/schema/printer.rb

@@ -186,7 +186,7 @@ module GraphQL
             end
 
             out = "(\n".dup
-            out << arguments.map.with_index{ |arg, i|
+            out << arguments.sort_by(&:name).map.with_index{ |arg, i|
               "#{print_description(arg, "  #{indentation}", i == 0)}  #{indentation}"\
               "#{print_input_value(arg)}"
             }.join("\n")
@@ -244,7 +244,7 @@ module GraphQL
           include DescriptionPrinter
           def print_fields(warden, type)
             fields = warden.fields(type)
-            fields.map.with_index { |field, i|
+            fields.sort_by(&:name).map.with_index { |field, i|
               "#{print_description(field, '  ', i == 0)}"\
               "  #{field.name}#{print_args(warden, field, '  ')}: #{field.type}#{print_deprecated(field)}"
             }.join("\n")
@@ -275,7 +275,7 @@ module GraphQL
           def self.print(warden, type)
             interfaces = warden.interfaces(type)
             if interfaces.any?
-              implementations = " implements #{interfaces.map(&:to_s).join(", ")}"
+              implementations = " implements #{interfaces.sort_by(&:name).map(&:to_s).join(", ")}"
             else
               implementations = nil
             end
@@ -301,7 +301,7 @@ module GraphQL
           def self.print(warden, type)
             possible_types = warden.possible_types(type)
             "#{print_description(type)}"\
-            "union #{type.name} = #{possible_types.map(&:to_s).join(" | ")}"
+            "union #{type.name} = #{possible_types.sort_by(&:name).map(&:to_s).join(" | ")}"
           end
         end
 
@@ -311,7 +311,7 @@ module GraphQL
           def self.print(warden, type)
             enum_values = warden.enum_values(type)
 
-            values = enum_values.map.with_index { |v, i|
+            values = enum_values.sort_by(&:name).map.with_index { |v, i|
               "#{print_description(v, '  ', i == 0)}"\
               "  #{v.name}#{print_deprecated(v)}"
             }.join("\n")
@@ -326,7 +326,7 @@ module GraphQL
           extend DescriptionPrinter
           def self.print(warden, type)
             arguments = warden.arguments(type)
-            fields = arguments.map.with_index{ |field, i|
+            fields = arguments.sort_by(&:name).map.with_index{ |field, i|
               "#{print_description(field, "  ", i == 0)}"\
               "  #{print_input_value(field)}"
             }.join("\n")

data/lib/graphql/static_validation/validator.rb

@@ -7,8 +7,8 @@ module GraphQL
     #
     # @example Validate a query
     #   validator = GraphQL::StaticValidation::Validator.new(schema: MySchema)
-    #   document = GraphQL.parse(query_string)
-    #   errors = validator.validate(document)
+    #   query = GraphQL::Query.new(MySchema, query_string)
+    #   errors = validator.validate(query)[:errors]
     #
     class Validator
       # @param schema [GraphQL::Schema]
@@ -21,14 +21,18 @@ module GraphQL
       # Validate `query` against the schema. Returns an array of message hashes.
       # @param query [GraphQL::Query]
       # @return [Array<Hash>]
-      def validate(query)
+      def validate(query, validate: true)
         context = GraphQL::StaticValidation::ValidationContext.new(query)
         rewrite = GraphQL::InternalRepresentation::Rewrite.new
 
         # Put this first so its enters and exits are always called
         rewrite.validate(context)
-        @rules.each do |rules|
-          rules.new.validate(context)
+
+        # If the caller opted out of validation, don't attach these
+        if validate
+          @rules.each do |rules|
+            rules.new.validate(context)
+          end
         end
 
         context.visitor.visit

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

data/readme.md

@@ -31,6 +31,8 @@ $ bundle install
 $ rails generate graphql:install
 ```
 
+After this, you may need to run `bundle install` again, as by default graphiql-rails is added on installation.
+
 Or, see ["Getting Started"](https://rmosolgo.github.io/graphql-ruby/).
 
 ## Upgrade

data/spec/generators/graphql/install_generator_spec.rb

@@ -3,20 +3,19 @@ require "spec_helper"
 require "generators/graphql/install_generator"
 
 class GraphQLGeneratorsInstallGeneratorTest < Rails::Generators::TestCase
-
   tests Graphql::Generators::InstallGenerator
   destination File.expand_path("../../../tmp/dummy", File.dirname(__FILE__))
 
   setup do
     prepare_destination
-    FileUtils.cd(File.expand_path("../../../tmp", File.dirname(__FILE__))) do
-      `rm -rf dummy`
+
+    FileUtils.cd(File.join(destination_root, '..')) do
       `rails new dummy --skip-active-record --skip-test-unit --skip-spring --skip-bundle`
     end
   end
 
   test "it generates a folder structure" do
-    run_generator([])
+    run_generator
 
     assert_file "app/graphql/types/.keep"
     assert_file "app/graphql/mutations/.keep"
@@ -93,6 +92,18 @@ RUBY
     assert_file "app/graphql/dummy_schema.rb", EXPECTED_RELAY_BATCH_SCHEMA
   end
 
+  test "it doesn't install graphiql when API Only" do
+    run_generator(['--api'])
+
+    assert_file "Gemfile" do |contents|
+      refute_includes contents, "graphiql-rails"
+    end
+
+    assert_file "config/routes.rb" do |contents|
+      refute_includes contents, "GraphiQL::Rails"
+    end
+  end
+
   test "it can skip keeps, skip graphiql and customize schema name" do
     run_generator(["--skip-keeps", "--skip-graphiql", "--schema=CustomSchema"])
     assert_no_file "app/graphql/types/.keep"
@@ -116,11 +127,12 @@ class GraphqlController < ApplicationController
   def execute
     variables = ensure_hash(params[:variables])
     query = params[:query]
+    operation_name = params[:operationName]
     context = {
       # Query context goes here, for example:
       # current_user: current_user,
     }
-    result = DummySchema.execute(query, variables: variables, context: context)
+    result = DummySchema.execute(query, variables: variables, context: context, operation_name: operation_name)
     render json: result
   end
 

data/spec/graphql/base_type_spec.rb

@@ -72,9 +72,9 @@ describe GraphQL::BaseType do
     expected = <<TYPE
 # A blog post
 type Post {
+  body: String!
   id: ID!
   title: String!
-  body: String!
 }
 TYPE
 

data/spec/graphql/query/literal_input_spec.rb

@@ -20,6 +20,19 @@ describe GraphQL::Query::LiteralInput do
             end
             resolve ->(t, a, c) { a[:value] }
           end
+
+          field :fieldWithArgumentThatIsBadByDefault do
+            type types.Int
+            argument :value do
+              type types.Int
+              default_value 7
+              prepare ->(arg, ctx) do
+                GraphQL::ExecutionError.new("Always bad")
+              end
+            end
+
+            resolve ->(*args) { 42 }
+          end
         end
 
         GraphQL::Schema.define(query: query)
@@ -35,6 +48,11 @@ describe GraphQL::Query::LiteralInput do
         assert_equal(7, result["data"]["addToArgumentValue"])
       end
 
+      it "raises an execution error if the default value is bad" do
+        result = schema.execute("{ fieldWithArgumentThatIsBadByDefault }", context: { })
+        assert_equal(result["errors"], [{"message" => "Always bad"}])
+      end
+
       it "prepares values from variables" do
         result = schema.execute("query ($value: Int!) { addToArgumentValue(value: $value) }", variables: { "value" => 1}, context: { val: 2 } )
         assert_equal(result["data"]["addToArgumentValue"], 3)

data/spec/graphql/query_spec.rb

@@ -518,6 +518,27 @@ describe GraphQL::Query do
     end
   end
 
+  describe "validate: false" do
+    it "doesn't validate the query" do
+      invalid_query_string = "{ nonExistantField }"
+      # Can assign attribute
+      query = GraphQL::Query.new(schema, invalid_query_string)
+      query.validate = false
+      assert_equal true, query.valid?
+      assert_equal 0, query.static_errors.length
+
+      # Can pass keyword argument
+      query = GraphQL::Query.new(schema, invalid_query_string, validate: false)
+      assert_equal true, query.valid?
+      assert_equal 0, query.static_errors.length
+
+      # Can pass `true`
+      query = GraphQL::Query.new(schema, invalid_query_string, validate: true)
+      assert_equal false, query.valid?
+      assert_equal 1, query.static_errors.length
+    end
+  end
+
   describe 'NullValue type arguments' do
     let(:schema_definition) {
       <<-GRAPHQL

data/spec/graphql/schema/build_from_definition_spec.rb

@@ -19,11 +19,11 @@ schema {
 }
 
 type HelloScalars {
-  str: String!
-  int: Int
+  bool: Boolean
   float: Float
   id: ID
-  bool: Boolean
+  int: Int
+  str: String!
 }
       SCHEMA
 
@@ -60,11 +60,11 @@ directive @foo(
 
 # With an enum
 enum Color {
-  RED
+  BLUE
 
   # Not a creative color
   GREEN
-  BLUE
+  RED
 }
 
 # What a great type
@@ -142,11 +142,11 @@ schema {
 }
 
 type HelloScalars {
-  nonNullStr: String!
-  listOfStrs: [String]
   listOfNonNullStrs: [String!]
-  nonNullListOfStrs: [String]!
+  listOfStrs: [String]
   nonNullListOfNonNullStrs: [String!]!
+  nonNullListOfStrs: [String]!
+  nonNullStr: String!
 }
       SCHEMA
 
@@ -160,8 +160,8 @@ schema {
 }
 
 type Recurse {
-  str: String
   recurse: Recurse
+  str: String
 }
       SCHEMA
 
@@ -195,10 +195,10 @@ schema {
 }
 
 type Hello {
-  str(int: Int): String
+  booleanToStr(bool: Boolean): String
   floatToStr(float: Float): String
   idToStr(id: ID): String
-  booleanToStr(bool: Boolean): String
+  str(int: Int): String
   strToStr(bool: String): String
 }
       SCHEMA
@@ -281,8 +281,8 @@ schema {
 }
 
 enum Hello {
-  WO
   RLD
+  WO
 }
 
 type OutputEnumRoot {
@@ -382,14 +382,14 @@ schema {
 }
 
 enum Color {
-  RED
   BLUE
+  RED
 }
 
 type Hello {
-  str(int: Int = 2): String
   hello(color: Color = RED): String
   nullable(color: Color = null): String
+  str(int: Int = 2): String
 }
       SCHEMA
 
@@ -404,9 +404,9 @@ schema {
 }
 
 type HelloScalars {
-  str: String
-  int: Int
   bool: Boolean
+  int: Int
+  str: String
 }
 
 type Mutation {
@@ -420,8 +420,8 @@ type Mutation {
     it 'supports simple type with mutation and default values' do
       schema = <<-SCHEMA
 enum Color {
-  RED
   BLUE
+  RED
 }
 
 type Mutation {
@@ -444,9 +444,9 @@ schema {
 }
 
 type HelloScalars {
-  str: String
-  int: Int
   bool: Boolean
+  int: Int
+  str: String
 }
 
 type Subscription {
@@ -494,15 +494,15 @@ union Union = Concrete
     it 'supports @deprecated' do
       schema = <<-SCHEMA
 enum MyEnum {
-  VALUE
   OLD_VALUE @deprecated
   OTHER_VALUE @deprecated(reason: "Terrible reasons")
+  VALUE
 }
 
 type Query {
+  enum: MyEnum
   field1: String @deprecated
   field2: Int @deprecated(reason: "Because I said so")
-  enum: MyEnum
 }
       SCHEMA
 

data/spec/graphql/schema/printer_spec.rb

@@ -136,13 +136,13 @@ schema {
   query: Root
 }
 
-# Directs the executor to include this field or fragment only when the \`if\` argument is true.
+# Directs the executor to include this field or fragment only when the `if` argument is true.
 directive @include(
   # Included when true.
   if: Boolean!
 ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-# Directs the executor to skip this field or fragment when the \`if\` argument is true.
+# Directs the executor to skip this field or fragment when the `if` argument is true.
 directive @skip(
   # Skipped when true.
   if: Boolean!
@@ -163,30 +163,33 @@ directive @deprecated(
 # skipping a field. Directives provide this by describing additional information
 # to the executor.
 type __Directive {
-  name: String!
+  args: [__InputValue!]!
   description: String
   locations: [__DirectiveLocation!]!
-  args: [__InputValue!]!
-  onOperation: Boolean! @deprecated(reason: "Use \`locations\`.")
-  onFragment: Boolean! @deprecated(reason: "Use \`locations\`.")
-  onField: Boolean! @deprecated(reason: "Use \`locations\`.")
+  name: String!
+  onField: Boolean! @deprecated(reason: "Use `locations`.")
+  onFragment: Boolean! @deprecated(reason: "Use `locations`.")
+  onOperation: Boolean! @deprecated(reason: "Use `locations`.")
 }
 
 # A Directive can be adjacent to many parts of the GraphQL language, a
 # __DirectiveLocation describes one such possible adjacencies.
 enum __DirectiveLocation {
-  # Location adjacent to a query operation.
-  QUERY
+  # Location adjacent to an argument definition.
+  ARGUMENT_DEFINITION
 
-  # Location adjacent to a mutation operation.
-  MUTATION
+  # Location adjacent to an enum definition.
+  ENUM
 
-  # Location adjacent to a subscription operation.
-  SUBSCRIPTION
+  # Location adjacent to an enum value definition.
+  ENUM_VALUE
 
   # Location adjacent to a field.
   FIELD
 
+  # Location adjacent to a field definition.
+  FIELD_DEFINITION
+
   # Location adjacent to a fragment definition.
   FRAGMENT_DEFINITION
 
@@ -196,95 +199,91 @@ enum __DirectiveLocation {
   # Location adjacent to an inline fragment.
   INLINE_FRAGMENT
 
-  # Location adjacent to a schema definition.
-  SCHEMA
+  # Location adjacent to an input object field definition.
+  INPUT_FIELD_DEFINITION
 
-  # Location adjacent to a scalar definition.
-  SCALAR
+  # Location adjacent to an input object type definition.
+  INPUT_OBJECT
+
+  # Location adjacent to an interface definition.
+  INTERFACE
+
+  # Location adjacent to a mutation operation.
+  MUTATION
 
   # Location adjacent to an object type definition.
   OBJECT
 
-  # Location adjacent to a field definition.
-  FIELD_DEFINITION
+  # Location adjacent to a query operation.
+  QUERY
 
-  # Location adjacent to an argument definition.
-  ARGUMENT_DEFINITION
+  # Location adjacent to a scalar definition.
+  SCALAR
 
-  # Location adjacent to an interface definition.
-  INTERFACE
+  # Location adjacent to a schema definition.
+  SCHEMA
+
+  # Location adjacent to a subscription operation.
+  SUBSCRIPTION
 
   # Location adjacent to a union definition.
   UNION
-
-  # Location adjacent to an enum definition.
-  ENUM
-
-  # Location adjacent to an enum value definition.
-  ENUM_VALUE
-
-  # Location adjacent to an input object type definition.
-  INPUT_OBJECT
-
-  # Location adjacent to an input object field definition.
-  INPUT_FIELD_DEFINITION
 }
 
 # One possible value for a given Enum. Enum values are unique values, not a
 # placeholder for a string or numeric value. However an Enum value is returned in
 # a JSON response as a string.
 type __EnumValue {
-  name: String!
+  deprecationReason: String
   description: String
   isDeprecated: Boolean!
-  deprecationReason: String
+  name: String!
 }
 
 # Object and Interface types are described by a list of Fields, each of which has
 # a name, potentially a list of arguments, and a return type.
 type __Field {
-  name: String!
-  description: String
   args: [__InputValue!]!
-  type: __Type!
-  isDeprecated: Boolean!
   deprecationReason: String
+  description: String
+  isDeprecated: Boolean!
+  name: String!
+  type: __Type!
 }
 
 # Arguments provided to Fields or Directives and the input fields of an
 # InputObject are represented as Input Values which describe their type and
 # optionally a default value.
 type __InputValue {
-  name: String!
-  description: String
-  type: __Type!
-
   # A GraphQL-formatted string representing the default value for this input value.
   defaultValue: String
+  description: String
+  name: String!
+  type: __Type!
 }
 
 # A GraphQL Schema defines the capabilities of a GraphQL server. It exposes all
 # available types and directives on the server, as well as the entry points for
 # query, mutation, and subscription operations.
 type __Schema {
-  # A list of all types supported by this server.
-  types: [__Type!]!
-
-  # The type that query operations will be rooted at.
-  queryType: __Type!
+  # A list of all directives supported by this server.
+  directives: [__Directive!]!
 
   # If this server supports mutation, the type that mutation operations will be rooted at.
   mutationType: __Type
 
+  # The type that query operations will be rooted at.
+  queryType: __Type!
+
   # If this server support subscription, the type that subscription operations will be rooted at.
   subscriptionType: __Type
 
-  # A list of all directives supported by this server.
-  directives: [__Directive!]!
+  # A list of all types supported by this server.
+  types: [__Type!]!
 }
 
 # The fundamental unit of any GraphQL Schema is the type. There are many kinds of
-# types in GraphQL as represented by the \`__TypeKind\` enum.
+# types in GraphQL as represented by the `__TypeKind` enum.
 #
 # Depending on the kind of a type, certain fields describe information about that
 # type. Scalar types provide no information beyond a name and description, while
@@ -292,42 +291,42 @@ type __Schema {
 # they describe. Abstract types, Union and Interface, provide the Object types
 # possible at runtime. List and NonNull types compose other types.
 type __Type {
-  kind: __TypeKind!
-  name: String
   description: String
-  fields(includeDeprecated: Boolean = false): [__Field!]
-  interfaces: [__Type!]
-  possibleTypes: [__Type!]
   enumValues(includeDeprecated: Boolean = false): [__EnumValue!]
+  fields(includeDeprecated: Boolean = false): [__Field!]
   inputFields: [__InputValue!]
+  interfaces: [__Type!]
+  kind: __TypeKind!
+  name: String
   ofType: __Type
+  possibleTypes: [__Type!]
 }
 
-# An enum describing what kind of type a given \`__Type\` is.
+# An enum describing what kind of type a given `__Type` is.
 enum __TypeKind {
-  # Indicates this type is a scalar.
-  SCALAR
+  # Indicates this type is an enum. `enumValues` is a valid field.
+  ENUM
 
-  # Indicates this type is an object. \`fields\` and \`interfaces\` are valid fields.
-  OBJECT
+  # Indicates this type is an input object. `inputFields` is a valid field.
+  INPUT_OBJECT
 
-  # Indicates this type is an interface. \`fields\` and \`possibleTypes\` are valid fields.
+  # Indicates this type is an interface. `fields` and `possibleTypes` are valid fields.
   INTERFACE
 
-  # Indicates this type is a union. \`possibleTypes\` is a valid field.
-  UNION
+  # Indicates this type is a list. `ofType` is a valid field.
+  LIST
 
-  # Indicates this type is an enum. \`enumValues\` is a valid field.
-  ENUM
+  # Indicates this type is a non-null. `ofType` is a valid field.
+  NON_NULL
 
-  # Indicates this type is an input object. \`inputFields\` is a valid field.
-  INPUT_OBJECT
+  # Indicates this type is an object. `fields` and `interfaces` are valid fields.
+  OBJECT
 
-  # Indicates this type is a list. \`ofType\` is a valid field.
-  LIST
+  # Indicates this type is a scalar.
+  SCALAR
 
-  # Indicates this type is a non-null. \`ofType\` is a valid field.
-  NON_NULL
+  # Indicates this type is a union. `possibleTypes` is a valid field.
+  UNION
 }
 SCHEMA
       assert_equal expected.chomp, GraphQL::Schema::Printer.print_introspection_schema
@@ -384,15 +383,15 @@ SCHEMA
     it "returns the schema as a string for the defined types" do
       expected = <<SCHEMA
 type Audio {
+  duration: Int!
   id: ID!
   name: String!
-  duration: Int!
 }
 
 enum Choice {
-  FOO
   BAR
   BAZ @deprecated(reason: "Use \\\"BAR\\\".")
+  FOO
   WOZ @deprecated
 }
 
@@ -403,10 +402,11 @@ type Comment implements Node {
 
 # Autogenerated input type of CreatePost
 input CreatePostInput {
+  body: String!
+
   # A unique identifier for the client performing the mutation.
   clientMutationId: String
   title: String!
-  body: String!
 }
 
 # Autogenerated return type of CreatePost
@@ -417,14 +417,14 @@ type CreatePostPayload {
 }
 
 type Image {
+  height: Int!
   id: ID!
   name: String!
   width: Int!
-  height: Int!
 }
 
 # Media objects
-union Media = Image | Audio
+union Media = Audio | Image
 
 type Mutation {
   # Create a blog post
@@ -437,11 +437,11 @@ interface Node {
 
 # A blog post
 type Post {
-  id: ID!
-  title: String!
   body: String!
   comments: [Comment!]
-  comments_count: Int! @deprecated(reason: \"Use \\\"comments\\\".\")
+  comments_count: Int! @deprecated(reason: "Use \\\"comments\\\".")
+  id: ID!
+  title: String!
 }
 
 # The query root of this schema
@@ -449,7 +449,7 @@ type Query {
   post(
     # Post ID
     id: ID!
-    varied: Varied = {id: \"123\", int: 234, float: 2.3, enum: FOO, sub: [{string: \"str\"}]}
+    varied: Varied = {id: "123", int: 234, float: 2.3, enum: FOO, sub: [{string: "str"}]}
     variedWithNulls: Varied = {id: null, int: null, float: null, enum: null, sub: null}
   ): Post
 }
@@ -457,10 +457,10 @@ type Query {
 # Test
 input Sub {
   # Something
-  string: String
+  int: Int
 
   # Something
-  int: Int
+  string: String
 }
 
 type Subscription {
@@ -468,14 +468,15 @@ type Subscription {
 }
 
 input Varied {
-  id: ID
-  int: Int
-  float: Float
   bool: Boolean
   enum: Choice = FOO
+  float: Float
+  id: ID
+  int: Int
   sub: [Sub]
 }
 SCHEMA
+
       assert_equal expected.chomp, GraphQL::Schema::Printer.print_schema(schema)
     end
   end
@@ -483,8 +484,8 @@ SCHEMA
   it "applies an `only` filter" do
     expected = <<SCHEMA
 enum Choice {
-  FOO
   BAR
+  FOO
 }
 
 type Subscription {
@@ -492,10 +493,10 @@ type Subscription {
 }
 
 input Varied {
-  int: Int
-  float: Float
   bool: Boolean
   enum: Choice = FOO
+  float: Float
+  int: Int
 }
 SCHEMA
 
@@ -520,14 +521,14 @@ SCHEMA
   it "applies an `except` filter" do
     expected = <<SCHEMA
 type Audio {
+  duration: Int!
   id: ID!
   name: String!
-  duration: Int!
 }
 
 enum Choice {
-  FOO
   BAR
+  FOO
 }
 
 # A blog comment
@@ -537,10 +538,11 @@ type Comment implements Node {
 
 # Autogenerated input type of CreatePost
 input CreatePostInput {
+  body: String!
+
   # A unique identifier for the client performing the mutation.
   clientMutationId: String
   title: String!
-  body: String!
 }
 
 # Autogenerated return type of CreatePost
@@ -564,10 +566,10 @@ interface Node {
 
 # A blog post
 type Post {
-  id: ID!
-  title: String!
   body: String!
   comments: [Comment!]
+  id: ID!
+  title: String!
 }
 
 # The query root of this schema
@@ -596,11 +598,11 @@ SCHEMA
       expected = <<SCHEMA
 # A blog post
 type Post {
-  id: ID!
-  title: String!
   body: String!
   comments: [Comment!]
   comments_count: Int! @deprecated(reason: \"Use \\\"comments\\\".\")
+  id: ID!
+  title: String!
 }
 SCHEMA
       assert_equal expected.chomp, GraphQL::Schema::Printer.new(schema).print_type(schema.types['Post'])

data/spec/graphql/static_validation/validator_spec.rb

@@ -4,7 +4,8 @@ require "spec_helper"
 describe GraphQL::StaticValidation::Validator do
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: Dummy::Schema) }
   let(:query) { GraphQL::Query.new(Dummy::Schema, query_string) }
-  let(:errors) { validator.validate(query)[:errors].map(&:to_h) }
+  let(:validate) { true }
+  let(:errors) { validator.validate(query, validate: validate)[:errors].map(&:to_h) }
 
 
   describe "validation order" do
@@ -30,6 +31,14 @@ describe GraphQL::StaticValidation::Validator do
         # nonsenseField, nonsenseArg, bogusField, bogusArg, undefinedVar
         assert_equal(5, errors.length)
       end
+
+      describe "when validate: false" do
+        let(:validate) { false }
+
+        it "skips validation" do
+          assert_equal 0, errors.length
+        end
+      end
     end
 
     describe "infinite fragments" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips