@orval/axios 6.19.0 → 6.20.0

package/dist/index.js

@@ -1,17 +1,173 @@
-"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&&a.hasSecondArg?`options?: SecondParameter<typeof ${a.name}>,`:""}) => {${y}
-      return ${a.name}<${i.definition.success||"unknown"}>(
-      ${h},
-      ${q});
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  builder: () => builder,
+  default: () => src_default,
+  generateAxios: () => generateAxios,
+  generateAxiosFooter: () => generateAxiosFooter,
+  generateAxiosFunctions: () => generateAxiosFunctions,
+  generateAxiosHeader: () => generateAxiosHeader,
+  generateAxiosTitle: () => generateAxiosTitle,
+  getAxiosDependencies: () => getAxiosDependencies
+});
+module.exports = __toCommonJS(src_exports);
+var import_core = require("@orval/core");
+var AXIOS_DEPENDENCIES = [
+  {
+    exports: [
+      {
+        name: "axios",
+        default: true,
+        values: true,
+        syntheticDefaultImport: true
+      },
+      { name: "AxiosRequestConfig" },
+      { name: "AxiosResponse" }
+    ],
+    dependency: "axios"
+  }
+];
+var PARAMS_SERIALIZER_DEPENDENCIES = [
+  {
+    exports: [
+      {
+        name: "qs",
+        default: true,
+        values: true,
+        syntheticDefaultImport: true
+      }
+    ],
+    dependency: "qs"
+  }
+];
+var returnTypesToWrite = /* @__PURE__ */ new Map();
+var getAxiosDependencies = (hasGlobalMutator, hasParamsSerializerOptions) => [
+  ...!hasGlobalMutator ? AXIOS_DEPENDENCIES : [],
+  ...hasParamsSerializerOptions ? PARAMS_SERIALIZER_DEPENDENCIES : []
+];
+var generateAxiosImplementation = ({
+  headers,
+  queryParams,
+  operationName,
+  response,
+  mutator,
+  body,
+  props,
+  verb,
+  override,
+  formData,
+  formUrlEncoded,
+  paramsSerializer
+}, { route, context }) => {
+  var _a, _b;
+  const isRequestOptions = (override == null ? void 0 : override.requestOptions) !== false;
+  const isFormData = (override == null ? void 0 : override.formData) !== false;
+  const isFormUrlEncoded = (override == null ? void 0 : override.formUrlEncoded) !== false;
+  const isExactOptionalPropertyTypes = !!((_b = (_a = context.tsconfig) == null ? void 0 : _a.compilerOptions) == null ? void 0 : _b.exactOptionalPropertyTypes);
+  const isSyntheticDefaultImportsAllowed = (0, import_core.isSyntheticDefaultImportsAllow)(
+    context.tsconfig
+  );
+  const bodyForm = (0, import_core.generateFormDataAndUrlEncodedFunction)({
+    formData,
+    formUrlEncoded,
+    body,
+    isFormData,
+    isFormUrlEncoded
+  });
+  const isBodyVerb = import_core.VERBS_WITH_BODY.includes(verb);
+  if (mutator) {
+    const mutatorConfig = (0, import_core.generateMutatorConfig)({
+      route,
+      body,
+      headers,
+      queryParams,
+      response,
+      verb,
+      isFormData,
+      isFormUrlEncoded,
+      isBodyVerb,
+      hasSignal: false,
+      isExactOptionalPropertyTypes
+    });
+    const requestOptions = isRequestOptions ? (0, import_core.generateMutatorRequestOptions)(
+      override == null ? void 0 : override.requestOptions,
+      mutator.hasSecondArg
+    ) : "";
+    returnTypesToWrite.set(
+      operationName,
+      (title) => `export type ${(0, import_core.pascal)(
+        operationName
+      )}Result = NonNullable<Awaited<ReturnType<${title ? `ReturnType<typeof ${title}>['${operationName}']` : `typeof ${operationName}`}>>>`
+    );
+    const propsImplementation = mutator.bodyTypeName && body.definition ? (0, import_core.toObjectString)(props, "implementation").replace(
+      new RegExp(`(\\w*):\\s?${body.definition}`),
+      `$1: ${mutator.bodyTypeName}<${body.definition}>`
+    ) : (0, import_core.toObjectString)(props, "implementation");
+    return `const ${operationName} = (
+    ${propsImplementation}
+ ${isRequestOptions && mutator.hasSecondArg ? `options?: SecondParameter<typeof ${mutator.name}>,` : ""}) => {${bodyForm}
+      return ${mutator.name}<${response.definition.success || "unknown"}>(
+      ${mutatorConfig},
+      ${requestOptions});
     }
-  `}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});
+  `;
   }
-`},B= exports.generateAxiosTitle =e=>{let s=_core.sanitize.call(void 0, e);return`get${_core.pascal.call(void 0, s)}`},D= exports.generateAxiosHeader =({title:e,isRequestOptions:s,isMutator:n,noFunction:i})=>`
-${s&&n?`// eslint-disable-next-line
+  const options = (0, import_core.generateOptions)({
+    route,
+    body,
+    headers,
+    queryParams,
+    response,
+    verb,
+    requestOptions: override == null ? void 0 : override.requestOptions,
+    isFormData,
+    isFormUrlEncoded,
+    paramsSerializer,
+    paramsSerializerOptions: override == null ? void 0 : override.paramsSerializerOptions,
+    isExactOptionalPropertyTypes,
+    hasSignal: false
+  });
+  returnTypesToWrite.set(
+    operationName,
+    () => `export type ${(0, import_core.pascal)(operationName)}Result = AxiosResponse<${response.definition.success || "unknown"}>`
+  );
+  return `const ${operationName} = <TData = AxiosResponse<${response.definition.success || "unknown"}>>(
+    ${(0, import_core.toObjectString)(props, "implementation")} ${isRequestOptions ? `options?: AxiosRequestConfig
+` : ""} ): Promise<TData> => {${bodyForm}
+    return axios${!isSyntheticDefaultImportsAllowed ? ".default" : ""}.${verb}(${options});
+  }
+`;
+};
+var generateAxiosTitle = (title) => {
+  const sanTitle = (0, import_core.sanitize)(title);
+  return `get${(0, import_core.pascal)(sanTitle)}`;
+};
+var generateAxiosHeader = ({
+  title,
+  isRequestOptions,
+  isMutator,
+  noFunction
+}) => `
+${isRequestOptions && isMutator ? `// eslint-disable-next-line
   type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
   args: infer P,
