@orval/query 6.11.0-alpha.2 → 6.11.0-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -1,14 +1,25 @@
1
- import { ClientDependenciesBuilder, ClientTitleBuilder, ClientHeaderBuilder, ClientFooterBuilder, ClientBuilder, ClientGeneratorsBuilder } from '@orval/core';
1
+ import { ClientDependenciesBuilder, ClientHeaderBuilder, ClientBuilder } from '@orval/core';
2
+
3
+ declare type QueryOptions = {
4
+ useQuery?: boolean;
5
+ useInfinite?: boolean;
6
+ useInfiniteQueryParam?: string;
7
+ options?: any;
8
+ signal?: boolean;
9
+ };
2
10
 
3
11
  declare const getSvelteQueryDependencies: ClientDependenciesBuilder;
4
12
  declare const getReactQueryDependencies: ClientDependenciesBuilder;
5
13
  declare const getVueQueryDependencies: ClientDependenciesBuilder;
6
- declare const generateQueryTitle: ClientTitleBuilder;
7
14
  declare const generateQueryHeader: ClientHeaderBuilder;
8
- declare const generateQueryFooter: ClientFooterBuilder;
9
15
  declare const generateQuery: ClientBuilder;
10
- declare const builder: ({ type, }?: {
16
+ declare const builder: ({ type, options: queryOptions, }?: {
11
17
  type?: "react-query" | "vue-query" | "svelte-query" | undefined;
12
- }) => () => ClientGeneratorsBuilder;
18
+ options?: QueryOptions | undefined;
19
+ }) => () => {
20
+ client: ClientBuilder;
21
+ header: ClientHeaderBuilder;
22
+ dependencies: ClientDependenciesBuilder;
23
+ };
13
24
 
