Skip to content
This repository has been archived by the owner on Sep 3, 2021. It is now read-only.

Fix for #169 #170

Merged
merged 4 commits into from
Jan 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/augment.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,14 @@ const augmentQueryArguments = (typeMap, config, queryType) => {
return typeMap;
};

export const augmentResolvers = (augmentedTypeMap, resolvers) => {
export const augmentResolvers = (augmentedTypeMap, resolvers, config) => {
let queryResolvers = resolvers && resolvers.Query ? resolvers.Query : {};
const generatedQueryMap = createOperationMap(augmentedTypeMap.Query);
queryResolvers = possiblyAddResolvers(generatedQueryMap, queryResolvers);
queryResolvers = possiblyAddResolvers(
generatedQueryMap,
queryResolvers,
config
);
if (Object.keys(queryResolvers).length > 0) {
resolvers.Query = queryResolvers;
}
Expand All @@ -166,7 +170,8 @@ export const augmentResolvers = (augmentedTypeMap, resolvers) => {
const generatedMutationMap = createOperationMap(augmentedTypeMap.Mutation);
mutationResolvers = possiblyAddResolvers(
generatedMutationMap,
mutationResolvers
mutationResolvers,
config
);
if (Object.keys(mutationResolvers).length > 0) {
resolvers.Mutation = mutationResolvers;
Expand Down Expand Up @@ -210,13 +215,15 @@ export const possiblyAddArgument = (args, fieldName, fieldType) => {
return args;
};

const possiblyAddResolvers = (operationTypeMap, resolvers) => {
const possiblyAddResolvers = (operationTypeMap, resolvers, config) => {
let operationName = '';
return Object.keys(operationTypeMap).reduce((acc, t) => {
// if no resolver provided for this operation type field
operationName = operationTypeMap[t].name.value;
if (acc[operationName] === undefined) {
acc[operationName] = neo4jgraphql;
acc[operationName] = function(...args) {
return neo4jgraphql(...args, config.debug);
};
}
return acc;
}, resolvers);
Expand Down
4 changes: 2 additions & 2 deletions src/augmentSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {

export const augmentedSchema = (typeMap, resolvers, config) => {
const augmentedTypeMap = augmentTypeMap(typeMap, config);
const augmentedResolvers = augmentResolvers(augmentedTypeMap, resolvers);
const augmentedResolvers = augmentResolvers(augmentedTypeMap, resolvers, config);
return makeExecutableSchema({
typeDefs: printTypeMap(augmentedTypeMap),
resolvers: augmentedResolvers,
Expand All @@ -34,7 +34,7 @@ export const makeAugmentedExecutableSchema = ({
}) => {
const typeMap = extractTypeMapFromTypeDefs(typeDefs);
const augmentedTypeMap = augmentTypeMap(typeMap, config);
const augmentedResolvers = augmentResolvers(augmentedTypeMap, resolvers);
const augmentedResolvers = augmentResolvers(augmentedTypeMap, resolvers, config);
resolverValidationOptions.requireResolversForResolveType = false;
return makeExecutableSchema({
typeDefs: printTypeMap(augmentedTypeMap),
Expand Down
10 changes: 8 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ export function cypherMutation(
});
}

export const augmentSchema = (schema, config) => {
export const augmentSchema = (schema, config = {
query: true,
mutation: true,
temporal: true,
debug: true
}) => {
const typeMap = extractTypeMapFromSchema(schema);
const resolvers = extractResolversFromSchema(schema);
return augmentedSchema(typeMap, resolvers, config);
Expand All @@ -118,7 +123,8 @@ export const makeAugmentedSchema = ({
config = {
query: true,
mutation: true,
temporal: true
temporal: true,
debug: true
}
}) => {
if (schema) {
Expand Down