File tree Expand file tree Collapse file tree 2 files changed +5
-14
lines changed Expand file tree Collapse file tree 2 files changed +5
-14
lines changed Original file line number Diff line number Diff line change 14
14
"dedent" : " 0.7.0"
15
15
},
16
16
"peerDependencies" : {
17
- "graphql-compose" : " ^7.6.1 "
17
+ "graphql-compose" : " ^7.7.0 "
18
18
},
19
19
"devDependencies" : {
20
20
"@types/dedent" : " ^0.7.0" ,
21
21
"@types/glob" : " 7.1.1" ,
22
- "@types/jest" : " 24.0.23" ,
23
- "@types/node" : " 12.12.12" ,
24
- "@typescript-eslint/eslint-plugin" : " 2.8.0" ,
25
- "@typescript-eslint/parser" : " 2.8.0" ,
26
- "apollo-server" : " ^2.9.12" ,
27
- "eslint" : " 6.7.1" ,
28
- "eslint-config-prettier" : " 6.7.0" ,
29
- "eslint-plugin-prettier" : " 3.1.1" ,
30
- "graphql" : " ^14.0.0" ,
31
- "graphql-compose" : " ^7.6.1" ,
22
+ "graphql-compose" : " 7.7.0" ,
32
23
"jest" : " 24.9.0" ,
33
24
"prettier" : " 1.19.1" ,
34
25
"rimraf" : " 3.0.0" ,
Original file line number Diff line number Diff line change 4
4
upperFirst ,
5
5
ObjectTypeComposerFieldConfig ,
6
6
isOutputTypeDefinitionString ,
7
- isTypeNameString ,
7
+ isWrappedTypeNameString ,
8
8
isComposeOutputType ,
9
9
isSomeOutputTypeDefinitionString ,
10
10
inspect ,
@@ -161,7 +161,7 @@ function prepareNamespaceFieldConfig(
161
161
fc . type = sc . createObjectTC ( typename ) ;
162
162
} else {
163
163
if ( typeof fc . type === 'string' ) {
164
- if ( ! isOutputTypeDefinitionString ( fc . type ) && ! isTypeNameString ( fc . type ) ) {
164
+ if ( ! isOutputTypeDefinitionString ( fc . type ) && ! isWrappedTypeNameString ( fc . type ) ) {
165
165
throw new Error ( dedent `
166
166
You provide incorrect output type definition:
167
167
${ fc . type }
@@ -225,7 +225,7 @@ function prepareFieldConfig(
225
225
function isSomeOutputTypeDefinition ( type : any ) : boolean {
226
226
if ( typeof type === 'string' ) {
227
227
// type: 'String'
228
- return isSomeOutputTypeDefinitionString ( type ) || isTypeNameString ( type ) ;
228
+ return isSomeOutputTypeDefinitionString ( type ) || isWrappedTypeNameString ( type ) ;
229
229
} else if ( Array . isArray ( type ) ) {
230
230
// type: ['String']
231
231
return isSomeOutputTypeDefinition ( type [ 0 ] ) ;
You can’t perform that action at this time.
0 commit comments