Skip to content

Commit 81ec19c

Browse files
committed
Avoid double name conversion
1 parent 381f409 commit 81ec19c

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

src/introspection/getTypesFromData.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,6 @@ export default data =>
6161
}))
6262
.map(typeObject => new GraphQLObjectType(typeObject));
6363

64+
export const getTypeNameFromKey = key => camelize(singularize(key));
6465
export const getTypeNamesFromData = data =>
65-
Object.keys(data).map(typeName => camelize(singularize(typeName)));
66+
Object.keys(data).map(getTypeNameFromKey);

src/resolver/index.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import { pluralize, underscore } from 'inflection';
1+
import { pluralize } from 'inflection';
22

33
import all from './Query/all';
44
import meta from './Query/meta';
55
import single from './Query/single';
66
import create from './Mutation/create';
77
import update from './Mutation/update';
88
import remove from './Mutation/remove';
9-
import { getTypeNamesFromData } from '../introspection/getTypesFromData';
10-
11-
const getData = (entityName, data) => data[underscore(pluralize(entityName))];
9+
import { getTypeNameFromKey } from '../introspection/getTypesFromData';
1210

1311
const getQueryResolvers = (entityName, data) => ({
1412
[`all${pluralize(entityName)}`]: all(data),
@@ -23,19 +21,18 @@ const getMutationResolvers = (entityName, data) => ({
2321
});
2422

2523
export default data => {
26-
const typeNames = getTypeNamesFromData(data);
2724
return {
28-
Query: typeNames.reduce(
29-
(resolvers, entityName) => ({
25+
Query: Object.keys(data).reduce(
26+
(resolvers, key) => ({
3027
...resolvers,
31-
...getQueryResolvers(entityName, getData(entityName, data)),
28+
...getQueryResolvers(getTypeNameFromKey(key), data[key]),
3229
}),
3330
{},
3431
),
35-
Mutation: typeNames.reduce(
36-
(resolvers, entityName) => ({
32+
Mutation: Object.keys(data).reduce(
33+
(resolvers, key) => ({
3734
...resolvers,
38-
...getMutationResolvers(entityName, getData(entityName, data)),
35+
...getMutationResolvers(getTypeNameFromKey(key), data[key]),
3936
}),
4037
{},
4138
),

0 commit comments

Comments
 (0)