Skip to content

Commit f00e878

Browse files
eddeee888eddeee888
authored
Merge pull request #108 from eddeee888/add-watch-pattern-in-define-config
Handle `watchPattern` in `defineConfig`
2 parents 666fef8 + db94510 commit f00e878

17 files changed

Lines changed: 552 additions & 340 deletions

File tree

‎.changeset/witty-windows-search.md‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
---
2-
'@eddeee888/gcg-typescript-resolver-files': patch
2+
'@eddeee888/gcg-typescript-resolver-files': minor
33
---
44

5-
Add defineConfig
5+
Add `defineConfig`. This sets up `preset`, `presetConfig` and `watchPattern`.
6+
7+
Example:
8+
9+
```ts
10+
import type { CodegenConfig } from '@graphql-codegen/cli';
11+
import { defineConfig } from '@eddeee888/typescript-resolver-files';
12+
13+
const config: CodegenConfig = {
14+
schema: 'src/schema/**/*.graphql',
15+
generates: {
16+
'src/schema': defineConfig(),
17+
},
18+
};
19+
20+
export default config;
21+
```

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@graphql-codegen/add": "4.0.0",
1616
"@graphql-codegen/cli": "3.3.0",
1717
"@graphql-codegen/plugin-helpers": "4.2.0",
18-
"@graphql-codegen/typescript": "3.0.0",
18+
"@graphql-codegen/typescript": "3.0.3",
1919
"@graphql-codegen/typescript-resolvers": "3.2.0",
2020
"@nrwl/devkit": "15.9.1",
2121
"@nrwl/eslint-plugin-nx": "15.9.1",

‎packages/typescript-resolver-files-e2e/src/test-config-overrides/modules/types.gen.ts‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,24 @@ export type DirectiveResolverFn<
286286
info: GraphQLResolveInfo
287287
) => TResult | Promise<TResult>;
288288

