@orval/query 6.30.2 → 7.0.0

package/dist/index.js

@@ -1592,7 +1592,7 @@ __export(src_exports, {
   getVueQueryDependencies: () => getVueQueryDependencies
 });
 module.exports = __toCommonJS(src_exports);
-var import_core2 = require("@orval/core");
+var import_core3 = require("@orval/core");
 var import_lodash = __toESM(require("lodash.omitby"));
 
 // src/utils.ts
@@ -1672,18 +1672,9 @@ var wrapRouteParameters = (route, prepend, append) => route.replaceAll(import_co
 var makeRouteSafe = (route) => wrapRouteParameters(route, "encodeURIComponent(String(", "))");
 var isVue = (client) => import_core.OutputClient.VUE_QUERY === client;
 
-// src/index.ts
-var REACT_DEPENDENCIES = [
-  {
-    exports: [
-      {
-        name: "useCallback",
-        values: true
-      }
-    ],
-    dependency: "react"
-  }
-];
+// src/client.ts
+var import_core2 = require("@orval/core");
+var import_fetch = require("@orval/fetch");
 var AXIOS_DEPENDENCIES = [
   {
     exports: [
@@ -1700,6 +1691,230 @@ var AXIOS_DEPENDENCIES = [
     dependency: "axios"
   }
 ];
+var generateQueryRequestFunction = (verbOptions, options, isVue3) => {
+  if (options.context.output.httpClient === import_core2.OutputHttpClient.AXIOS) {
+    return generateAxiosRequestFunction(verbOptions, options, isVue3);
+  } else {
+    return (0, import_fetch.generateRequestFunction)(verbOptions, options);
+  }
+};
+var generateAxiosRequestFunction = ({
+  headers,
+  queryParams,
+  operationName,
+  response,
+  mutator,
+  body,
+  props: _props,
+  verb,
+  formData,
+  formUrlEncoded,
+  override,
+  paramsSerializer
+}, { route: _route, context }, isVue3) => {
+  var _a, _b, _c;
+  let props = _props;
+  let route = _route;
+  if (isVue3) {
+    props = vueWrapTypeWithMaybeRef(_props);
+  }
+  if ((_a = context.output) == null ? void 0 : _a.urlEncodeParameters) {
+    route = makeRouteSafe(route);
+  }
+  const isRequestOptions = override.requestOptions !== false;
+  const isFormData = override.formData !== false;
+  const isFormUrlEncoded = override.formUrlEncoded !== false;
+  const hasSignal = !!override.query.signal;
+  const isExactOptionalPropertyTypes = !!((_c = (_b = context.output.tsconfig) == null ? void 0 : _b.compilerOptions) == null ? void 0 : _c.exactOptionalPropertyTypes);
+  const isBodyVerb = import_core2.VERBS_WITH_BODY.includes(verb);
+  const bodyForm = (0, import_core2.generateFormDataAndUrlEncodedFunction)({
+    formData,
+    formUrlEncoded,
+    body,
+    isFormData,
+    isFormUrlEncoded
+  });
+  if (mutator) {
+    const mutatorConfig = (0, import_core2.generateMutatorConfig)({
+      route,
+      body,
+      headers,
+      queryParams,
+      response,
+      verb,
+      isFormData,
+      isFormUrlEncoded,
+      isBodyVerb,
+      hasSignal,
+      isExactOptionalPropertyTypes,
+      isVue: isVue3
+    });
+    let bodyDefinition = body.definition.replace("[]", "\\[\\]");
+    let propsImplementation = (mutator == null ? void 0 : mutator.bodyTypeName) && body.definition ? (0, import_core2.toObjectString)(props, "implementation").replace(
+      new RegExp(`(\\w*):\\s?${bodyDefinition}`),
+      `$1: ${mutator.bodyTypeName}<${body.definition}>`
+    ) : (0, import_core2.toObjectString)(props, "implementation");
+    const requestOptions = isRequestOptions ? (0, import_core2.generateMutatorRequestOptions)(
+      override.requestOptions,
+      mutator.hasSecondArg
+    ) : "";
+    if (mutator.isHook) {
+      return `${override.query.shouldExportMutatorHooks ? "export " : ""}const use${(0, import_core2.pascal)(operationName)}Hook = () => {
+        const ${operationName} = ${mutator.name}<${response.definition.success || "unknown"}>();
+
+        return useCallback((
+    ${propsImplementation}
+ ${isRequestOptions && mutator.hasSecondArg ? `options${context.output.optionsParamRequired ? "" : "?"}: SecondParameter<ReturnType<typeof ${mutator.name}>>,` : ""}${!isBodyVerb && hasSignal ? "signal?: AbortSignal\n" : ""}) => {${bodyForm}
+        return ${operationName}(
+          ${mutatorConfig},
+          ${requestOptions});
+        }, [${operationName}])
+      }
+    `;
+    }
+    return `${override.query.shouldExportHttpClient ? "export " : ""}const ${operationName} = (
+    ${propsImplementation}
+ ${isRequestOptions && mutator.hasSecondArg ? `options${context.output.optionsParamRequired ? "" : "?"}: SecondParameter<typeof ${mutator.name}>,` : ""}${!isBodyVerb && hasSignal ? "signal?: AbortSignal\n" : ""}) => {
+      ${isVue3 ? vueUnRefParams(props) : ""}
+      ${bodyForm}
+      return ${mutator.name}<${response.definition.success || "unknown"}>(
+      ${mutatorConfig},
+      ${requestOptions});
+    }
+  `;
+  }
+  const isSyntheticDefaultImportsAllowed = (0, import_core2.isSyntheticDefaultImportsAllow)(
+    context.output.tsconfig
+  );
+  const options = (0, import_core2.generateOptions)({
+    route,
+    body,
+    headers,
+    queryParams,
+    response,
+    verb,
+    requestOptions: override == null ? void 0 : override.requestOptions,
+    isFormData,
+    isFormUrlEncoded,
+    paramsSerializer,
+    paramsSerializerOptions: override == null ? void 0 : override.paramsSerializerOptions,
+    isExactOptionalPropertyTypes,
+    hasSignal,
+    isVue: isVue3
+  });
+  const optionsArgs = generateRequestOptionsArguments({
+    isRequestOptions,
+    hasSignal
+  });
+  const queryProps = (0, import_core2.toObjectString)(props, "implementation");
+  const httpRequestFunctionImplementation = `export const ${operationName} = (
+    ${queryProps} ${optionsArgs} ): Promise<AxiosResponse<${response.definition.success || "unknown"}>> => {${bodyForm}
+    ${isVue3 ? vueUnRefParams(props) : ""}
+    return axios${!isSyntheticDefaultImportsAllowed ? ".default" : ""}.${verb}(${options});
+  }
+`;
+  return httpRequestFunctionImplementation;
+};
+var generateRequestOptionsArguments = ({
+  isRequestOptions,
+  hasSignal
+}) => {
+  if (isRequestOptions) {
+    return "options?: AxiosRequestConfig\n";
+  }
+  return hasSignal ? "signal?: AbortSignal\n" : "";
+};
+var getQueryArgumentsRequestType = (httpClient, mutator) => {
+  if (!mutator) {
+    return httpClient === import_core2.OutputHttpClient.AXIOS ? `axios?: AxiosRequestConfig` : "fetch?: RequestInit";
+  }
+  if (mutator.hasSecondArg && !mutator.isHook) {
+    return `request?: SecondParameter<typeof ${mutator.name}>`;
+  }
+  if (mutator.hasSecondArg && mutator.isHook) {
+    return `request?: SecondParameter<ReturnType<typeof ${mutator.name}>>`;
+  }
+  return "";
+};
+var getQueryOptions = ({
+  isRequestOptions,
+  mutator,
+  isExactOptionalPropertyTypes,
+  hasSignal,
+  httpClient
+}) => {
+  if (!mutator && isRequestOptions) {
+    const options = httpClient === import_core2.OutputHttpClient.AXIOS ? "axiosOptions" : "fetchOptions";
+    if (!hasSignal) {
+      return options;
+    }
+    return `{ ${isExactOptionalPropertyTypes ? "...(signal ? { signal } : {})" : "signal"}, ...${options} }`;
+  }
+  if ((mutator == null ? void 0 : mutator.hasSecondArg) && isRequestOptions) {
+    if (!hasSignal) {
+      return "requestOptions";
+    }
+    return httpClient === import_core2.OutputHttpClient.AXIOS ? "requestOptions, signal" : "{ signal, ...requestOptions }";
+  }
+  if (hasSignal) {
+    return "signal";
+  }
+  return "";
+};
+var getHookOptions = ({
+  isRequestOptions,
+  httpClient,
+  mutator
+}) => {
+  if (!isRequestOptions) {
+    return "";
+  }
+  let value = "const {query: queryOptions";
+  if (!mutator) {
+    const options = httpClient === import_core2.OutputHttpClient.AXIOS ? ", axios: axiosOptions" : ", fetch: fetchOptions";
+    value += options;
+  }
+  if (mutator == null ? void 0 : mutator.hasSecondArg) {
+    value += ", request: requestOptions";
+  }
+  value += "} = options ?? {};";
+  return value;
+};
+var getQueryErrorType = (operationName, response, httpClient, mutator) => {
+  if (mutator) {
+    return mutator.hasErrorType ? `${mutator.default ? (0, import_core2.pascal)(operationName) : ""}ErrorType<${response.definition.errors || "unknown"}>` : response.definition.errors || "unknown";
+  } else {
+    const errorType = httpClient === import_core2.OutputHttpClient.AXIOS ? "AxiosError" : "Promise";
+    return `${errorType}<${response.definition.errors || "unknown"}>`;
+  }
+};
+var getHooksOptionImplementation = (isRequestOptions, httpClient, mutator) => {
+  const options = httpClient === import_core2.OutputHttpClient.AXIOS ? ", axios: axiosOptions" : ", fetch: fetchOptions";
+  return isRequestOptions ? `const {mutation: mutationOptions${!mutator ? options : (mutator == null ? void 0 : mutator.hasSecondArg) ? ", request: requestOptions" : ""}} = options ?? {};` : "";
+};
+var getMutationRequestArgs = (isRequestOptions, httpClient, mutator) => {
+  const options = httpClient === import_core2.OutputHttpClient.AXIOS ? "axiosOptions" : "fetchOptions";
+  return isRequestOptions ? !mutator ? options : (mutator == null ? void 0 : mutator.hasSecondArg) ? "requestOptions" : "" : "";
+};
+var getHttpFunctionQueryProps = (isVue3, httpClient, queryProperties) => {
+  if (isVue3 && httpClient === import_core2.OutputHttpClient.FETCH && queryProperties) {
+    return `unref(${queryProperties})`;
+  }
+  return queryProperties;
+};
+
+// src/index.ts
+var REACT_DEPENDENCIES = [
+  {
+    exports: [
+      {
+        name: "useCallback",
+        values: true
+      }
+    ],
+    dependency: "react"
+  }
+];
 var PARAMS_SERIALIZER_DEPENDENCIES = [
   {
     exports: [
@@ -1762,10 +1977,10 @@ var isSvelteQueryV3 = (packageJson) => {
   const hasVueQueryV4 = (_f = (_d = packageJson == null ? void 0 : packageJson.dependencies) == null ? void 0 : _d["@tanstack/svelte-query"]) != null ? _f : (_e = packageJson == null ? void 0 : packageJson.devDependencies) == null ? void 0 : _e["@tanstack/svelte-query"];
   return !!hasVueQuery && !hasVueQueryV4;
 };
-var getSvelteQueryDependencies = (hasGlobalMutator, hasParamsSerializerOptions, packageJson) => {
+var getSvelteQueryDependencies = (hasGlobalMutator, hasParamsSerializerOptions, packageJson, httpClient) => {
   const hasSvelteQueryV3 = isSvelteQueryV3(packageJson);
   return [
-    ...!hasGlobalMutator ? AXIOS_DEPENDENCIES : [],
+    ...!hasGlobalMutator && httpClient === import_core3.OutputHttpClient.AXIOS ? AXIOS_DEPENDENCIES : [],
     ...hasParamsSerializerOptions ? PARAMS_SERIALIZER_DEPENDENCIES : [],
     ...hasSvelteQueryV3 ? SVELTE_QUERY_DEPENDENCIES_V3 : SVELTE_QUERY_DEPENDENCIES
   ];
@@ -1799,6 +2014,8 @@ var REACT_QUERY_DEPENDENCIES = [
       { name: "useSuspenseInfiniteQuery", values: true },
       { name: "useMutation", values: true },
       { name: "UseQueryOptions" },
+      { name: "DefinedInitialDataOptions" },
+      { name: "UndefinedInitialDataOptions" },
       { name: "UseSuspenseQueryOptions" },
       { name: "UseInfiniteQueryOptions" },
       { name: "UseSuspenseInfiniteQueryOptions" },
@@ -1806,8 +2023,10 @@ var REACT_QUERY_DEPENDENCIES = [
       { name: "QueryFunction" },
       { name: "MutationFunction" },
       { name: "UseQueryResult" },
+      { name: "DefinedUseQueryResult" },
       { name: "UseSuspenseQueryResult" },
       { name: "UseInfiniteQueryResult" },
+      { name: "DefinedUseInfiniteQueryResult" },
       { name: "UseSuspenseInfiniteQueryResult" },
       { name: "QueryKey" },
       { name: "QueryClient" },
@@ -1817,13 +2036,13 @@ var REACT_QUERY_DEPENDENCIES = [
     dependency: "@tanstack/react-query"
   }
 ];
-var getReactQueryDependencies = (hasGlobalMutator, hasParamsSerializerOptions, packageJson) => {
+var getReactQueryDependencies = (hasGlobalMutator, hasParamsSerializerOptions, packageJson, httpClient) => {
   var _a, _b, _c, _d, _e, _f;
   const hasReactQuery = (_c = (_a = packageJson == null ? void 0 : packageJson.dependencies) == null ? void 0 : _a["react-query"]) != null ? _c : (_b = packageJson == null ? void 0 : packageJson.devDependencies) == null ? void 0 : _b["react-query"];
   const hasReactQueryV4 = (_f = (_d = packageJson == null ? void 0 : packageJson.dependencies) == null ? void 0 : _d["@tanstack/react-query"]) != null ? _f : (_e = packageJson == null ? void 0 : packageJson.devDependencies) == null ? void 0 : _e["@tanstack/react-query"];
   return [
     ...hasGlobalMutator ? REACT_DEPENDENCIES : [],
-    ...!hasGlobalMutator ? AXIOS_DEPENDENCIES : [],
+    ...!hasGlobalMutator && httpClient === import_core3.OutputHttpClient.AXIOS ? AXIOS_DEPENDENCIES : [],
     ...hasParamsSerializerOptions ? PARAMS_SERIALIZER_DEPENDENCIES : [],
     ...hasReactQuery && !hasReactQueryV4 ? REACT_QUERY_DEPENDENCIES_V3 : REACT_QUERY_DEPENDENCIES
   ];
@@ -1897,10 +2116,10 @@ var isVueQueryV3 = (packageJson) => {
   const hasVueQueryV4 = (_f = (_d = packageJson == null ? void 0 : packageJson.dependencies) == null ? void 0 : _d["@tanstack/vue-query"]) != null ? _f : (_e = packageJson == null ? void 0 : packageJson.devDependencies) == null ? void 0 : _e["@tanstack/vue-query"];
   return !!hasVueQuery && !hasVueQueryV4;
 };
-var getVueQueryDependencies = (hasGlobalMutator, hasParamsSerializerOptions, packageJson) => {
+var getVueQueryDependencies = (hasGlobalMutator, hasParamsSerializerOptions, packageJson, httpClient) => {
   const hasVueQueryV3 = isVueQueryV3(packageJson);
   return [
-    ...!hasGlobalMutator ? AXIOS_DEPENDENCIES : [],
+    ...!hasGlobalMutator && httpClient === import_core3.OutputHttpClient.AXIOS ? AXIOS_DEPENDENCIES : [],
     ...hasParamsSerializerOptions ? PARAMS_SERIALIZER_DEPENDENCIES : [],
     ...hasVueQueryV3 ? VUE_QUERY_DEPENDENCIES_V3 : VUE_QUERY_DEPENDENCIES
   ];
@@ -1911,7 +2130,7 @@ var isQueryV5 = (packageJson, queryClient) => {
     return false;
   }
   const withoutRc = version.split("-")[0];
-  return (0, import_core2.compareVersions)(withoutRc, "5.0.0");
+  return (0, import_core3.compareVersions)(withoutRc, "5.0.0");
 };
 var getPackageByQueryClient = (packageJson, queryClient) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
@@ -1927,131 +2146,6 @@ var getPackageByQueryClient = (packageJson, queryClient) => {
     }
   }
 };
-var generateRequestOptionsArguments = ({
-  isRequestOptions,
-  hasSignal
-}) => {
-  if (isRequestOptions) {
-    return "options?: AxiosRequestConfig\n";
-  }
-  return hasSignal ? "signal?: AbortSignal\n" : "";
-};
-var generateQueryRequestFunction = ({
-  headers,
-  queryParams,
-  operationName,
-  response,
-  mutator,
-  body,
-  props: _props,
-  verb,
-  formData,
-  formUrlEncoded,
-  paramsSerializer,
-  override
-}, { route: _route, context }, outputClient, output) => {
-  var _a, _b;
-  let props = _props;
-  let route = _route;
-  if (isVue(outputClient)) {
-    props = vueWrapTypeWithMaybeRef(_props);
-  }
-  if (output == null ? void 0 : output.urlEncodeParameters) {
-    route = makeRouteSafe(route);
-  }
-  const isRequestOptions = override.requestOptions !== false;
-  const isFormData = override.formData !== false;
-  const isFormUrlEncoded = override.formUrlEncoded !== false;
-  const hasSignal = !!override.query.signal;
-  const isSyntheticDefaultImportsAllowed = (0, import_core2.isSyntheticDefaultImportsAllow)(
-    context.output.tsconfig
-  );
-  const isExactOptionalPropertyTypes = !!((_b = (_a = context.output.tsconfig) == null ? void 0 : _a.compilerOptions) == null ? void 0 : _b.exactOptionalPropertyTypes);
-  const isBodyVerb = import_core2.VERBS_WITH_BODY.includes(verb);
-  const bodyForm = (0, import_core2.generateFormDataAndUrlEncodedFunction)({
-    formData,
-    formUrlEncoded,
-    body,
-    isFormData,
-    isFormUrlEncoded
-  });
-  if (mutator) {
-    const mutatorConfig = (0, import_core2.generateMutatorConfig)({
-      route,
-      body,
-      headers,
-      queryParams,
-      response,
-      verb,
-      isFormData,
-      isFormUrlEncoded,
-      isBodyVerb,
-      hasSignal,
-      isExactOptionalPropertyTypes,
-      isVue: isVue(outputClient)
-    });
-    let bodyDefinition = body.definition.replace("[]", "\\[\\]");
-    let propsImplementation = (mutator == null ? void 0 : mutator.bodyTypeName) && body.definition ? (0, import_core2.toObjectString)(props, "implementation").replace(
-      new RegExp(`(\\w*):\\s?${bodyDefinition}`),
-      `$1: ${mutator.bodyTypeName}<${body.definition}>`
-    ) : (0, import_core2.toObjectString)(props, "implementation");
-    const requestOptions = isRequestOptions ? (0, import_core2.generateMutatorRequestOptions)(
-      override.requestOptions,
-      mutator.hasSecondArg
-    ) : "";
-    if (mutator.isHook) {
-      return `${override.query.shouldExportMutatorHooks ? "export " : ""}const use${(0, import_core2.pascal)(operationName)}Hook = () => {
-        const ${operationName} = ${mutator.name}<${response.definition.success || "unknown"}>();
-
-        return useCallback((
-    ${propsImplementation}
- ${isRequestOptions && mutator.hasSecondArg ? `options${context.output.optionsParamRequired ? "" : "?"}: SecondParameter<ReturnType<typeof ${mutator.name}>>,` : ""}${!isBodyVerb && hasSignal ? "signal?: AbortSignal\n" : ""}) => {${bodyForm}
-        return ${operationName}(
-          ${mutatorConfig},
-          ${requestOptions});
-        }, [${operationName}])
-      }
-    `;
-    }
-    return `${override.query.shouldExportHttpClient ? "export " : ""}const ${operationName} = (
-    ${propsImplementation}
- ${isRequestOptions && mutator.hasSecondArg ? `options${context.output.optionsParamRequired ? "" : "?"}: SecondParameter<typeof ${mutator.name}>,` : ""}${!isBodyVerb && hasSignal ? "signal?: AbortSignal\n" : ""}) => {
-      ${isVue(outputClient) ? vueUnRefParams(props) : ""}
-      ${bodyForm}
-      return ${mutator.name}<${response.definition.success || "unknown"}>(
-      ${mutatorConfig},
-      ${requestOptions});
-    }
-  `;
-  }
-  const options = (0, import_core2.generateOptions)({
-    route,
-    body,
-    headers,
-    queryParams,
-    response,
-    verb,
-    requestOptions: override == null ? void 0 : override.requestOptions,
-    isFormData,
-    isFormUrlEncoded,
-    paramsSerializer,
-    paramsSerializerOptions: override == null ? void 0 : override.paramsSerializerOptions,
-    isExactOptionalPropertyTypes,
-    hasSignal,
-    isVue: isVue(outputClient)
-  });
-  const optionsArgs = generateRequestOptionsArguments({
-    isRequestOptions,
-    hasSignal
-  });
-  const queryProps = (0, import_core2.toObjectString)(props, "implementation");
-  return `export const ${operationName} = (
-    ${queryProps} ${optionsArgs} ): Promise<AxiosResponse<${response.definition.success || "unknown"}>> => {${bodyForm}
-    ${isVue(outputClient) ? vueUnRefParams(props) : ""}
-    return axios${!isSyntheticDefaultImportsAllowed ? ".default" : ""}.${verb}(${options});
-  }
-`;
-};
 var QueryType = {
   INFINITE: "infiniteQuery",
   QUERY: "query",
@@ -2069,7 +2163,7 @@ var generateQueryOptions = ({
   if (options === false) {
     return "";
   }
-  const queryConfig = (0, import_core2.isObject)(options) ? ` ${(_a = (0, import_core2.stringify)(
+  const queryConfig = (0, import_core3.isObject)(options) ? ` ${(_a = (0, import_core3.stringify)(
     (0, import_lodash.default)(
       options,
       (_, key) => (type !== QueryType.INFINITE || type !== QueryType.SUSPENSE_INFINITE) && INFINITE_QUERY_PROPERTIES.includes(key)
@@ -2081,19 +2175,10 @@ var generateQueryOptions = ({
     }
     return "...queryOptions";
   }
-  return `${!(0, import_core2.isObject)(options) || !options.hasOwnProperty("enabled") ? isVue(outputClient) ? `enabled: computed(() => !!(${params.map(({ name }) => `unref(${name})`).join(" && ")})),` : `enabled: !!(${params.map(({ name }) => name).join(" && ")}),` : ""}${queryConfig} ...queryOptions`;
+  return `${!(0, import_core3.isObject)(options) || !options.hasOwnProperty("enabled") ? isVue(outputClient) ? `enabled: computed(() => !!(${params.map(({ name }) => `unref(${name})`).join(" && ")})),` : `enabled: !!(${params.map(({ name }) => name).join(" && ")}),` : ""}${queryConfig} ...queryOptions`;
 };
-var getQueryArgumentsRequestType = (mutator) => {
-  if (!mutator) {
-    return `axios?: AxiosRequestConfig`;
-  }
-  if (mutator.hasSecondArg && !mutator.isHook) {
-    return `request?: SecondParameter<typeof ${mutator.name}>`;
-  }
-  if (mutator.hasSecondArg && mutator.isHook) {
-    return `request?: SecondParameter<ReturnType<typeof ${mutator.name}>>`;
-  }
-  return "";
+var isSuspenseQuery = (type) => {
+  return [QueryType.SUSPENSE_INFINITE, QueryType.SUSPENSE_QUERY].includes(type);
 };
 var getQueryOptionsDefinition = ({
   operationName,
@@ -2104,18 +2189,27 @@ var getQueryOptionsDefinition = ({
   hasQueryV5,
   queryParams,
   queryParam,
-  isReturnType
+  isReturnType,
+  initialData
 }) => {
   const isMutatorHook = mutator == null ? void 0 : mutator.isHook;
   const prefix = !hasSvelteQueryV4 ? "Use" : "Create";
   const partialOptions = !isReturnType && hasQueryV5;
   if (type) {
-    const funcReturnType = `Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core2.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>`;
-    return `${partialOptions ? "Partial<" : ""}${prefix}${(0, import_core2.pascal)(
+    const funcReturnType = `Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>`;
+    const optionTypeInitialDataPostfix = initialData && !isSuspenseQuery(type) ? ` & Pick<
+        ${(0, import_core3.pascal)(initialData)}InitialDataOptions<
+          ${funcReturnType},
+          TError,
+          TData${hasQueryV5 && (type === QueryType.INFINITE || type === QueryType.SUSPENSE_INFINITE) && queryParam && queryParams ? `, QueryKey` : ""}
+        > , 'initialData'
+      >` : "";
+    const optionType = `${prefix}${(0, import_core3.pascal)(
       type
-    )}Options<${funcReturnType}, TError, TData${hasQueryV5 && (type === QueryType.INFINITE || type === QueryType.SUSPENSE_INFINITE) && queryParam && queryParams ? `, ${funcReturnType}, QueryKey, ${queryParams == null ? void 0 : queryParams.schema.name}['${queryParam}']` : ""}>${partialOptions ? ">" : ""}`;
+    )}Options<${funcReturnType}, TError, TData${hasQueryV5 && (type === QueryType.INFINITE || type === QueryType.SUSPENSE_INFINITE) && queryParam && queryParams ? `, ${funcReturnType}, QueryKey, ${queryParams == null ? void 0 : queryParams.schema.name}['${queryParam}']` : ""}>`;
+    return `${partialOptions ? "Partial<" : ""}${optionType}${partialOptions ? ">" : ""}${optionTypeInitialDataPostfix}`;
   }
-  return `${prefix}MutationOptions<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core2.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError,${definitions ? `{${definitions}}` : "void"}, TContext>`;
+  return `${prefix}MutationOptions<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError,${definitions ? `{${definitions}}` : "void"}, TContext>`;
 };
 var generateQueryArguments = ({
   operationName,
@@ -2126,7 +2220,9 @@ var generateQueryArguments = ({
   hasSvelteQueryV4,
   hasQueryV5,
   queryParams,
-  queryParam
+  queryParam,
+  initialData,
+  httpClient
 }) => {
   const definition = getQueryOptionsDefinition({
     operationName,
@@ -2137,13 +2233,15 @@ var generateQueryArguments = ({
     hasQueryV5,
     queryParams,
     queryParam,
-    isReturnType: false
+    isReturnType: false,
+    initialData
   });
   if (!isRequestOptions) {
     return `${type ? "queryOptions" : "mutationOptions"}?: ${definition}`;
   }
-  const requestType = getQueryArgumentsRequestType(mutator);
-  return `options?: { ${type ? "query" : "mutation"}?:${definition}, ${requestType}}
+  const requestType = getQueryArgumentsRequestType(httpClient, mutator);
+  const isQueryRequired = initialData === "defined";
+  return `options${isQueryRequired ? "" : "?"}: { ${type ? "query" : "mutation"}${isQueryRequired ? "" : "?"}:${definition}, ${requestType}}
 `;
 };
 var generateQueryReturnType = ({
@@ -2152,20 +2250,21 @@ var generateQueryReturnType = ({
   isMutatorHook,
   operationName,
   hasVueQueryV4,
-  hasSvelteQueryV4
+  hasSvelteQueryV4,
+  isInitialDataDefined
 }) => {
   switch (outputClient) {
-    case import_core2.OutputClient.SVELTE_QUERY: {
+    case import_core3.OutputClient.SVELTE_QUERY: {
       if (!hasSvelteQueryV4) {
-        return `Use${(0, import_core2.pascal)(type)}StoreResult<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core2.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError, TData, QueryKey> & { queryKey: QueryKey }`;
+        return `Use${(0, import_core3.pascal)(type)}StoreResult<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError, TData, QueryKey> & { queryKey: QueryKey }`;
       }
-      return `Create${(0, import_core2.pascal)(
+      return `Create${(0, import_core3.pascal)(
         type
       )}Result<TData, TError> & { queryKey: QueryKey }`;
     }
-    case import_core2.OutputClient.VUE_QUERY: {
+    case import_core3.OutputClient.VUE_QUERY: {
       if (!hasVueQueryV4) {
-        return ` UseQueryReturnType<TData, TError, Use${(0, import_core2.pascal)(
+        return ` UseQueryReturnType<TData, TError, Use${(0, import_core3.pascal)(
           type
         )}Result<TData, TError>> & { queryKey: QueryKey }`;
       }
@@ -2174,9 +2273,9 @@ var generateQueryReturnType = ({
       }
       return `UseInfiniteQueryReturnType<TData, TError> & { queryKey: QueryKey }`;
     }
-    case import_core2.OutputClient.REACT_QUERY:
+    case import_core3.OutputClient.REACT_QUERY:
     default: {
-      return ` Use${(0, import_core2.pascal)(
+      return ` ${isInitialDataDefined && !isSuspenseQuery(type) ? "Defined" : ""}Use${(0, import_core3.pascal)(
         type
       )}Result<TData, TError> & { queryKey: QueryKey }`;
     }
@@ -2187,7 +2286,7 @@ var generateMutatorReturnType = ({
   dataType,
   variableType
 }) => {
-  if (outputClient === import_core2.OutputClient.REACT_QUERY) {
+  if (outputClient === import_core3.OutputClient.REACT_QUERY) {
     return `: UseMutationResult<
         Awaited<ReturnType<${dataType}>>,
         TError,
@@ -2195,7 +2294,7 @@ var generateMutatorReturnType = ({
         TContext
       >`;
   }
-  if (outputClient === import_core2.OutputClient.SVELTE_QUERY) {
+  if (outputClient === import_core3.OutputClient.SVELTE_QUERY) {
     return `: CreateMutationResult<
         Awaited<ReturnType<${dataType}>>,
         TError,
@@ -2203,7 +2302,7 @@ var generateMutatorReturnType = ({
         TContext
       >`;
   }
-  if (outputClient === import_core2.OutputClient.VUE_QUERY) {
+  if (outputClient === import_core3.OutputClient.VUE_QUERY) {
     return `: UseMutationReturnType<
         Awaited<ReturnType<${dataType}>>,
         TError,
@@ -2213,46 +2312,6 @@ var generateMutatorReturnType = ({
   }
   return "";
 };
-var getQueryOptions = ({
-  isRequestOptions,
-  mutator,
-  isExactOptionalPropertyTypes,
-  hasSignal
-}) => {
-  if (!mutator && isRequestOptions) {
-    if (!hasSignal) {
-      return "axiosOptions";
-    }
-    return `{ ${isExactOptionalPropertyTypes ? "...(signal ? { signal } : {})" : "signal"}, ...axiosOptions }`;
-  }
-  if ((mutator == null ? void 0 : mutator.hasSecondArg) && isRequestOptions) {
-    if (!hasSignal) {
-      return "requestOptions";
-    }
-    return "requestOptions, signal";
-  }
-  if (hasSignal) {
-    return "signal";
-  }
-  return "";
-};
-var getHookOptions = ({
-  isRequestOptions,
-  mutator
-}) => {
-  if (!isRequestOptions) {
-    return "";
-  }
-  let value = "const {query: queryOptions";
-  if (!mutator) {
-    value += ", axios: axiosOptions";
-  }
-  if (mutator == null ? void 0 : mutator.hasSecondArg) {
-    value += ", request: requestOptions";
-  }
-  value += "} = options ?? {};";
-  return value;
-};
 var getQueryFnArguments = ({
   hasQueryParam,
   hasSignal
@@ -2283,6 +2342,7 @@ var generateQueryImplementation = ({
   isRequestOptions,
   response,
   outputClient,
+  httpClient,
   isExactOptionalPropertyTypes,
   hasSignal,
   route,
@@ -2292,13 +2352,44 @@ var generateQueryImplementation = ({
   doc,
   usePrefetch
 }) => {
-  const queryProps = (0, import_core2.toObjectString)(props, "implementation");
+  const queryPropDefinitions = (0, import_core3.toObjectString)(props, "definition");
+  const definedInitialDataQueryPropsDefinitions = (0, import_core3.toObjectString)(
+    props.map((prop) => {
+      const regex = new RegExp(`^${prop.name}\\s*\\?:`);
+      if (!regex.test(prop.definition)) {
+        return prop;
+      }
+      const definitionWithUndefined = prop.definition.replace(
+        regex,
+        `${prop.name}: undefined | `
+      );
+      return {
+        ...prop,
+        definition: definitionWithUndefined
+      };
+    }),
+    "definition"
+  );
+  const queryProps = (0, import_core3.toObjectString)(props, "implementation");
   const hasInfiniteQueryParam = queryParam && (queryParams == null ? void 0 : queryParams.schema.name);
   const httpFunctionProps = queryParam ? props.map((param) => {
-    if (param.type === import_core2.GetterPropType.NAMED_PATH_PARAMS && !isVue(outputClient))
+    if (param.type === import_core3.GetterPropType.NAMED_PATH_PARAMS && !isVue(outputClient))
       return param.destructured;
     return param.name === "params" ? `{...${isVue(outputClient) ? `unref(params)` : "params"}, ${queryParam}: pageParam || ${isVue(outputClient) ? `unref(params)?.['${queryParam}']` : `params?.['${queryParam}']`}}` : param.name;
-  }).join(",") : queryProperties;
+  }).join(",") : getHttpFunctionQueryProps(
+    isVue(outputClient),
+    httpClient,
+    queryProperties
+  );
+  const definedInitialDataReturnType = generateQueryReturnType({
+    outputClient,
+    type,
+    isMutatorHook: mutator == null ? void 0 : mutator.isHook,
+    operationName,
+    hasVueQueryV4,
+    hasSvelteQueryV4,
+    isInitialDataDefined: true
+  });
   const returnType = generateQueryReturnType({
     outputClient,
     type,
@@ -2307,11 +2398,39 @@ var generateQueryImplementation = ({
     hasVueQueryV4,
     hasSvelteQueryV4
   });
-  let errorType = `AxiosError<${response.definition.errors || "unknown"}>`;
-  if (mutator) {
-    errorType = mutator.hasErrorType ? `${mutator.default ? (0, import_core2.pascal)(operationName) : ""}ErrorType<${response.definition.errors || "unknown"}>` : response.definition.errors || "unknown";
-  }
-  const dataType = (mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core2.pascal)(operationName)}Hook>` : `typeof ${operationName}`;
+  const errorType = getQueryErrorType(
+    operationName,
+    response,
+    httpClient,
+    mutator
+  );
+  const dataType = (mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`;
+  const definedInitialDataQueryArguments = generateQueryArguments({
+    operationName,
+    definitions: "",
+    mutator,
+    isRequestOptions,
+    type,
+    hasSvelteQueryV4,
+    hasQueryV5,
+    queryParams,
+    queryParam,
+    initialData: "defined",
+    httpClient
+  });
+  const undefinedInitialDataQueryArguments = generateQueryArguments({
+    operationName,
+    definitions: "",
+    mutator,
+    isRequestOptions,
+    type,
+    hasSvelteQueryV4,
+    hasQueryV5,
+    queryParams,
+    queryParam,
+    initialData: "undefined",
+    httpClient
+  });
   const queryArguments = generateQueryArguments({
     operationName,
     definitions: "",
@@ -2321,16 +2440,19 @@ var generateQueryImplementation = ({
     hasSvelteQueryV4,
     hasQueryV5,
     queryParams,
-    queryParam
+    queryParam,
+    httpClient
   });
   const queryOptions = getQueryOptions({
     isRequestOptions,
     isExactOptionalPropertyTypes,
     mutator,
-    hasSignal
+    hasSignal,
+    httpClient
   });
   const hookOptions = getHookOptions({
     isRequestOptions,
+    httpClient,
     mutator
   });
   const queryFnArguments = getQueryFnArguments({
@@ -2354,7 +2476,7 @@ var generateQueryImplementation = ({
     type,
     outputClient
   });
-  const queryOptionsFnName = (0, import_core2.camel)(
+  const queryOptionsFnName = (0, import_core3.camel)(
     queryKeyMutator || queryOptionsMutator || (mutator == null ? void 0 : mutator.isHook) ? `use-${name}-queryOptions` : `get-${name}-queryOptions`
   );
   const queryOptionsVarName = isRequestOptions ? "queryOptions" : "options";
@@ -2370,13 +2492,13 @@ ${hookOptions}
 
   const queryKey =  ${!queryKeyMutator ? `${!hasVueQueryV4 ? "queryOptions?.queryKey ?? " : ""}${queryKeyFnName}(${queryKeyProperties});` : `${queryKeyMutator.name}({ ${queryProperties} }${queryKeyMutator.hasSecondArg ? `, { url: \`${route}\`, queryOptions }` : ""});`}
 
-  ${(mutator == null ? void 0 : mutator.isHook) ? `const ${operationName} =  use${(0, import_core2.pascal)(operationName)}Hook();` : ""}
+  ${(mutator == null ? void 0 : mutator.isHook) ? `const ${operationName} =  use${(0, import_core3.pascal)(operationName)}Hook();` : ""}
 
-    const queryFn: QueryFunction<Awaited<ReturnType<${(mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core2.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>${hasQueryV5 && hasInfiniteQueryParam ? `, QueryKey, ${queryParams == null ? void 0 : queryParams.schema.name}['${queryParam}']` : ""}> = (${queryFnArguments}) => ${operationName}(${httpFunctionProps}${httpFunctionProps ? ", " : ""}${queryOptions});
+    const queryFn: QueryFunction<Awaited<ReturnType<${(mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>${hasQueryV5 && hasInfiniteQueryParam ? `, QueryKey, ${queryParams == null ? void 0 : queryParams.schema.name}['${queryParam}']` : ""}> = (${queryFnArguments}) => ${operationName}(${httpFunctionProps}${httpFunctionProps ? ", " : ""}${queryOptions});
 
       ${isVue(outputClient) ? vueUnRefParams(
     props.filter(
-      (prop) => prop.type === import_core2.GetterPropType.NAMED_PATH_PARAMS
+      (prop) => prop.type === import_core3.GetterPropType.NAMED_PATH_PARAMS
     )
   ) : ""}
 
@@ -2385,23 +2507,34 @@ ${hookOptions}
    return  ${!queryOptionsMutator ? `{ queryKey, queryFn, ${queryOptionsImp}}` : "customOptions"} as ${queryOptionFnReturnType} ${isVue(outputClient) ? "" : "& { queryKey: QueryKey }"}
 }`;
   const operationPrefix = hasSvelteQueryV4 ? "create" : "use";
+  const queryHookName = (0, import_core3.camel)(`${operationPrefix}-${name}`);
+  const overrideTypes = `
+export function ${queryHookName}<TData = ${TData}, TError = ${errorType}>(
+ ${definedInitialDataQueryPropsDefinitions} ${definedInitialDataQueryArguments}
+  ): ${definedInitialDataReturnType}
+export function ${queryHookName}<TData = ${TData}, TError = ${errorType}>(
+ ${queryPropDefinitions} ${undefinedInitialDataQueryArguments}
+  ): ${returnType}
+export function ${queryHookName}<TData = ${TData}, TError = ${errorType}>(
+ ${queryPropDefinitions} ${queryArguments}
+  ): ${returnType}`;
   return `
 ${queryOptionsFn}
 
-export type ${(0, import_core2.pascal)(
+export type ${(0, import_core3.pascal)(
     name
   )}QueryResult = NonNullable<Awaited<ReturnType<${dataType}>>>
-export type ${(0, import_core2.pascal)(name)}QueryError = ${errorType}
+export type ${(0, import_core3.pascal)(name)}QueryError = ${errorType}
 
-${doc}export const ${(0, import_core2.camel)(
-    `${operationPrefix}-${name}`
-  )} = <TData = ${TData}, TError = ${errorType}>(
+${hasQueryV5 && import_core3.OutputClient.REACT_QUERY === outputClient ? overrideTypes : ""}
+${doc}
+export function ${queryHookName}<TData = ${TData}, TError = ${errorType}>(
  ${queryProps} ${queryArguments}
-  ): ${returnType} => {
+  ): ${returnType} {
 
   const ${queryOptionsVarName} = ${queryOptionsFnName}(${queryProperties}${queryProperties ? "," : ""}${isRequestOptions ? "options" : "queryOptions"})
 
-  const ${queryResultVarName} = ${(0, import_core2.camel)(
+  const ${queryResultVarName} = ${(0, import_core3.camel)(
     `${operationPrefix}-${type}`
   )}(${queryOptionsVarName}) as ${returnType};
 
@@ -2410,7 +2543,7 @@ ${doc}export const ${(0, import_core2.camel)(
   return ${queryResultVarName};
 }
 
-${usePrefetch && (type === QueryType.QUERY || type === QueryType.INFINITE) ? `${doc}export const ${(0, import_core2.camel)(
+${usePrefetch && (type === QueryType.QUERY || type === QueryType.INFINITE) ? `${doc}export const ${(0, import_core3.camel)(
     `prefetch-${name}`
   )} = async <TData = Awaited<ReturnType<${dataType}>>, TError = ${errorType}>(
  queryClient: QueryClient, ${queryProps} ${queryArguments}
@@ -2418,7 +2551,7 @@ ${usePrefetch && (type === QueryType.QUERY || type === QueryType.INFINITE) ? `${
 
   const ${queryOptionsVarName} = ${queryOptionsFnName}(${queryProperties}${queryProperties ? "," : ""}${isRequestOptions ? "options" : "queryOptions"})
 
-  await queryClient.${(0, import_core2.camel)(`prefetch-${type}`)}(${queryOptionsVarName});
+  await queryClient.${(0, import_core3.camel)(`prefetch-${type}`)}(${queryOptionsVarName});
 
   return queryClient;
 }
@@ -2448,16 +2581,17 @@ var generateQueryHook = async ({
   const isRequestOptions = (override == null ? void 0 : override.requestOptions) !== false;
   const operationQueryOptions = (_a = operations[operationId]) == null ? void 0 : _a.query;
   const isExactOptionalPropertyTypes = !!((_c = (_b = context.output.tsconfig) == null ? void 0 : _b.compilerOptions) == null ? void 0 : _c.exactOptionalPropertyTypes);
-  const hasVueQueryV4 = import_core2.OutputClient.VUE_QUERY === outputClient && (!isVueQueryV3(context.output.packageJson) || query.version === 4);
-  const hasSvelteQueryV4 = import_core2.OutputClient.SVELTE_QUERY === outputClient && (!isSvelteQueryV3(context.output.packageJson) || query.version === 4);
+  const hasVueQueryV4 = import_core3.OutputClient.VUE_QUERY === outputClient && (!isVueQueryV3(context.output.packageJson) || query.version === 4);
+  const hasSvelteQueryV4 = import_core3.OutputClient.SVELTE_QUERY === outputClient && (!isSvelteQueryV3(context.output.packageJson) || query.version === 4);
   const hasQueryV5 = query.version === 5 || isQueryV5(
     context.output.packageJson,
     outputClient
   );
-  const doc = (0, import_core2.jsDoc)({ summary, deprecated });
+  const httpClient = context.output.httpClient;
+  const doc = (0, import_core3.jsDoc)({ summary, deprecated });
   let implementation = "";
   let mutators = void 0;
-  let isQuery = import_core2.Verbs.GET === verb && (override.query.useQuery || override.query.useSuspenseQuery || override.query.useInfinite || override.query.useSuspenseInfiniteQuery);
+  let isQuery = import_core3.Verbs.GET === verb && (override.query.useQuery || override.query.useSuspenseQuery || override.query.useInfinite || override.query.useSuspenseInfiniteQuery);
   if ((operationQueryOptions == null ? void 0 : operationQueryOptions.useInfinite) !== void 0) {
     isQuery = operationQueryOptions.useInfinite;
   }
@@ -2471,14 +2605,14 @@ var generateQueryHook = async ({
     isQuery = operationQueryOptions.useSuspenseQuery;
   }
   if (isQuery) {
-    const queryKeyMutator = query.queryKey ? await (0, import_core2.generateMutator)({
+    const queryKeyMutator = query.queryKey ? await (0, import_core3.generateMutator)({
       output,
       mutator: query.queryKey,
       name: `${operationName}QueryKey`,
       workspace: context.workspace,
       tsconfig: context.output.tsconfig
     }) : void 0;
-    const queryOptionsMutator = query.queryOptions ? await (0, import_core2.generateMutator)({
+    const queryOptionsMutator = query.queryOptions ? await (0, import_core3.generateMutator)({
       output,
       mutator: query.queryOptions,
       name: `${operationName}QueryOptions`,
@@ -2486,19 +2620,19 @@ var generateQueryHook = async ({
       tsconfig: context.output.tsconfig
     }) : void 0;
     const queryProperties = props.map((param) => {
-      if (param.type === import_core2.GetterPropType.NAMED_PATH_PARAMS && !isVue(outputClient))
+      if (param.type === import_core3.GetterPropType.NAMED_PATH_PARAMS && !isVue(outputClient))
         return param.destructured;
-      return param.type === import_core2.GetterPropType.BODY ? body.implementation : param.name;
+      return param.type === import_core3.GetterPropType.BODY ? body.implementation : param.name;
     }).join(",");
-    const queryKeyProperties = props.filter((prop) => prop.type !== import_core2.GetterPropType.HEADER).map((param) => {
-      if (param.type === import_core2.GetterPropType.NAMED_PATH_PARAMS && !isVue(outputClient))
+    const queryKeyProperties = props.filter((prop) => prop.type !== import_core3.GetterPropType.HEADER).map((param) => {
+      if (param.type === import_core3.GetterPropType.NAMED_PATH_PARAMS && !isVue(outputClient))
         return param.destructured;
-      return param.type === import_core2.GetterPropType.BODY ? body.implementation : param.name;
+      return param.type === import_core3.GetterPropType.BODY ? body.implementation : param.name;
     }).join(",");
     const queries = [
       ...(query == null ? void 0 : query.useInfinite) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useInfinite) ? [
         {
-          name: (0, import_core2.camel)(`${operationName}-infinite`),
+          name: (0, import_core3.camel)(`${operationName}-infinite`),
           options: query == null ? void 0 : query.options,
           type: QueryType.INFINITE,
           queryParam: query == null ? void 0 : query.useInfiniteQueryParam
@@ -2513,26 +2647,26 @@ var generateQueryHook = async ({
       ] : [],
       ...(query == null ? void 0 : query.useSuspenseQuery) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useSuspenseQuery) ? [
         {
-          name: (0, import_core2.camel)(`${operationName}-suspense`),
+          name: (0, import_core3.camel)(`${operationName}-suspense`),
           options: query == null ? void 0 : query.options,
           type: QueryType.SUSPENSE_QUERY
         }
       ] : [],
       ...(query == null ? void 0 : query.useSuspenseInfiniteQuery) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useSuspenseInfiniteQuery) ? [
         {
-          name: (0, import_core2.camel)(`${operationName}-suspense-infinite`),
+          name: (0, import_core3.camel)(`${operationName}-suspense-infinite`),
           options: query == null ? void 0 : query.options,
           type: QueryType.SUSPENSE_INFINITE,
           queryParam: query == null ? void 0 : query.useInfiniteQueryParam
         }
       ] : []
     ];
-    const queryKeyFnName = (0, import_core2.camel)(`get-${operationName}-queryKey`);
-    let queryKeyProps = (0, import_core2.toObjectString)(
-      props.filter((prop) => prop.type !== import_core2.GetterPropType.HEADER),
+    const queryKeyFnName = (0, import_core3.camel)(`get-${operationName}-queryKey`);
+    let queryKeyProps = (0, import_core3.toObjectString)(
+      props.filter((prop) => prop.type !== import_core3.GetterPropType.HEADER),
       "implementation"
     );
-    const routeString = isVue(outputClient) ? (0, import_core2.getRouteAsArray)(route) : `\`${route}\``;
+    const routeString = isVue(outputClient) ? (0, import_core3.getRouteAsArray)(route) : `\`${route}\``;
     const queryKeyFn = `${override.query.shouldExportQueryKey ? "export " : ""}const ${queryKeyFnName} = (${queryKeyProps}) => {
     return [${routeString}${queryParams ? ", ...(params ? [params]: [])" : ""}${body.implementation ? `, ${body.implementation}` : ""}] as const;
     }`;
@@ -2552,6 +2686,7 @@ var generateQueryHook = async ({
         queryParams,
         response,
         outputClient,
+        httpClient,
         isExactOptionalPropertyTypes,
         hasSignal: !!query.signal,
         queryOptionsMutator,
@@ -2571,12 +2706,12 @@ var generateQueryHook = async ({
       ...queryKeyMutator ? [queryKeyMutator] : []
     ] : void 0;
   }
-  let isMutation = verb !== import_core2.Verbs.GET && override.query.useMutation;
+  let isMutation = verb !== import_core3.Verbs.GET && override.query.useMutation;
   if ((operationQueryOptions == null ? void 0 : operationQueryOptions.useMutation) !== void 0) {
     isMutation = operationQueryOptions.useMutation;
   }
   if (isMutation) {
-    const mutationOptionsMutator = query.mutationOptions ? await (0, import_core2.generateMutator)({
+    const mutationOptionsMutator = query.mutationOptions ? await (0, import_core3.generateMutator)({
       output,
       mutator: query.mutationOptions,
       name: `${operationName}MutationOptions`,
@@ -2584,14 +2719,16 @@ var generateQueryHook = async ({
       tsconfig: context.output.tsconfig
     }) : void 0;
     const definitions = props.map(
-      ({ definition, type }) => type === import_core2.GetterPropType.BODY ? (mutator == null ? void 0 : mutator.bodyTypeName) ? `data: ${mutator.bodyTypeName}<${body.definition}>` : `data: ${body.definition}` : definition
+      ({ definition, type }) => type === import_core3.GetterPropType.BODY ? (mutator == null ? void 0 : mutator.bodyTypeName) ? `data: ${mutator.bodyTypeName}<${body.definition}>` : `data: ${body.definition}` : definition
     ).join(";");
-    const properties = props.map(({ name, type }) => type === import_core2.GetterPropType.BODY ? "data" : name).join(",");
-    let errorType = `AxiosError<${response.definition.errors || "unknown"}>`;
-    if (mutator) {
-      errorType = mutator.hasErrorType ? `${mutator.default ? (0, import_core2.pascal)(operationName) : ""}ErrorType<${response.definition.errors || "unknown"}>` : response.definition.errors || "unknown";
-    }
-    const dataType = (mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core2.pascal)(operationName)}Hook>` : `typeof ${operationName}`;
+    const properties = props.map(({ name, type }) => type === import_core3.GetterPropType.BODY ? "data" : name).join(",");
+    let errorType = getQueryErrorType(
+      operationName,
+      response,
+      httpClient,
+      mutator
+    );
+    const dataType = (mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`;
     const mutationOptionFnReturnType = getQueryOptionsDefinition({
       operationName,
       definitions,
@@ -2606,23 +2743,33 @@ var generateQueryHook = async ({
       mutator,
       isRequestOptions,
       hasSvelteQueryV4,
-      hasQueryV5
+      hasQueryV5,
+      httpClient
     });
-    const mutationOptionsFnName = (0, import_core2.camel)(
+    const mutationOptionsFnName = (0, import_core3.camel)(
       mutationOptionsMutator || (mutator == null ? void 0 : mutator.isHook) ? `use-${operationName}-mutationOptions` : `get-${operationName}-mutationOptions`
     );
     const mutationOptionsVarName = isRequestOptions ? "mutationOptions" : "options";
+    const hooksOptionImplementation = getHooksOptionImplementation(
+      isRequestOptions,
+      httpClient,
+      mutator
+    );
     const mutationOptionsFn = `export const ${mutationOptionsFnName} = <TError = ${errorType},
     TContext = unknown>(${mutationArguments}): ${mutationOptionFnReturnType} => {
-${isRequestOptions ? `const {mutation: mutationOptions${!mutator ? `, axios: axiosOptions` : (mutator == null ? void 0 : mutator.hasSecondArg) ? ", request: requestOptions" : ""}} = options ?? {};` : ""}
+${hooksOptionImplementation}
 
-      ${(mutator == null ? void 0 : mutator.isHook) ? `const ${operationName} =  use${(0, import_core2.pascal)(operationName)}Hook()` : ""}
+      ${(mutator == null ? void 0 : mutator.isHook) ? `const ${operationName} =  use${(0, import_core3.pascal)(operationName)}Hook()` : ""}
 
 
       const mutationFn: MutationFunction<Awaited<ReturnType<${dataType}>>, ${definitions ? `{${definitions}}` : "void"}> = (${properties ? "props" : ""}) => {
           ${properties ? `const {${properties}} = props ?? {};` : ""}
 
-          return  ${operationName}(${properties}${properties ? "," : ""}${isRequestOptions ? !mutator ? `axiosOptions` : (mutator == null ? void 0 : mutator.hasSecondArg) ? "requestOptions" : "" : ""})
+          return  ${operationName}(${properties}${properties ? "," : ""}${getMutationRequestArgs(
+      isRequestOptions,
+      httpClient,
+      mutator
+    )})
         }
 
         ${mutationOptionsMutator ? `const customOptions = ${mutationOptionsMutator.name}({...mutationOptions, mutationFn}${mutationOptionsMutator.hasThirdArg ? `, { url: \`${route}\` }` : ""});` : ""}
@@ -2633,13 +2780,13 @@ ${isRequestOptions ? `const {mutation: mutationOptions${!mutator ? `, axios: axi
     implementation += `
 ${mutationOptionsFn}
 
-    export type ${(0, import_core2.pascal)(
+    export type ${(0, import_core3.pascal)(
       operationName
     )}MutationResult = NonNullable<Awaited<ReturnType<${dataType}>>>
-    ${body.definition ? `export type ${(0, import_core2.pascal)(operationName)}MutationBody = ${(mutator == null ? void 0 : mutator.bodyTypeName) ? `${mutator.bodyTypeName}<${body.definition}>` : body.definition}` : ""}
-    export type ${(0, import_core2.pascal)(operationName)}MutationError = ${errorType}
+    ${body.definition ? `export type ${(0, import_core3.pascal)(operationName)}MutationBody = ${(mutator == null ? void 0 : mutator.bodyTypeName) ? `${mutator.bodyTypeName}<${body.definition}>` : body.definition}` : ""}
+    export type ${(0, import_core3.pascal)(operationName)}MutationError = ${errorType}
 
-    ${doc}export const ${(0, import_core2.camel)(
+    ${doc}export const ${(0, import_core3.camel)(
       `${operationPrefix}-${operationName}`
     )} = <TError = ${errorType},
     TContext = unknown>(${mutationArguments})${generateMutatorReturnType({
@@ -2675,13 +2822,12 @@ ${isRequestOptions && isMutator ? `type SecondParameter<T extends (...args: any)
 ` : ""}
 `;
 };
-var generateQuery = async (verbOptions, options, outputClient, output) => {
-  const imports = (0, import_core2.generateVerbImports)(verbOptions);
+var generateQuery = async (verbOptions, options, outputClient) => {
+  const imports = (0, import_core3.generateVerbImports)(verbOptions);
   const functionImplementation = generateQueryRequestFunction(
     verbOptions,
     options,
-    outputClient,
-    output
+    isVue(outputClient)
   );
   const { implementation: hookImplementation, mutators } = await generateQueryHook(verbOptions, options, outputClient);
   return {
@@ -2705,7 +2851,7 @@ var builder = ({
   const client = (verbOptions, options, outputClient) => {
     if (options.override.useNamedParameters && (type === "vue-query" || outputClient === "vue-query")) {
       throw new Error(
-        `vue-query client does not support named parameters, and had broken reactivity previously, please set useNamedParameters to false; See for context: https://github.com/anymaniax/orval/pull/931#issuecomment-1752355686`
+        `vue-query client does not support named parameters, and had broken reactivity previously, please set useNamedParameters to false; See for context: https://github.com/orval-labs/orval/pull/931#issuecomment-1752355686`
       );
     }
     if (queryOptions) {
@@ -2713,11 +2859,11 @@ var builder = ({
         queryOptions,
         options.context.workspace
       );
-      verbOptions.override.query = (0, import_core2.mergeDeep)(
+      verbOptions.override.query = (0, import_core3.mergeDeep)(
         normalizedQueryOptions,
         verbOptions.override.query
       );
-      options.override.query = (0, import_core2.mergeDeep)(
+      options.override.query = (0, import_core3.mergeDeep)(
         normalizedQueryOptions,
         verbOptions.override.query
       );