@orval/query 8.15.0 → 8.16.0

package/dist/index.mjs

@@ -130,7 +130,9 @@ const ANGULAR_HTTP_DEPENDENCIES = [
 		dependency: "rxjs/operators"
 	}
 ];
-const generateAngularHttpRequestFunction = ({ headers, queryParams, operationName, response, mutator, body, props, verb, formData, formUrlEncoded, override }, { route, context }) => {
+const generateAngularHttpRequestFunction = ({ headers, queryParams, operationName, response, mutator, body, props, verb, formData, formUrlEncoded, override }, { route: _route, context }) => {
+	let route = _route;
+	if (context.output.urlEncodeParameters) route = makeRouteSafe(route);
 	const isRequestOptions = override.requestOptions !== false;
 	const isFormData = !override.formData.disabled;
 	const isFormUrlEncoded = override.formUrlEncoded !== false;
@@ -144,6 +146,7 @@ const generateAngularHttpRequestFunction = ({ headers, queryParams, operationNam
 		isFormUrlEncoded
 	});
 	if (mutator) {
+		const isExactOptionalPropertyTypes = !!context.output.tsconfig?.compilerOptions?.exactOptionalPropertyTypes;
 		const mutatorConfig = generateMutatorConfig({
 			route,
 			body,
@@ -155,7 +158,7 @@ const generateAngularHttpRequestFunction = ({ headers, queryParams, operationNam
 			isFormUrlEncoded,
 			hasSignal,
 			hasSignalParam,
-			isExactOptionalPropertyTypes: !!context.output.tsconfig?.compilerOptions?.exactOptionalPropertyTypes,
+			isExactOptionalPropertyTypes,
 			isVue: false,
 			isAngular: context.output.httpClient === OutputHttpClient.ANGULAR
 		});
@@ -742,6 +745,12 @@ const getSolidQueryImports = (prefix, hasRenamedOptionsTypes) => {
 			{ name: "InvalidateOptions" }
 		],
 		dependency: "@tanstack/solid-query"
+	}, {
+		exports: [{
+			name: "mergeProps",
+			values: true
+		}],
+		dependency: "solid-js"
 	}];
 };
 const ANGULAR_QUERY_DEPENDENCIES = [{
@@ -1176,7 +1185,7 @@ const createSolidAdapter = ({ hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5
       >`;
 	},
 	getQueryReturnStatement({ queryResultVarName, queryOptionsVarName }) {
-		return `return Object.assign(${queryResultVarName}, { queryKey: ${queryOptionsVarName}.queryKey }) as any;`;
+		return `return mergeProps(${queryResultVarName}, { queryKey: ${queryOptionsVarName}.queryKey }) as any;`;
 	},
 	generateQueryInvocationArgs({ queryOptionsFnName, queryProperties, isRequestOptions, optionalQueryClientArgument }) {
 		const optionsArg = isRequestOptions ? "options" : "queryOptions";
@@ -1600,6 +1609,31 @@ const getStaticRoutePrefix = (route) => {
 	const prefix = route.slice(0, idx);
 	return prefix.split("/").some((segment) => segment.length > 0) ? prefix : void 0;
 };
+const getMutationOptionsUrl = (route, pathParamNames, pathRoute) => {
+	const pathParams = new Set(pathParamNames);
+	if (pathParams.size === 0) return route;
+	const formatPathRoute = (value) => value.replace(/\$\{([^}]+)\}/g, (match, expression) => pathParams.has(expression) ? `{${expression}}` : match);
+	if (pathRoute) {
+		if (route.endsWith(pathRoute)) return `${route.slice(0, -pathRoute.length)}${formatPathRoute(pathRoute)}`;
+		const routeWithoutLeadingSlash = pathRoute.startsWith("/") ? pathRoute.slice(1) : void 0;
+		if (routeWithoutLeadingSlash && route.endsWith(routeWithoutLeadingSlash)) return `${route.slice(0, -routeWithoutLeadingSlash.length)}${formatPathRoute(routeWithoutLeadingSlash)}`;
+	}
+	return pathRoute ? route : formatPathRoute(route);
+};
+const getMutationOptionsNamedPathParamName = (param) => {
+	const trimmedParam = param.trim();
+	if (!trimmedParam || trimmedParam.startsWith("...")) return void 0;
+	const [name] = trimmedParam.split(/[=:]/);
+	return name?.trim() || void 0;
+};
+const getMutationOptionsPathParamNames = (props) => props.flatMap((prop) => {
+	if (prop.type === GetterPropType.PARAM) return [prop.name];
+	if (prop.type === GetterPropType.NAMED_PATH_PARAMS) return prop.destructured.replace(/^\{\s*|\s*\}$/g, "").split(",").flatMap((param) => {
+		const name = getMutationOptionsNamedPathParamName(param);
+		return name ? [name] : [];
+	});
+	return [];
+});
 /**
 * Check whether the target invalidation needs to call the query key function.
 * Returns false when no params are specified and the route has required path
@@ -1655,7 +1689,7 @@ const createGenerateInvalidateCall = (spec, shouldSplitQueryKey, useOperationIdA
 	};
 };
 const generateMutationHook = async ({ verbOptions, options, isRequestOptions, httpClient, doc, adapter }) => {
-	const { operationName, body, props, mutator, response, operationId, override } = verbOptions;
+	const { operationName, body, props, mutator, response, operationId, route: pathRoute, override } = verbOptions;
 	const { route, context, output } = options;
 	const query = override.query;
 	const mutationOptionsMutator = query.mutationOptions ? await generateMutator({
@@ -1733,7 +1767,7 @@ ${hasInvalidation ? adapter.generateMutationOnSuccess({
 		uniqueInvalidates
 	}) : ""}
 
-        ${mutationOptionsMutator ? `const customOptions = ${mutationOptionsMutator.name}({...mutationOptions, mutationFn}${mutationOptionsMutator.hasSecondArg ? `, { url: \`${route.replaceAll("/${", "/{")}\` }` : ""}${mutationOptionsMutator.hasThirdArg ? `, { operationId: '${operationId}', operationName: '${operationName}' }` : ""});` : ""}
+        ${mutationOptionsMutator ? `const customOptions = ${mutationOptionsMutator.name}({...mutationOptions, mutationFn}${mutationOptionsMutator.hasSecondArg ? `, { url: \`${getMutationOptionsUrl(route, getMutationOptionsPathParamNames(props), pathRoute)}\` }` : ""}${mutationOptionsMutator.hasThirdArg ? `, { operationId: '${operationId}', operationName: '${operationName}' }` : ""});` : ""}
 
 
   return  ${mutationOptionsMutator ? "customOptions" : hasInvalidation ? "{ ...mutationOptions, mutationFn, onSuccess }" : "{ mutationFn, ...mutationOptions }"}}`;