@@ -19,13 +175,76 @@ ${s&&n?`// eslint-disable-next-line
   ? P
   : never;
 
-`:""}
-  ${i?"":`export const ${e} = () => {
-`}`,R= exports.generateAxiosFooter =({operationNames:e,title:s,noFunction:n,hasMutator:i,hasAwaitedType:a})=>{let o="";return n||(o+=`return {${e.join(",")}}};
-`),i&&!a&&(o+=`
+` : ""}
+  ${!noFunction ? `export const ${title} = () => {
+` : ""}`;
+var generateAxiosFooter = ({
+  operationNames,
+  title,
+  noFunction,
+  hasMutator,
+  hasAwaitedType
+}) => {
+  let footer = "";
+  if (!noFunction) {
+    footer += `return {${operationNames.join(",")}}};
+`;
+  }
+  if (hasMutator && !hasAwaitedType) {
+    footer += `
 type AwaitedInput<T> = PromiseLike<T> | T;
 
     type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
 
-`),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;
+`;
+  }
+  operationNames.forEach((operationName) => {
+    if (returnTypesToWrite.has(operationName)) {
+      const func = returnTypesToWrite.get(operationName);
+      footer += func(!noFunction ? title : void 0) + "\n";
+    }
+  });
+  return footer;
+};
+var generateAxios = (verbOptions, options) => {
+  const imports = (0, import_core.generateVerbImports)(verbOptions);
+  const implementation = generateAxiosImplementation(verbOptions, options);
+  return { implementation, imports };
+};
+var generateAxiosFunctions = async (verbOptions, options) => {
+  const { implementation, imports } = generateAxios(verbOptions, options);
+  return {
+    implementation: "export " + implementation,
+    imports
+  };
+};
+var axiosClientBuilder = {
+  client: generateAxios,
+  header: generateAxiosHeader,
+  dependencies: getAxiosDependencies,
+  footer: generateAxiosFooter,
+  title: generateAxiosTitle
+};
+var axiosFunctionsClientBuilder = {
+  client: generateAxiosFunctions,
+  header: (options) => generateAxiosHeader({ ...options, noFunction: true }),
+  dependencies: getAxiosDependencies,
+  footer: (options) => generateAxiosFooter({ ...options, noFunction: true }),
+  title: generateAxiosTitle
+};
+var builders = {
+  axios: axiosClientBuilder,
+  "axios-functions": axiosFunctionsClientBuilder
+};
+var builder = ({ type = "axios-functions" } = {}) => () => builders[type];
+var src_default = builder;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  builder,
+  generateAxios,
+  generateAxiosFooter,
+  generateAxiosFunctions,
+  generateAxiosHeader,
+  generateAxiosTitle,
+  getAxiosDependencies
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orval/axios",
-  "version": "6.19.0",
+  "version": "6.20.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -8,11 +8,11 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup ./src/index.ts --target node12 --minify --clean --dts --splitting",
+    "build": "tsup ./src/index.ts --target node12 --clean --dts",
     "dev": "tsup ./src/index.ts --target node12 --clean --watch src",
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
-    "@orval/core": "6.19.0"
+    "@orval/core": "6.20.0"
   }
 }