Support recent versions of introspection json (#59)

* Support recent versions of introspection json * Update Introspection type
2fd · Jun 18, 2019 · 40ecde3 · 40ecde3
1 parent 1459746
commit 40ecde3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/interface.d.ts b/lib/interface.d.ts
@@ -152,9 +152,11 @@ type refToUrl = (typeName: TypeRef) => string;
  * Introspection types
  */
 type Introspection = {
-  data: {
-    __schema: Schema;
-  };
+    data: {
+        __schema: Schema
+    }
+} | {
+    __schema: Schema
 };
 
 type Schema = {

diff --git a/lib/schema-loader/json.ts b/lib/schema-loader/json.ts
@@ -11,7 +11,7 @@ export const jsonSchemaLoader: SchemaLoader = (
   try {
     const schemaPath = resolve(options.schemaFile);
     const introspection: Introspection = require(schemaPath);
-    return Promise.resolve(introspection.data.__schema);
+    return Promise.resolve(introspection.__schema || introspection.data.__schema);
   } catch (err) {
     return Promise.reject(err);
   }