Skip to content

Commit 4291915

Browse files
committed
Clean up
- Formatting - [ ] Abstract duplicated code
1 parent 565f12c commit 4291915

File tree

2 files changed

+42
-43
lines changed

2 files changed

+42
-43
lines changed

packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,7 @@ export class BaseResolversVisitor<
904904
const fieldsToOmit = this._federation
905905
.filterFieldNames(Object.keys(fields))
906906
.map(fieldName => {
907+
// TODO: eddeee888 this is duplicated from createResolversFields. Abstract to reuse
907908
const field = fields[fieldName];
908909
const baseType = getBaseType(field.type);
909910
const isMapped = this.config.mappers[baseType.name];

packages/plugins/typescript/resolvers/tests/ts-resolvers.spec.ts

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,22 +1430,22 @@ export type ResolverFn<TResult, TParent, TContext, TArgs> = (
14301430
const content = await plugin(testSchema, [], {}, { outputFile: 'graphql.ts' });
14311431

14321432
expect(tsContent.content).toBeSimilarStringTo(`
1433-
export type CccFoo = {
1434-
__typename?: 'CCCFoo';
1435-
foo: Scalars['String'];
1436-
};
1433+
export type CccFoo = {
1434+
__typename?: 'CCCFoo';
1435+
foo: Scalars['String'];
1436+
};
14371437
`);
14381438
expect(tsContent.content).toBeSimilarStringTo(`
1439-
export type CccBar = {
1440-
__typename?: 'CCCBar';
1441-
bar: Scalars['String'];
1442-
};
1439+
export type CccBar = {
1440+
__typename?: 'CCCBar';
1441+
bar: Scalars['String'];
1442+
};
14431443
`);
14441444

14451445
expect(content.content).toBeSimilarStringTo(`
1446-
export type ResolversUnionTypes = {
1447-
CCCUnion: ( CccFoo ) | ( CccBar );
1448-
}
1446+
export type ResolversUnionTypes = {
1447+
CCCUnion: ( CccFoo ) | ( CccBar );
1448+
};
14491449
`);
14501450
expect(content.content).toBeSimilarStringTo(`
14511451
/** Mapping between all available schema types and the resolvers types */
@@ -1784,44 +1784,42 @@ export type ResolverFn<TResult, TParent, TContext, TArgs> = (
17841784
const content = await plugin(testSchema, [], {}, { outputFile: 'graphql.ts' });
17851785

17861786
expect(content.content).toBeSimilarStringTo(`
1787-
export type ResolversUnionTypes = {
1788-
UserPayload: ( UserResult ) | ( StandardError );
1789-
PostsPayload: ( PostsResult ) | ( StandardError );
1790-
};
1787+
export type ResolversUnionTypes = {
1788+
UserPayload: ( UserResult ) | ( StandardError );
1789+
PostsPayload: ( PostsResult ) | ( StandardError );
1790+
};
17911791
`);
17921792

17931793
expect(content.content).toBeSimilarStringTo(`
1794-
/** Mapping between all available schema types and the resolvers types */
1795-
export type ResolversTypes = {
1796-
Query: ResolverTypeWrapper<{}>;
1797-
ID: ResolverTypeWrapper<Scalars['ID']>;
1798-
StandardError: ResolverTypeWrapper<StandardError>;
1799-
String: ResolverTypeWrapper<Scalars['String']>;
1800-
User: ResolverTypeWrapper<User>;
1801-
UserResult: ResolverTypeWrapper<UserResult>;
1802-
UserPayload: ResolverTypeWrapper<ResolversUnionTypes['UserPayload']>;
1803-
Post: ResolverTypeWrapper<Post>;
1804-
PostsResult: ResolverTypeWrapper<PostsResult>;
1805-
PostsPayload: ResolverTypeWrapper<ResolversUnionTypes['PostsPayload']>;
1806-
Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
1807-
};
1794+
export type ResolversTypes = {
1795+
Query: ResolverTypeWrapper<{}>;
1796+
ID: ResolverTypeWrapper<Scalars['ID']>;
1797+
StandardError: ResolverTypeWrapper<StandardError>;
1798+
String: ResolverTypeWrapper<Scalars['String']>;
1799+
User: ResolverTypeWrapper<User>;
1800+
UserResult: ResolverTypeWrapper<UserResult>;
1801+
UserPayload: ResolverTypeWrapper<ResolversUnionTypes['UserPayload']>;
1802+
Post: ResolverTypeWrapper<Post>;
1803+
PostsResult: ResolverTypeWrapper<PostsResult>;
1804+
PostsPayload: ResolverTypeWrapper<ResolversUnionTypes['PostsPayload']>;
1805+
Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
1806+
};
18081807
`);
18091808

18101809
expect(content.content).toBeSimilarStringTo(`
1811-
/** Mapping between all available schema types and the resolvers parents */
1812-
export type ResolversParentTypes = {
1813-
Query: {};
1814-
ID: Scalars['ID'];
1815-
StandardError: StandardError;
1816-
String: Scalars['String'];
1817-
User: User;
1818-
UserResult: UserResult;
1819-
UserPayload: ResolversUnionTypes['UserPayload'];
1820-
Post: Post;
1821-
PostsResult: PostsResult;
1822-
PostsPayload: ResolversUnionTypes['PostsPayload'];
1823-
Boolean: Scalars['Boolean'];
1824-
};
1810+
export type ResolversParentTypes = {
1811+
Query: {};
1812+
ID: Scalars['ID'];
1813+
StandardError: StandardError;
1814+
String: Scalars['String'];
1815+
User: User;
1816+
UserResult: UserResult;
1817+
UserPayload: ResolversUnionTypes['UserPayload'];
1818+
Post: Post;
1819+
PostsResult: PostsResult;
1820+
PostsPayload: ResolversUnionTypes['PostsPayload'];
1821+
Boolean: Scalars['Boolean'];
1822+
};
18251823
`);
18261824
});
18271825

0 commit comments

Comments
 (0)