refactor: Adjust class name

Author: igorjacauna

src/index.ts

@@ -1,6 +1,6 @@
 import { type AxiosInstance } from 'axios';
-import Adapter from './runtime/adapter';
+import Proxy from './runtime/proxy';
 
 export function defineProxy(apiInstance: AxiosInstance) {
-  return new Adapter(apiInstance);
+  return new Proxy(apiInstance);
 }

src/runtime/helpers.ts

@@ -0,0 +1,46 @@
+import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+import { isEqual } from 'ohash';
+
+export function hasSameParams(requestParams: object, proxyParams?: object) {
+  if (!proxyParams) return true;
+  return isEqual(requestParams, proxyParams);
+}
+
+export function matchRequest(
+  verb: string,
+  path: string,
+  config: AxiosRequestConfig,
+  params?: object,
+) {
+  return (
+    config.method === verb &&
+    config.url === path &&
+    hasSameParams(config.params, params)
+  );
+}
+
+export function matchResponse(
+  verb: string,
+  path: string,
+  response: AxiosResponse,
+  params?: object,
+) {
+  return (
+    response.config.method === verb &&
+    response.config.url === path &&
+    hasSameParams(response.config.params, params)
+  );
+}
+
+export function ejectFromRequest(axios: AxiosInstance, id: number) {
+  axios.interceptors.request.eject(id);
+}
+
+export function ejectFromResponse(axios: AxiosInstance, id: number) {
+  axios.interceptors.response.eject(id);
+}
+
+export function clearAll(axios: AxiosInstance) {
+  axios.interceptors.request.clear();
+  axios.interceptors.response.clear();
+}

src/runtime/adapter.ts src/runtime/proxy.tssrc/runtime/adapter.ts renamed to src/runtime/proxy.ts

