fix(types): Re-export AxiosHeaders as class (#26)

JoseLion · Jan 26, 2023 · c234057 · c234057
1 parent 5587d96
commit c234057
Show file tree

Hide file tree

Showing 8 changed files with 618 additions and 334 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -113,7 +113,7 @@ workflows:
             parameters:
               nodejs: ["16", "17", "18", "19"]
               rxjs: ["5.5.12", "6.6.7", "7.8.0"]
-              axios: ["1.0.0", "1.1.3", "1.2.2"]
+              axios: ["1.0.0", "1.1.3", "1.2.4"]
 
       - release:
           requires:

diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,6 @@ dist.tar.gz
 
 ### Logs ###
 *.log
+
+### VSCode ###
+.vscode/
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/package.json b/package.json
@@ -39,17 +39,17 @@
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.11.18",
     "@types/sinon": "^10.0.13",
-    "@typescript-eslint/eslint-plugin": "^5.47.1",
-    "@typescript-eslint/parser": "^5.47.1",
-    "axios": "^1.2.2",
-    "eslint": "^8.31.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.6.4",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "axios": "^1.2.4",
+    "eslint": "^8.32.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsdoc": "^39.6.8",
     "form-data": "^4.0.0",
     "mocha": "^10.2.0",
-    "msw": "^0.49.2",
+    "msw": "^1.0.0",
     "rxjs": "^7.8.0",
-    "semantic-release": "^19.0.5",
+    "semantic-release": "^20.1.0",
     "sinon": "^15.0.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.1",

diff --git a/src/index.ts b/src/index.ts
@@ -11,10 +11,10 @@ export type AxiosObservable<T> = Observable<AxiosResponse<T>>;
  */
 export {
   AxiosError,
+  AxiosHeaders,
   CanceledError,
   type AxiosAdapter,
   type AxiosBasicCredentials,
-  type AxiosHeaders,
   type AxiosInterceptorManager,
   type AxiosInterceptorOptions,
   type AxiosProgressEvent,
@@ -51,7 +51,6 @@ export {
   RxjsAxios as Axios,
   AxiosRequestTransformer,
   AxiosResponseTransformer,
-  RxjsAxiosDefaults as AxiosDefaults,
 } from "./lib/RxjsAxios";
 
 export const axios = RxjsAxios.of(defaultAxios);
diff --git a/src/lib/RxjsAxios.ts b/src/lib/RxjsAxios.ts
@@ -1,11 +1,12 @@
 import axios, {
-  AxiosDefaults,
   AxiosError,
   AxiosInstance,
   AxiosInterceptorManager,
   AxiosRequestConfig,
   AxiosRequestHeaders,
-  AxiosResponse, AxiosResponseHeaders, Cancel,
+  AxiosResponse,
+  AxiosResponseHeaders,
+  Cancel,
   CreateAxiosDefaults,
   FormSerializerOptions,
   GenericFormData,
@@ -28,11 +29,6 @@ export type AxiosResponseTransformer<T> = (
   status?: number
 ) => T;
 
-export interface RxjsAxiosDefaults<T = unknown> extends AxiosDefaults<T> {
-  transformRequest?: AxiosRequestTransformer<T> | AxiosRequestTransformer<T>[];
-  transformResponse?: AxiosResponseTransformer<T> | AxiosResponseTransformer<T>[];
-}
-
 interface Interceptors {
   request: AxiosInterceptorManager<AxiosRequestConfig<unknown>>;
   response: AxiosInterceptorManager<AxiosResponse<unknown>>;
@@ -81,7 +77,7 @@ export class RxjsAxios {
     return axios.formToJSON(form);
   }
 
-  public get defaults(): RxjsAxiosDefaults {
+  public get defaults(): CreateAxiosDefaults<unknown> {
     return this.axios.defaults;
   }
 

diff --git a/test/lib/observify.test.ts b/test/lib/observify.test.ts
@@ -1,12 +1,12 @@
 import { expect } from "@stackbuilders/assertive-ts";
-import { AxiosError, AxiosResponse } from "axios";
+import { AxiosError, AxiosHeaders, AxiosResponse } from "axios";
 import Sinon from "sinon";
 
 import { observify } from "../../src/lib/observify";
 import { delay } from "../helpers/async.helpers";
 
 const RESPONSE: AxiosResponse<string> = {
-  config: { },
+  config: { headers: AxiosHeaders.from() },
   data: "ok",
   headers: { ["Content-Type"]: "plain/text" },
   status: 200,