Skip to content

Commit 0b12a2b

Browse files
committed
fix: enhance type parameters for resolver handlers and route options
1 parent 7b61e4f commit 0b12a2b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

packages/event-handler/src/appsync-graphql/Router.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ class Router {
140140
): MethodDecorator | undefined {
141141
if (typeof handler === 'function') {
142142
const resolverOptions = options as GraphQlRouteOptions;
143-
const typeName = resolverOptions.typeName ?? 'Query';
143+
const { typeName = 'Query', fieldName } = resolverOptions;
144144

145145
this.resolverRegistry.register({
146-
fieldName: resolverOptions.fieldName,
147-
handler: handler as ResolverHandler<Record<string, unknown>>,
146+
fieldName,
147+
handler: handler as ResolverHandler,
148148
typeName,
149149
});
150150

@@ -153,10 +153,10 @@ class Router {
153153

154154
const resolverOptions = handler;
155155
return (_target, _propertyKey, descriptor: PropertyDescriptor) => {
156-
const typeName = resolverOptions.typeName ?? 'Query';
156+
const { typeName = 'Query', fieldName } = resolverOptions;
157157

158158
this.resolverRegistry.register({
159-
fieldName: resolverOptions.fieldName,
159+
fieldName,
160160
handler: descriptor.value,
161161
typeName,
162162
});

packages/event-handler/src/types/appsync-graphql.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import type { GenericLogger } from './common.js';
33

44
// #region Resolver fn
55

6-
type ResolverSyncHandlerFn<TParams extends Record<string, unknown>> = (
6+
type ResolverSyncHandlerFn<TParams = Record<string, unknown>> = (
77
args: TParams
88
) => unknown;
99

10-
type ResolverHandlerFn<TParams extends Record<string, unknown>> = (
10+
type ResolverHandlerFn<TParams = Record<string, unknown>> = (
1111
args: TParams
1212
) => Promise<unknown>;
1313

14-
type ResolverHandler<TParams extends Record<string, unknown>> =
14+
type ResolverHandler<TParams = Record<string, unknown>> =
1515
| ResolverSyncHandlerFn<TParams>
1616
| ResolverHandlerFn<TParams>;
1717

@@ -36,11 +36,11 @@ type RouteHandlerRegistryOptions = {
3636
* @property fieldName - The name of the field to be registered
3737
* @property typeName - The name of the type to be registered
3838
*/
39-
type RouteHandlerOptions = {
39+
type RouteHandlerOptions<TParams = Record<string, unknown>> = {
4040
/**
4141
* The handler function to be called when the event is received
4242
*/
43-
handler: ResolverHandler<Record<string, unknown>>;
43+
handler: ResolverHandler<TParams>;
4444
/**
4545
* The field name of the event to be registered
4646
*/

0 commit comments

Comments
 (0)