@team-supercharge/oasg 18.0.1 → 18.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "18.0.1",
+  "version": "18.0.2",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/react/templates/hook.mustache

@@ -41,7 +41,8 @@ import {
 {{#operation}}
 
 export type {{classname}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Params =
-  {{#allParams.0}}{{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request{{/allParams.0}}{{^allParams.0}}void{{/allParams.0}} & { [HEADERS]?: Record<string, string> };
+  {{#allParams.0}}{{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request & { [HEADERS]?: Record<string, string> };{{/allParams.0}}
+  {{^allParams.0}}void | { [HEADERS]?: Record<string, string> };{{/allParams.0}}
 
 /**
   * `{{httpMethod}} {{path}}`
@@ -71,7 +72,13 @@ export function use{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Mutatio
 
   return useMutation<{{{returnType}}}{{^returnType}}void{{/returnType}}, TError, {{classname}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Params, TContext>({
     {{#allParams.0}}
-    mutationFn: ({ [HEADERS]: headers, ...params }) => api.{{nickname}}(params, { headers: { ...optionsHeaders, ...headers } }),
+    mutationFn: ({ [HEADERS]: headers, ...params }) => api.{{nickname}}(
+      params,
+      async ({ init }) => ({
+        ...init,
+        headers: { ...init.headers, ...optionsHeaders, ...headers }
+      })
+    ),
     {{/allParams.0}}
     {{^allParams.0}}
     mutationFn: () => api.{{nickname}}(),
@@ -175,12 +182,20 @@ export function use{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Query(
   return useQuery({
     {{#allParams.0}}
     queryKey: {{#lambda.camelcase}}{{nickname}}{{/lambda.camelcase}}QueryKey.withParams(params, headers),
-    queryFn: ({ signal }) => api.{{nickname}}(params, { signal, headers }),
+    queryFn: ({ signal }) => api.{{nickname}}(params, async ({ init }) => ({
+      ...init,
+      signal,
+      headers: { ...init.headers, ...headers }
+    })),
     enabled: typeof params !== 'undefined' && enabled,
     {{/allParams.0}}
     {{^allParams.0}}
     queryKey: {{#lambda.camelcase}}{{nickname}}{{/lambda.camelcase}}QueryKey.all(headers),
-    queryFn: ({ signal }) => api.{{nickname}}({ signal, headers }),
+    queryFn: ({ signal }) => api.{{nickname}}(async ({ init }) => ({
+      ...init,
+      signal,
+      headers: { ...init.headers, ...headers }
+    })),
     enabled,
     {{/allParams.0}}
     ...options,
@@ -217,11 +232,19 @@ export function use{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Suspens
   return useSuspenseQuery({
     {{#allParams.0}}
     queryKey: {{#lambda.camelcase}}{{nickname}}{{/lambda.camelcase}}QueryKey.withParams(params, headers),
-    queryFn: ({ signal }) => api.{{nickname}}(params, { signal, headers }),
+    queryFn: ({ signal }) => api.{{nickname}}(params, async ({ init }) => ({
+      ...init,
+      signal,
+      headers: { ...init.headers, ...headers }
+    })),
     {{/allParams.0}}
     {{^allParams.0}}
     queryKey: {{#lambda.camelcase}}{{nickname}}{{/lambda.camelcase}}QueryKey.all(headers),
-    queryFn: ({ signal }) => api.{{nickname}}({ signal, headers }),
+    queryFn: ({ signal }) => api.{{nickname}}(async ({ init }) => ({
+      ...init,
+      signal,
+      headers: { ...init.headers, ...headers }
+    })),
     {{/allParams.0}}
     ...options,
   });