@orval/query 8.3.0 → 8.4.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { GetterPropType, OutputClient, OutputHttpClient, TEMPLATE_TAG_REGEX, Verbs, camel, compareVersions, generateFormDataAndUrlEncodedFunction, generateMutator, generateMutatorConfig, generateMutatorRequestOptions, generateOptions, generateVerbImports, getRouteAsArray, isObject, isString, isSyntheticDefaultImportsAllow, jsDoc, mergeDeep, pascal, stringify, toObjectString, upath } from "@orval/core";
+import { GetterPropType, OutputClient, OutputHttpClient, TEMPLATE_TAG_REGEX, Verbs, camel, compareVersions, generateFormDataAndUrlEncodedFunction, generateMutator, generateMutatorConfig, generateMutatorRequestOptions, generateOptions, generateVerbImports, getAngularFilteredParamsCallExpression, getAngularFilteredParamsHelperBody, getRouteAsArray, getSuccessResponseType, isObject, isString, isSyntheticDefaultImportsAllow, jsDoc, mergeDeep, pascal, stringify, toObjectString, upath } from "@orval/core";
 import { generateFetchHeader, generateRequestFunction } from "@orval/fetch";
 import chalk from "chalk";
 import { omitBy } from "remeda";
@@ -167,24 +167,29 @@ const generateAngularHttpRequestFunction = ({ headers, queryParams, operationNam
 	const queryProps = toObjectString(props, "implementation").replace(/,\s*$/, "");
 	const dataType = response.definition.success || "unknown";
 	const hasQueryParams = queryParams?.schema.name;
-	const urlConstruction = hasQueryParams ? `const httpParams = params ? new HttpParams({ fromObject: params as Record<string, string> }) : undefined;
+	const filteredParamsExpression = getAngularFilteredParamsCallExpression("params", queryParams?.requiredNullableKeys);
+	const urlConstruction = hasQueryParams ? `const httpParams = params ? new HttpParams({ fromObject: ${filteredParamsExpression} }) : undefined;
     const url = \`${route}\`;` : `const url = \`${route}\`;`;
 	const httpOptions = [];
 	if (hasQueryParams) httpOptions.push("params: httpParams");
 	if (headers) httpOptions.push("headers: new HttpHeaders(headers)");
+	const successResponseType = getSuccessResponseType(response);
+	const responseTypeOption = successResponseType ? `'${successResponseType}'` : void 0;
+	if (responseTypeOption) httpOptions.push(`responseType: ${responseTypeOption}`);
 	const optionsStr = httpOptions.length > 0 ? `, { ${httpOptions.join(", ")} }` : "";
 	let httpCall;
+	const httpGeneric = responseTypeOption ? "" : `<${dataType}>`;
 	const bodyArg = isFormData && body.formData ? "formData" : isFormUrlEncoded && body.formUrlEncoded ? "formUrlEncoded" : body.definition ? toObjectString([body], "implementation").replace(/,\s*$/, "") : "";
 	switch (verb) {
 		case "get":
 		case "head":
-			httpCall = `http.${verb}<${dataType}>(url${optionsStr})`;
+			httpCall = `http.${verb}${httpGeneric}(url${optionsStr})`;
 			break;
 		case "delete":
-			httpCall = bodyArg ? `http.${verb}<${dataType}>(url, { ${httpOptions.length > 0 ? httpOptions.join(", ") + ", " : ""}body: ${bodyArg} })` : `http.${verb}<${dataType}>(url${optionsStr})`;
+			httpCall = bodyArg ? `http.${verb}${httpGeneric}(url, { ${httpOptions.length > 0 ? httpOptions.join(", ") + ", " : ""}body: ${bodyArg} })` : `http.${verb}${httpGeneric}(url${optionsStr})`;
 			break;
 		default:
-			httpCall = `http.${verb}<${dataType}>(url, ${bodyArg || "undefined"}${optionsStr})`;
+			httpCall = `http.${verb}${httpGeneric}(url, ${bodyArg || "undefined"}${optionsStr})`;
 			break;
 	}
 	const responseType = response.definition.success;
@@ -197,7 +202,7 @@ const generateAngularHttpRequestFunction = ({ headers, queryParams, operationNam
 	].includes(responseType);
 	const hasSchema = response.imports.some((imp) => imp.name === responseType);
 	const isZodOutput = isObject(context.output.schemas) && context.output.schemas.type === "zod";
-	if (override.query.runtimeValidation && isZodOutput && !isPrimitiveType && hasSchema) httpCall = `${httpCall}.pipe(map(data => ${responseType}.parse(data)))`;
+	if (override.query.runtimeValidation && isZodOutput && !isPrimitiveType && hasSchema) httpCall = `${httpCall}.pipe(map(data => ${responseType === "Error" ? "ErrorSchema" : responseType}.parse(data)))`;
 	const additionalParams = [queryProps, hasSignal ? "options?: { signal?: AbortSignal | null }" : ""].filter(Boolean).join(", ");
 	return `${override.query.shouldExportHttpClient ? "export " : ""}const ${operationName} = (
     http: HttpClient${additionalParams ? `,\n    ${additionalParams}` : ""}
@@ -395,7 +400,9 @@ const getMutationRequestArgs = (isRequestOptions, httpClient, mutator) => {
 	return isRequestOptions ? mutator ? mutator.hasSecondArg ? "requestOptions" : "" : options : "";
 };
 const getQueryHeader = (params) => {
-	return params.output.httpClient === OutputHttpClient.FETCH ? generateFetchHeader(params) : "";
+	if (params.output.httpClient === OutputHttpClient.FETCH) return generateFetchHeader(params);
+	if (params.output.httpClient === OutputHttpClient.ANGULAR) return Object.values(params.verbOptions).some((v) => v.queryParams) ? getAngularFilteredParamsHelperBody() : "";
+	return "";
 };
 
 //#endregion
@@ -565,6 +572,7 @@ const REACT_QUERY_DEPENDENCIES = [{
 		{ name: "UseMutationOptions" },
 		{ name: "QueryFunction" },
 		{ name: "MutationFunction" },
+		{ name: "MutationFunctionContext" },
 		{ name: "UseQueryResult" },
 		{ name: "DefinedUseQueryResult" },
 		{ name: "UseSuspenseQueryResult" },
@@ -815,6 +823,18 @@ const isQueryV5WithDataTagError = (packageJson, queryClient) => {
 	const withoutRc = version.split("-")[0];
 	return compareVersions(withoutRc, "5.62.0");
 };
+const isQueryV5WithRequiredContextOnSuccess = (packageJson, queryClient) => {
+	const version = getPackageByQueryClient(packageJson, queryClient);
+	if (!version) return false;
+	const withoutRc = version.split("-")[0];
+	return compareVersions(withoutRc, "5.14.1");
+};
+const isQueryV5WithMutationContextOnSuccess = (packageJson, queryClient) => {
+	const version = getPackageByQueryClient(packageJson, queryClient);
+	if (!version) return false;
+	const withoutRc = version.split("-")[0];
+	return compareVersions(withoutRc, "5.89.0");
+};
 const isQueryV5WithInfiniteQueryOptionsError = (packageJson, queryClient) => {
 	if (queryClient === "angular-query") return true;
 	const version = getPackageByQueryClient(packageJson, queryClient);
@@ -830,11 +850,26 @@ const isSolidQueryWithUsePrefix = (packageJson) => {
 };
 const getPackageByQueryClient = (packageJson, queryClient) => {
 	switch (queryClient) {
-		case "react-query": return packageJson?.dependencies?.["@tanstack/react-query"] ?? packageJson?.devDependencies?.["@tanstack/react-query"] ?? packageJson?.peerDependencies?.["@tanstack/react-query"];
-		case "svelte-query": return packageJson?.dependencies?.["@tanstack/svelte-query"] ?? packageJson?.devDependencies?.["@tanstack/svelte-query"] ?? packageJson?.peerDependencies?.["@tanstack/svelte-query"];
-		case "vue-query": return packageJson?.dependencies?.["@tanstack/vue-query"] ?? packageJson?.devDependencies?.["@tanstack/vue-query"] ?? packageJson?.peerDependencies?.["@tanstack/vue-query"];
-		case "angular-query": return packageJson?.dependencies?.["@tanstack/angular-query-experimental"] ?? packageJson?.devDependencies?.["@tanstack/angular-query-experimental"] ?? packageJson?.peerDependencies?.["@tanstack/angular-query-experimental"];
-		case "solid-query": return packageJson?.dependencies?.["@tanstack/solid-query"] ?? packageJson?.devDependencies?.["@tanstack/solid-query"] ?? packageJson?.peerDependencies?.["@tanstack/solid-query"];
+		case "react-query": {
+			const pkgName = "@tanstack/react-query";
+			return packageJson?.resolvedVersions?.[pkgName] ?? packageJson?.dependencies?.[pkgName] ?? packageJson?.devDependencies?.[pkgName] ?? packageJson?.peerDependencies?.[pkgName];
+		}
+		case "svelte-query": {
+			const pkgName = "@tanstack/svelte-query";
+			return packageJson?.resolvedVersions?.[pkgName] ?? packageJson?.dependencies?.[pkgName] ?? packageJson?.devDependencies?.[pkgName] ?? packageJson?.peerDependencies?.[pkgName];
+		}
+		case "vue-query": {
+			const pkgName = "@tanstack/vue-query";
+			return packageJson?.resolvedVersions?.[pkgName] ?? packageJson?.dependencies?.[pkgName] ?? packageJson?.devDependencies?.[pkgName] ?? packageJson?.peerDependencies?.[pkgName];
+		}
+		case "angular-query": {
+			const pkgName = "@tanstack/angular-query-experimental";
+			return packageJson?.resolvedVersions?.[pkgName] ?? packageJson?.dependencies?.[pkgName] ?? packageJson?.devDependencies?.[pkgName] ?? packageJson?.peerDependencies?.[pkgName];
+		}
+		case "solid-query": {
+			const pkgName = "@tanstack/solid-query";
+			return packageJson?.resolvedVersions?.[pkgName] ?? packageJson?.dependencies?.[pkgName] ?? packageJson?.devDependencies?.[pkgName] ?? packageJson?.peerDependencies?.[pkgName];
+		}
 	}
 };
 
@@ -879,7 +914,7 @@ const getQueryOptionsDefinition = ({ operationName, mutator, definitions, type,
 
 //#endregion
 //#region src/frameworks/angular.ts
-const createAngularAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError }) => {
+const createAngularAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError, hasQueryV5WithMutationContextOnSuccess, hasQueryV5WithRequiredContextOnSuccess }) => {
 	const prefix = "Create";
 	return {
 		outputClient: OutputClient.ANGULAR_QUERY,
@@ -888,6 +923,8 @@ const createAngularAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQuery
 		hasQueryV5,
 		hasQueryV5WithDataTagError,
 		hasQueryV5WithInfiniteQueryOptionsError,
+		hasQueryV5WithMutationContextOnSuccess,
+		hasQueryV5WithRequiredContextOnSuccess,
 		getHookPropsDefinitions(props) {
 			return toObjectString(props.map((prop) => {
 				const getterType = prop.definition.replace(/^(\w+)(\??): (.+)$/, (_match, name, optional, type) => `${name}${optional}: ${type} | (() => ${type.replace(" | undefined", "")}${optional ? " | undefined" : ""})`);
@@ -981,19 +1018,6 @@ const createAngularAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQuery
 		supportsMutationInvalidation() {
 			return true;
 		},
-		generateMutationOnSuccess({ operationName, definitions, isRequestOptions, generateInvalidateCall: generateInvalidateCall$1, uniqueInvalidates }) {
-			const invalidateCalls = uniqueInvalidates.map((t) => generateInvalidateCall$1(t)).join("\n");
-			if (isRequestOptions) return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, onMutateResult: TContext, context: MutationFunctionContext) => {
-    if (!options?.skipInvalidation) {
-${invalidateCalls}
-    }
-    mutationOptions?.onSuccess?.(data, variables, onMutateResult, context);
-  };`;
-			return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, onMutateResult: TContext, context: MutationFunctionContext) => {
-${invalidateCalls}
-    mutationOptions?.onSuccess?.(data, variables, onMutateResult, context);
-  };`;
-		},
 		generateMutationHookBody({ operationPrefix, mutationOptionsFnName, mutationOptionsVarName, isRequestOptions, mutator, hasInvalidation }) {
 			if (!mutator || mutator.hasSecondArg) return `      const http = inject(HttpClient);${hasInvalidation ? "\n      const queryClient = inject(QueryClient);" : ""}
       const ${mutationOptionsVarName} = ${mutationOptionsFnName}(http${hasInvalidation ? ", queryClient" : ""}${isRequestOptions ? ", options" : ", mutationOptions"});
@@ -1014,12 +1038,14 @@ ${invalidateCalls}
 
 //#endregion
 //#region src/frameworks/react.ts
-const createReactAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError }) => ({
+const createReactAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError, hasQueryV5WithMutationContextOnSuccess, hasQueryV5WithRequiredContextOnSuccess }) => ({
 	outputClient: OutputClient.REACT_QUERY,
 	hookPrefix: "use",
 	hasQueryV5,
 	hasQueryV5WithDataTagError,
 	hasQueryV5WithInfiniteQueryOptionsError,
+	hasQueryV5WithMutationContextOnSuccess,
+	hasQueryV5WithRequiredContextOnSuccess,
 	getQueryReturnType({ type, isInitialDataDefined }) {
 		return ` ${isInitialDataDefined && !isSuspenseQuery(type) ? "Defined" : ""}Use${pascal(type)}Result<TData, TError> & { queryKey: ${hasQueryV5 ? `DataTag<QueryKey, TData${hasQueryV5WithDataTagError ? ", TError" : ""}>` : "QueryKey"} }`;
 	},
@@ -1043,19 +1069,6 @@ const createReactAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5
 	supportsMutationInvalidation() {
 		return true;
 	},
-	generateMutationOnSuccess({ operationName, definitions, isRequestOptions, generateInvalidateCall: generateInvalidateCall$1, uniqueInvalidates }) {
-		const invalidateCalls = uniqueInvalidates.map((t) => generateInvalidateCall$1(t)).join("\n");
-		if (isRequestOptions) return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, context: TContext) => {
-    if (!options?.skipInvalidation) {
-${invalidateCalls}
-    }
-    mutationOptions?.onSuccess?.(data, variables, context);
-  };`;
-		return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, context: TContext) => {
-${invalidateCalls}
-    mutationOptions?.onSuccess?.(data, variables, context);
-  };`;
-	},
 	generateMutationHookBody({ operationPrefix, mutationImplementation, hasInvalidation, optionalQueryClientArgument }) {
 		return `      ${hasInvalidation ? `const backupQueryClient = useQueryClient();\n      ` : ""}return ${operationPrefix}Mutation(${mutationImplementation}${optionalQueryClientArgument ? `, queryClient` : ""});`;
 	},
@@ -1066,12 +1079,14 @@ ${invalidateCalls}
 
 //#endregion
 //#region src/frameworks/solid.ts
-const createSolidAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError, hasSolidQueryUsePrefix }) => ({
+const createSolidAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError, hasQueryV5WithMutationContextOnSuccess, hasQueryV5WithRequiredContextOnSuccess, hasSolidQueryUsePrefix }) => ({
 	outputClient: OutputClient.SOLID_QUERY,
 	hookPrefix: hasSolidQueryUsePrefix ? "use" : "create",
 	hasQueryV5,
 	hasQueryV5WithDataTagError,
 	hasQueryV5WithInfiniteQueryOptionsError,
+	hasQueryV5WithMutationContextOnSuccess,
+	hasQueryV5WithRequiredContextOnSuccess,
 	getQueryOptionsDefinitionPrefix() {
 		return hasSolidQueryUsePrefix ? "Use" : "Create";
 	},
@@ -1111,7 +1126,7 @@ const createSolidAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5
 
 //#endregion
 //#region src/frameworks/svelte.ts
-const createSvelteAdapter = ({ hasSvelteQueryV4, hasSvelteQueryV6, hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError }) => {
+const createSvelteAdapter = ({ hasSvelteQueryV4, hasSvelteQueryV6, hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError, hasQueryV5WithMutationContextOnSuccess, hasQueryV5WithRequiredContextOnSuccess }) => {
 	const prefix = hasSvelteQueryV4 ? "Create" : "Use";
 	return {
 		outputClient: OutputClient.SVELTE_QUERY,
@@ -1119,6 +1134,8 @@ const createSvelteAdapter = ({ hasSvelteQueryV4, hasSvelteQueryV6, hasQueryV5, h
 		hasQueryV5,
 		hasQueryV5WithDataTagError,
 		hasQueryV5WithInfiniteQueryOptionsError,
+		hasQueryV5WithMutationContextOnSuccess,
+		hasQueryV5WithRequiredContextOnSuccess,
 		getHookPropsDefinitions(props) {
 			if (hasSvelteQueryV6) return toObjectString(props.map((p) => ({
 				...p,
@@ -1194,31 +1211,6 @@ const createSvelteAdapter = ({ hasSvelteQueryV4, hasSvelteQueryV6, hasQueryV5, h
 		supportsMutationInvalidation() {
 			return true;
 		},
-		generateMutationOnSuccess({ operationName, definitions, isRequestOptions, generateInvalidateCall: generateInvalidateCall$1, uniqueInvalidates }) {
-			const invalidateCalls = uniqueInvalidates.map((t) => generateInvalidateCall$1(t)).join("\n");
-			if (hasSvelteQueryV6) {
-				if (isRequestOptions) return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, onMutateResult: TContext, context: MutationFunctionContext) => {
-    if (!options?.skipInvalidation) {
-${invalidateCalls}
-    }
-    mutationOptions?.onSuccess?.(data, variables, onMutateResult, context);
-  };`;
-				return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, onMutateResult: TContext, context: MutationFunctionContext) => {
-${invalidateCalls}
-    mutationOptions?.onSuccess?.(data, variables, onMutateResult, context);
-  };`;
-			}
-			if (isRequestOptions) return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, context: TContext | undefined) => {
-    if (!options?.skipInvalidation) {
-${invalidateCalls}
-    }
-    mutationOptions?.onSuccess?.(data, variables, context);
-  };`;
-			return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, context: TContext | undefined) => {
-${invalidateCalls}
-    mutationOptions?.onSuccess?.(data, variables, context);
-  };`;
-		},
 		generateMutationHookBody({ operationPrefix, mutationImplementation, hasInvalidation, optionalQueryClientArgument }) {
 			if (hasSvelteQueryV6) return `      ${hasInvalidation ? `const backupQueryClient = useQueryClient(${optionalQueryClientArgument ? "queryClient?.()" : ""});\n      ` : ""}return ${operationPrefix}Mutation(() => ({ ...${mutationImplementation} })${optionalQueryClientArgument ? `, queryClient` : ""});`;
 			return `      ${hasInvalidation ? `const backupQueryClient = useQueryClient();\n      ` : ""}return ${operationPrefix}Mutation(${mutationImplementation});`;
@@ -1235,12 +1227,14 @@ ${invalidateCalls}
 
 //#endregion
 //#region src/frameworks/vue.ts
-const createVueAdapter = ({ hasVueQueryV4, hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError }) => ({
+const createVueAdapter = ({ hasVueQueryV4, hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError, hasQueryV5WithMutationContextOnSuccess, hasQueryV5WithRequiredContextOnSuccess }) => ({
 	outputClient: OutputClient.VUE_QUERY,
 	hookPrefix: "use",
 	hasQueryV5,
 	hasQueryV5WithDataTagError,
 	hasQueryV5WithInfiniteQueryOptionsError,
+	hasQueryV5WithMutationContextOnSuccess,
+	hasQueryV5WithRequiredContextOnSuccess,
 	transformProps(props) {
 		return vueWrapTypeWithMaybeRef(props);
 	},
@@ -1375,6 +1369,32 @@ const withDefaults = (adapter) => ({
 		const optionsType = `{ ${type ? "query" : "mutation"}${isQueryRequired ? "" : "?"}:${definition}, ${!type && hasInvalidation ? "skipInvalidation?: boolean, " : ""}${requestType}}`;
 		return `options${isQueryRequired ? "" : "?"}: ${optionsType}\n`;
 	},
+	generateMutationOnSuccess({ operationName, definitions, isRequestOptions, generateInvalidateCall: generateInvalidateCall$1, uniqueInvalidates }) {
+		const invalidateCalls = uniqueInvalidates.map((t) => generateInvalidateCall$1(t)).join("\n");
+		if (adapter.hasQueryV5WithMutationContextOnSuccess) {
+			if (isRequestOptions) return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, onMutateResult: TContext, context: MutationFunctionContext) => {
+        if (!options?.skipInvalidation) {
+    ${invalidateCalls}
+        }
+        mutationOptions?.onSuccess?.(data, variables, onMutateResult, context);
+      };`;
+			return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, onMutateResult: TContext, context: MutationFunctionContext) => {
+    ${invalidateCalls}
+        mutationOptions?.onSuccess?.(data, variables, onMutateResult, context);
+      };`;
+		} else {
+			if (isRequestOptions) return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, context: TContext${adapter.hasQueryV5WithRequiredContextOnSuccess ? "" : " | undefined"}) => {
+        if (!options?.skipInvalidation) {
+    ${invalidateCalls}
+        }
+        mutationOptions?.onSuccess?.(data, variables, context);
+      };`;
+			return `  const onSuccess = (data: Awaited<ReturnType<typeof ${operationName}>>, variables: ${definitions ? `{${definitions}}` : "void"}, context: TContext${adapter.hasQueryV5WithRequiredContextOnSuccess ? "" : " | undefined"}) => {
+    ${invalidateCalls}
+        mutationOptions?.onSuccess?.(data, variables, context);
+      };`;
+		}
+	},
 	...adapter
 });
 /**
@@ -1386,35 +1406,47 @@ const createFrameworkAdapter = ({ outputClient, packageJson, queryVersion }) =>
 	const _hasQueryV5 = queryVersion === 5 || isQueryV5(packageJson, clientType);
 	const _hasQueryV5WithDataTagError = queryVersion === 5 || isQueryV5WithDataTagError(packageJson, clientType);
 	const _hasQueryV5WithInfiniteQueryOptionsError = queryVersion === 5 || isQueryV5WithInfiniteQueryOptionsError(packageJson, clientType);
+	const _hasQueryV5WithMutationContextOnSuccess = isQueryV5WithMutationContextOnSuccess(packageJson, clientType);
+	const _hasQueryV5WithRequiredContextOnSuccess = isQueryV5WithRequiredContextOnSuccess(packageJson, clientType);
 	switch (outputClient) {
 		case OutputClient.VUE_QUERY: return withDefaults(createVueAdapter({
 			hasVueQueryV4: !isVueQueryV3(packageJson) || queryVersion === 4,
 			hasQueryV5: _hasQueryV5,
 			hasQueryV5WithDataTagError: _hasQueryV5WithDataTagError,
-			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError
+			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError,
+			hasQueryV5WithMutationContextOnSuccess: _hasQueryV5WithMutationContextOnSuccess,
+			hasQueryV5WithRequiredContextOnSuccess: _hasQueryV5WithRequiredContextOnSuccess
 		}));
 		case OutputClient.SVELTE_QUERY: return withDefaults(createSvelteAdapter({
 			hasSvelteQueryV4: !isSvelteQueryV3(packageJson) || queryVersion === 4,
 			hasSvelteQueryV6: isSvelteQueryV6(packageJson),
 			hasQueryV5: _hasQueryV5,
 			hasQueryV5WithDataTagError: _hasQueryV5WithDataTagError,
-			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError
+			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError,
+			hasQueryV5WithMutationContextOnSuccess: _hasQueryV5WithMutationContextOnSuccess,
+			hasQueryV5WithRequiredContextOnSuccess: _hasQueryV5WithRequiredContextOnSuccess
 		}));
 		case OutputClient.ANGULAR_QUERY: return withDefaults(createAngularAdapter({
 			hasQueryV5: _hasQueryV5,
 			hasQueryV5WithDataTagError: _hasQueryV5WithDataTagError,
-			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError
+			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError,
+			hasQueryV5WithMutationContextOnSuccess: _hasQueryV5WithMutationContextOnSuccess,
+			hasQueryV5WithRequiredContextOnSuccess: _hasQueryV5WithRequiredContextOnSuccess
 		}));
 		case OutputClient.SOLID_QUERY: return withDefaults(createSolidAdapter({
 			hasQueryV5: _hasQueryV5,
 			hasQueryV5WithDataTagError: _hasQueryV5WithDataTagError,
 			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError,
+			hasQueryV5WithMutationContextOnSuccess: _hasQueryV5WithMutationContextOnSuccess,
+			hasQueryV5WithRequiredContextOnSuccess: _hasQueryV5WithRequiredContextOnSuccess,
 			hasSolidQueryUsePrefix: isSolidQueryWithUsePrefix(packageJson)
 		}));
 		default: return withDefaults(createReactAdapter({
 			hasQueryV5: _hasQueryV5,
 			hasQueryV5WithDataTagError: _hasQueryV5WithDataTagError,
-			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError
+			hasQueryV5WithInfiniteQueryOptionsError: _hasQueryV5WithInfiniteQueryOptionsError,
+			hasQueryV5WithMutationContextOnSuccess: _hasQueryV5WithMutationContextOnSuccess,
+			hasQueryV5WithRequiredContextOnSuccess: _hasQueryV5WithRequiredContextOnSuccess
 		}));
 	}
 };
@@ -1431,7 +1463,8 @@ const normalizeTarget = (target) => isString(target) ? {
 const serializeTarget = (target) => JSON.stringify({
 	query: target.query,
 	params: target.params ?? [],
-	invalidateMode: target.invalidateMode
+	invalidateMode: target.invalidateMode,
+	file: target.file ?? ""
 });
 const generateVariableRef = (varName) => {
 	const parts = varName.split(".");
@@ -1560,7 +1593,12 @@ ${mutationOptionsFn}
 ${mutationHookBody}
     }
     `,
-		mutators: mutationOptionsMutator ? [mutationOptionsMutator] : void 0
+		mutators: mutationOptionsMutator ? [mutationOptionsMutator] : void 0,
+		imports: hasInvalidation ? uniqueInvalidates.filter((i) => !!i.file).map((i) => ({
+			name: camel(`get-${i.query}-query-key`),
+			importPath: i.file,
+			values: true
+		})) : []
 	};
 };
 
@@ -1812,7 +1850,6 @@ const generateQueryHook = async (verbOptions, options, outputClient, adapter) =>
 	const isRequestOptions = override.requestOptions !== false;
 	const operationQueryOptions = operations[operationId]?.query;
 	const isExactOptionalPropertyTypes = !!context.output.tsconfig?.compilerOptions?.exactOptionalPropertyTypes;
-	const { hasQueryV5 } = adapter;
 	const httpClient = context.output.httpClient;
 	const doc = jsDoc({
 		summary,
@@ -1886,8 +1923,8 @@ const generateQueryHook = async (verbOptions, options, outputClient, adapter) =>
 			}] : []
 		];
 		const uniqueQueryOptionsByKeys = queries.filter((obj, index, self) => index === self.findIndex((t) => t.queryKeyFnName === obj.queryKeyFnName));
-		implementation += `
-${queryKeyMutator ? "" : uniqueQueryOptionsByKeys.reduce((acc, queryOption) => {
+		let queryKeyFns = "";
+		if (!queryKeyMutator) for (const queryOption of uniqueQueryOptionsByKeys) {
 			const makeOptionalParam = (impl) => {
 				if (impl.includes("=")) return impl;
 				return impl.replace(/^(\w+):\s*/, "$1?: ");
@@ -1899,7 +1936,7 @@ ${queryKeyMutator ? "" : uniqueQueryOptionsByKeys.reduce((acc, queryOption) => {
 			const routeString = adapter.getQueryKeyRouteString(route, !!override.query.shouldSplitQueryKey);
 			const queryKeyIdentifier = override.query.useOperationIdAsQueryKey ? `"${operationName}"` : routeString;
 			const queryKeyParams = props.filter((p) => override.query.useOperationIdAsQueryKey ? true : p.type === GetterPropType.QUERY_PARAM).toSorted((a) => a.required ? -1 : 1).map((p) => `...(${p.name} ? [${p.name}] : [])`).join(", ");
-			return acc + `
+			queryKeyFns += `
 ${override.query.shouldExportQueryKey ? "export " : ""}const ${queryOption.queryKeyFnName} = (${queryKeyProps}) => {
     return [
     ${[
@@ -1911,37 +1948,40 @@ ${override.query.shouldExportQueryKey ? "export " : ""}const ${queryOption.query
     ] as const;
     }
 `;
-		}, "")}`;
+		}
 		implementation += `
-    ${queries.reduce((acc, queryOption) => {
-			return acc + generateQueryImplementation({
-				queryOption,
-				operationName,
-				queryProperties,
-				queryKeyProperties,
-				params,
-				props,
-				mutator,
-				isRequestOptions,
-				queryParams,
-				response,
-				httpClient,
-				isExactOptionalPropertyTypes,
-				hasSignal: getHasSignal({ overrideQuerySignal: override.query.signal }),
-				queryOptionsMutator,
-				queryKeyMutator,
-				route,
-				doc,
-				usePrefetch: query.usePrefetch,
-				useQuery: query.useQuery,
-				useInfinite: query.useInfinite,
-				useInvalidate: query.useInvalidate,
-				adapter
-			});
-		}, "")}
+${queryKeyFns}`;
+		let queryImplementations = "";
+		for (const queryOption of queries) queryImplementations += generateQueryImplementation({
+			queryOption,
+			operationName,
+			queryProperties,
+			queryKeyProperties,
+			params,
+			props,
+			mutator,
+			isRequestOptions,
+			queryParams,
+			response,
+			httpClient,
+			isExactOptionalPropertyTypes,
+			hasSignal: getHasSignal({ overrideQuerySignal: override.query.signal }),
+			queryOptionsMutator,
+			queryKeyMutator,
+			route,
+			doc,
+			usePrefetch: query.usePrefetch,
+			useQuery: query.useQuery,
+			useInfinite: query.useInfinite,
+			useInvalidate: query.useInvalidate,
+			adapter
+		});
+		implementation += `
+    ${queryImplementations}
 `;
 		mutators = queryOptionsMutator || queryKeyMutator ? [...queryOptionsMutator ? [queryOptionsMutator] : [], ...queryKeyMutator ? [queryKeyMutator] : []] : void 0;
 	}
+	let imports = [];
 	if (isMutation) {
 		const mutationResult = await generateMutationHook({
 			verbOptions: {
@@ -1956,10 +1996,12 @@ ${override.query.shouldExportQueryKey ? "export " : ""}const ${queryOption.query
 		});
 		implementation += mutationResult.implementation;
 		mutators = mutationResult.mutators ? [...mutators ?? [], ...mutationResult.mutators] : mutators;
+		imports = mutationResult.imports;
 	}
 	return {
 		implementation,
-		mutators
+		mutators,
+		imports
 	};
 };
 
@@ -1973,17 +2015,36 @@ ${getQueryHeader(params)}
 `;
 };
 const generateQuery = async (verbOptions, options, outputClient) => {
+	const isZodOutput = typeof options.context.output.schemas === "object" && options.context.output.schemas.type === "zod";
+	const responseType = verbOptions.response.definition.success;
+	const isPrimitiveResponse = [
+		"string",
+		"number",
+		"boolean",
+		"void",
+		"unknown"
+	].includes(responseType);
+	const normalizedVerbOptions = verbOptions.override.query.runtimeValidation && isZodOutput && !isPrimitiveResponse && verbOptions.response.imports.some((imp) => imp.name === responseType) ? {
+		...verbOptions,
+		response: {
+			...verbOptions.response,
+			imports: verbOptions.response.imports.map((imp) => imp.name === responseType ? {
+				...imp,
+				values: true
+			} : imp)
+		}
+	} : verbOptions;
 	const adapter = createFrameworkAdapter({
 		outputClient,
 		packageJson: options.context.output.packageJson,
-		queryVersion: verbOptions.override.query.version
+		queryVersion: normalizedVerbOptions.override.query.version
 	});
-	const imports = generateVerbImports(verbOptions);
-	const functionImplementation = adapter.generateRequestFunction(verbOptions, options);
-	const { implementation: hookImplementation, mutators } = await generateQueryHook(verbOptions, options, outputClient, adapter);
+	const imports = generateVerbImports(normalizedVerbOptions);
+	const functionImplementation = adapter.generateRequestFunction(normalizedVerbOptions, options);
+	const { implementation: hookImplementation, imports: hookImports, mutators } = await generateQueryHook(normalizedVerbOptions, options, outputClient, adapter);
 	return {
 		implementation: `${functionImplementation}\n\n${hookImplementation}`,
-		imports,
+		imports: [...imports, ...hookImports],
 		mutators
 	};
 };