Merge branch 'master' of github.com:neo4j-graphql/neo4j-graphql-js

Author: johnymontana

package-lock.json

@@ -48,6 +48,7 @@
  "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
  "@babel/plugin-transform-runtime": "^7.0.0",
  "@babel/preset-env": "^7.10.4",
+ "@graphql-inspector/core": "^2.3.0",
  "apollo-cache-inmemory": "^1.6.3",
  "apollo-client": "^2.6.10",
  "apollo-link-http": "^1.5.16",
@@ -57,7 +58,7 @@
  "body-parser": "^1.18.3",
  "express": "^4.17.1",
  "graphql-tag": "^2.10.1",
- "graphql-tools": "^4.0.8",
+ "graphql-tools": "^7.0.2",
  "husky": "^0.14.3",
  "lint-staged": "^7.2.0",
  "node-fetch": "^2.3.0",
@@ -71,11 +72,13 @@
  "@babel/runtime-corejs2": "^7.5.5",
  "apollo-server-errors": "^2.4.1",
  "debug": "^4.1.1",
- "graphql": "^14.2.1",
  "graphql-auth-directives": "^2.2.1",
  "lodash": "^4.17.19",
  "neo4j-driver": "^4.1.0"
  },
+ "peerDependencies": {
+ "graphql": "^15.4.0"
+ },
  "ava": {
  "require": [
  "@babel/register"

package.json

@@ -5,7 +5,7 @@ import {
  isTypeDefinitionNode,
  isTypeExtensionNode
 } from 'graphql';
-import { makeExecutableSchema } from 'graphql-tools';
+import { makeExecutableSchema, printSchemaWithDirectives } from 'graphql-tools';
 import { buildDocument } from './ast';
 import {
  initializeOperationTypes,
@@ -32,7 +32,7 @@ export const makeAugmentedExecutableSchema = ({
  directiveResolvers,
  schemaDirectives = {},
  schemaTransforms = [],
- parseOptions,
+ parseOptions = {},
  inheritResolversFromInterfaces,
  config
 }) => {
@@ -106,6 +106,8 @@ export const makeAugmentedExecutableSchema = ({
  };
  }
  resolverValidationOptions.requireResolversForResolveType = false;
+ // FIXME get this working
+ // parseOptions.commentDescriptions = true;
  return makeExecutableSchema({
  typeDefs: print(documentAST),
  resolvers: augmentedResolvers,
@@ -193,6 +195,10 @@ export const augmentedSchema = (schema, config) => {
  resolverValidationOptions: {
  requireResolversForResolveType: false
  },
+ // FIXME get this working
+ // parseOptions: {
+ // commentDescriptions: true
+ // },
  schemaDirectives
  });
 };
@@ -327,11 +333,10 @@ export const setDefaultConfig = ({ config = {} }) => {
  * regenerated schema type
  */
 export const printSchemaDocument = ({ schema }) => {
- return print(
- buildDocument({
- definitions: extractSchemaDefinitions({ schema })
- })
- );
+ return printSchemaWithDirectives(schema, {
+ // FIXME add to testing once using this is supported
+ // commentDescriptions: true
+ });
 };
 
 /**

src/augment/augment.js

@@ -956,12 +956,12 @@ export const removeIgnoredFields = (schemaType, selections) => {
 };
 
 export const getInterfaceDerivedTypeNames = (schema, interfaceName) => {
- const implementingTypeMap = schema._implementations
- ? schema._implementations[interfaceName]
+ const implementingTypeMap = schema._implementationsMap
+ ? schema._implementationsMap[interfaceName]
  : {};
  let implementingTypes = [];
- if (implementingTypeMap) {
- implementingTypes = Object.values(implementingTypeMap).map(
+ if (implementingTypeMap && implementingTypeMap.objects) {
+ implementingTypes = Object.values(implementingTypeMap.objects).map(
  type => type.name
  );
  }

src/utils.js

@@ -13,7 +13,7 @@ test('Call assertSchema for @id, @unique, and @index fields on node types', t =>
  auth: true
  }
  });
- const expected = `CALL apoc.schema.assert({State:["name"],UniqueNode:["anotherId"]}, {Movie:["movieId"],Person:["userId"],OldCamera:["id"],Camera:["id"],NewCamera:["id"],UniqueNode:["string","id"],UniqueStringNode:["uniqueString"]})`;
+ const expected = `CALL apoc.schema.assert({State:["name"],UniqueNode:["anotherId"]}, {Movie:["movieId"],Person:["userId"],Camera:["id"],OldCamera:["id"],NewCamera:["id"],UniqueNode:["string","id"],UniqueStringNode:["uniqueString"]})`;
  const schemaAssertCypher = schemaAssert({ schema });
  t.is(schemaAssertCypher, expected);
 });