@orval/query 6.12.0 → 6.13.0

package/dist/index.js

@@ -29,7 +29,7 @@
     ${_core.toObjectString.call(void 0, i,"implementation")} ${w} ): Promise<AxiosResponse<${t.definition.success||"unknown"}>> => {${v}
     return axios${T?"":".default"}.${u}(${R});
   }
-`},re={INFINITE:"infiniteQuery",QUERY:"query"},pt=["getNextPageParam","getPreviousPageParam"],ht=({params:e,options:n,type:r})=>{var s;if(n===!1)return"";let t=_core.isObject.call(void 0, n)?` ${(s=_core.stringify.call(void 0, _lodashomitby2.default.call(void 0, n,(o,i)=>r!==re.INFINITE&&pt.includes(i))))==null?void 0:s.slice(1,-1)}`:"";return e.length?`${!_core.isObject.call(void 0, n)||!n.hasOwnProperty("enabled")?`enabled: !!(${e.map(({name:o})=>o).join(" && ")}),`:""}${t} ...queryOptions`:n?`{${t} ...queryOptions}`:"...queryOptions"},gt=e=>e?e.hasSecondArg&&!e.isHook?`request?: SecondParameter<typeof ${e.name}>`:e.hasSecondArg&&e.isHook?`request?: SecondParameter<ReturnType<typeof ${e.name}>>`:"":"axios?: AxiosRequestConfig",un=({operationName:e,definitions:n,mutator:r,isRequestOptions:t,type:s,hasSvelteQueryV4:o})=>{let i=r==null?void 0:r.isHook,u=o?"Create":"Use",l=s?`${u}${_core.pascal.call(void 0, s)}Options<Awaited<ReturnType<${i?`ReturnType<typeof use${_core.pascal.call(void 0, e)}Hook>`:`typeof ${e}`}>>, TError, TData>`:`${u}MutationOptions<Awaited<ReturnType<${i?`ReturnType<typeof use${_core.pascal.call(void 0, e)}Hook>`:`typeof ${e}`}>>, TError,${n?`{${n}}`:"TVariables"}, TContext>`;if(!t)return`${s?"queryOptions":"mutationOptions"}?: ${l}`;let y=gt(r);return`options?: { ${s?"query":"mutation"}?:${l}, ${y}}
+`},re={INFINITE:"infiniteQuery",QUERY:"query"},pt=["getNextPageParam","getPreviousPageParam"],ht=({params:e,options:n,type:r})=>{var s;if(n===!1)return"";let t=_core.isObject.call(void 0, n)?` ${(s=_core.stringify.call(void 0, _lodashomitby2.default.call(void 0, n,(o,i)=>r!==re.INFINITE&&pt.includes(i))))==null?void 0:s.slice(1,-1)}`:"";return e.length?`${!_core.isObject.call(void 0, n)||!n.hasOwnProperty("enabled")?`enabled: !!(${e.map(({name:o})=>o).join(" && ")}),`:""}${t} ...queryOptions`:n?`${t} ...queryOptions`:"...queryOptions"},gt=e=>e?e.hasSecondArg&&!e.isHook?`request?: SecondParameter<typeof ${e.name}>`:e.hasSecondArg&&e.isHook?`request?: SecondParameter<ReturnType<typeof ${e.name}>>`:"":"axios?: AxiosRequestConfig",un=({operationName:e,definitions:n,mutator:r,isRequestOptions:t,type:s,hasSvelteQueryV4:o})=>{let i=r==null?void 0:r.isHook,u=o?"Create":"Use",l=s?`${u}${_core.pascal.call(void 0, s)}Options<Awaited<ReturnType<${i?`ReturnType<typeof use${_core.pascal.call(void 0, e)}Hook>`:`typeof ${e}`}>>, TError, TData>`:`${u}MutationOptions<Awaited<ReturnType<${i?`ReturnType<typeof use${_core.pascal.call(void 0, e)}Hook>`:`typeof ${e}`}>>, TError,${n?`{${n}}`:"TVariables"}, TContext>`;if(!t)return`${s?"queryOptions":"mutationOptions"}?: ${l}`;let y=gt(r);return`options?: { ${s?"query":"mutation"}?:${l}, ${y}}
 `},bt=({outputClient:e,type:n,isMutatorHook:r,operationName:t,hasVueQueryV4:s,hasSvelteQueryV4:o})=>{switch(e){case _core.OutputClient.SVELTE_QUERY:return o?`Create${_core.pascal.call(void 0, n)}Result<TData, TError> & { queryKey: QueryKey }`:`Use${_core.pascal.call(void 0, n)}StoreResult<Awaited<ReturnType<${r?`ReturnType<typeof use${_core.pascal.call(void 0, t)}Hook>`:`typeof ${t}`}>>, TError, TData, QueryKey> & { queryKey: QueryKey }`;case _core.OutputClient.VUE_QUERY:return s?n!==re.INFINITE?"UseQueryReturnType<TData, TError> & { queryKey: QueryKey }":"UseInfiniteQueryReturnType<TData, TError> & { queryKey: QueryKey }":` UseQueryReturnType<TData, TError, Use${_core.pascal.call(void 0, n)}Result<TData, TError>> & { queryKey: QueryKey }`;case _core.OutputClient.REACT_QUERY:default:return` Use${_core.pascal.call(void 0, n)}Result<TData, TError> & { queryKey: QueryKey }`}},mt=({isRequestOptions:e,mutator:n,isExactOptionalPropertyTypes:r,hasSignal:t})=>!n&&e?t?`{ ${r?"...(signal ? { signal } : {})":"signal"}, ...axiosOptions }`:"axiosOptions":(n==null?void 0:n.hasSecondArg)&&e?t?"requestOptions, signal":"requestOptions":t?"signal":"",$t=({isRequestOptions:e,mutator:n})=>{if(!e)return"";let r="const {query: queryOptions";return n||(r+=", axios: axiosOptions"),n!=null&&n.hasSecondArg&&(r+=", request: requestOptions"),r+="} = options ?? {};",r},Et=({hasQueryParam:e,hasSignal:n})=>!e&&!n?"":e?n?"{ signal, pageParam }":"{ pageParam }":"{ signal }",Ot=({queryOption:{name:e,queryParam:n,options:r,type:t},operationName:s,queryKeyFnName:o,queryProperties:i,queryKeyProperties:u,params:l,props:y,mutator:a,queryOptionsMutator:d,queryKeyMutator:h,isRequestOptions:m,response:O,outputClient:f,isExactOptionalPropertyTypes:$,hasSignal:T,route:P,hasVueQueryV4:I,hasSvelteQueryV4:v})=>{let R=_core.toObjectString.call(void 0, y,"implementation"),w=n?y.map(({name:b})=>b==="params"?`{ ${n}: pageParam, ...params }`:b).join(","):i,Q=bt({outputClient:f,type:t,isMutatorHook:a==null?void 0:a.isHook,operationName:s,hasVueQueryV4:I,hasSvelteQueryV4:v}),x=`AxiosError<${O.definition.errors||"unknown"}>`;a&&(x=a.hasErrorType?`${a.default?_core.pascal.call(void 0, s):""}ErrorType<${O.definition.errors||"unknown"}>`:O.definition.errors||"unknown");let k=a!=null&&a.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, s)}Hook>`:`typeof ${s}`,S=un({operationName:s,definitions:"",mutator:a,isRequestOptions:m,type:t,hasSvelteQueryV4:v}),j=mt({isRequestOptions:m,isExactOptionalPropertyTypes:$,mutator:a,hasSignal:T}),z=$t({isRequestOptions:m,mutator:a}),X=Et({hasQueryParam:!!n&&y.some(({type:b})=>b==="queryParam"),hasSignal:T}),V=v?"create":"use";return`
 export type ${_core.pascal.call(void 0, e)}QueryResult = NonNullable<Awaited<ReturnType<${k}>>>
 export type ${_core.pascal.call(void 0, e)}QueryError = ${x}
@@ -56,7 +56,8 @@ export const ${_core.camel.call(void 0, `${V}-${e}`)} = <TData = Awaited<ReturnT
 
   return query;
 }
-`},Tt=async({queryParams:e,operationName:n,body:r,props:t,verb:s,params:o,override:i,mutator:u,response:l,operationId:y},{route:a,override:{operations:d={}},context:h,output:m},O)=>{var z,X,V;let f=i==null?void 0:i.query,$=(i==null?void 0:i.requestOptions)!==!1,T=(z=d[y])==null?void 0:z.query,P=!!((V=(X=h.tsconfig)==null?void 0:X.compilerOptions)!=null&&V.exactOptionalPropertyTypes),I=_core.OutputClient.VUE_QUERY===O&&!on(h.packageJson),v=_core.OutputClient.SVELTE_QUERY===O&&!sn(h.packageJson);if(s===_core.Verbs.GET||(T==null?void 0:T.useInfinite)||(T==null?void 0:T.useQuery)){let b=f.queryKey?await _core.generateMutator.call(void 0, {output:m,mutator:f.queryKey,name:`${n}QueryKey`,workspace:h.workspace,tsconfig:h.tsconfig}):void 0,q=f.queryOptions?await _core.generateMutator.call(void 0, {output:m,mutator:f.queryOptions,name:`${n}QueryOptions`,workspace:h.workspace,tsconfig:h.tsconfig}):void 0,ln=t.map(({name:C,type:G})=>G===_core.GetterPropType.BODY?r.implementation:C).join(","),cn=t.filter(C=>C.type!==_core.GetterPropType.HEADER).map(({name:C,type:G})=>G===_core.GetterPropType.BODY?r.implementation:C).join(","),an=[...f!=null&&f.useInfinite?[{name:_core.camel.call(void 0, `${n}-infinite`),options:f==null?void 0:f.options,type:re.INFINITE,queryParam:f==null?void 0:f.useInfiniteQueryParam}]:[],...!(f!=null&&f.useQuery)&&!(f!=null&&f.useInfinite)||(f==null?void 0:f.useQuery)?[{name:n,options:f==null?void 0:f.options,type:re.QUERY}]:[]],be=_core.camel.call(void 0, `get-${n}-queryKey`),yn=_core.toObjectString.call(void 0, t.filter(C=>C.type!==_core.GetterPropType.HEADER),"implementation"),fn=`export const ${be} = (${yn}) => [\`${a}\`${e?", ...(params ? [params]: [])":""}${r.implementation?`, ${r.implementation}`:""}];`;return{implementation:`${b?"":fn}
+`},Tt=async({queryParams:e,operationName:n,body:r,props:t,verb:s,params:o,override:i,mutator:u,response:l,operationId:y},{route:a,override:{operations:d={}},context:h,output:m},O)=>{var z,X,V;let f=i==null?void 0:i.query,$=(i==null?void 0:i.requestOptions)!==!1,T=(z=d[y])==null?void 0:z.query,P=!!((V=(X=h.tsconfig)==null?void 0:X.compilerOptions)!=null&&V.exactOptionalPropertyTypes),I=_core.OutputClient.VUE_QUERY===O&&!on(h.packageJson),v=_core.OutputClient.SVELTE_QUERY===O&&!sn(h.packageJson);if(s===_core.Verbs.GET||(T==null?void 0:T.useInfinite)||(T==null?void 0:T.useQuery)){let b=f.queryKey?await _core.generateMutator.call(void 0, {output:m,mutator:f.queryKey,name:`${n}QueryKey`,workspace:h.workspace,tsconfig:h.tsconfig}):void 0,q=f.queryOptions?await _core.generateMutator.call(void 0, {output:m,mutator:f.queryOptions,name:`${n}QueryOptions`,workspace:h.workspace,tsconfig:h.tsconfig}):void 0,ln=t.map(({name:C,type:G})=>G===_core.GetterPropType.BODY?r.implementation:C).join(","),cn=t.filter(C=>C.type!==_core.GetterPropType.HEADER).map(({name:C,type:G})=>G===_core.GetterPropType.BODY?r.implementation:C).join(","),an=[...f!=null&&f.useInfinite?[{name:_core.camel.call(void 0, `${n}-infinite`),options:f==null?void 0:f.options,type:re.INFINITE,queryParam:f==null?void 0:f.useInfiniteQueryParam}]:[],...!(f!=null&&f.useQuery)&&!(f!=null&&f.useInfinite)||(f==null?void 0:f.useQuery)?[{name:n,options:f==null?void 0:f.options,type:re.QUERY}]:[]],be=_core.camel.call(void 0, `get-${n}-queryKey`),yn=_core.toObjectString.call(void 0, t.filter(C=>C.type!==_core.GetterPropType.HEADER),"implementation"),fn=`export const ${be} = (${yn}) => [\`${a}\`${e?", ...(params ? [params]: [])":""}${r.implementation?`, ${r.implementation}`:""}] as const;`;return{implementation:`${b?"":fn}
+  
 
     ${an.reduce((C,G)=>C+Ot({queryOption:G,operationName:n,queryKeyFnName:be,queryProperties:ln,queryKeyProperties:cn,params:o,props:t,mutator:u,isRequestOptions:$,response:l,outputClient:O,isExactOptionalPropertyTypes:P,hasSignal:!!f.signal,queryOptionsMutator:q,queryKeyMutator:b,route:a,hasVueQueryV4:I,hasSvelteQueryV4:v}),"")}
 `,mutators:q||b?[...q?[q]:[],...b?[b]:[]]:void 0}}let R=f.mutationOptions?await _core.generateMutator.call(void 0, {output:m,mutator:f.mutationOptions,name:`${n}MutationOptions`,workspace:h.workspace,tsconfig:h.tsconfig}):void 0,w=t.map(({definition:b,type:q})=>q===_core.GetterPropType.BODY?u!=null&&u.bodyTypeName?`data: ${u.bodyTypeName}<${r.definition}>`:`data: ${r.definition}`:b).join(";"),Q=t.map(({name:b,type:q})=>q===_core.GetterPropType.BODY?"data":b).join(","),x=`AxiosError<${l.definition.errors||"unknown"}>`;u&&(x=u.hasErrorType?`${u.default?_core.pascal.call(void 0, n):""}ErrorType<${l.definition.errors||"unknown"}>`:l.definition.errors||"unknown");let k=u!=null&&u.isHook?`ReturnType<typeof use${_core.pascal.call(void 0, n)}Hook>`:`typeof ${n}`,S=v?"create":"use";return{implementation:`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orval/query",
-  "version": "6.12.0",
+  "version": "6.13.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,7 +13,7 @@
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
-    "@orval/core": "6.12.0",
+    "@orval/core": "6.13.0",
     "lodash.omitby": "^4.6.0"
   },
   "devDependencies": {