14
- export { builder, builder as default, generateQuery, generateQueryFooter, generateQueryHeader, generateQueryTitle, getReactQueryDependencies, getSvelteQueryDependencies, getVueQueryDependencies };
25
+ export { builder, builder as default, generateQuery, generateQueryHeader, getReactQueryDependencies, getSvelteQueryDependencies, getVueQueryDependencies };
package/dist/index.js CHANGED
@@ -1,77 +1,77 @@
1
- "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _core = require('@orval/core');var _lodashomitby = require('lodash.omitby'); var _lodashomitby2 = _interopRequireDefault(_lodashomitby);var w=[{exports:[{name:"axios",default:!0,values:!0,syntheticDefaultImport:!0},{name:"AxiosRequestConfig"},{name:"AxiosResponse"},{name:"AxiosError"}],dependency:"axios"}],ne=[{exports:[{name:"useQuery",values:!0},{name:"useInfiniteQuery",values:!0},{name:"useMutation",values:!0},{name:"UseQueryOptions"},{name:"UseInfiniteQueryOptions"},{name:"UseMutationOptions"},{name:"QueryFunction"},{name:"MutationFunction"},{name:"UseQueryStoreResult"},{name:"UseInfiniteQueryStoreResult"},{name:"QueryKey"}],dependency:"@sveltestack/svelte-query"}],te= exports.getSvelteQueryDependencies =n=>[...n?[]:w,...ne],re=[{exports:[{name:"useQuery",values:!0},{name:"useInfiniteQuery",values:!0},{name:"useMutation",values:!0},{name:"UseQueryOptions"},{name:"UseInfiniteQueryOptions"},{name:"UseMutationOptions"},{name:"QueryFunction"},{name:"MutationFunction"},{name:"UseQueryResult"},{name:"UseInfiniteQueryResult"},{name:"QueryKey"}],dependency:"react-query"}],se=[{exports:[{name:"useQuery",values:!0},{name:"useInfiniteQuery",values:!0},{name:"useMutation",values:!0},{name:"UseQueryOptions"},{name:"UseInfiniteQueryOptions"},{name:"UseMutationOptions"},{name:"QueryFunction"},{name:"MutationFunction"},{name:"UseQueryResult"},{name:"UseInfiniteQueryResult"},{name:"QueryKey"}],dependency:"@tanstack/react-query"}],ie= exports.getReactQueryDependencies =(n,e)=>{var t,y,a,s,f,Q;let r=(a=(t=e==null?void 0:e.dependencies)==null?void 0:t["react-query"])!=null?a:(y=e==null?void 0:e.devDependencies)==null?void 0:y["react-query"],i=(Q=(s=e==null?void 0:e.dependencies)==null?void 0:s["@tanstack/react-query"])!=null?Q:(f=e==null?void 0:e.devDependencies)==null?void 0:f["@tanstack/react-query"];return[...n?[]:w,...r&&!i?re:se]},oe=[{exports:[{name:"useQuery",values:!0},{name:"useInfiniteQuery",values:!0},{name:"useMutation",values:!0}],dependency:"vue-query"},{exports:[{name:"UseQueryOptions"},{name:"UseInfiniteQueryOptions"},{name:"UseMutationOptions"},{name:"QueryFunction"},{name:"MutationFunction"},{name:"UseQueryResult"},{name:"UseInfiniteQueryResult"},{name:"QueryKey"}],dependency:"vue-query/types"},{exports:[{name:"UseQueryReturnType"}],dependency:"vue-query/lib/vue/useBaseQuery"}],ue= exports.getVueQueryDependencies =n=>[...n?[]:w,...oe],ye=({isRequestOptions:n,hasSignal:e})=>n?`options?: AxiosRequestConfig
1
+ "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _core = require('@orval/core');var _lodashomitby = require('lodash.omitby'); var _lodashomitby2 = _interopRequireDefault(_lodashomitby);var G=[{exports:[{name:"axios",default:!0,values:!0,syntheticDefaultImport:!0},{name:"AxiosRequestConfig"},{name:"AxiosResponse"},{name:"AxiosError"}],dependency:"axios"}],Z=[{exports:[{name:"useQuery",values:!0},{name:"useInfiniteQuery",values:!0},{name:"useMutation",values:!0},{name:"UseQueryOptions"},{name:"UseInfiniteQueryOptions"},{name:"UseMutationOptions"},{name:"QueryFunction"},{name:"MutationFunction"},{name:"UseQueryStoreResult"},{name:"UseInfiniteQueryStoreResult"},{name:"QueryKey"}],dependency:"@sveltestack/svelte-query"}],J= exports.getSvelteQueryDependencies =n=>[...n?[]:G,...Z],ee=[{exports:[{name:"useQuery",values:!0},{name:"useInfiniteQuery",values:!0},{name:"useMutation",values:!0},{name:"UseQueryOptions"},{name:"UseInfiniteQueryOptions"},{name:"UseMutationOptions"},{name:"QueryFunction"},{name:"MutationFunction"},{name:"UseQueryResult"},{name:"UseInfiniteQueryResult"},{name:"QueryKey"}],dependency:"react-query"}],ne=[{exports:[{name:"useQuery",values:!0},{name:"useInfiniteQuery",values:!0},{name:"useMutation",values:!0},{name:"UseQueryOptions"},{name:"UseInfiniteQueryOptions"},{name:"UseMutationOptions"},{name:"QueryFunction"},{name:"MutationFunction"},{name:"UseQueryResult"},{name:"UseInfiniteQueryResult"},{name:"QueryKey"}],dependency:"@tanstack/react-query"}],te= exports.getReactQueryDependencies =(n,e)=>{var t,y,a,r,d,Q;let s=(a=(t=e==null?void 0:e.dependencies)==null?void 0:t["react-query"])!=null?a:(y=e==null?void 0:e.devDependencies)==null?void 0:y["react-query"],i=(Q=(r=e==null?void 0:e.dependencies)==null?void 0:r["@tanstack/react-query"])!=null?Q:(d=e==null?void 0:e.devDependencies)==null?void 0:d["@tanstack/react-query"];return[...n?[]:G,...s&&!i?ee:ne]},se=[{exports:[{name:"useQuery",values:!0},{name:"useInfiniteQuery",values:!0},{name:"useMutation",values:!0}],dependency:"vue-query"},{exports:[{name:"UseQueryOptions"},{name:"UseInfiniteQueryOptions"},{name:"UseMutationOptions"},{name:"QueryFunction"},{name:"MutationFunction"},{name:"UseQueryResult"},{name:"UseInfiniteQueryResult"},{name:"QueryKey"}],dependency:"vue-query/types"},{exports:[{name:"UseQueryReturnType"}],dependency:"vue-query/lib/vue/useBaseQuery"}],re= exports.getVueQueryDependencies =n=>[...n?[]:G,...se],ie=({isRequestOptions:n,hasSignal:e})=>n?`options?: AxiosRequestConfig
2
2
  `:e?`signal?: AbortSignal
