Skip to content

feats(transform): #208

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.

Sign up for GitHub

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

Merged
danybeltran merged 1 commit into from
Jul 27, 2025
Merged

feats(transform): #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "http-react",
"version": "3.7.8",
"version": "3.7.9",
"description": "React hooks for data fetching",
"main": "dist/index.js",
"scripts": {
Expand Down
104 changes: 51 additions & 53 deletions src/hooks/others.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ export function useFetchConfig(id?: unknown) {
return thisConfig as FetchInit & FetchContextType
}

export function useFetchSuspense<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useFetchSuspense<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
let o =
typeof init === 'string'
Expand Down Expand Up @@ -224,13 +224,13 @@ export function useSuccess(id: any) {
* @deprecated - Use the useFetch hook instead
* Get everything from a `useFetch` call using its id
*/
export function useFetchId<ResponseType = any, BodyType = any>(id: any) {
export function useFetchId<ResponseType = any>(id: any) {
const defaultsKey = serialize({
idString: serialize(id)
})
const def = fetcherDefaults.get(defaultsKey)

return useFetch<ResponseType, BodyType>({
return useFetch<ResponseType>({
id,
default: def
})
Expand Down Expand Up @@ -289,9 +289,9 @@ export function useResolve<ResponseType = any, VT = any>(
/**
* User a `GET` request
*/
export function useGET<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useGET<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -302,9 +302,9 @@ export function useGET<FetchDataType = any, BodyType = any>(
/**
* Use a `DELETE` request
*/
export function useDELETE<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useDELETE<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -315,9 +315,9 @@ export function useDELETE<FetchDataType = any, BodyType = any>(
/**
* Use a `HEAD` request
*/
export function useHEAD<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useHEAD<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -328,9 +328,9 @@ export function useHEAD<FetchDataType = any, BodyType = any>(
/**
* Use an `OPTIONS` request
*/
export function useOPTIONS<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useOPTIONS<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -342,9 +342,9 @@ export function useOPTIONS<FetchDataType = any, BodyType = any>(
/**
* Use a `POST` request
*/
export function usePOST<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function usePOST<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -355,9 +355,9 @@ export function usePOST<FetchDataType = any, BodyType = any>(
/**
* Use a `PUT` request
*/
export function usePUT<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function usePUT<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -368,9 +368,9 @@ export function usePUT<FetchDataType = any, BodyType = any>(
/**
* Use a `PATCH` request
*/
export function usePATCH<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function usePATCH<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -381,9 +381,9 @@ export function usePATCH<FetchDataType = any, BodyType = any>(
/**
* Use a `PURGE` request
*/
export function usePURGE<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function usePURGE<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -394,9 +394,9 @@ export function usePURGE<FetchDataType = any, BodyType = any>(
/**
* Use a `LINK` request
*/
export function useLINK<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useLINK<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -407,9 +407,9 @@ export function useLINK<FetchDataType = any, BodyType = any>(
/**
* Use an `UNLINK` request
*/
export function useUNLINK<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useUNLINK<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -420,9 +420,9 @@ export function useUNLINK<FetchDataType = any, BodyType = any>(
/**
* Use a request without making it automatically
*/
export function useManualFetch<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useManualFetch<FetchDataType = any>(
init: FetchConfigType<FetchDataType> | string,
options?: FetchConfigTypeNoUrl<FetchDataType>
) {
return useFetch(init, {
...options,
Expand All @@ -433,15 +433,13 @@ export function useManualFetch<FetchDataType = any, BodyType = any>(
/**
* Get a blob of the response. You can pass an `objectURL` property that will convet that blob into a string using `URL.createObjectURL`
*/
export function useFetchBlob<FetchDataType = string, BodyType = any>(
init:
| (FetchConfigType<FetchDataType, BodyType> & { objectURL?: boolean })
| string,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType> & {
export function useFetchBlob<FetchDataType = string>(
init: (FetchConfigType<FetchDataType> & { objectURL?: boolean }) | string,
options?: FetchConfigTypeNoUrl<FetchDataType> & {
objectURL?: boolean
}
) {
return useFetch<FetchDataType, BodyType>(init, {
return useFetch<FetchDataType>(init, {
...options,
async resolver(res) {
const blob = await res.blob()
Expand All @@ -463,11 +461,11 @@ export function useFetchBlob<FetchDataType = string, BodyType = any>(
/**
* Get a text of the response
*/
export function useFetchText<FetchDataType = string, BodyType = any>(
init: FetchConfigType<string, BodyType> | string,
options?: FetchConfigTypeNoUrl<string, BodyType>
export function useFetchText<FetchDataType = string>(
init: FetchConfigType<string> | string,
options?: FetchConfigTypeNoUrl<string>
) {
return useFetch<string, BodyType>(init, {
return useFetch<string>(init, {
...options,
async resolver(res) {
const text = await res.text()
Expand Down Expand Up @@ -503,21 +501,21 @@ export function useRequestEnd(id: any) {
/**
* Debounce a fetch by the time given
*/
export function useDebounceFetch<FetchDataType = any, BodyType = any>(
export function useDebounceFetch<FetchDataType = any>(
init:
| (Omit<FetchConfigType<FetchDataType, BodyType>, 'debounce'> & {
| (Omit<FetchConfigType<FetchDataType>, 'debounce'> & {
debounce?: TimeSpan
})
| string
| Request,
options?: Omit<FetchConfigTypeNoUrl<FetchDataType, BodyType>, 'debounce'> & {
options?: Omit<FetchConfigTypeNoUrl<FetchDataType>, 'debounce'> & {
debounce?: TimeSpan
}
) {
// @ts-ignore - auto can be present in the first arg
const canDebounce = init?.auto ?? options?.auto ?? true

const res = useFetch<FetchDataType, BodyType>(init, {
const res = useFetch<FetchDataType>(init, {
...options,
auto: false
})
Expand Down Expand Up @@ -550,7 +548,7 @@ export function useGql<T = any, VT = { [k: string]: any }>(
value: T
variables: VT
},
cfg: FetchConfigTypeNoUrl<T, any> & {
cfg: FetchConfigTypeNoUrl<T> & {
/**
* GraphQL variables
*/
Expand Down
16 changes: 8 additions & 8 deletions src/hooks/use-fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ const temporaryFormData = new Map()
/**
* Fetch hook
*/
export function useFetch<FetchDataType = any, BodyType = any>(
init: FetchConfigType<FetchDataType, BodyType> | string | Request,
options?: FetchConfigTypeNoUrl<FetchDataType, BodyType>
export function useFetch<FetchDataType = any, TransformData = any>(
init: FetchConfigType<FetchDataType, TransformData> | string | Request,
options?: FetchConfigTypeNoUrl<FetchDataType, TransformData>
) {
const $ctx = useHRFContext()

Expand Down Expand Up @@ -129,7 +129,7 @@ export function useFetch<FetchDataType = any, BodyType = any>(
...options,
// @ts-expect-error
id: init?.id ?? init?.key
} as FetchConfigType<FetchDataType, BodyType>)
} as Required<FetchConfigType<FetchDataType, TransformData>>)

const {
onOnline = ctx.onOnline,
Expand All @@ -143,7 +143,7 @@ export function useFetch<FetchDataType = any, BodyType = any>(
method = isRequest ? init.method : (METHODS.GET as HTTP_METHODS),
headers = {} as Headers,
body = undefined as unknown as Body,
formatBody = e => JSON.stringify(e),
formatBody = (e: any) => JSON.stringify(e),
resolver = isFunction(ctx.resolver) ? ctx.resolver : DEFAULT_RESOLVER,
onError,
auto = isDefined(ctx.auto) ? ctx.auto : true,
Expand Down Expand Up @@ -523,7 +523,7 @@ export function useFetch<FetchDataType = any, BodyType = any>(

const fetchData = useCallback(
async function fetchData(
c: { headers?: any; body?: BodyType; query?: any; params?: any } = {}
c: { headers?: any; body?: any; query?: any; params?: any } = {}
) {
const rawUrl =
(hasBaseUrl(url)
Expand Down Expand Up @@ -1790,7 +1790,7 @@ Learn more: https://httpr.vercel.app/docs/api#suspense
loadingFirst: boolean
isLoadingFirst: boolean
expiration: Date
data: FetchDataType
data: 0 extends 1 & TransformData ? FetchDataType : TransformData
isPending?: boolean
loading: boolean
isLoading: boolean
Expand All @@ -1806,7 +1806,7 @@ Learn more: https://httpr.vercel.app/docs/api#suspense
) => FetchDataType
fetcher: ImperativeFetch
abort: () => void
config: FetchConfigType<FetchDataType, BodyType> & {
config: Required<FetchConfigType<FetchDataType, TransformData>> & {
baseUrl: string
url: string
rawUrl: string
Expand Down
Loading