@orval/query 8.20.0 → 8.21.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { GetterPropType, OutputClient, OutputHttpClient, Verbs, camel, compareVersions, generateFormDataAndUrlEncodedFunction, generateMutator, generateMutatorConfig, generateMutatorRequestOptions, generateOptions, generateVerbImports, getAngularFilteredParamsCallExpression, getAngularFilteredParamsHelperBody, getFullRoute, getRouteAsArray, getSuccessResponseType, isObject, isOperationInTagBucket, isString, isSyntheticDefaultImportsAllow, jsDoc, logWarning, makeRouteSafe, mergeDeep, pascal, stringify, toObjectString } from "@orval/core";
+import { GetterPropType, OutputClient, OutputHttpClient, Verbs, camel, compareVersions, generateFormDataAndUrlEncodedFunction, generateMutator, generateMutatorConfig, generateMutatorRequestOptions, generateOptions, generateVerbImports, getAngularFilteredParamsCallExpression, getAngularFilteredParamsHelperBody, getFullRoute, getRoute, getRouteAsArray, getSuccessResponseType, isObject, isOperationInTagBucket, isString, isSyntheticDefaultImportsAllow, jsDoc, logWarning, makeRouteSafe, mergeDeep, pascal, stringify, toObjectString } from "@orval/core";
 import { generateFetchHeader, generateRequestFunction } from "@orval/fetch";
 import nodePath from "node:path";
 import { styleText } from "node:util";
