@orval/axios 6.11.0-alpha.2 → 6.11.0-alpha.4

package/dist/index.d.ts

@@ -1,10 +1,14 @@
-import { ClientDependenciesBuilder, ClientTitleBuilder, ClientHeaderBuilder, ClientFooterBuilder, ClientBuilder, ClientGeneratorsBuilder } from '@orval/core';
+import * as _orval_core from '@orval/core';
+import { ClientDependenciesBuilder, ClientTitleBuilder, ClientHeaderBuilder, ClientFooterBuilder, GeneratorVerbOptions, GeneratorOptions, ClientBuilder, ClientGeneratorsBuilder } from '@orval/core';
 
 declare const getAxiosDependencies: ClientDependenciesBuilder;
 declare const generateAxiosTitle: ClientTitleBuilder;
 declare const generateAxiosHeader: ClientHeaderBuilder;
 declare const generateAxiosFooter: ClientFooterBuilder;
-declare const generateAxios: ClientBuilder;
+declare const generateAxios: (verbOptions: GeneratorVerbOptions, options: GeneratorOptions) => {
+    implementation: string;
+    imports: _orval_core.GeneratorImport[];
+};
 declare const generateAxiosFunctions: ClientBuilder;
 declare const builder: ({ type }?: {
     type?: "axios" | "axios-functions" | undefined;

package/dist/index.js

@@ -1,11 +1,11 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _core = require('@orval/core');var W=[{exports:[{name:"axios",default:!0,values:!0,syntheticDefaultImport:!0},{name:"AxiosRequestConfig"},{name:"AxiosResponse"}],dependency:"axios"}],c=new Map,O= exports.getAxiosDependencies =e=>[...e?[]:W],z=({headers:e,queryParams:s,operationName:n,response:i,mutator:o,body:a,props:l,verb:r,override:t,formData:G,formUrlEncoded:S},{route:g,context:$})=>{var A,C;let p=(t==null?void 0:t.requestOptions)!==!1,u=(t==null?void 0:t.formData)!==!1,f=(t==null?void 0:t.formUrlEncoded)!==!1,m=!!((C=(A=$.tsconfig)==null?void 0:A.compilerOptions)!=null&&C.exactOptionalPropertyTypes),E=_core.isSyntheticDefaultImportsAllow.call(void 0, $.tsconfig),y=_core.generateFormDataAndUrlEncodedFunction.call(void 0, {formData:G,formUrlEncoded:S,body:a,isFormData:u,isFormUrlEncoded:f}),F=_core.VERBS_WITH_BODY.includes(r);if(o){let h=_core.generateMutatorConfig.call(void 0, {route:g,body:a,headers:e,queryParams:s,response:i,verb:r,isFormData:u,isFormUrlEncoded:f,isBodyVerb:F,hasSignal:!1,isExactOptionalPropertyTypes:m}),q=p?_core.generateMutatorRequestOptions.call(void 0, t==null?void 0:t.requestOptions,o.hasSecondArg):"";c.set(n,T=>`export type ${_core.pascal.call(void 0, n)}Result = NonNullable<Awaited<ReturnType<${T?`ReturnType<typeof ${T}>['${n}']`:`typeof ${n}`}>>>`);let P=o.bodyTypeName&&a.definition?_core.toObjectString.call(void 0, l,"implementation").replace(new RegExp(`(\\w*):\\s?${a.definition}`),`$1: ${o.bodyTypeName}<${a.definition}>`):_core.toObjectString.call(void 0, l,"implementation");return`const ${n} = (
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _core = require('@orval/core');var W=[{exports:[{name:"axios",default:!0,values:!0,syntheticDefaultImport:!0},{name:"AxiosRequestConfig"},{name:"AxiosResponse"}],dependency:"axios"}],c=new Map,O= exports.getAxiosDependencies =e=>[...e?[]:W],z=({headers:e,queryParams:s,operationName:n,response:i,mutator:a,body:o,props:l,verb:r,override:t,formData:G,formUrlEncoded:S},{route:g,context:$})=>{var A,T;let p=(t==null?void 0:t.requestOptions)!==!1,u=(t==null?void 0:t.formData)!==!1,f=(t==null?void 0:t.formUrlEncoded)!==!1,m=!!((T=(A=$.tsconfig)==null?void 0:A.compilerOptions)!=null&&T.exactOptionalPropertyTypes),E=_core.isSyntheticDefaultImportsAllow.call(void 0, $.tsconfig),y=_core.generateFormDataAndUrlEncodedFunction.call(void 0, {formData:G,formUrlEncoded:S,body:o,isFormData:u,isFormUrlEncoded:f}),F=_core.VERBS_WITH_BODY.includes(r);if(a){let h=_core.generateMutatorConfig.call(void 0, {route:g,body:o,headers:e,queryParams:s,response:i,verb:r,isFormData:u,isFormUrlEncoded:f,isBodyVerb:F,hasSignal:!1,isExactOptionalPropertyTypes:m}),q=p?_core.generateMutatorRequestOptions.call(void 0, t==null?void 0:t.requestOptions,a.hasSecondArg):"";c.set(n,C=>`export type ${_core.pascal.call(void 0, n)}Result = NonNullable<Awaited<ReturnType<${C?`ReturnType<typeof ${C}>['${n}']`:`typeof ${n}`}>>>`);let P=a.bodyTypeName&&o.definition?_core.toObjectString.call(void 0, l,"implementation").replace(new RegExp(`(\\w*):\\s?${o.definition}`),`$1: ${a.bodyTypeName}<${o.definition}>`):_core.toObjectString.call(void 0, l,"implementation");return`const ${n} = (
     ${P}
- ${p&&o.hasSecondArg?`options?: SecondParameter<typeof ${o.name}>,`:""}) => {${y}
-      return ${o.name}<${i.definition.success||"unknown"}>(
+ ${p&&a.hasSecondArg?`options?: SecondParameter<typeof ${a.name}>,`:""}) => {${y}
+      return ${a.name}<${i.definition.success||"unknown"}>(
       ${h},
       ${q});
     }
-  `}let I=_core.generateOptions.call(void 0, {route:g,body:a,headers:e,queryParams:s,response:i,verb:r,requestOptions:t==null?void 0:t.requestOptions,isFormData:u,isFormUrlEncoded:f,isExactOptionalPropertyTypes:m,hasSignal:!1});return c.set(n,()=>`export type ${_core.pascal.call(void 0, n)}Result = AxiosResponse<${i.definition.success||"unknown"}>`),`const ${n} = <TData = AxiosResponse<${i.definition.success||"unknown"}>>(
+  `}let I=_core.generateOptions.call(void 0, {route:g,body:o,headers:e,queryParams:s,response:i,verb:r,requestOptions:t==null?void 0:t.requestOptions,isFormData:u,isFormUrlEncoded:f,isExactOptionalPropertyTypes:m,hasSignal:!1});return c.set(n,()=>`export type ${_core.pascal.call(void 0, n)}Result = AxiosResponse<${i.definition.success||"unknown"}>`),`const ${n} = <TData = AxiosResponse<${i.definition.success||"unknown"}>>(
     ${_core.toObjectString.call(void 0, l,"implementation")} ${p?`options?: AxiosRequestConfig
 `:""} ): Promise<TData> => {${y}
     return axios${E?"":".default"}.${r}(${I});
@@ -21,11 +21,11 @@ ${s&&n?`// eslint-disable-next-line
 
 `:""}
   ${i?"":`export const ${e} = () => {
-`}`,R= exports.generateAxiosFooter =({operationNames:e,title:s,noFunction:n,hasMutator:i,hasAwaitedType:o})=>{let a="";return n||(a+=`return {${e.join(",")}}};
-`),i&&!o&&(a+=`
+`}`,R= exports.generateAxiosFooter =({operationNames:e,title:s,noFunction:n,hasMutator:i,hasAwaitedType:a})=>{let o="";return n||(o+=`return {${e.join(",")}}};
+`),i&&!a&&(o+=`
 type AwaitedInput<T> = PromiseLike<T> | T;
 
     type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
 
-`),e.forEach(l=>{c.has(l)&&(a+=c.get(l)(n?void 0:s)+`
-`)}),a},w= exports.generateAxios =(e,s)=>{let n=_core.generateVerbImports.call(void 0, e);return{implementation:z(e,s),imports:n}},L= exports.generateAxiosFunctions =(e,s,n)=>{let{implementation:i,imports:o}=w(e,s,n);return{implementation:"export "+i,imports:o}},X={client:w,header:D,dependencies:O,footer:R,title:B},Y={client:L,header:e=>D({...e,noFunction:!0}),dependencies:O,footer:e=>R({...e,noFunction:!0}),title:B},J={axios:X,"axios-functions":Y},K= exports.builder =({type:e="axios-functions"}={})=>()=>J[e],ae= exports.default =K;exports.builder = K; exports.default = ae; exports.generateAxios = w; exports.generateAxiosFooter = R; exports.generateAxiosFunctions = L; exports.generateAxiosHeader = D; exports.generateAxiosTitle = B; exports.getAxiosDependencies = O;
+`),e.forEach(l=>{c.has(l)&&(o+=c.get(l)(n?void 0:s)+`
+`)}),o},w= exports.generateAxios =(e,s)=>{let n=_core.generateVerbImports.call(void 0, e);return{implementation:z(e,s),imports:n}},L= exports.generateAxiosFunctions =async(e,s)=>{let{implementation:n,imports:i}=w(e,s);return{implementation:"export "+n,imports:i}},X={client:w,header:D,dependencies:O,footer:R,title:B},Y={client:L,header:e=>D({...e,noFunction:!0}),dependencies:O,footer:e=>R({...e,noFunction:!0}),title:B},J={axios:X,"axios-functions":Y},K= exports.builder =({type:e="axios-functions"}={})=>()=>J[e],ae= exports.default =K;exports.builder = K; exports.default = ae; exports.generateAxios = w; exports.generateAxiosFooter = R; exports.generateAxiosFunctions = L; exports.generateAxiosHeader = D; exports.generateAxiosTitle = B; exports.getAxiosDependencies = O;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orval/axios",
-  "version": "6.11.0-alpha.2",
+  "version": "6.11.0-alpha.4",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,6 +13,6 @@
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
-    "@orval/core": "6.11.0-alpha.2"
+    "@orval/core": "6.11.0-alpha.4"
   }
 }