@orval/query 8.19.0 → 8.20.0

package/dist/index.mjs

@@ -48,24 +48,6 @@ const normalizeMutator = (workspace, mutator) => {
 		default: true
 	};
 };
-function vueWrapTypeWithMaybeRef(props) {
-	return props.map((prop) => {
-		const [paramName, paramType] = prop.implementation.split(":");
-		if (!paramType) return prop;
-		const name = prop.type === GetterPropType.NAMED_PATH_PARAMS ? prop.name : paramName;
-		const [type, defaultValue] = paramType.split("=");
-		return {
-			...prop,
-			implementation: `${name}: MaybeRef<${type.trim()}>${defaultValue ? ` = ${defaultValue}` : ""}`
-		};
-	});
-}
-const vueUnRefParams = (props) => {
-	return props.map((prop) => {
-		if (prop.type === GetterPropType.NAMED_PATH_PARAMS) return `const ${prop.destructured} = unref(${prop.name});`;
-		return `${prop.name} = unref(${prop.name});`;
-	}).join("\n");
-};
 const getQueryTypeForFramework = (type) => {
 	switch (type) {
 		case "suspenseQuery": return "query";
@@ -688,15 +670,20 @@ const VUE_QUERY_DEPENDENCIES = [{
 	dependency: "@tanstack/vue-query"
 }, {
 	exports: [
+		{
+			name: "computed",
+			values: true
+		},
 		{
 			name: "unref",
 			values: true
 		},
-		{ name: "MaybeRef" },
 		{
-			name: "computed",
+			name: "toValue",
 			values: true
-		}
+		},
+		{ name: "MaybeRef" },
+		{ name: "MaybeRefOrGetter" }
 	],
 	dependency: "vue"
 }];
@@ -1294,6 +1281,33 @@ const createSvelteAdapter = ({ hasSvelteQueryV4, hasSvelteQueryV6, hasQueryV5, h
 };
 //#endregion
 //#region src/frameworks/vue.ts
+const getVueReactivity = (hasQueryV5) => hasQueryV5 ? {
+	wrapper: "MaybeRefOrGetter",
+	resolve: "toValue"
+} : {
+	wrapper: "MaybeRef",
+	resolve: "unref"
+};
+function vueWrapTypeWithMaybeRef(props, hasQueryV5) {
+	const { wrapper } = getVueReactivity(hasQueryV5);
+	return props.map((prop) => {
+		const [paramName, paramType] = prop.implementation.split(":");
+		if (!paramType) return prop;
+		const name = prop.type === GetterPropType.NAMED_PATH_PARAMS ? prop.name : paramName;
+		const [type, defaultValue] = paramType.split("=");
+		return {
+			...prop,
+			implementation: `${name}: ${wrapper}<${type.trim()}>${defaultValue ? ` = ${defaultValue}` : ""}`
+		};
+	});
+}
+const vueUnRefParams = (props, hasQueryV5) => {
+	const { resolve } = getVueReactivity(hasQueryV5);
+	return props.map((prop) => {
+		if (prop.type === GetterPropType.NAMED_PATH_PARAMS) return `const ${prop.destructured} = ${resolve}(${prop.name});`;
+		return `${prop.name} = ${resolve}(${prop.name});`;
+	}).join("\n");
+};
 const createVueAdapter = ({ hasVueQueryV4, hasQueryV5, hasQueryV5WithDataTagError, hasQueryV5WithInfiniteQueryOptionsError, hasQueryV5WithMutationContextOnSuccess, hasQueryV5WithRequiredContextOnSuccess }) => ({
 	outputClient: OutputClient.VUE_QUERY,
 	hookPrefix: "use",
@@ -1303,19 +1317,23 @@ const createVueAdapter = ({ hasVueQueryV4, hasQueryV5, hasQueryV5WithDataTagErro
 	hasQueryV5WithMutationContextOnSuccess,
 	hasQueryV5WithRequiredContextOnSuccess,
 	transformProps(props) {
-		return vueWrapTypeWithMaybeRef(props);
+		return vueWrapTypeWithMaybeRef(props, hasQueryV5);
 	},
 	shouldDestructureNamedPathParams() {
 		return false;
 	},
 	getHttpFunctionQueryProps(queryProperties, httpClient) {
-		if (httpClient === OutputHttpClient.FETCH && queryProperties) return queryProperties.split(",").map((prop) => `unref(${prop})`).join(",");
+		if (httpClient === OutputHttpClient.FETCH && queryProperties) {
+			const { resolve } = getVueReactivity(hasQueryV5);
+			return queryProperties.split(",").map((prop) => `${resolve}(${prop})`).join(",");
+		}
 		return queryProperties;
 	},
 	getInfiniteQueryHttpProps(props, queryParam, httpClient) {
+		const { resolve } = getVueReactivity(hasQueryV5);
 		return props.map((param) => {
-			if (param.name === "params") return `{...unref(params), '${queryParam}': pageParam ?? unref(params)?.['${queryParam}']}`;
-			return httpClient === OutputHttpClient.FETCH ? `unref(${param.name})` : param.name;
+			if (param.name === "params") return `{...${resolve}(params), '${queryParam}': pageParam ?? ${resolve}(params)?.['${queryParam}']}`;
+			return httpClient === OutputHttpClient.FETCH ? `${resolve}(${param.name})` : param.name;
 		}).join(",");
 	},
 	getQueryReturnType({ type }) {
@@ -1343,17 +1361,20 @@ const createVueAdapter = ({ hasVueQueryV4, hasQueryV5, hasQueryV5WithDataTagErro
 		return false;
 	},
 	getRequestUnrefStatements(props) {
-		return vueUnRefParams(props);
+		return vueUnRefParams(props, hasQueryV5);
 	},
 	getQueryOptionsUnrefStatements(props) {
-		return vueUnRefParams(props.filter((prop) => prop.type === GetterPropType.NAMED_PATH_PARAMS));
+		return vueUnRefParams(props.filter((prop) => prop.type === GetterPropType.NAMED_PATH_PARAMS), hasQueryV5);
 	},
 	wrapHookMutatorCallback(callback) {
 		return callback;
 	},
 	generateEnabledOption(params, options) {
 		if (params.length === 0) return "";
-		if (!isObject(options) || !Object.hasOwn(options, "enabled")) return `enabled: computed(() => ${params.map(({ name }) => `unref(${name}) !== null && unref(${name}) !== undefined`).join(" && ")}),`;
+		if (!isObject(options) || !Object.hasOwn(options, "enabled")) {
+			const { resolve } = getVueReactivity(hasQueryV5);
+			return `enabled: computed(() => ${params.map(({ name }) => `${resolve}(${name}) !== null && ${resolve}(${name}) !== undefined`).join(" && ")}),`;
+		}
 		return "";
 	},
 	getQueryKeyPrefix() {