289+
/** Mapping of union types */
290+
export type ResolversUnionTypes = {
291+
TopicByIdPayload: StandardError | TopicByIdResult;
292+
TopicCreatePayload: StandardError | TopicCreateResult;
293+
TopicEditPayload: StandardError | TopicEditResult;
294+
TopicsCreatedByUserPayload: StandardError | TopicsCreatedByUserResult;
295+
UserPayload: StandardError | UserResult;
296+
};
297+
298+
/** Mapping of union parent types */
299+
export type ResolversUnionParentTypes = {
300+
TopicByIdPayload: StandardError | TopicByIdResult;
301+
TopicCreatePayload: StandardError | TopicCreateResult;
302+
TopicEditPayload: StandardError | TopicEditResult;
303+
TopicsCreatedByUserPayload: StandardError | TopicsCreatedByUserResult;
304+
UserPayload: StandardError | UserResult;
305+
};
306+
289307
/** Mapping between all available schema types and the resolvers types */
290308
export type ResolversTypes = {
291309
BigInt: ResolverTypeWrapper<Scalars['BigInt']>;
@@ -305,27 +323,27 @@ export type ResolversTypes = {
305323
StandardError: ResolverTypeWrapper<StandardError>;
306324
Subscription: ResolverTypeWrapper<{}>;
307325
Topic: ResolverTypeWrapper<Topic>;
308-
TopicByIdPayload:
309-
| ResolversTypes['StandardError']
310-
| ResolversTypes['TopicByIdResult'];
326+
TopicByIdPayload: ResolverTypeWrapper<
327+
ResolversUnionTypes['TopicByIdPayload']
328+
>;
311329
TopicByIdResult: ResolverTypeWrapper<TopicByIdResult>;
312330
TopicCreateInput: TopicCreateInput;
313-
TopicCreatePayload:
314-
| ResolversTypes['StandardError']
315-
| ResolversTypes['TopicCreateResult'];
331+
TopicCreatePayload: ResolverTypeWrapper<
332+
ResolversUnionTypes['TopicCreatePayload']
333+
>;
316334
TopicCreateResult: ResolverTypeWrapper<TopicCreateResult>;
317335
TopicEditInput: TopicEditInput;
318-
TopicEditPayload:
319-
| ResolversTypes['StandardError']
320-
| ResolversTypes['TopicEditResult'];
336+
TopicEditPayload: ResolverTypeWrapper<
337+
ResolversUnionTypes['TopicEditPayload']
338+
>;
321339
TopicEditResult: ResolverTypeWrapper<TopicEditResult>;
322340
TopicsCreatedByUserInput: TopicsCreatedByUserInput;
323-
TopicsCreatedByUserPayload:
324-
| ResolversTypes['StandardError']
325-
| ResolversTypes['TopicsCreatedByUserResult'];
341+
TopicsCreatedByUserPayload: ResolverTypeWrapper<
342+
ResolversUnionTypes['TopicsCreatedByUserPayload']
343+
>;
326344
TopicsCreatedByUserResult: ResolverTypeWrapper<TopicsCreatedByUserResult>;
327345
User: ResolverTypeWrapper<User>;
328-
UserPayload: ResolversTypes['StandardError'] | ResolversTypes['UserResult'];
346+
UserPayload: ResolverTypeWrapper<ResolversUnionTypes['UserPayload']>;
329347
UserResult: ResolverTypeWrapper<UserResult>;
330348
Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
331349
};
@@ -347,29 +365,19 @@ export type ResolversParentTypes = {
347365
StandardError: StandardError;
348366
Subscription: {};
349367
Topic: Topic;
350-
TopicByIdPayload:
351-
| ResolversParentTypes['StandardError']
352-
| ResolversParentTypes['TopicByIdResult'];
368+
TopicByIdPayload: ResolversUnionParentTypes['TopicByIdPayload'];
353369
TopicByIdResult: TopicByIdResult;
354370
TopicCreateInput: TopicCreateInput;
355-
TopicCreatePayload:
356-
| ResolversParentTypes['StandardError']
357-
| ResolversParentTypes['TopicCreateResult'];
371+
TopicCreatePayload: ResolversUnionParentTypes['TopicCreatePayload'];
358372
TopicCreateResult: TopicCreateResult;
359373
TopicEditInput: TopicEditInput;
360-
TopicEditPayload:
361-
| ResolversParentTypes['StandardError']
362-
| ResolversParentTypes['TopicEditResult'];
374+
TopicEditPayload: ResolversUnionParentTypes['TopicEditPayload'];
363375
TopicEditResult: TopicEditResult;
364376
TopicsCreatedByUserInput: TopicsCreatedByUserInput;
365-
TopicsCreatedByUserPayload:
366-
| ResolversParentTypes['StandardError']
367-
| ResolversParentTypes['TopicsCreatedByUserResult'];
377+
TopicsCreatedByUserPayload: ResolversUnionParentTypes['TopicsCreatedByUserPayload'];
368378
TopicsCreatedByUserResult: TopicsCreatedByUserResult;
369379
User: User;
370-
UserPayload:
371-
| ResolversParentTypes['StandardError']
372-
| ResolversParentTypes['UserResult'];
380+
UserPayload: ResolversUnionParentTypes['UserPayload'];
373381
UserResult: UserResult;
374382
Boolean: Scalars['Boolean'];
375383
};

‎packages/typescript-resolver-files-e2e/src/test-external-resolvers/modules/types.generated.ts‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,24 @@ export type DirectiveResolverFn<
285285
info: GraphQLResolveInfo
286286
) => TResult | Promise<TResult>;
287287

