fix(swr): correct second mutator parameter when using custom mutator (#…

…1412) Co-authored-by: Alfred Jonsson <alfred.jonsson@decerno.se>
orval-labs · May 29, 2024 · 1624e6a · 1624e6a
1 parent 1a13970
commit 1624e6a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/swr/src/index.ts b/packages/swr/src/index.ts
@@ -552,7 +552,7 @@ const generateSwrHook = (
     summary,
     deprecated,
   }: GeneratorVerbOptions,
-  { route }: GeneratorOptions,
+  { route, context }: GeneratorOptions,
 ) => {
   const isRequestOptions = override?.requestOptions !== false;
   const doc = jsDoc({ summary, deprecated });
@@ -695,8 +695,15 @@ export const ${swrKeyFnName} = (${queryKeyProps}) => [\`${route}\`${
     const swrMutationFetcherType = mutator
       ? `Promise<${response.definition.success || 'unknown'}>`
       : `Promise<AxiosResponse<${response.definition.success || 'unknown'}>>`;
+    const swrMutationFetcherOptionType = !mutator
+      ? 'AxiosRequestConfig'
+      : mutator.hasSecondArg
+        ? `SecondParameter<typeof ${mutator.name}>`
+        : '';
     const swrMutationFetcherOptions =
-      !mutator && isRequestOptions ? 'options?: AxiosRequestConfig' : '';
+      isRequestOptions && swrMutationFetcherOptionType
+        ? `options${context.output.optionsParamRequired ? '' : '?'}: ${swrMutationFetcherOptionType}`
+        : '';
 
     const swrMutationFetcherArg = props.some(
       (prop) => prop.type === GetterPropType.BODY,

diff --git a/tests/configs/swr.config.ts b/tests/configs/swr.config.ts
@@ -59,7 +59,7 @@ export default defineConfig({
       mock: true,
       override: {
         mutator: {
-          path: '../mutators/custom-instance.ts',
+          path: '../mutators/multi-arguments.ts',
           name: 'customInstance',
         },
       },
@@ -73,8 +73,8 @@ export default defineConfig({
   },
   customClient: {
     output: {
-      target: '../generated/swr/mutator/endpoints.ts',
-      schemas: '../generated/swr/mutator/model',
+      target: '../generated/swr/custom-client/endpoints.ts',
+      schemas: '../generated/swr/custom-client/model',
       client: 'swr',
       mock: true,
       override: {