3
- `:"",pe=({headers:n,queryParams:e,operationName:r,response:i,mutator:t,body:y,props:a,verb:s,formData:f,formUrlEncoded:Q,override:o},{route:q,context:R})=>{var A,C;let g=o.requestOptions!==!1,u=o.formData!==!1,T=o.formUrlEncoded!==!1,l=!!o.query.signal,I=_core.isSyntheticDefaultImportsAllow.call(void 0, R.tsconfig),d=!!((C=(A=R.tsconfig)==null?void 0:A.compilerOptions)!=null&&C.exactOptionalPropertyTypes),c=_core.VERBS_WITH_BODY.includes(s),O=_core.generateFormDataAndUrlEncodedFunction.call(void 0, {formData:f,formUrlEncoded:Q,body:y,isFormData:u,isFormUrlEncoded:T});if(t){let $=_core.generateMutatorConfig.call(void 0, {route:q,body:y,headers:n,queryParams:e,response:i,verb:s,isFormData:u,isFormUrlEncoded:T,isBodyVerb:c,hasSignal:l,isExactOptionalPropertyTypes:d}),x=(t==null?void 0:t.bodyTypeName)&&y.definition?_core.toObjectString.call(void 0, a,"implementation").replace(new RegExp(`(\\w*):\\s?${y.definition}`),`$1: ${t.bodyTypeName}<${y.definition}>`):_core.toObjectString.call(void 0, a,"implementation"),H=g?_core.generateMutatorRequestOptions.call(void 0, o.requestOptions,t.hasSecondArg):"";return t.isHook?`export const use${_core.pascal.call(void 0, r)}Hook = () => {
4
- const ${r} = ${t.name}<${i.definition.success||"unknown"}>();
3
+ `:"",oe=({headers:n,queryParams:e,operationName:s,response:i,mutator:t,body:y,props:a,verb:r,formData:d,formUrlEncoded:Q,override:o},{route:q,context:R})=>{var A,D;let g=o.requestOptions!==!1,u=o.formData!==!1,T=o.formUrlEncoded!==!1,c=!!o.query.signal,I=_core.isSyntheticDefaultImportsAllow.call(void 0, R.tsconfig),f=!!((D=(A=R.tsconfig)==null?void 0:A.compilerOptions)!=null&&D.exactOptionalPropertyTypes),l=_core.VERBS_WITH_BODY.includes(r),O=_core.generateFormDataAndUrlEncodedFunction.call(void 0, {formData:d,formUrlEncoded:Q,body:y,isFormData:u,isFormUrlEncoded:T});if(t){let $=_core.generateMutatorConfig.call(void 0, {route:q,body:y,headers:n,queryParams:e,response:i,verb:r,isFormData:u,isFormUrlEncoded:T,isBodyVerb:l,hasSignal:c,isExactOptionalPropertyTypes:f}),x=(t==null?void 0:t.bodyTypeName)&&y.definition?_core.toObjectString.call(void 0, a,"implementation").replace(new RegExp(`(\\w*):\\s?${y.definition}`),`$1: ${t.bodyTypeName}<${y.definition}>`):_core.toObjectString.call(void 0, a,"implementation"),w=g?_core.generateMutatorRequestOptions.call(void 0, o.requestOptions,t.hasSecondArg):"";return t.isHook?`export const use${_core.pascal.call(void 0, s)}Hook = () => {
4
+ const ${s} = ${t.name}<${i.definition.success||"unknown"}>();
5
5
 
6
6
  return (
7
7
  ${x}
8
- ${g&&t.hasSecondArg?`options?: SecondParameter<ReturnType<typeof ${t.name}>>,`:""}${!c&&l?`signal?: AbortSignal
8
+ ${g&&t.hasSecondArg?`options?: SecondParameter<ReturnType<typeof ${t.name}>>,`:""}${!l&&c?`signal?: AbortSignal
9
9
  `:""}) => {${O}
10
- return ${r}(
10
+ return ${s}(
11
11
  ${$},
12
- ${H});
12
+ ${w});
13
13
  }
14
14
  }
15
- `:`export const ${r} = (
15
+ `:`export const ${s} = (
16
16
  ${x}
17
- ${g&&t.hasSecondArg?`options?: SecondParameter<typeof ${t.name}>,`:""}${!c&&l?`signal?: AbortSignal
17
+ ${g&&t.hasSecondArg?`options?: SecondParameter<typeof ${t.name}>,`:""}${!l&&c?`signal?: AbortSignal
18
18
  `:""}) => {${O}
19
19
  return ${t.name}<${i.definition.success||"unknown"}>(
20
20
  ${$},
21
- ${H});
21
+ ${w});
22
22
  }
23
- `}let P=_core.generateOptions.call(void 0, {route:q,body:y,headers:n,queryParams:e,response:i,verb:s,requestOptions:o==null?void 0:o.requestOptions,isFormData:u,isFormUrlEncoded:T,isExactOptionalPropertyTypes:d,hasSignal:l}),D=ye({isRequestOptions:g,hasSignal:l});return`export const ${r} = (
24
- ${_core.toObjectString.call(void 0, a,"implementation")} ${D} ): Promise<AxiosResponse<${i.definition.success||"unknown"}>> => {${O}
25
- return axios${I?"":".default"}.${s}(${P});
23
+ `}let P=_core.generateOptions.call(void 0, {route:q,body:y,headers:n,queryParams:e,response:i,verb:r,requestOptions:o==null?void 0:o.requestOptions,isFormData:u,isFormUrlEncoded:T,isExactOptionalPropertyTypes:f,hasSignal:c}),U=ie({isRequestOptions:g,hasSignal:c});return`export const ${s} = (
24
+ ${_core.toObjectString.call(void 0, a,"implementation")} ${U} ): Promise<AxiosResponse<${i.definition.success||"unknown"}>> => {${O}
25
+ return axios${I?"":".default"}.${r}(${P});
26
26
  }
27
- `},B={INFINITE:"infiniteQuery",QUERY:"query"},ae=["getNextPageParam","getPreviousPageParam"],le=({params:n,options:e,type:r})=>{var t;if(e===!1)return"";let i=_core.isObject.call(void 0, e)?` ${(t=_core.stringify.call(void 0, _lodashomitby2.default.call(void 0, e,(y,a)=>!!(r!==B.INFINITE&&ae.includes(a)))))==null?void 0:t.slice(1,-1)}`:"";return n.length?`{${!_core.isObject.call(void 0, e)||!e.hasOwnProperty("enabled")?`enabled: !!(${n.map(({name:y})=>y).join(" && ")}),`:""}${i} ...queryOptions}`:e?`{${i} ...queryOptions}`:"queryOptions"},ce=n=>n?n.hasSecondArg&&!n.isHook?`request?: SecondParameter<typeof ${n.name}>`:n.hasSecondArg&&n.isHook?`request?: SecondParameter<ReturnType<typeof ${n.name}>>`:"":"axios?: AxiosRequestConfig",_=({operationName:n,definitions:e,mutator:r,isRequestOptions:i,type:t})=>{let y=r==null?void 0:r.isHook,a=t?`Use${_core.pascal.call(void 0, t)}Options<Awaited<ReturnType<${y?`ReturnType<typeof use${_core.pascal.call(void 0, n)}Hook>`:`typeof ${n}`}>>, TError, TData>`:`UseMutationOptions<Awaited<ReturnType<${y?`ReturnType<typeof use${_core.pascal.call(void 0, n)}Hook>`:`typeof ${n}`}>>, TError,${e?`{${e}}`:"TVariables"}, TContext>`;if(!i)return`${t?"queryOptions":"mutationOptions"}?: ${a}`;let s=ce(r);return`options?: { ${t?"query":"mutation"}?:${a}, ${s}}
28
- `},$e=({outputClient:n,type:e,isMutatorHook:r,operationName:i})=>{switch(n){case _core.OutputClient.SVELTE_QUERY:return`Use${_core.pascal.call(void 0, e)}StoreResult<Awaited<ReturnType<${r?`ReturnType<typeof use${_core.pascal.call(void 0, i)}Hook>`:`typeof ${i}`}>>, TError, TData, QueryKey>`;case _core.OutputClient.VUE_QUERY:return` UseQueryReturnType<TData, TError, Use${_core.pascal.call(void 0, e)}Result<TData, TError>>`;case _core.OutputClient.REACT_QUERY:default:return` Use${_core.pascal.call(void 0, e)}Result<TData, TError>`}},de=({isRequestOptions:n,mutator:e,isExactOptionalPropertyTypes:r,hasSignal:i})=>!e&&n?i?`{ ${r?"...(signal ? { signal } : {})":"signal"}, ...axiosOptions }`:"axiosOptions":(e==null?void 0:e.hasSecondArg)&&n?i?"requestOptions, signal":"requestOptions":i?"signal":"",fe=({isRequestOptions:n,mutator:e})=>{if(!n)return"";let r="const {query: queryOptions";return e||(r+=", axios: axiosOptions"),e!=null&&e.hasSecondArg&&(r+=", request: requestOptions"),r+="} = options ?? {};",r},Te=({hasQueryParam:n,hasSignal:e})=>!n&&!e?"":n?e?"{ signal, pageParam }":"{ pageParam }":"{ signal }",Qe=({queryOption:{name:n,queryParam:e,options:r,type:i},operationName:t,queryKeyFnName:y,queryProperties:a,queryKeyProperties:s,params:f,props:Q,mutator:o,isRequestOptions:q,response:R,outputClient:g,isExactOptionalPropertyTypes:u,hasSignal:T})=>{let l=_core.toObjectString.call(void 0, Q,"implementation"),I=e?Q.map(({name:$})=>$==="params"?`{ ${e}: pageParam, ...params }`:$).join(","):a,d=$e({outputClient:g,type:i,isMutatorHook:o==null?void 0:o.isHook,operationName:t}),c=`AxiosError<${R.definition.errors||"unknown"}>`;o&&(c=o.hasErrorType?`${o.default?_core.pascal.call(void 0, t):""}ErrorType<${R.definition.errors||"unknown"}>`:R.definition.errors||"unknown");let O=o!=null&&o.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, t)}Hook>`:`typeof ${t}`,P=_({operationName:t,definitions:"",mutator:o,isRequestOptions:q,type:i}),D=de({isRequestOptions:q,isExactOptionalPropertyTypes:u,mutator:o,hasSignal:T}),A=fe({isRequestOptions:q,mutator:o}),C=Te({hasQueryParam:!!e&&Q.some(({type:$})=>$==="queryParam"),hasSignal:T});return`
27
+ `},b={INFINITE:"infiniteQuery",QUERY:"query"},ue=["getNextPageParam","getPreviousPageParam"],ye=({params:n,options:e,type:s})=>{var t;if(e===!1)return"";let i=_core.isObject.call(void 0, e)?` ${(t=_core.stringify.call(void 0, _lodashomitby2.default.call(void 0, e,(y,a)=>!!(s!==b.INFINITE&&ue.includes(a)))))==null?void 0:t.slice(1,-1)}`:"";return n.length?`{${!_core.isObject.call(void 0, e)||!e.hasOwnProperty("enabled")?`enabled: !!(${n.map(({name:y})=>y).join(" && ")}),`:""}${i} ...queryOptions}`:e?`{${i} ...queryOptions}`:"queryOptions"},pe=n=>n?n.hasSecondArg&&!n.isHook?`request?: SecondParameter<typeof ${n.name}>`:n.hasSecondArg&&n.isHook?`request?: SecondParameter<ReturnType<typeof ${n.name}>>`:"":"axios?: AxiosRequestConfig",B=({operationName:n,definitions:e,mutator:s,isRequestOptions:i,type:t})=>{let y=s==null?void 0:s.isHook,a=t?`Use${_core.pascal.call(void 0, t)}Options<Awaited<ReturnType<${y?`ReturnType<typeof use${_core.pascal.call(void 0, n)}Hook>`:`typeof ${n}`}>>, TError, TData>`:`UseMutationOptions<Awaited<ReturnType<${y?`ReturnType<typeof use${_core.pascal.call(void 0, n)}Hook>`:`typeof ${n}`}>>, TError,${e?`{${e}}`:"TVariables"}, TContext>`;if(!i)return`${t?"queryOptions":"mutationOptions"}?: ${a}`;let r=pe(s);return`options?: { ${t?"query":"mutation"}?:${a}, ${r}}
28
+ `},ae=({outputClient:n,type:e,isMutatorHook:s,operationName:i})=>{switch(n){case _core.OutputClient.SVELTE_QUERY:return`Use${_core.pascal.call(void 0, e)}StoreResult<Awaited<ReturnType<${s?`ReturnType<typeof use${_core.pascal.call(void 0, i)}Hook>`:`typeof ${i}`}>>, TError, TData, QueryKey>`;case _core.OutputClient.VUE_QUERY:return` UseQueryReturnType<TData, TError, Use${_core.pascal.call(void 0, e)}Result<TData, TError>>`;case _core.OutputClient.REACT_QUERY:default:return` Use${_core.pascal.call(void 0, e)}Result<TData, TError>`}},ce=({isRequestOptions:n,mutator:e,isExactOptionalPropertyTypes:s,hasSignal:i})=>!e&&n?i?`{ ${s?"...(signal ? { signal } : {})":"signal"}, ...axiosOptions }`:"axiosOptions":(e==null?void 0:e.hasSecondArg)&&n?i?"requestOptions, signal":"requestOptions":i?"signal":"",le=({isRequestOptions:n,mutator:e})=>{if(!n)return"";let s="const {query: queryOptions";return e||(s+=", axios: axiosOptions"),e!=null&&e.hasSecondArg&&(s+=", request: requestOptions"),s+="} = options ?? {};",s},$e=({hasQueryParam:n,hasSignal:e})=>!n&&!e?"":n?e?"{ signal, pageParam }":"{ pageParam }":"{ signal }",fe=({queryOption:{name:n,queryParam:e,options:s,type:i},operationName:t,queryKeyFnName:y,queryProperties:a,queryKeyProperties:r,params:d,props:Q,mutator:o,isRequestOptions:q,response:R,outputClient:g,isExactOptionalPropertyTypes:u,hasSignal:T})=>{let c=_core.toObjectString.call(void 0, Q,"implementation"),I=e?Q.map(({name:$})=>$==="params"?`{ ${e}: pageParam, ...params }`:$).join(","):a,f=ae({outputClient:g,type:i,isMutatorHook:o==null?void 0:o.isHook,operationName:t}),l=`AxiosError<${R.definition.errors||"unknown"}>`;o&&(l=o.hasErrorType?`${o.default?_core.pascal.call(void 0, t):""}ErrorType<${R.definition.errors||"unknown"}>`:R.definition.errors||"unknown");let O=o!=null&&o.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, t)}Hook>`:`typeof ${t}`,P=B({operationName:t,definitions:"",mutator:o,isRequestOptions:q,type:i}),U=ce({isRequestOptions:q,isExactOptionalPropertyTypes:u,mutator:o,hasSignal:T}),A=le({isRequestOptions:q,mutator:o}),D=$e({hasQueryParam:!!e&&Q.some(({type:$})=>$==="queryParam"),hasSignal:T});return`
29
29
  export type ${_core.pascal.call(void 0, n)}QueryResult = NonNullable<Awaited<ReturnType<${O}>>>
30
- export type ${_core.pascal.call(void 0, n)}QueryError = ${c}
30
+ export type ${_core.pascal.call(void 0, n)}QueryError = ${l}
31
31
 
32
- export const ${_core.camel.call(void 0, `use-${n}`)} = <TData = Awaited<ReturnType<${O}>>, TError = ${c}>(
33
- ${l} ${P}
34
- ): ${d} & { queryKey: QueryKey } => {
32
+ export const ${_core.camel.call(void 0, `use-${n}`)} = <TData = Awaited<ReturnType<${O}>>, TError = ${l}>(
33
+ ${c} ${P}
34
+ ): ${f} & { queryKey: QueryKey } => {
35
35
 
36
36
  ${A}
37
37
 
38
- const queryKey = queryOptions?.queryKey ?? ${y}(${s});
38
+ const queryKey = queryOptions?.queryKey ?? ${y}(${r});
39
39
 
40
40
  ${o!=null&&o.isHook?`const ${t} = use${_core.pascal.call(void 0, t)}Hook();`:""}
41
41
 
42
- const queryFn: QueryFunction<Awaited<ReturnType<${o!=null&&o.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, t)}Hook>`:`typeof ${t}`}>>> = (${C}) => ${t}(${I}${I?", ":""}${D});
42
+ const queryFn: QueryFunction<Awaited<ReturnType<${o!=null&&o.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, t)}Hook>`:`typeof ${t}`}>>> = (${D}) => ${t}(${I}${I?", ":""}${U});
43
43
 
44
- const query = ${_core.camel.call(void 0, `use-${i}`)}<Awaited<ReturnType<${o!=null&&o.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, t)}Hook>`:`typeof ${t}`}>>, TError, TData>(queryKey, queryFn, ${le({params:f,options:r,type:i})}) as ${d} & { queryKey: QueryKey };
44
+ const query = ${_core.camel.call(void 0, `use-${i}`)}<Awaited<ReturnType<${o!=null&&o.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, t)}Hook>`:`typeof ${t}`}>>, TError, TData>(queryKey, queryFn, ${ye({params:d,options:s,type:i})}) as ${f} & { queryKey: QueryKey };
45
45
 