288+
/** Mapping of union types */
289+
export type ResolversUnionTypes = {
290+
TopicByIdPayload: StandardError | TopicByIdResult;
291+
TopicCreatePayload: StandardError | TopicCreateResult;
292+
TopicEditPayload: StandardError | TopicEditResult;
293+
TopicsCreatedByUserPayload: StandardError | TopicsCreatedByUserResult;
294+
UserPayload: StandardError | UserResult;
295+
};
296+
297+
/** Mapping of union parent types */
298+
export type ResolversUnionParentTypes = {
299+
TopicByIdPayload: StandardError | TopicByIdResult;
300+
TopicCreatePayload: StandardError | TopicCreateResult;
301+
TopicEditPayload: StandardError | TopicEditResult;
302+
TopicsCreatedByUserPayload: StandardError | TopicsCreatedByUserResult;
303+
UserPayload: StandardError | UserResult;
304+
};
305+
288306
/** Mapping between all available schema types and the resolvers types */
289307
export type ResolversTypes = {
290308
AbsoluteDefault: ResolverTypeWrapper<Scalars['AbsoluteDefault']>;
@@ -315,27 +333,27 @@ export type ResolversTypes = {
315333
StandardError: ResolverTypeWrapper<StandardError>;
316334
Subscription: ResolverTypeWrapper<{}>;
317335
Topic: ResolverTypeWrapper<Topic>;
318-
TopicByIdPayload:
319-
| ResolversTypes['StandardError']
320-
| ResolversTypes['TopicByIdResult'];
336+
TopicByIdPayload: ResolverTypeWrapper<
337+
ResolversUnionTypes['TopicByIdPayload']
338+
>;
321339
TopicByIdResult: ResolverTypeWrapper<TopicByIdResult>;
322340
TopicCreateInput: TopicCreateInput;
323-
TopicCreatePayload:
324-
| ResolversTypes['StandardError']
325-
| ResolversTypes['TopicCreateResult'];
341+
TopicCreatePayload: ResolverTypeWrapper<
342+
ResolversUnionTypes['TopicCreatePayload']
343+
>;
326344
TopicCreateResult: ResolverTypeWrapper<TopicCreateResult>;
327345
TopicEditInput: TopicEditInput;
328-
TopicEditPayload:
329-
| ResolversTypes['StandardError']
330-
| ResolversTypes['TopicEditResult'];
346+
TopicEditPayload: ResolverTypeWrapper<
347+
ResolversUnionTypes['TopicEditPayload']
348+
>;
331349
TopicEditResult: ResolverTypeWrapper<TopicEditResult>;
332350
TopicsCreatedByUserInput: TopicsCreatedByUserInput;
333-
TopicsCreatedByUserPayload:
334-
| ResolversTypes['StandardError']
335-
| ResolversTypes['TopicsCreatedByUserResult'];
351+
TopicsCreatedByUserPayload: ResolverTypeWrapper<
352+
ResolversUnionTypes['TopicsCreatedByUserPayload']
353+
>;
336354
TopicsCreatedByUserResult: ResolverTypeWrapper<TopicsCreatedByUserResult>;
337355
User: ResolverTypeWrapper<User>;
338-
UserPayload: ResolversTypes['StandardError'] | ResolversTypes['UserResult'];
356+
UserPayload: ResolverTypeWrapper<ResolversUnionTypes['UserPayload']>;
339357
UserResult: ResolverTypeWrapper<UserResult>;
340358
Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
341359
};
@@ -363,29 +381,19 @@ export type ResolversParentTypes = {
363381
StandardError: StandardError;
364382
Subscription: {};
365383
Topic: Topic;
366-
TopicByIdPayload:
367-
| ResolversParentTypes['StandardError']
368-
| ResolversParentTypes['TopicByIdResult'];
384+
TopicByIdPayload: ResolversUnionParentTypes['TopicByIdPayload'];
369385
TopicByIdResult: TopicByIdResult;
370386
TopicCreateInput: TopicCreateInput;
371-
TopicCreatePayload:
372-
| ResolversParentTypes['StandardError']
373-
| ResolversParentTypes['TopicCreateResult'];
387+
TopicCreatePayload: ResolversUnionParentTypes['TopicCreatePayload'];
374388
TopicCreateResult: TopicCreateResult;
375389
TopicEditInput: TopicEditInput;
376-
TopicEditPayload:
377-
| ResolversParentTypes['StandardError']
378-
| ResolversParentTypes['TopicEditResult'];
390+
TopicEditPayload: ResolversUnionParentTypes['TopicEditPayload'];
379391
TopicEditResult: TopicEditResult;
380392
TopicsCreatedByUserInput: TopicsCreatedByUserInput;
381-
TopicsCreatedByUserPayload:
382-
| ResolversParentTypes['StandardError']
383-
| ResolversParentTypes['TopicsCreatedByUserResult'];
393+
TopicsCreatedByUserPayload: ResolversUnionParentTypes['TopicsCreatedByUserPayload'];
384394
TopicsCreatedByUserResult: TopicsCreatedByUserResult;
385395
User: User;
386-
UserPayload:
387-
| ResolversParentTypes['StandardError']
388-
| ResolversParentTypes['UserResult'];
396+
UserPayload: ResolversUnionParentTypes['UserPayload'];
389397
UserResult: UserResult;
390398
Boolean: Scalars['Boolean'];
391399
};

‎packages/typescript-resolver-files-e2e/src/test-mappers-vs-schema-types/modules/types.generated.ts‎

Lines changed: 70 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,58 @@ export type DirectiveResolverFn<
281281
info: GraphQLResolveInfo
282282
) => TResult | Promise<TResult>;
283283

