Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ dist.tar.gz

### Logs ###
*.log

### VSCode ###
.vscode/
3 changes: 0 additions & 3 deletions .vscode/settings.json

This file was deleted.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -51,7 +51,6 @@ export {
RxjsAxios as Axios,
AxiosRequestTransformer,
AxiosResponseTransformer,
RxjsAxiosDefaults as AxiosDefaults,
} from "./lib/RxjsAxios";

export const axios = RxjsAxios.of(defaultAxios);
12 changes: 4 additions & 8 deletions src/lib/RxjsAxios.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import axios, {
AxiosDefaults,
AxiosError,
AxiosInstance,
AxiosInterceptorManager,
AxiosRequestConfig,
AxiosRequestHeaders,
AxiosResponse, AxiosResponseHeaders, Cancel,
AxiosResponse,
AxiosResponseHeaders,
Cancel,
CreateAxiosDefaults,
FormSerializerOptions,
GenericFormData,
Expand All @@ -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>>;
Expand Down Expand Up @@ -81,7 +77,7 @@ export class RxjsAxios {
return axios.formToJSON(form);
}

public get defaults(): RxjsAxiosDefaults {
public get defaults(): CreateAxiosDefaults<unknown> {
return this.axios.defaults;
}

Expand Down
4 changes: 2 additions & 2 deletions test/lib/observify.test.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Loading