Skip to content

Commit b7e5f2e

Browse files
committed
Merge remote-tracking branch 'origin/main' into support-custom-path-serializer
2 parents 48c85b9 + 7527d1e commit b7e5f2e

File tree

6 files changed

+611
-53
lines changed

6 files changed

+611
-53
lines changed

.changeset/empty-rooms-attack.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"openapi-fetch": patch
3+
---
4+
5+
Fix Request parameter being ignored by client methods

.github/workflows/issue-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
close-issues:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/stale@v9
11+
- uses: actions/stale@v10
1212
with:
1313
stale-issue-message: "This issue is stale because it has been open for 180 days with no activity. If there is no activity in the next 7 days, the issue will be closed."
1414
close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale. Please open a new issue if you believe you are encountering a related problem."

packages/openapi-fetch/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"axios": "^1.12.2",
6666
"execa": "catalog:",
6767
"express": "^5.1.0",
68-
"feature-fetch": "^0.0.43",
68+
"feature-fetch": "^0.0.51",
6969
"node-forge": "^1.3.1",
7070
"openapi-typescript": "workspace:^",
7171
"openapi-typescript-codegen": "^0.29.0",

packages/openapi-fetch/src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export default function createClient(clientOptions) {
113113

114114
let id;
115115
let options;
116-
let request = new CustomRequest(
116+
let request = new Request(
117117
createFinalURL(schemaPath, { baseUrl: finalBaseUrl, params, querySerializer, pathSerializer }),
118118
requestInit,
119119
);
@@ -148,7 +148,7 @@ export default function createClient(clientOptions) {
148148
id,
149149
});
150150
if (result) {
151-
if (result instanceof CustomRequest) {
151+
if (result instanceof Request) {
152152
request = result;
153153
} else if (result instanceof Response) {
154154
response = result;

packages/openapi-fetch/test/common/request.test.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ describe("request", () => {
296296
});
297297

298298
test("uses provided Request class", async () => {
299-
// santity check to make sure the profided fetch function is actually called
299+
// sanity check to make sure the provided fetch function is actually called
300300
expect.assertions(1);
301301

302302
class SpecialRequestImplementation extends Request {}
@@ -316,6 +316,26 @@ describe("request", () => {
316316
await client.GET("/resources");
317317
});
318318

319+
test("Can use custom Request class", async () => {
320+
// sanity check to make sure the provided fetch function is actually called
321+
expect.assertions(1);
322+
323+
class SpecialRequestImplementation extends Request {}
324+
325+
const customFetch = async (input: Request) => {
326+
// make sure that the request is actually an instance of the custom request we provided
327+
expect(input).instanceOf(SpecialRequestImplementation);
328+
return Promise.resolve(Response.json({ hello: "world" }));
329+
};
330+
331+
const client = createClient<paths>({
332+
baseUrl: "https://fakeurl.example",
333+
fetch: customFetch,
334+
});
335+
336+
await client.GET("/resources", { Request: SpecialRequestImplementation });
337+
});
338+
319339
test("can attach custom properties to request", async () => {
320340
function createCustomFetch(data: any) {
321341
const response = {

0 commit comments

Comments
 (0)