284+
/** Mapping of union types */
285+
export type ResolversUnionTypes = {
286+
TopicByIdPayload:
287+
| Error
288+
| (Omit<TopicByIdResult, 'result'> & {
289+
result?: Maybe<ResolversTypes['Topic']>;
290+
});
291+
TopicCreatePayload:
292+
| Error
293+
| (Omit<TopicCreateResult, 'result'> & { result: ResolversTypes['Topic'] });
294+
TopicEditPayload:
295+
| Error
296+
| (Omit<TopicEditResult, 'result'> & { result: ResolversTypes['Topic'] });
297+
TopicsCreatedByUserPayload:
298+
| Error
299+
| (Omit<TopicsCreatedByUserResult, 'result'> & {
300+
result: Array<ResolversTypes['Topic']>;
301+
});
302+
UserPayload:
303+
| Error
304+
| (Omit<UserResult, 'result'> & { result?: Maybe<ResolversTypes['User']> });
305+
};
306+
307+
/** Mapping of union parent types */
308+
export type ResolversUnionParentTypes = {
309+
TopicByIdPayload:
310+
| Error
311+
| (Omit<TopicByIdResult, 'result'> & {
312+
result?: Maybe<ResolversParentTypes['Topic']>;
313+
});
314+
TopicCreatePayload:
315+
| Error
316+
| (Omit<TopicCreateResult, 'result'> & {
317+
result: ResolversParentTypes['Topic'];
318+
});
319+
TopicEditPayload:
320+
| Error
321+
| (Omit<TopicEditResult, 'result'> & {
322+
result: ResolversParentTypes['Topic'];
323+
});
324+
TopicsCreatedByUserPayload:
325+
| Error
326+
| (Omit<TopicsCreatedByUserResult, 'result'> & {
327+
result: Array<ResolversParentTypes['Topic']>;
328+
});
329+
UserPayload:
330+
| Error
331+
| (Omit<UserResult, 'result'> & {
332+
result?: Maybe<ResolversParentTypes['User']>;
333+
});
334+
};
335+
284336
/** Mapping between all available schema types and the resolvers types */
285337
export type ResolversTypes = {
286338
Account: ResolverTypeWrapper<AccountMapper>;
@@ -298,35 +350,39 @@ export type ResolversTypes = {
298350
Topic: ResolverTypeWrapper<
299351
Omit<Topic, 'creator'> & { creator: ResolversTypes['User'] }
300352
>;
301-
TopicByIdPayload: ResolversTypes['Error'] | ResolversTypes['TopicByIdResult'];
353+
TopicByIdPayload: ResolverTypeWrapper<
354+
ResolversUnionTypes['TopicByIdPayload']
355+
>;
302356
TopicByIdResult: ResolverTypeWrapper<
303357
Omit<TopicByIdResult, 'result'> & {
304358
result?: Maybe<ResolversTypes['Topic']>;
305359
}
306360
>;
307361
TopicCreateInput: TopicCreateInput;
308-
TopicCreatePayload:
309-
| ResolversTypes['Error']
310-
| ResolversTypes['TopicCreateResult'];
362+
TopicCreatePayload: ResolverTypeWrapper<
363+
ResolversUnionTypes['TopicCreatePayload']
364+
>;
311365
TopicCreateResult: ResolverTypeWrapper<
312366
Omit<TopicCreateResult, 'result'> & { result: ResolversTypes['Topic'] }
313367
>;
314368
TopicEditInput: TopicEditInput;
315-
TopicEditPayload: ResolversTypes['Error'] | ResolversTypes['TopicEditResult'];
369+
TopicEditPayload: ResolverTypeWrapper<
370+
ResolversUnionTypes['TopicEditPayload']
371+
>;
316372
TopicEditResult: ResolverTypeWrapper<
317373
Omit<TopicEditResult, 'result'> & { result: ResolversTypes['Topic'] }
318374
>;
319375
TopicsCreatedByUserInput: TopicsCreatedByUserInput;
320-
TopicsCreatedByUserPayload:
321-
| ResolversTypes['Error']
322-
| ResolversTypes['TopicsCreatedByUserResult'];
376+
TopicsCreatedByUserPayload: ResolverTypeWrapper<
377+
ResolversUnionTypes['TopicsCreatedByUserPayload']
378+
>;
323379
TopicsCreatedByUserResult: ResolverTypeWrapper<
324380
Omit<TopicsCreatedByUserResult, 'result'> & {
325381
result: Array<ResolversTypes['Topic']>;
326382
}
327383
>;
328384
User: ResolverTypeWrapper<UserMapper>;
329-
UserPayload: ResolversTypes['Error'] | ResolversTypes['UserResult'];
385+
UserPayload: ResolverTypeWrapper<ResolversUnionTypes['UserPayload']>;
330386
UserResult: ResolverTypeWrapper<
331387
Omit<UserResult, 'result'> & { result?: Maybe<ResolversTypes['User']> }
332388
>;
@@ -348,37 +404,27 @@ export type ResolversParentTypes = {
348404
Query: {};
349405
Subscription: {};
350406
Topic: Omit<Topic, 'creator'> & { creator: ResolversParentTypes['User'] };
351-
TopicByIdPayload:
352-
| ResolversParentTypes['Error']
353-
| ResolversParentTypes['TopicByIdResult'];
407+
TopicByIdPayload: ResolversUnionParentTypes['TopicByIdPayload'];
354408
TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
355409
result?: Maybe<ResolversParentTypes['Topic']>;
356410
};
357411
TopicCreateInput: TopicCreateInput;
358-
TopicCreatePayload:
359-
| ResolversParentTypes['Error']
360-
| ResolversParentTypes['TopicCreateResult'];
412+
TopicCreatePayload: ResolversUnionParentTypes['TopicCreatePayload'];
361413
TopicCreateResult: Omit<TopicCreateResult, 'result'> & {
362414
result: ResolversParentTypes['Topic'];
363415
};
364416
TopicEditInput: TopicEditInput;
365-
TopicEditPayload:
366-
| ResolversParentTypes['Error']
367-
| ResolversParentTypes['TopicEditResult'];
417+
TopicEditPayload: ResolversUnionParentTypes['TopicEditPayload'];
368418
TopicEditResult: Omit<TopicEditResult, 'result'> & {
369419
result: ResolversParentTypes['Topic'];
370420
};
371421
TopicsCreatedByUserInput: TopicsCreatedByUserInput;
372-
TopicsCreatedByUserPayload:
373-
| ResolversParentTypes['Error']
374-
| ResolversParentTypes['TopicsCreatedByUserResult'];
422+
TopicsCreatedByUserPayload: ResolversUnionParentTypes['TopicsCreatedByUserPayload'];
375423
TopicsCreatedByUserResult: Omit<TopicsCreatedByUserResult, 'result'> & {
376424
result: Array<ResolversParentTypes['Topic']>;
377425
};
378426
User: UserMapper;
379-
UserPayload:
380-
| ResolversParentTypes['Error']
381-
| ResolversParentTypes['UserResult'];
427+
UserPayload: ResolversUnionParentTypes['UserPayload'];
382428
UserResult: Omit<UserResult, 'result'> & {
383429
result?: Maybe<ResolversParentTypes['User']>;
384430
};

0 commit comments

Comments
 (0)