Type Axios -> AxiosInstance

1cedsoda · Feb 1, 2024 · 00e8464 · 00e8464
1 parent 354da99
commit 00e8464
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 260 deletions.
diff --git a/packages/ts-axios/package.json b/packages/ts-axios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pastapi-ts-axios",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "dist/index",
   "types": "dist/index",
   "files": [

diff --git a/packages/ts-axios/src/class.ts b/packages/ts-axios/src/class.ts
@@ -3,9 +3,9 @@ import { fuck } from "./helpers";
 
 export const apiClass = (ast: Operation[]) => `
 export class Client {
-  public axiosInstance: Axios
+  public axiosInstance: AxiosInstance
   constructor (
-    axiosInstance?: Axios,
+    axiosInstance?: AxiosInstance,
   ) {
     this.axiosInstance = axiosInstance ?? axios.create()
   }

diff --git a/packages/ts-axios/src/index.ts b/packages/ts-axios/src/index.ts
@@ -12,7 +12,7 @@ export const generate = (ops: Operation[], prettierConfig?: Options | undefined)
 export const generateRaw = (ops: Operation[]): string => `${buildHeader()}
 
 import { z } from "zod";
-import axios, { AxiosRequestConfig, Axios } from "axios";
+import axios, { AxiosRequestConfig, AxiosInstance } from "axios";
 
 ${operationNamespaces(ops)}
 ${apiClass(ops)}

diff --git a/packages/ts-axios/src/namespace.ts b/packages/ts-axios/src/namespace.ts
@@ -44,7 +44,7 @@ const operationNamespace = (o: Operation) => {
       )}
     }
 
-    export const request = async (axios: Axios, vars: Variables, config?: AxiosRequestConfig<${
+    export const request = async (axios: AxiosInstance, vars: Variables, config?: AxiosRequestConfig<${
       o.requestBodies.length > 0 ? `Pick<RequestBody, "body">` : `undefined`
     }>) => axios.request<RequestBody, ResponseBody>({
       method: "${o.method}",

diff --git a/packages/ts-axios/test/api1/gen/client.ts b/packages/ts-axios/test/api1/gen/client.ts
@@ -6,7 +6,7 @@
 */
 
 import { z } from "zod";
-import axios, { AxiosRequestConfig, Axios } from "axios";
+import axios, { AxiosRequestConfig, AxiosInstance } from "axios";
 
 export namespace GetUser {
   export const requestBodySchemas = {};
@@ -30,7 +30,7 @@ export namespace GetUser {
   export type Variables = RequestBody & {};
 
   export const request = async (
-    axios: Axios,
+    axios: AxiosInstance,
     vars: Variables,
     config?: AxiosRequestConfig<undefined>,
   ) =>
@@ -71,7 +71,7 @@ export namespace PostUser {
   export type Variables = RequestBody & {};
 
   export const request = async (
-    axios: Axios,
+    axios: AxiosInstance,
     vars: Variables,
     config?: AxiosRequestConfig<Pick<RequestBody, "body">>,
   ) =>
@@ -113,7 +113,7 @@ export namespace GetUserId {
   };
 
   export const request = async (
-    axios: Axios,
+    axios: AxiosInstance,
     vars: Variables,
     config?: AxiosRequestConfig<undefined>,
   ) =>
@@ -155,7 +155,7 @@ export namespace GetCookie {
   };
 
   export const request = async (
-    axios: Axios,
+    axios: AxiosInstance,
     vars: Variables,
     config?: AxiosRequestConfig<undefined>,
   ) =>
@@ -201,7 +201,7 @@ export namespace GetHeader {
   };
 
   export const request = async (
-    axios: Axios,
+    axios: AxiosInstance,
     vars: Variables,
     config?: AxiosRequestConfig<undefined>,
   ) =>
@@ -250,7 +250,7 @@ export namespace GetQuery {
   };
 
   export const request = async (
-    axios: Axios,
+    axios: AxiosInstance,
     vars: Variables,
     config?: AxiosRequestConfig<undefined>,
   ) =>
@@ -289,7 +289,7 @@ export namespace GetError {
   export type Variables = RequestBody & {};
 
   export const request = async (
-    axios: Axios,
+    axios: AxiosInstance,
     vars: Variables,
     config?: AxiosRequestConfig<undefined>,
   ) =>
@@ -304,8 +304,8 @@ export namespace GetError {
 }
 
 export class Client {
-  public axiosInstance: Axios;
-  constructor(axiosInstance?: Axios) {
+  public axiosInstance: AxiosInstance;
+  constructor(axiosInstance?: AxiosInstance) {
     this.axiosInstance = axiosInstance ?? axios.create();
   }