@@ -1,20 +1,13 @@
-import type {
-  AxiosResponse,
-  AxiosInstance,
-  AxiosRequestConfig,
-  InternalAxiosRequestConfig,
-} from 'axios';
-import { isEqual } from 'ohash';
-
-type RouteConfig = (
-  config?: AxiosRequestConfig,
-) => [number, unknown] | Promise<[number, unknown]>;
-
-type RequestConfigChanger = (
-  config: InternalAxiosRequestConfig,
-) => InternalAxiosRequestConfig;
-
-export default class Adapter {
+import type { AxiosResponse, AxiosInstance } from 'axios';
+import {
+  clearAll,
+  ejectFromRequest,
+  ejectFromResponse,
+  matchRequest,
+  matchResponse,
+} from './helpers';
+
+export default class Proxy {
   axios: AxiosInstance;
 
   verb!: string;
@@ -30,48 +23,15 @@ export default class Adapter {
     this.once = false;
   }
 
-  private hasSameParams(requestParams: object, proxyParams?: object) {
-    if (!proxyParams) return true;
-    return isEqual(requestParams, proxyParams);
-  }
-
-  private matchRequest(
-    verb: string,
-    path: string,
-    config: AxiosRequestConfig,
-    params?: object,
-  ) {
-    return (
-      config.method === verb &&
-      config.url === path &&
-      this.hasSameParams(config.params, params)
-    );
-  }
-
-  private matchResponse(
-    verb: string,
-    path: string,
-    response: AxiosResponse,
-    params?: object,
-  ) {
-    return (
-      response.config.method === verb &&
-      response.config.url === path &&
-      this.hasSameParams(response.config.params, params)
-    );
-  }
-
   private setProxy(statusCodeOrFunction: number | RouteConfig, mock?: unknown) {
     const verbConfig = this.verb;
     const pathConfig = this.path;
     const onceConfig = this.once;
     const paramsConfig = this.params;
     const interceptorId = this.axios.interceptors.request.use(requestConfig => {
-      if (
-        this.matchRequest(verbConfig, pathConfig, requestConfig, paramsConfig)
-      ) {
+      if (matchRequest(verbConfig, pathConfig, requestConfig, paramsConfig)) {
         requestConfig.adapter = config => {
-          if (onceConfig) this.ejectFromRequest(interceptorId);
+          if (onceConfig) ejectFromRequest(this.axios, interceptorId);
           return new Promise((resolve, reject) => {
             if (typeof statusCodeOrFunction === 'function') {
               Promise.resolve(statusCodeOrFunction(requestConfig)).then(
@@ -110,30 +70,30 @@ export default class Adapter {
     });
   }
 
-  private setRequestConfigChanger(configChanger: RequestConfigChanger) {
+  private setRequestConfigChanger(
+    configChanger: RequestConfigChanger,
+    once = false,
+  ) {
     const verbConfig = this.verb;
     const pathConfig = this.path;
     const paramsConfig = this.params;
     const interceptorId = this.axios.interceptors.request.use(requestConfig => {
-      if (
-        this.matchRequest(verbConfig, pathConfig, requestConfig, paramsConfig)
-      ) {
-        if (this.once) this.ejectFromRequest(interceptorId);
+      if (matchRequest(verbConfig, pathConfig, requestConfig, paramsConfig)) {
+        if (once) ejectFromRequest(this.axios, interceptorId);
         const result = configChanger(requestConfig);
         return result;
       }
       return requestConfig;
     });
   }
 
-  private setPrintableResponse() {
+  private setPrintableResponse(once = false) {
     const verbConfig = this.verb;
     const pathConfig = this.path;
     const paramsConfig = this.params;
-    const onceConfig = this.once;
     const interceptorId = this.axios.interceptors.response.use(response => {
-      if (this.matchResponse(verbConfig, pathConfig, response, paramsConfig)) {
-        if (onceConfig) this.ejectFromResponse(interceptorId);
+      if (matchResponse(verbConfig, pathConfig, response, paramsConfig)) {
+        if (once) ejectFromResponse(this.axios, interceptorId);
         console.log('Response from:', this.path);
         console.log(JSON.stringify(response.data, null, 2));
       }
@@ -148,17 +108,8 @@ export default class Adapter {
     return this;
   }
 
-  private ejectFromRequest(id: number) {
-    this.axios.interceptors.request.eject(id);
-  }
-
-  private ejectFromResponse(id: number) {
-    this.axios.interceptors.response.eject(id);
-  }
-
   clear() {
-    this.axios.interceptors.request.clear();
-    this.axios.interceptors.response.clear();
+    clearAll(this.axios);
   }
 
   reply(statusCodeOrConfig: number | RouteConfig, mock?: unknown) {
@@ -174,26 +125,22 @@ export default class Adapter {
   }
 
   changeRequest(changer: RequestConfigChanger) {
-    this.once = false;
     this.setRequestConfigChanger(changer);
     return this;
   }
 
   changeRequestOnce(changer: RequestConfigChanger) {
-    this.once = true;
-    this.setRequestConfigChanger(changer);
+    this.setRequestConfigChanger(changer, true);
     return this;
   }
 
   printResponse() {
-    this.once = false;
     this.setPrintableResponse();
     return this;
   }
 
   printResponseOnce() {
-    this.once = true;
-    this.setPrintableResponse();
+    this.setPrintableResponse(true);
     return this;
   }
 

src/types.d.ts

@@ -0,0 +1,27 @@
+import type {
+  AxiosInstance,
+  AxiosRequestConfig,
+  InternalAxiosRequestConfig,
+} from 'axios';
+
+declare global {
+  type BaseToMix = new (...args: any[]) => {
+    axios: AxiosInstance;
+  };
+
+  type RouteConfig = (
+    config?: AxiosRequestConfig,
+  ) => [number, unknown] | Promise<[number, unknown]>;
+
+  type RequestConfigChanger = (
+    config: InternalAxiosRequestConfig,
+  ) => InternalAxiosRequestConfig;
+
+  type SetupRequestConfig = {
+    axios: AxiosInstance;
+    verb: string;
+    path: string;
+    params?: object;
+    once?: boolean;
+  };
+}