fix for missing modifiers with preResolveType (#2175) (#2270)

dotansimha · Aug 1, 2019 · 9a53d8d · 9a53d8d
1 parent 1559ab6
commit 9a53d8d
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 15 deletions.
diff --git a/dev-test/codegen.yml b/dev-test/codegen.yml
@@ -194,6 +194,15 @@ generates:
     plugins:
       - typescript
       - typescript-operations
+  ./dev-test/test-schema/types.preResolveTypes.ts:
+    schema: ./dev-test/test-schema/schema.graphql
+    documents:
+      - "query test { testArr1 testArr2 testArr3 }"
+    config:
+      preResolveTypes: true
+    plugins:
+      - typescript
+      - typescript-operations
   ./dev-test/star-wars/types.d.ts:
     schema: ./dev-test/star-wars/schema.json
     documents: ./dev-test/star-wars/**/*.graphql

diff --git a/dev-test/githunt/types.preResolveTypes.compatibility.ts b/dev-test/githunt/types.preResolveTypes.compatibility.ts
@@ -181,7 +181,7 @@ export type CommentQueryVariables = {
 };
 
 
-export type CommentQuery = { __typename?: 'Query', currentUser: Maybe<{ __typename?: 'User', login: string, html_url: string }>, entry: Maybe<{ __typename?: 'Entry', id: number, createdAt: number, commentCount: number, postedBy: { __typename?: 'User', login: string, html_url: string }, comments: Array<Maybe<({ __typename?: 'Comment' } & CommentsPageCommentFragment)>>, repository: ({ __typename?: 'Repository', full_name: string, html_url: string } & { __typename?: 'Repository', description: string, open_issues_count: number, stargazers_count: number }) }> };
+export type CommentQuery = { __typename?: 'Query', currentUser: Maybe<{ __typename?: 'User', login: string, html_url: string }>, entry: Maybe<{ __typename?: 'Entry', id: number, createdAt: number, commentCount: number, postedBy: { __typename?: 'User', login: string, html_url: string }, comments: Array<Maybe<({ __typename?: 'Comment' } & CommentsPageCommentFragment)>>, repository: ({ __typename?: 'Repository', full_name: string, html_url: string } & { __typename?: 'Repository', description: Maybe<string>, open_issues_count: Maybe<number>, stargazers_count: number }) }> };
 
 export type CommentsPageCommentFragment = { __typename?: 'Comment', id: number, createdAt: number, content: string, postedBy: { __typename?: 'User', login: string, html_url: string } };
 
@@ -208,7 +208,7 @@ export type SubmitRepositoryMutationVariables = {
 
 export type SubmitRepositoryMutation = { __typename?: 'Mutation', submitRepository: Maybe<{ __typename?: 'Entry', createdAt: number }> };
 
-export type RepoInfoFragment = { __typename?: 'Entry', createdAt: number, repository: { __typename?: 'Repository', description: string, stargazers_count: number, open_issues_count: number }, postedBy: { __typename?: 'User', html_url: string, login: string } };
+export type RepoInfoFragment = { __typename?: 'Entry', createdAt: number, repository: { __typename?: 'Repository', description: Maybe<string>, stargazers_count: number, open_issues_count: Maybe<number> }, postedBy: { __typename?: 'User', html_url: string, login: string } };
 
 export type SubmitCommentMutationVariables = {
   repoFullName: Scalars['String'],

diff --git a/dev-test/githunt/types.preResolveTypes.ts b/dev-test/githunt/types.preResolveTypes.ts
@@ -181,7 +181,7 @@ export type CommentQueryVariables = {
 };
 
 
-export type CommentQuery = { __typename?: 'Query', currentUser: Maybe<{ __typename?: 'User', login: string, html_url: string }>, entry: Maybe<{ __typename?: 'Entry', id: number, createdAt: number, commentCount: number, postedBy: { __typename?: 'User', login: string, html_url: string }, comments: Array<Maybe<({ __typename?: 'Comment' } & CommentsPageCommentFragment)>>, repository: ({ __typename?: 'Repository', full_name: string, html_url: string } & { __typename?: 'Repository', description: string, open_issues_count: number, stargazers_count: number }) }> };
+export type CommentQuery = { __typename?: 'Query', currentUser: Maybe<{ __typename?: 'User', login: string, html_url: string }>, entry: Maybe<{ __typename?: 'Entry', id: number, createdAt: number, commentCount: number, postedBy: { __typename?: 'User', login: string, html_url: string }, comments: Array<Maybe<({ __typename?: 'Comment' } & CommentsPageCommentFragment)>>, repository: ({ __typename?: 'Repository', full_name: string, html_url: string } & { __typename?: 'Repository', description: Maybe<string>, open_issues_count: Maybe<number>, stargazers_count: number }) }> };
 
 export type CommentsPageCommentFragment = { __typename?: 'Comment', id: number, createdAt: number, content: string, postedBy: { __typename?: 'User', login: string, html_url: string } };
 
@@ -208,7 +208,7 @@ export type SubmitRepositoryMutationVariables = {
 
 export type SubmitRepositoryMutation = { __typename?: 'Mutation', submitRepository: Maybe<{ __typename?: 'Entry', createdAt: number }> };
 
-export type RepoInfoFragment = { __typename?: 'Entry', createdAt: number, repository: { __typename?: 'Repository', description: string, stargazers_count: number, open_issues_count: number }, postedBy: { __typename?: 'User', html_url: string, login: string } };
+export type RepoInfoFragment = { __typename?: 'Entry', createdAt: number, repository: { __typename?: 'Repository', description: Maybe<string>, stargazers_count: number, open_issues_count: Maybe<number> }, postedBy: { __typename?: 'User', html_url: string, login: string } };
 
 export type SubmitCommentMutationVariables = {
   repoFullName: Scalars['String'],

diff --git a/dev-test/githunt/types.reactApollo.preResolveTypes.tsx b/dev-test/githunt/types.reactApollo.preResolveTypes.tsx
@@ -186,7 +186,7 @@ export type CommentQueryVariables = {
 };
 
 
-export type CommentQuery = { __typename?: 'Query', currentUser: Maybe<{ __typename?: 'User', login: string, html_url: string }>, entry: Maybe<{ __typename?: 'Entry', id: number, createdAt: number, commentCount: number, postedBy: { __typename?: 'User', login: string, html_url: string }, comments: Array<Maybe<({ __typename?: 'Comment' } & CommentsPageCommentFragment)>>, repository: ({ __typename?: 'Repository', full_name: string, html_url: string } & { __typename?: 'Repository', description: string, open_issues_count: number, stargazers_count: number }) }> };
+export type CommentQuery = { __typename?: 'Query', currentUser: Maybe<{ __typename?: 'User', login: string, html_url: string }>, entry: Maybe<{ __typename?: 'Entry', id: number, createdAt: number, commentCount: number, postedBy: { __typename?: 'User', login: string, html_url: string }, comments: Array<Maybe<({ __typename?: 'Comment' } & CommentsPageCommentFragment)>>, repository: ({ __typename?: 'Repository', full_name: string, html_url: string } & { __typename?: 'Repository', description: Maybe<string>, open_issues_count: Maybe<number>, stargazers_count: number }) }> };
 
 export type CommentsPageCommentFragment = { __typename?: 'Comment', id: number, createdAt: number, content: string, postedBy: { __typename?: 'User', login: string, html_url: string } };
 
@@ -213,7 +213,7 @@ export type SubmitRepositoryMutationVariables = {
 
 export type SubmitRepositoryMutation = { __typename?: 'Mutation', submitRepository: Maybe<{ __typename?: 'Entry', createdAt: number }> };
 
-export type RepoInfoFragment = { __typename?: 'Entry', createdAt: number, repository: { __typename?: 'Repository', description: string, stargazers_count: number, open_issues_count: number }, postedBy: { __typename?: 'User', html_url: string, login: string } };
+export type RepoInfoFragment = { __typename?: 'Entry', createdAt: number, repository: { __typename?: 'Repository', description: Maybe<string>, stargazers_count: number, open_issues_count: Maybe<number> }, postedBy: { __typename?: 'User', html_url: string, login: string } };
 
 export type SubmitCommentMutationVariables = {
   repoFullName: Scalars['String'],

diff --git a/dev-test/star-wars/types.preResolveTypes.ts b/dev-test/star-wars/types.preResolveTypes.ts
@@ -252,7 +252,7 @@ export type CreateReviewForEpisodeMutationVariables = {
 };
 
 
-export type CreateReviewForEpisodeMutation = { __typename?: 'Mutation', createReview: Maybe<{ __typename?: 'Review', stars: number, commentary: string }> };
+export type CreateReviewForEpisodeMutation = { __typename?: 'Mutation', createReview: Maybe<{ __typename?: 'Review', stars: number, commentary: Maybe<string> }> };
 
 export type HeroAndFriendsNamesQueryVariables = {
   episode?: Maybe<Episode>
@@ -264,14 +264,14 @@ export type HeroAndFriendsNamesQuery = { __typename?: 'Query', hero: Maybe<{ __t
 export type HeroAppearsInQueryVariables = {};
 
 
-export type HeroAppearsInQuery = { __typename?: 'Query', hero: Maybe<{ __typename?: 'Human' | 'Droid', name: string, appearsIn: Episode }> };
+export type HeroAppearsInQuery = { __typename?: 'Query', hero: Maybe<{ __typename?: 'Human' | 'Droid', name: string, appearsIn: Array<Maybe<Episode>> }> };
 
 export type HeroDetailsQueryVariables = {
   episode?: Maybe<Episode>
 };
 
 
-export type HeroDetailsQuery = { __typename?: 'Query', hero: Maybe<({ __typename?: 'Human' | 'Droid', name: string } & ({ __typename?: 'Human', height: number } | { __typename?: 'Droid', primaryFunction: string }))> };
+export type HeroDetailsQuery = { __typename?: 'Query', hero: Maybe<({ __typename?: 'Human' | 'Droid', name: string } & ({ __typename?: 'Human', height: Maybe<number> } | { __typename?: 'Droid', primaryFunction: Maybe<string> }))> };
 
 export type HeroDetailsWithFragmentQueryVariables = {
   episode?: Maybe<Episode>
@@ -280,7 +280,7 @@ export type HeroDetailsWithFragmentQueryVariables = {
 
 export type HeroDetailsWithFragmentQuery = { __typename?: 'Query', hero: Maybe<({ __typename?: 'Human' | 'Droid' } & HeroDetailsFragment)> };
 
-export type HeroDetailsFragment = ({ __typename?: 'Human' | 'Droid', name: string } & ({ __typename?: 'Human', height: number } | { __typename?: 'Droid', primaryFunction: string }));
+export type HeroDetailsFragment = ({ __typename?: 'Human' | 'Droid', name: string } & ({ __typename?: 'Human', height: Maybe<number> } | { __typename?: 'Droid', primaryFunction: Maybe<string> }));
 
 export type HeroNameQueryVariables = {
   episode?: Maybe<Episode>
@@ -310,19 +310,19 @@ export type HeroParentTypeDependentFieldQueryVariables = {
 };
 
 
-export type HeroParentTypeDependentFieldQuery = { __typename?: 'Query', hero: Maybe<({ __typename?: 'Human' | 'Droid', name: string } & ({ __typename?: 'Human', friends: Maybe<Array<Maybe<({ __typename?: 'Human' | 'Droid', name: string } & { __typename?: 'Human', height: number })>>> } | { __typename?: 'Droid', friends: Maybe<Array<Maybe<({ __typename?: 'Human' | 'Droid', name: string } & { __typename?: 'Human', height: number })>>> }))> };
+export type HeroParentTypeDependentFieldQuery = { __typename?: 'Query', hero: Maybe<({ __typename?: 'Human' | 'Droid', name: string } & ({ __typename?: 'Human', friends: Maybe<Array<Maybe<({ __typename?: 'Human' | 'Droid', name: string } & { __typename?: 'Human', height: Maybe<number> })>>> } | { __typename?: 'Droid', friends: Maybe<Array<Maybe<({ __typename?: 'Human' | 'Droid', name: string } & { __typename?: 'Human', height: Maybe<number> })>>> }))> };
 
 export type HeroTypeDependentAliasedFieldQueryVariables = {
   episode?: Maybe<Episode>
 };
 
 
-export type HeroTypeDependentAliasedFieldQuery = { __typename?: 'Query', hero: Maybe<({ __typename?: 'Human' | 'Droid' } & ({ __typename?: 'Human', property: string } | { __typename?: 'Droid', property: string }))> };
+export type HeroTypeDependentAliasedFieldQuery = { __typename?: 'Query', hero: Maybe<({ __typename?: 'Human' | 'Droid' } & ({ __typename?: 'Human', property: Maybe<string> } | { __typename?: 'Droid', property: Maybe<string> }))> };
 
 export type HumanWithNullHeightQueryVariables = {};
 
 
-export type HumanWithNullHeightQuery = { __typename?: 'Query', human: Maybe<{ __typename?: 'Human', name: string, mass: number }> };
+export type HumanWithNullHeightQuery = { __typename?: 'Query', human: Maybe<{ __typename?: 'Human', name: string, mass: Maybe<number> }> };
 
 export type TwoHeroesQueryVariables = {};
 

diff --git a/dev-test/test-schema/resolvers-types.ts b/dev-test/test-schema/resolvers-types.ts
@@ -15,6 +15,9 @@ export type Query = {
   allUsers: Array<Maybe<User>>,
   userById?: Maybe<User>,
   answer: Array<Scalars['Int']>,
+  testArr1?: Maybe<Array<Maybe<Scalars['String']>>>,
+  testArr2: Array<Maybe<Scalars['String']>>,
+  testArr3: Array<Scalars['String']>,
 };
 
 
@@ -110,6 +113,9 @@ export type QueryResolvers<ContextType = any, ParentType = ResolversParentTypes[
   allUsers?: Resolver<Array<Maybe<ResolversTypes['User']>>, ParentType, ContextType>,
   userById?: Resolver<Maybe<ResolversTypes['User']>, ParentType, ContextType, QueryUserByIdArgs>,
   answer?: Resolver<Array<ResolversTypes['Int']>, ParentType, ContextType>,
+  testArr1?: Resolver<Maybe<Array<Maybe<ResolversTypes['String']>>>, ParentType, ContextType>,
+  testArr2?: Resolver<Array<Maybe<ResolversTypes['String']>>, ParentType, ContextType>,
+  testArr3?: Resolver<Array<ResolversTypes['String']>, ParentType, ContextType>,
 };
 
 export type UserResolvers<ContextType = any, ParentType = ResolversParentTypes['User']> = {

diff --git a/dev-test/test-schema/schema.graphql b/dev-test/test-schema/schema.graphql
@@ -11,5 +11,8 @@ type Query {
   # Generates a new answer for the
   # guessing game
   answer: [Int!]!
+  testArr1: [String]
+  testArr2: [String]!
+  testArr3: [String!]!
 }
 
diff --git a/dev-test/test-schema/types.preResolveTypes.ts b/dev-test/test-schema/types.preResolveTypes.ts
@@ -0,0 +1,35 @@
+export type Maybe<T> = T | null;
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+  ID: string,
+  String: string,
+  Boolean: boolean,
+  Int: number,
+  Float: number,
+};
+
+export type Query = {
+  __typename?: 'Query',
+  allUsers: Array<Maybe<User>>,
+  userById?: Maybe<User>,
+  answer: Array<Scalars['Int']>,
+  testArr1?: Maybe<Array<Maybe<Scalars['String']>>>,
+  testArr2: Array<Maybe<Scalars['String']>>,
+  testArr3: Array<Scalars['String']>,
+};
+
+
+export type QueryUserByIdArgs = {
+  id: Scalars['Int']
+};
+
+export type User = {
+  __typename?: 'User',
+  id: Scalars['Int'],
+  name: Scalars['String'],
+  email: Scalars['String'],
+};
+export type TestQueryVariables = {};
+
+
+export type TestQuery = { __typename?: 'Query', testArr1: Maybe<Array<Maybe<string>>>, testArr2: Array<Maybe<string>>, testArr3: Array<string> };
diff --git a/packages/plugins/other/visitor-plugin-common/src/selection-set-to-object.ts b/packages/plugins/other/visitor-plugin-common/src/selection-set-to-object.ts
@@ -196,10 +196,11 @@ export class SelectionSetToObject {
       const fieldObj = schemaType.getFields()[aliasedField.fieldName];
       const baseType = getBaseType(fieldObj.type);
       const typeToUse = this._scalars[baseType.name] || baseType.name;
+      const wrappedType = this.wrapTypeWithModifiers(typeToUse, fieldObj.type as GraphQLObjectType);
 
       return {
         name: this.formatNamedField(aliasedField.alias),
-        type: typeToUse,
+        type: wrappedType,
       };
     });
   }
@@ -221,10 +222,11 @@ export class SelectionSetToObject {
       const fieldObj = schemaType.getFields()[field];
       const baseType = getBaseType(fieldObj.type);
       const typeToUse = this._scalars[baseType.name] || baseType.name;
+      const wrappedType = this.wrapTypeWithModifiers(typeToUse, fieldObj.type as GraphQLObjectType);
 
       return {
         name: this.formatNamedField(field),
-        type: typeToUse,
+        type: wrappedType,
       };
     });
   }