graphql: update introspection schema

graph/src/schema/api.rs

@@ -6,7 +6,7 @@ use inflector::Inflector;
 use lazy_static::lazy_static;
 
 use crate::components::store::EntityType;
-use crate::data::graphql::ObjectOrInterface;
+use crate::data::graphql::{ObjectOrInterface, ObjectTypeExt};
 use crate::schema::{ast, META_FIELD_NAME, META_FIELD_TYPE};
 
 use crate::data::graphql::ext::{DirectiveExt, DocumentExt, ValueExt};
@@ -233,6 +233,13 @@ lazy_static! {
         let schema = include_str!("introspection.graphql");
         parse_schema(schema).expect("the schema `introspection.graphql` is invalid")
     };
+    pub static ref INTROSPECTION_QUERY_TYPE: ast::ObjectType = ast::ObjectType::from(Arc::new(
+        INTROSPECTION_SCHEMA.get_root_query_type().unwrap().clone()
+    ));
+}
+
+pub fn is_introspection_field(name: &str) -> bool {
+    INTROSPECTION_QUERY_TYPE.field(name).is_some()
 }
 
 fn add_introspection_schema(schema: &mut Document) {

graph/src/schema/introspection.graphql

@@ -4,6 +4,7 @@
 # API schema.
 
 type __Schema {
+  description: String
   types: [__Type!]!
   queryType: __Type!
   mutationType: __Type
@@ -33,12 +34,15 @@ type __Type {
 
   # NON_NULL and LIST only
   ofType: __Type
+
+  # may be non-null for custom SCALAR, otherwise null.
+  specifiedByURL: String
 }
 
 type __Field {
   name: String!
   description: String
-  args: [__InputValue!]!
+  args(includeDeprecated: Boolean = false): [__InputValue!]!
   type: __Type!
   isDeprecated: Boolean!
   deprecationReason: String
@@ -49,6 +53,8 @@ type __InputValue {
   description: String
   type: __Type!
   defaultValue: String
+  isDeprecated: Boolean!
+  deprecationReason: String
 }
 
 type __EnumValue {
@@ -73,7 +79,8 @@ type __Directive {
   name: String!
   description: String
   locations: [__DirectiveLocation!]!
-  args: [__InputValue!]!
+  args(includeDeprecated: Boolean = false): [__InputValue!]!
+  isRepeatable: Boolean!
 }
 
 enum __DirectiveLocation {
@@ -84,6 +91,7 @@ enum __DirectiveLocation {
   FRAGMENT_DEFINITION
   FRAGMENT_SPREAD
   INLINE_FRAGMENT
+  VARIABLE_DEFINITION
   SCHEMA
   SCALAR
   OBJECT
@@ -95,4 +103,4 @@ enum __DirectiveLocation {
   ENUM_VALUE
   INPUT_OBJECT
   INPUT_FIELD_DEFINITION
-}
+}

graph/src/schema/mod.rs

@@ -31,7 +31,7 @@ pub mod ast;
 mod fulltext;
 mod input_schema;
 
-pub use api::{api_schema, APISchemaError};
+pub use api::{api_schema, is_introspection_field, APISchemaError, INTROSPECTION_QUERY_TYPE};
 
 pub use api::{ApiSchema, ErrorPolicy};
 pub use fulltext::{FulltextAlgorithm, FulltextConfig, FulltextDefinition, FulltextLanguage};

graphql/src/execution/execution.rs

@@ -7,7 +7,7 @@ use graph::{
         value::{Object, Word},
     },
     prelude::{s, CheapClone},
-    schema::META_FIELD_NAME,
+    schema::{is_introspection_field, INTROSPECTION_QUERY_TYPE, META_FIELD_NAME},
     util::{lfu_cache::EvictStats, timed_rw_lock::TimedMutex},
 };
 use lazy_static::lazy_static;
@@ -24,7 +24,6 @@ use graph::util::{lfu_cache::LfuCache, stable_hash_glue::impl_stable_hash};
 
 use super::QueryHash;
 use crate::execution::ast as a;
-use crate::introspection::{is_introspection_field, INTROSPECTION_QUERY_TYPE};
 use crate::prelude::*;
 
 lazy_static! {

graphql/src/introspection/mod.rs

@@ -1,5 +1,3 @@
 mod resolver;
-mod schema;
 
 pub use self::resolver::IntrospectionResolver;
-pub use self::schema::{is_introspection_field, INTROSPECTION_DOCUMENT, INTROSPECTION_QUERY_TYPE};