@@ -1744,7 +1744,7 @@ const createGenerateInvalidateCall = (spec, shouldSplitQueryKey, useOperationIdA
 		if (info?.hasRequiredPathParams) {
 			const prefix = getStaticRoutePrefix(info.route);
 			if (prefix !== void 0) {
-				const prefixWithBase = getFullRoute(prefix, servers, baseUrl);
+				const prefixWithBase = getFullRoute(getRoute(prefix), servers, baseUrl);
 				const verbPrefix = getQueryKeyVerbPrefix({
 					verb: info.method,
 					useOperationIdAsQueryKey
@@ -1762,7 +1762,7 @@ const createGenerateInvalidateCall = (spec, shouldSplitQueryKey, useOperationIdA
 	};
 };
 const generateMutationHook = async ({ verbOptions, options, isRequestOptions, httpClient, doc, adapter }) => {
-	const { operationName, body, props, mutator, response, operationId, route: pathRoute, override } = verbOptions;
+	const { operationName, typeName, body, props, mutator, response, operationId, route: pathRoute, override } = verbOptions;
 	const { route, context, output } = options;
 	const query = override.query;
 	const mutationOptionsMutator = query.mutationOptions ? await generateMutator({
@@ -1777,7 +1777,7 @@ const generateMutationHook = async ({ verbOptions, options, isRequestOptions, ht
 	const properties = props.map(({ name, type }) => type === GetterPropType.BODY ? "data" : name).join(",");
 	const operationLocalNames = new Set(MUTATION_OPERATION_LOCAL_NAMES);
 	for (const { name, type } of props) operationLocalNames.add(type === GetterPropType.BODY ? "data" : name);
-	const errorType = getQueryErrorType(operationName, response, httpClient, mutator, override.fetch.forceSuccessResponse);
+	const errorType = getQueryErrorType(typeName, response, httpClient, mutator, override.fetch.forceSuccessResponse);
 	const operationReferenceName = getMutationOperationReferenceName(operationName, operationLocalNames);
 	const dataType = mutator?.isHook ? `ReturnType<typeof use${pascal(operationName)}Hook>` : `typeof ${operationReferenceName}`;
 	const operationTypeReferenceName = mutator?.isHook ? operationName : operationReferenceName;
@@ -1875,9 +1875,9 @@ ${hasInvalidation ? adapter.generateMutationOnSuccess({
 ${!mutator?.isHook && operationReferenceName !== operationName ? `const ${operationReferenceName} = ${operationName};` : ""}
 ${mutationOptionsFn}
 
-    export type ${pascal(operationName)}MutationResult = NonNullable<Awaited<ReturnType<${dataType}>>>
-    ${body.definition ? `export type ${pascal(operationName)}MutationBody = ${mutator?.bodyTypeName ? `${mutator.bodyTypeName}<${body.definition}>` : body.definition}${body.isOptional ? " | undefined" : ""}` : ""}
-    export type ${pascal(operationName)}MutationError = ${errorType}
+    export type ${pascal(typeName)}MutationResult = NonNullable<Awaited<ReturnType<${dataType}>>>
+    ${body.definition ? `export type ${pascal(typeName)}MutationBody = ${mutator?.bodyTypeName ? `${mutator.bodyTypeName}<${body.definition}>` : body.definition}${body.isOptional ? " | undefined" : ""}` : ""}
+    export type ${pascal(typeName)}MutationError = ${errorType}
 
     ${doc}export const ${camel(`${operationPrefix}-${operationName}`)} = <TError = ${errorType},
     TContext = unknown>(${mutationArguments} ${optionalQueryClientArgument})${mutationReturnType} => {
@@ -2048,7 +2048,7 @@ const generatePrefetch = ({ usePrefetch, type, useQuery, useInfinite, operationN
   return queryClient;
 }\n`;
 };
-const generateQueryImplementation = ({ queryOption: { name, queryParam, options, type, queryKeyFnName }, operationId, operationName, queryProperties, queryKeyProperties, queryParams, params, props, body, mutator, queryOptionsMutator, queryKeyMutator, isRequestOptions, response, httpClient, isExactOptionalPropertyTypes, hasSignal, useRuntimeFetcher, forceSuccessResponse, route, doc, usePrefetch, useQuery, useInfinite, useInvalidate, useSetQueryData, useGetQueryData, adapter }) => {
+const generateQueryImplementation = ({ queryOption: { name, typeName: optionTypeName, queryParam, options, type, queryKeyFnName }, operationId, operationName, typeName, queryProperties, queryKeyProperties, queryParams, params, props, body, mutator, queryOptionsMutator, queryKeyMutator, isRequestOptions, response, httpClient, isExactOptionalPropertyTypes, hasSignal, useRuntimeFetcher, forceSuccessResponse, route, doc, usePrefetch, useQuery, useInfinite, useInvalidate, useSetQueryData, useGetQueryData, adapter }) => {
 	const { hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError } = adapter;
 	const hasSignalParam = props.some((prop) => prop.name === "signal");
 	const queryPropDefinitions = wrapPropsBodyWithMutatorBodyType({
@@ -2092,7 +2092,7 @@ const generateQueryImplementation = ({ queryOption: { name, queryParam, options,
 		hasQueryV5,
 		hasQueryV5WithDataTagError
 	});
-	const errorType = getQueryErrorType(operationName, response, httpClient, mutator, forceSuccessResponse);
+	const errorType = getQueryErrorType(typeName, response, httpClient, mutator, forceSuccessResponse);
 	const dataType = mutator?.isHook ? `ReturnType<typeof use${pascal(operationName)}Hook>` : `typeof ${operationName}`;
 	const definedInitialDataQueryArguments = adapter.generateQueryArguments({
 		operationName,
@@ -2272,8 +2272,8 @@ export function ${queryHookName}<TData = ${TData}, TError = ${errorType}>(\n ${q
 	return `
 ${queryOptionsFn}
 
-export type ${pascal(name)}QueryResult = NonNullable<Awaited<ReturnType<${dataType}>>>
-export type ${pascal(name)}QueryError = ${errorType}
+export type ${pascal(optionTypeName)}QueryResult = NonNullable<Awaited<ReturnType<${dataType}>>>
+export type ${pascal(optionTypeName)}QueryError = ${errorType}
 
 ${adapter.shouldGenerateOverrideTypes() ? overrideTypes : ""}
 ${doc}
@@ -2318,7 +2318,7 @@ ${shouldGenerateGetQueryData ? isReactQuery ? `${doc}export const ${getQueryData
 };
 const generateQueryHook = async (verbOptions, options, outputClient, adapter) => {
 	if (!adapter) throw new Error("FrameworkAdapter is required for generateQueryHook");
-	const { queryParams, operationName, body, props: _props, verb, params, override, mutator, response, operationId, summary, deprecated } = verbOptions;
+	const { queryParams, operationName, typeName, body, props: _props, verb, params, override, mutator, response, operationId, summary, deprecated } = verbOptions;
 	const { route, override: { operations }, context, output } = options;
 	const props = adapter.transformProps(_props);
 	const query = override.query;
@@ -2374,6 +2374,7 @@ const generateQueryHook = async (verbOptions, options, outputClient, adapter) =>
 		const queries = [
 			...effectiveUseInfinite ? [{
 				name: camel(`${operationName}-infinite`),
+				typeName: camel(`${typeName}-infinite`),
 				options: query.options,
 				type: QueryType.INFINITE,
 				queryParam: query.useInfiniteQueryParam,
@@ -2381,18 +2382,21 @@ const generateQueryHook = async (verbOptions, options, outputClient, adapter) =>
 			}] : [],
 			...effectiveUseQuery ? [{
 				name: operationName,
+				typeName,
 				options: query.options,
 				type: QueryType.QUERY,
 				queryKeyFnName: camel(`get-${operationName}-query-key`)
 			}] : [],
 			...effectiveUseSuspenseQuery ? [{
 				name: camel(`${operationName}-suspense`),
+				typeName: camel(`${typeName}-suspense`),
 				options: query.options,
 				type: QueryType.SUSPENSE_QUERY,
 				queryKeyFnName: camel(`get-${operationName}-query-key`)
 			}] : [],
 			...effectiveUseSuspenseInfiniteQuery ? [{
 				name: camel(`${operationName}-suspense-infinite`),
+				typeName: camel(`${typeName}-suspense-infinite`),
 				options: query.options,
 				type: QueryType.SUSPENSE_INFINITE,
 				queryParam: query.useInfiniteQueryParam,
@@ -2436,6 +2440,7 @@ ${queryKeyFns}`;
 			queryOption,
 			operationId,
 			operationName,
+			typeName,
 			queryProperties,
 			queryKeyProperties,
 			params,