@orval/query 6.20.0 → 6.22.0

package/dist/index.d.ts

@@ -1,13 +1,14 @@
-import { ClientDependenciesBuilder, ClientHeaderBuilder, ClientBuilder, QueryOptions } from '@orval/core';
+import { ClientDependenciesBuilder, ClientHeaderBuilder, ClientBuilder, QueryOptions, NormalizedOutputOptions } from '@orval/core';
 
 declare const getSvelteQueryDependencies: ClientDependenciesBuilder;
 declare const getReactQueryDependencies: ClientDependenciesBuilder;
 declare const getVueQueryDependencies: ClientDependenciesBuilder;
 declare const generateQueryHeader: ClientHeaderBuilder;
 declare const generateQuery: ClientBuilder;
-declare const builder: ({ type, options: queryOptions, }?: {
+declare const builder: ({ type, options: queryOptions, output, }?: {
     type?: "react-query" | "vue-query" | "svelte-query" | undefined;
     options?: QueryOptions | undefined;
+    output?: NormalizedOutputOptions | undefined;
 }) => () => {
     client: ClientBuilder;
     header: ClientHeaderBuilder;

package/dist/index.js

@@ -190,6 +190,7 @@ var require_color_name = __commonJS({
 // ../../node_modules/color-convert/conversions.js
 var require_conversions = __commonJS({
   "../../node_modules/color-convert/conversions.js"(exports, module2) {
+    "use strict";
     var cssKeywords = require_color_name();
     var reverseKeywords = {};
     for (const key of Object.keys(cssKeywords)) {
@@ -861,6 +862,7 @@ var require_conversions = __commonJS({
 // ../../node_modules/color-convert/route.js
 var require_route = __commonJS({
   "../../node_modules/color-convert/route.js"(exports, module2) {
+    "use strict";
     var conversions = require_conversions();
     function buildGraph() {
       const graph = {};
@@ -931,6 +933,7 @@ var require_route = __commonJS({
 // ../../node_modules/color-convert/index.js
 var require_color_convert = __commonJS({
   "../../node_modules/color-convert/index.js"(exports, module2) {
+    "use strict";
     var conversions = require_conversions();
     var route = require_route();
     var convert = {};
@@ -1662,6 +1665,8 @@ var vueUnRefParams = (props) => {
     return `${prop.name} = unref(${prop.name});`;
   }).join("\n");
 };
+var wrapRouteParameters = (route, prepend, append) => route.replaceAll(/\${(.+?)}/g, `\${${prepend}$1${append}}`);
+var makeRouteSafe = (route) => wrapRouteParameters(route, "encodeURIComponent(String(", "))");
 var isVue = (client) => import_core.OutputClient.VUE_QUERY === client;
 
 // src/index.ts
@@ -1826,7 +1831,10 @@ var VUE_QUERY_DEPENDENCIES_V3 = [
     dependency: "vue-query/types"
   },
   {
-    exports: [{ name: "unref", values: true }],
+    exports: [
+      { name: "unref", values: true },
+      { name: "computed", values: true }
+    ],
     dependency: "vue"
   },
   {
@@ -1852,12 +1860,12 @@ var VUE_QUERY_DEPENDENCIES = [
     dependency: "@tanstack/vue-query"
   },
   {
-    exports: [{ name: "unref", values: true }],
+    exports: [
+      { name: "unref", values: true },
+      { name: "MaybeRef" },
+      { name: "computed", values: true }
+    ],
     dependency: "vue"
-  },
-  {
-    exports: [{ name: "MaybeRef" }],
-    dependency: "@tanstack/vue-query/build/lib/types"
   }
 ];
 var isVueQueryV3 = (packageJson) => {
@@ -1918,12 +1926,16 @@ var generateQueryRequestFunction = ({
   formUrlEncoded,
   paramsSerializer,
   override
-}, { route, context }, outputClient) => {
+}, { 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;
@@ -1952,10 +1964,12 @@ var generateQueryRequestFunction = ({
       isFormUrlEncoded,
       isBodyVerb,
       hasSignal,
-      isExactOptionalPropertyTypes
+      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?${body.definition}`),
+      new RegExp(`(\\w*):\\s?${bodyDefinition}`),
       `$1: ${mutator.bodyTypeName}<${body.definition}>`
     ) : (0, import_core2.toObjectString)(props, "implementation");
     const requestOptions = isRequestOptions ? (0, import_core2.generateMutatorRequestOptions)(
@@ -2000,7 +2014,8 @@ var generateQueryRequestFunction = ({
     paramsSerializer,
     paramsSerializerOptions: override == null ? void 0 : override.paramsSerializerOptions,
     isExactOptionalPropertyTypes,
-    hasSignal
+    hasSignal,
+    isVue: isVue(outputClient)
   });
   const optionsArgs = generateRequestOptionsArguments({
     isRequestOptions,
@@ -2024,7 +2039,8 @@ var INFINITE_QUERY_PROPERTIES = ["getNextPageParam", "getPreviousPageParam"];
 var generateQueryOptions = ({
   params,
   options,
-  type
+  type,
+  outputClient
 }) => {
   var _a;
   if (options === false) {
@@ -2042,7 +2058,7 @@ var generateQueryOptions = ({
     }
     return "...queryOptions";
   }
-  return `${!(0, import_core2.isObject)(options) || !options.hasOwnProperty("enabled") ? `enabled: !!(${params.map(({ name }) => name).join(" && ")}),` : ""}${queryConfig} ...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`;
 };
 var getQueryArgumentsRequestType = (mutator) => {
   if (!mutator) {
@@ -2076,7 +2092,7 @@ var getQueryOptionsDefinition = ({
       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 ? ">" : ""}`;
   }
-  return `${prefix}MutationOptions<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core2.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError,${definitions ? `{${definitions}}` : "TVariables"}, TContext>`;
+  return `${prefix}MutationOptions<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core2.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError,${definitions ? `{${definitions}}` : "{}"}, TContext>`;
 };
 var generateQueryArguments = ({
   operationName,
@@ -2227,7 +2243,7 @@ var generateQueryImplementation = ({
   const httpFunctionProps = queryParam ? props.map((param) => {
     if (param.type === import_core2.GetterPropType.NAMED_PATH_PARAMS && !isVue(outputClient))
       return param.destructured;
-    return param.name === "params" ? `{ ${queryParam}: pageParam, ...params }` : param.name;
+    return param.name === "params" ? `{...params, ${queryParam}: pageParam || ${isVue(outputClient) ? `unref(params)?.['${queryParam}']` : `params?.['${queryParam}']`}}` : param.name;
   }).join(",") : queryProperties;
   const returnType = generateQueryReturnType({
     outputClient,
@@ -2281,7 +2297,8 @@ var generateQueryImplementation = ({
   const queryOptionsImp = generateQueryOptions({
     params,
     options,
-    type
+    type,
+    outputClient
   });
   const queryOptionsFnName = (0, import_core2.camel)(
     queryKeyMutator || queryOptionsMutator || (mutator == null ? void 0 : mutator.isHook) ? `use-${name}-queryOptions` : `get-${name}-queryOptions`
@@ -2382,7 +2399,7 @@ var generateQueryHook = async ({
   const doc = (0, import_core2.jsDoc)({ summary, deprecated });
   let implementation = "";
   let mutators = void 0;
-  const isQuery = import_core2.Verbs.GET === verb && (override.query.useQuery || override.query.useInfinite) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useInfinite) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useQuery);
+  const isQuery = import_core2.Verbs.GET === verb && (override.query.useQuery || override.query.useSuspenseQuery || override.query.useInfinite || override.query.useSuspenseInfiniteQuery) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useInfinite) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useSuspenseInfiniteQuery) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useQuery) || (operationQueryOptions == null ? void 0 : operationQueryOptions.useSuspenseQuery);
   if (isQuery) {
     const queryKeyMutator = query.queryKey ? await (0, import_core2.generateMutator)({
       output,
@@ -2417,7 +2434,7 @@ var generateQueryHook = async ({
           queryParam: query == null ? void 0 : query.useInfiniteQueryParam
         }
       ] : [],
-      ...!(query == null ? void 0 : query.useQuery) && !(query == null ? void 0 : query.useInfinite) || (query == null ? void 0 : query.useQuery) ? [
+      ...(query == null ? void 0 : query.useQuery) ? [
         {
           name: operationName,
           options: query == null ? void 0 : query.options,
@@ -2445,9 +2462,8 @@ var generateQueryHook = async ({
       props.filter((prop) => prop.type !== import_core2.GetterPropType.HEADER),
       "implementation"
     );
-    const routeString = `\`${route}\``;
+    const routeString = isVue(outputClient) ? (0, import_core2.getRouteAsArray)(route) : `\`${route}\``;
     const queryKeyFn = `export const ${queryKeyFnName} = (${queryKeyProps}) => {
-    ${isVue(outputClient) ? vueUnRefParams(props) : ""}
     return [${routeString}${queryParams ? ", ...(params ? [params]: [])" : ""}${body.implementation ? `, ${body.implementation}` : ""}] as const;
     }`;
     implementation += `${!queryKeyMutator ? queryKeyFn : ""}
@@ -2524,14 +2540,13 @@ var generateQueryHook = async ({
     );
     const mutationOptionsVarName = isRequestOptions ? "mutationOptions" : "options";
     const mutationOptionsFn = `export const ${mutationOptionsFnName} = <TError = ${errorType},
-    ${!definitions ? `TVariables = void,` : ""}
     TContext = unknown>(${mutationArguments}): ${mutationOptionFnReturnType} => {
  ${isRequestOptions ? `const {mutation: mutationOptions${!mutator ? `, axios: axiosOptions` : (mutator == null ? void 0 : mutator.hasSecondArg) ? ", request: requestOptions" : ""}} = options ?? {};` : ""}
 
       ${(mutator == null ? void 0 : mutator.isHook) ? `const ${operationName} =  use${(0, import_core2.pascal)(operationName)}Hook()` : ""}
 
 
-      const mutationFn: MutationFunction<Awaited<ReturnType<${dataType}>>, ${definitions ? `{${definitions}}` : "TVariables"}> = (${properties ? "props" : ""}) => {
+      const mutationFn: MutationFunction<Awaited<ReturnType<${dataType}>>, ${definitions ? `{${definitions}}` : "{}"}> = (${properties ? "props" : ""}) => {
           ${properties ? `const {${properties}} = props ?? {};` : ""}
 
           return  ${operationName}(${properties}${properties ? "," : ""}${isRequestOptions ? !mutator ? `axiosOptions` : (mutator == null ? void 0 : mutator.hasSecondArg) ? "requestOptions" : "" : ""})
@@ -2554,7 +2569,6 @@ ${mutationOptionsFn}
     ${doc}export const ${(0, import_core2.camel)(
       `${operationPrefix}-${operationName}`
     )} = <TError = ${errorType},
-    ${!definitions ? `TVariables = void,` : ""}
     TContext = unknown>(${mutationArguments}) => {
 
       const ${mutationOptionsVarName} = ${mutationOptionsFnName}(${isRequestOptions ? "options" : "mutationOptions"});
@@ -2590,12 +2604,13 @@ ${isRequestOptions && isMutator ? `// eslint-disable-next-line
 ` : ""}
 `;
 };
-var generateQuery = async (verbOptions, options, outputClient) => {
+var generateQuery = async (verbOptions, options, outputClient, output) => {
   const imports = (0, import_core2.generateVerbImports)(verbOptions);
   const functionImplementation = generateQueryRequestFunction(
     verbOptions,
     options,
-    outputClient
+    outputClient,
+    output
   );
   const { implementation: hookImplementation, mutators } = await generateQueryHook(verbOptions, options, outputClient);
   return {
@@ -2613,9 +2628,15 @@ var dependenciesBuilder = {
 };
 var builder = ({
   type = "react-query",
-  options: queryOptions
+  options: queryOptions,
+  output
 } = {}) => () => {
   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`
+      );
+    }
     if (queryOptions) {
       const normalizedQueryOptions = normalizeQueryOptions(
         queryOptions,
@@ -2630,7 +2651,7 @@ var builder = ({
         verbOptions.override.query
       );
     }
-    return generateQuery(verbOptions, options, outputClient);
+    return generateQuery(verbOptions, options, outputClient, output);
   };
   return {
     client,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orval/query",
-  "version": "6.20.0",
+  "version": "6.22.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -10,11 +10,13 @@
   "scripts": {
     "build": "tsup ./src/index.ts --target node12 --clean --dts",
     "dev": "tsup ./src/index.ts --target node12 --clean --watch src",
-    "lint": "eslint src/**/*.ts"
+    "lint": "eslint src/**/*.ts",
+    "test": "vitest"
   },
   "dependencies": {
-    "@orval/core": "6.20.0",
-    "lodash.omitby": "^4.6.0"
+    "@orval/core": "6.22.0",
+    "lodash.omitby": "^4.6.0",
+    "vitest": "^0.34.6"
   },
   "devDependencies": {
     "@types/lodash.omitby": "^4.6.7"