Skip to content

Commit 13f7887

Browse files
committed
fix: if not provided schemaComposer for convertSchemaToGraphQL() it will use global instance
1 parent 6abef5f commit 13f7887

File tree

3 files changed

+216
-184
lines changed

3 files changed

+216
-184
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,27 @@
3939
"devDependencies": {
4040
"babel-cli": "^6.26.0",
4141
"babel-core": "^6.26.0",
42-
"babel-eslint": "^8.2.1",
43-
"babel-jest": "^22.2.2",
42+
"babel-eslint": "^8.2.2",
43+
"babel-jest": "^22.4.0",
4444
"babel-plugin-transform-flow-strip-types": "^6.22.0",
4545
"babel-plugin-transform-object-rest-spread": "^6.13.0",
4646
"babel-plugin-transform-runtime": "^6.23.0",
4747
"babel-preset-env": "^1.6.1",
4848
"cz-conventional-changelog": "^2.1.0",
49-
"eslint": "^4.17.0",
49+
"eslint": "^4.18.0",
5050
"eslint-config-airbnb-base": "^12.1.0",
5151
"eslint-config-prettier": "^2.9.0",
52-
"eslint-plugin-flowtype": "^2.44.0",
52+
"eslint-plugin-flowtype": "^2.45.0",
5353
"eslint-plugin-import": "^2.8.0",
5454
"eslint-plugin-prettier": "^2.6.0",
5555
"flow-bin": "^0.65.0",
56-
"graphql": "0.13.0",
57-
"graphql-compose": "^3.0.3",
56+
"graphql": "0.13.1",
57+
"graphql-compose": "^3.0.5",
5858
"graphql-compose-connection": ">=3.0.0",
5959
"graphql-compose-pagination": ">=3.0.0",
60-
"jest": "^22.3.0",
60+
"jest": "^22.4.0",
6161
"mongodb-memory-server": "^1.7.0",
62-
"mongoose": "^5.0.5",
62+
"mongoose": "^5.0.6",
6363
"prettier": "^1.10.2",
6464
"request": "^2.83.0",
6565
"rimraf": "^2.6.2",

src/fieldsConverter.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import mongoose from 'mongoose';
55
import type { Schema, MongooseModel, MongooseSchemaField } from 'mongoose';
66
import objectPath from 'object-path';
77
import type { SchemaComposer, TypeComposer, EnumTypeComposer } from 'graphql-compose';
8-
import { upperFirst } from 'graphql-compose';
8+
import { upperFirst, schemaComposer as globalSchemaComposer } from 'graphql-compose';
99
import type { GraphQLScalarType } from 'graphql-compose/lib/graphql';
1010
import GraphQLMongoID from './types/mongoid';
1111

@@ -113,8 +113,10 @@ export function getFieldsFromModel(model: MongooseModel | MongoosePseudoModelT):
113113
export function convertModelToGraphQL(
114114
model: MongooseModel | MongoosePseudoModelT,
115115
typeName: string,
116-
schemaComposer: SchemaComposer<any>
116+
sc?: SchemaComposer<any>
117117
): TypeComposer {
118+
const schemaComposer = sc || globalSchemaComposer;
119+
118120
// if model already has generated TypeComposer early, then return it
119121
if (model.schema && model.schema._gqcTypeComposer) {
120122
return (model.schema._gqcTypeComposer: any);
@@ -161,8 +163,10 @@ export function convertModelToGraphQL(
161163
export function convertSchemaToGraphQL(
162164
schema: Object, // MongooseModelSchemaT, TODO use Model from mongoose_v4.x.x definition when it will be public
163165
typeName: string,
164-
schemaComposer: SchemaComposer<any>
166+
sc?: SchemaComposer<any>
165167
): TypeComposer {
168+
const schemaComposer = sc || globalSchemaComposer;
169+
166170
if (!typeName) {
167171
throw new Error('You provide empty name for type. `name` argument should be non-empty string.');
168172
}

0 commit comments

Comments
 (0)