Skip to content

Commit b67380c

Browse files
committed
fix: Fix types related to useSWRInfinite
1 parent 869b6db commit b67380c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/visitor.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ export class SWRVisitor extends ClientSideBaseVisitor<
181181
utilsForInfinite.generateGetKey<${o.operationResultType}, ${
182182
o.operationVariablesTypes
183183
}>(getKey),
184-
utilsForInfinite.generateFetcher<${o.operationVariablesTypes}>(sdk.${
185-
o.node.name.value
186-
}, variables),
184+
utilsForInfinite.generateFetcher<${o.operationResultType}, ${
185+
o.operationVariablesTypes
186+
}>(sdk.${o.node.name.value}, variables),
187187
config);
188188
}`)
189189
}
@@ -214,9 +214,9 @@ ${
214214
? ` const utilsForInfinite = {
215215
generateGetKey: <Data = unknown, Variables = unknown>(getKey: SWRInfiniteKeyLoader<Data, Variables>) => (pageIndex: number, previousData: Data | null) => {
216216
const key = getKey(pageIndex, previousData)
217-
return key ? [key] : key
217+
return key ? [key] : null
218218
},
219-
generateFetcher: <Variables = unknown>(query: (...params: unknown[]) => unknown, variables?: Variables) => (...params) => query(Object.assign({}, variables, ...params))
219+
generateFetcher: <Query = unknown, Variables = unknown>(query: (variables: Variables) => Promise<Query>, variables?: Variables) => (...params: unknown[]) => query(Object.assign({}, variables, ...params))
220220
}\n`
221221
: ''
222222
}${

tests/swr.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ export function getSdkWithHooks(client: GraphQLClient, withWrapper: SdkFunctionW
294294
const utilsForInfinite = {
295295
generateGetKey: <Data = unknown, Variables = unknown>(getKey: SWRInfiniteKeyLoader<Data, Variables>) => (pageIndex: number, previousData: Data | null) => {
296296
const key = getKey(pageIndex, previousData)
297-
return key ? [key] : key
297+
return key ? [key] : null
298298
},
299-
generateFetcher: <Variables = unknown>(query: (...params: unknown[]) => unknown, variables?: Variables) => (...params) => query(Object.assign({}, variables, ...params))
299+
generateFetcher: <Query = unknown, Variables = unknown>(query: (variables: Variables) => Promise<Query>, variables?: Variables) => (...params: unknown[]) => query(Object.assign({}, variables, ...params))
300300
}
301301
return {
302302
...sdk,
@@ -309,7 +309,7 @@ export function getSdkWithHooks(client: GraphQLClient, withWrapper: SdkFunctionW
309309
useFeed2Infinite(getKey: SWRInfiniteKeyLoader<Feed2Query, Feed2QueryVariables>, variables: Feed2QueryVariables, config?: SWRInfiniteConfigInterface<Feed2Query>) {
310310
return useSWRInfinite<Feed2Query>(
311311
utilsForInfinite.generateGetKey<Feed2Query, Feed2QueryVariables>(getKey),
312-
utilsForInfinite.generateFetcher<Feed2QueryVariables>(sdk.feed2, variables),
312+
utilsForInfinite.generateFetcher<Feed2Query, Feed2QueryVariables>(sdk.feed2, variables),
313313
config);
314314
},
315315
useFeed3(key: SWRKeyInterface, variables?: Feed3QueryVariables, config?: SWRConfigInterface<Feed3Query>) {
@@ -321,7 +321,7 @@ export function getSdkWithHooks(client: GraphQLClient, withWrapper: SdkFunctionW
321321
useFeed4Infinite(getKey: SWRInfiniteKeyLoader<Feed4Query, Feed4QueryVariables>, variables?: Feed4QueryVariables, config?: SWRInfiniteConfigInterface<Feed4Query>) {
322322
return useSWRInfinite<Feed4Query>(
323323
utilsForInfinite.generateGetKey<Feed4Query, Feed4QueryVariables>(getKey),
324-
utilsForInfinite.generateFetcher<Feed4QueryVariables>(sdk.feed4, variables),
324+
utilsForInfinite.generateFetcher<Feed4Query, Feed4QueryVariables>(sdk.feed4, variables),
325325
config);
326326
}
327327
};

0 commit comments

Comments
 (0)