Skip to content
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
[typescript-fetch] override with init params even if initOverrides is…
… function
  • Loading branch information
mkusaka committed Apr 23, 2022
commit 6ac3a92ef8b902416c876f04eacb26fdc9c2d1b8
Original file line number Diff line number Diff line change
Expand Up @@ -123,24 +123,35 @@ export class BaseAPI {
const headers = Object.assign({}, this.configuration.headers, context.headers);
Object.keys(headers).forEach(key => headers[key] === undefined ? delete headers[key] : {});

const initOverrideFn: InitOverideFunction = typeof initOverrides === "function" ? initOverrides : async (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => ({...requestContext.init, ...initOverrides});

const initWithOverride = await initOverrideFn({
init: {
method: context.method,
headers,
body: context.body,
credentials: this.configuration.credentials,
},
context
})
const initOverrideFn =
typeof initOverrides === "function"
? initOverrides
: async () => initOverrides;

const initParams = {
method: context.method,
headers,
body: context.body,
credentials: this.configuration.credentials,
};

const overridedInit: RequestInit = {
...initParams,
...(await initOverrideFn({
init: initParams,
context,
}))
}

const init: RequestInit = {
...initWithOverride,
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}
...overridedInit,
body:
isFormData(overridedInit.body) ||
overridedInit.body instanceof URLSearchParams ||
isBlob(overridedInit.body)
? overridedInit.body
: JSON.stringify(overridedInit.body),
};

return { url, init };
}
Expand Down Expand Up @@ -185,6 +196,10 @@ function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

export class ResponseError extends Error {
name: "ResponseError" = "ResponseError";
constructor(public response: Response, msg?: string) {
Expand Down