46
46
  query.queryKey = queryKey;
47
47
 
48
48
  return query;
49
49
  }
50
- `},Oe=({queryParams:n,operationName:e,body:r,props:i,verb:t,params:y,override:a,mutator:s,response:f,operationId:Q},{route:o,override:{operations:q={}},context:R},g)=>{var D,A,C;let u=a==null?void 0:a.query,T=(a==null?void 0:a.requestOptions)!==!1,l=(D=q[Q])==null?void 0:D.query,I=!!((C=(A=R.tsconfig)==null?void 0:A.compilerOptions)!=null&&C.exactOptionalPropertyTypes);if(t===_core.Verbs.GET||(l==null?void 0:l.useInfinite)||(l==null?void 0:l.useQuery)){let $=i.map(({name:E,type:F})=>F===_core.GetterPropType.BODY?r.implementation:E).join(","),x=i.filter(E=>E.type!==_core.GetterPropType.HEADER).map(({name:E,type:F})=>F===_core.GetterPropType.BODY?r.implementation:E).join(","),H=[...u!=null&&u.useInfinite?[{name:_core.camel.call(void 0, `${e}-infinite`),options:u==null?void 0:u.options,type:B.INFINITE,queryParam:u==null?void 0:u.useInfiniteQueryParam}]:[],...!(u!=null&&u.useQuery)&&!(u!=null&&u.useInfinite)||(u==null?void 0:u.useQuery)?[{name:e,options:u==null?void 0:u.options,type:B.QUERY}]:[]],K=_core.camel.call(void 0, `get-${e}-queryKey`),Y=_core.toObjectString.call(void 0, i.filter(E=>E.type!==_core.GetterPropType.HEADER),"implementation");return`export const ${K} = (${Y}) => [\`${o}\`${n?", ...(params ? [params]: [])":""}${r.implementation?`, ${r.implementation}`:""}];
50
+ `},de=({queryParams:n,operationName:e,body:s,props:i,verb:t,params:y,override:a,mutator:r,response:d,operationId:Q},{route:o,override:{operations:q={}},context:R},g)=>{var U,A,D;let u=a==null?void 0:a.query,T=(a==null?void 0:a.requestOptions)!==!1,c=(U=q[Q])==null?void 0:U.query,I=!!((D=(A=R.tsconfig)==null?void 0:A.compilerOptions)!=null&&D.exactOptionalPropertyTypes);if(t===_core.Verbs.GET||(c==null?void 0:c.useInfinite)||(c==null?void 0:c.useQuery)){let $=i.map(({name:E,type:S})=>S===_core.GetterPropType.BODY?s.implementation:E).join(","),x=i.filter(E=>E.type!==_core.GetterPropType.HEADER).map(({name:E,type:S})=>S===_core.GetterPropType.BODY?s.implementation:E).join(","),w=[...u!=null&&u.useInfinite?[{name:_core.camel.call(void 0, `${e}-infinite`),options:u==null?void 0:u.options,type:b.INFINITE,queryParam:u==null?void 0:u.useInfiniteQueryParam}]:[],...!(u!=null&&u.useQuery)&&!(u!=null&&u.useInfinite)||(u==null?void 0:u.useQuery)?[{name:e,options:u==null?void 0:u.options,type:b.QUERY}]:[]],m=_core.camel.call(void 0, `get-${e}-queryKey`),K=_core.toObjectString.call(void 0, i.filter(E=>E.type!==_core.GetterPropType.HEADER),"implementation");return`export const ${m} = (${K}) => [\`${o}\`${n?", ...(params ? [params]: [])":""}${s.implementation?`, ${s.implementation}`:""}];
51
51
 
52
- ${H.reduce((E,F)=>E+Qe({queryOption:F,operationName:e,queryKeyFnName:K,queryProperties:$,queryKeyProperties:x,params:y,props:i,mutator:s,isRequestOptions:T,response:f,outputClient:g,isExactOptionalPropertyTypes:I,hasSignal:!!u.signal}),"")}
53
- `}let d=i.map(({definition:$,type:x})=>x===_core.GetterPropType.BODY?s!=null&&s.bodyTypeName?`data: ${s.bodyTypeName}<${r.definition}>`:`data: ${r.definition}`:$).join(";"),c=i.map(({name:$,type:x})=>x===_core.GetterPropType.BODY?"data":$).join(","),O=`AxiosError<${f.definition.errors||"unknown"}>`;s&&(O=s.hasErrorType?`${s.default?_core.pascal.call(void 0, e):""}ErrorType<${f.definition.errors||"unknown"}>`:f.definition.errors||"unknown");let P=s!=null&&s.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, e)}Hook>`:`typeof ${e}`;return`
52
+ ${w.reduce((E,S)=>E+fe({queryOption:S,operationName:e,queryKeyFnName:m,queryProperties:$,queryKeyProperties:x,params:y,props:i,mutator:r,isRequestOptions:T,response:d,outputClient:g,isExactOptionalPropertyTypes:I,hasSignal:!!u.signal}),"")}
53
+ `}let f=i.map(({definition:$,type:x})=>x===_core.GetterPropType.BODY?r!=null&&r.bodyTypeName?`data: ${r.bodyTypeName}<${s.definition}>`:`data: ${s.definition}`:$).join(";"),l=i.map(({name:$,type:x})=>x===_core.GetterPropType.BODY?"data":$).join(","),O=`AxiosError<${d.definition.errors||"unknown"}>`;r&&(O=r.hasErrorType?`${r.default?_core.pascal.call(void 0, e):""}ErrorType<${d.definition.errors||"unknown"}>`:d.definition.errors||"unknown");let P=r!=null&&r.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, e)}Hook>`:`typeof ${e}`;return`
54
54
  export type ${_core.pascal.call(void 0, e)}MutationResult = NonNullable<Awaited<ReturnType<${P}>>>
55
- ${r.definition?`export type ${_core.pascal.call(void 0, e)}MutationBody = ${s!=null&&s.bodyTypeName?`${s.bodyTypeName}<${r.definition}>`:r.definition}`:""}
55
+ ${s.definition?`export type ${_core.pascal.call(void 0, e)}MutationBody = ${r!=null&&r.bodyTypeName?`${r.bodyTypeName}<${s.definition}>`:s.definition}`:""}
56
56
  export type ${_core.pascal.call(void 0, e)}MutationError = ${O}
57
57
 
58
58
  export const ${_core.camel.call(void 0, `use-${e}`)} = <TError = ${O},
59
- ${d?"":"TVariables = void,"}
60
- TContext = unknown>(${_({operationName:e,definitions:d,mutator:s,isRequestOptions:T})}) => {
61
- ${T?`const {mutation: mutationOptions${s?s!=null&&s.hasSecondArg?", request: requestOptions":"":", axios: axiosOptions"}} = options ?? {};`:""}
59
+ ${f?"":"TVariables = void,"}
60
+ TContext = unknown>(${B({operationName:e,definitions:f,mutator:r,isRequestOptions:T})}) => {
61
+ ${T?`const {mutation: mutationOptions${r?r!=null&&r.hasSecondArg?", request: requestOptions":"":", axios: axiosOptions"}} = options ?? {};`:""}
62
62
 
63
- ${s!=null&&s.isHook?`const ${e} = use${_core.pascal.call(void 0, e)}Hook()`:""}
63
+ ${r!=null&&r.isHook?`const ${e} = use${_core.pascal.call(void 0, e)}Hook()`:""}
64
64
 
65
65
 
66
- const mutationFn: MutationFunction<Awaited<ReturnType<${P}>>, ${d?`{${d}}`:"TVariables"}> = (${c?"props":""}) => {
67
- ${c?`const {${c}} = props ?? {};`:""}
66
+ const mutationFn: MutationFunction<Awaited<ReturnType<${P}>>, ${f?`{${f}}`:"TVariables"}> = (${l?"props":""}) => {
67
+ ${l?`const {${l}} = props ?? {};`:""}
68
68
 
69
- return ${e}(${c}${c?",":""}${T?s?s!=null&&s.hasSecondArg?"requestOptions":"":"axiosOptions":""})
69
+ return ${e}(${l}${l?",":""}${T?r?r!=null&&r.hasSecondArg?"requestOptions":"":"axiosOptions":""})
70
70
  }
71
71
 
72
- return useMutation<Awaited<ReturnType<typeof ${e}>>, TError, ${d?`{${d}}`:"TVariables"}, TContext>(mutationFn, mutationOptions)
72
+ return useMutation<Awaited<ReturnType<typeof ${e}>>, TError, ${f?`{${f}}`:"TVariables"}, TContext>(mutationFn, mutationOptions)
73
73
  }
74
- `},M= exports.generateQueryTitle =()=>"",h= exports.generateQueryHeader =({isRequestOptions:n,isMutator:e,hasAwaitedType:r})=>`${r?"":`type AwaitedInput<T> = PromiseLike<T> | T;
74
+ `},Te= exports.generateQueryHeader =({isRequestOptions:n,isMutator:e,hasAwaitedType:s})=>`${s?"":`type AwaitedInput<T> = PromiseLike<T> | T;
75
75
 
76
76
  type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
77
77
 
@@ -84,6 +84,6 @@ ${n&&e?`// eslint-disable-next-line
84
84
  ? P
85
85
  : never;
86
86
 
87
- `:""}`,k= exports.generateQueryFooter =()=>"",m= exports.generateQuery =(n,e,r)=>{let i=_core.generateVerbImports.call(void 0, n),t=pe(n,e),y=Oe(n,e,r);return{implementation:`${t}
87
+ `:""}`,Qe= exports.generateQuery =(n,e,s)=>{let i=_core.generateVerbImports.call(void 0, n),t=oe(n,e),y=de(n,e,s);return{implementation:`${t}
88
88
 
89
- ${y}`,imports:i}},Ee={client:m,header:h,dependencies:ie,footer:k,title:M},qe={client:m,header:h,dependencies:te,footer:k,title:M},Re={client:m,header:h,dependencies:ue,footer:k,title:M},ge={"react-query":Ee,"vue-query":Re,"svelte-query":qe},xe= exports.builder =({type:n="react-query"}={})=>()=>ge[n],me= exports.default =xe;exports.builder = xe; exports.default = me; exports.generateQuery = m; exports.generateQueryFooter = k; exports.generateQueryHeader = h; exports.generateQueryTitle = M; exports.getReactQueryDependencies = ie; exports.getSvelteQueryDependencies = te; exports.getVueQueryDependencies = ue;
89
+ ${y}`,imports:i}},Oe={"react-query":te,"vue-query":re,"svelte-query":J},Ee= exports.builder =({type:n="react-query",options:e}={})=>()=>({client:(i,t,y)=>(e&&(i.override.query=_core.mergeDeep.call(void 0, e,i.override.query),t.override.query=_core.mergeDeep.call(void 0, e,i.override.query)),Qe(i,t,y)),header:Te,dependencies:Oe[n]}),we= exports.default =Ee;exports.builder = Ee; exports.default = we; exports.generateQuery = Qe; exports.generateQueryHeader = Te; exports.getReactQueryDependencies = te; exports.getSvelteQueryDependencies = J; exports.getVueQueryDependencies = re;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@orval/query",
3
- "version": "6.11.0-alpha.2",
3
+ "version": "6.11.0-alpha.3",
4
4
  "license": "MIT",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -13,7 +13,7 @@
13
13
  "lint": "eslint src/**/*.ts"
14
14
  },
15
15
  "dependencies": {
16
- "@orval/core": "6.11.0-alpha.2",
16
+ "@orval/core": "6.11.0-alpha.3",
17
17
  "lodash.omitby": "^4.6.0"
18
18
  },
19
19
  "devDependencies": {