@brickflow/http 0.0.23 → 0.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/create-get.d.ts +16 -16
- package/dist/create-get.d.ts.map +1 -1
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
- package/src/create-get.ts +31 -33
package/dist/create-get.d.ts
CHANGED
|
@@ -1,32 +1,32 @@
|
|
|
1
1
|
import type { HttpClient, HttpKey, HttpParam, HttpResponseData } from './http';
|
|
2
2
|
import type { HttpError, UseHttpFn, UseHttpOptions, UseHttpResult } from './nuxt';
|
|
3
3
|
export interface CreateGetFactory<P extends HttpParam> {
|
|
4
|
-
<
|
|
4
|
+
<T extends string>(url: T, payload?: CreateGetPayload<T, CreateGetParams<T, P>>): (options?: CreateGetOptions<T, CreateGetParams<T, P>>) => Promise<CreateGetResult<T, CreateGetParams<T, P>>>;
|
|
5
5
|
}
|
|
6
|
-
export type CreateGetOptions<T extends
|
|
7
|
-
effect?: CreateGetEffect<T, P
|
|
8
|
-
isError?: CreateGetIsError<T
|
|
6
|
+
export type CreateGetOptions<T extends string, P extends HttpParam> = Omit<UseHttpOptions<HttpKey, P>, 'effect' | 'isError' | 'url'> & {
|
|
7
|
+
effect?: CreateGetEffect<T, P>;
|
|
8
|
+
isError?: CreateGetIsError<T>;
|
|
9
9
|
};
|
|
10
|
-
export type CreateGetPayload<T extends
|
|
11
|
-
effect?: CreateGetEffect<T, P
|
|
12
|
-
isError?: CreateGetIsError<T
|
|
13
|
-
mapParams?: UseHttpOptions<
|
|
10
|
+
export type CreateGetPayload<T extends string, P extends HttpParam> = {
|
|
11
|
+
effect?: CreateGetEffect<T, P>;
|
|
12
|
+
isError?: CreateGetIsError<T>;
|
|
13
|
+
mapParams?: UseHttpOptions<HttpKey, P>['mapParams'];
|
|
14
14
|
};
|
|
15
|
-
export type CreateGetResult<T extends
|
|
16
|
-
data: Exclude<CreateGetData<T
|
|
17
|
-
error: Extract<CreateGetData<T
|
|
15
|
+
export type CreateGetResult<T extends string, P extends HttpParam> = Omit<UseHttpResult<HttpKey, P>, 'data' | 'error'> & {
|
|
16
|
+
data: Exclude<CreateGetData<T>, HttpError> | null;
|
|
17
|
+
error: Extract<CreateGetData<T>, HttpError> | null;
|
|
18
18
|
};
|
|
19
|
-
type CreateGetData<T extends
|
|
20
|
-
type CreateGetEffect<T extends
|
|
19
|
+
type CreateGetData<T extends string> = T extends HttpKey ? HttpResponseData<T> : unknown;
|
|
20
|
+
type CreateGetEffect<T extends string, P extends HttpParam> = (data: CreateGetData<T>, config: CreateGetEffectConfig<P>) => void;
|
|
21
21
|
type CreateGetEffectConfig<P extends HttpParam> = {
|
|
22
22
|
cached: boolean;
|
|
23
23
|
params: P;
|
|
24
24
|
};
|
|
25
25
|
type CreateGetEmptyParams = Record<never, never>;
|
|
26
|
-
type CreateGetIsError<T extends
|
|
26
|
+
type CreateGetIsError<T extends string> = (payload: CreateGetData<T>) => boolean;
|
|
27
27
|
type CreateGetParamKeys<T extends string> = T extends `${string}:${infer Rest}` ? Rest extends `${infer Key}/${infer Tail}` ? CreateGetParamKeys<`/${Tail}`> | Key : Rest : never;
|
|
28
|
-
type CreateGetParams<T extends
|
|
29
|
-
type CreateGetPathParams<T extends
|
|
28
|
+
type CreateGetParams<T extends string, P extends HttpParam> = Omit<CreateGetPathParams<T>, keyof P> & P;
|
|
29
|
+
type CreateGetPathParams<T extends string> = [CreateGetParamKeys<T>] extends [never] ? CreateGetEmptyParams : {
|
|
30
30
|
[K in CreateGetParamKeys<T>]: string;
|
|
31
31
|
};
|
|
32
32
|
export declare function createUseCase<D>(): <T>(callback: (payload: D & {
|
package/dist/create-get.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-get.d.ts","sourceRoot":"","sources":["../src/create-get.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAEjF,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,SAAS;IACnD,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"create-get.d.ts","sourceRoot":"","sources":["../src/create-get.ts"],"names":[],"mappings":"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"}
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","names":[],"sources":["../src/create-get.ts","../src/http.ts"],"sourcesContent":["import type { HttpClient, HttpKey, HttpParam, HttpResponseData } from './http'\nimport type { HttpError, UseHttpFn, UseHttpOptions, UseHttpResult } from './nuxt'\n\nexport interface CreateGetFactory<P extends HttpParam> {\n <D = never, T extends HttpKey = HttpKey>(\n url: T,\n payload?: CreateGetPayload<T, CreateGetParams<T, P>, D>,\n ): (\n options?: CreateGetOptions<T, CreateGetParams<T, P>, D>,\n ) => Promise<CreateGetResult<T, CreateGetParams<T, P>, D>>\n}\nexport type CreateGetOptions<T extends HttpKey, P extends HttpParam, D = never> = Omit<\n UseHttpOptions<T, P>,\n 'effect' | 'isError' | 'url'\n> & {\n effect?: CreateGetEffect<T, P, D>\n isError?: CreateGetIsError<T, D>\n}\nexport type CreateGetPayload<T extends HttpKey, P extends HttpParam, D = never> = {\n effect?: CreateGetEffect<T, P, D>\n isError?: CreateGetIsError<T, D>\n mapParams?: UseHttpOptions<T, P>['mapParams']\n}\nexport type CreateGetResult<T extends HttpKey, P extends HttpParam, D = never> = Omit<\n UseHttpResult<T, P>,\n 'data' | 'error'\n> & {\n data: Exclude<CreateGetData<T, D>, HttpError> | null\n error: Extract<CreateGetData<T, D>, HttpError> | null\n}\n\ntype CreateGetData<T extends HttpKey, D> = [D] extends [never] ? HttpResponseData<T> : D\ntype CreateGetEffect<T extends HttpKey, P extends HttpParam, D = never> = (\n data: CreateGetData<T, D>,\n config: CreateGetEffectConfig<P>,\n) => void\ntype CreateGetEffectConfig<P extends HttpParam> = {\n cached: boolean\n params: P\n}\ntype CreateGetEmptyParams = Record<never, never>\n\ntype CreateGetIsError<T extends HttpKey, D = never> = (payload: CreateGetData<T, D>) => boolean\n\ntype CreateGetParamKeys<T extends string> = T extends `${string}:${infer Rest}`\n ? Rest extends `${infer Key}/${infer Tail}`\n ? CreateGetParamKeys<`/${Tail}`> | Key\n : Rest\n : never\ntype CreateGetParams<T extends HttpKey, P extends HttpParam> = Omit<CreateGetPathParams<T>, keyof P> & P\ntype CreateGetPathParams<T extends HttpKey> = [CreateGetParamKeys<T>] extends [never]\n ? CreateGetEmptyParams\n : {\n [K in CreateGetParamKeys<T>]: string\n }\n\nexport function createUseCase<D>() {\n return <T>(\n callback: (payload: D & { httpClient: HttpClient }) => T,\n ): ((payload: D & { httpClient: HttpClient }) => T) => callback\n}\n\nexport function defineGet(useHttp: UseHttpFn) {\n return function withParams<P extends HttpParam = CreateGetEmptyParams>(): CreateGetFactory<P> {\n function withUrl<T extends HttpKey, D = never>(\n url: T,\n payload?: CreateGetPayload<T, CreateGetParams<T, P>, D>,\n ): (\n options?: CreateGetOptions<T, CreateGetParams<T, P>, D>,\n ) => Promise<CreateGetResult<T, CreateGetParams<T, P>, D>> {\n return async function request(\n options: CreateGetOptions<T, CreateGetParams<T, P>, D> = {},\n ): Promise<CreateGetResult<T, CreateGetParams<T, P>, D>> {\n const result = await useHttp({\n ...options,\n effect: (data, config) => {\n payload?.effect?.(data as CreateGetData<T, D>, config)\n options?.effect?.(data as CreateGetData<T, D>, config)\n },\n isError: options.isError ?? payload?.isError,\n mapParams: options.mapParams ?? payload?.mapParams,\n url,\n } as UseHttpOptions<T, CreateGetParams<T, P>>)\n\n return result as CreateGetResult<T, CreateGetParams<T, P>, D>\n }\n }\n\n return withUrl as CreateGetFactory<P>\n }\n}\n","import { resolveUrlParams } from './utils'\n\nexport interface CreateHttpOptions {\n arrayMode?: HttpArrayMode\n baseURL: string\n fetch?: typeof fetch\n headers?: (() => HttpHeaders) | HttpHeaders\n onResponse?: (response: HttpAnyResponse) => Promise<void> | void\n timeout?: number\n}\n\nexport type GetConfig<TKey extends HttpKey = HttpKey> = HttpConfigFull<TKey> & {\n retry?: {\n delay?: number\n retries?: number\n }\n}\n\nexport type HttpAnyResponse = HttpResponse<HttpResponseData<HttpKey>, HttpKey, HttpConfigFull<HttpKey>>\n\nexport type HttpArrayMode = 'json' | 'repeat'\nexport type HttpClient = {\n get: <T extends HttpKey, TConfig extends GetConfig<T> = GetConfig<T>>(\n url: T,\n config?: TConfig,\n ) => Promise<HttpResponse<HttpResponseData<T>, T, TConfig>>\n post: <\n T extends HttpKey,\n TData extends Record<string, unknown> = Record<string, unknown>,\n TConfig extends PostConfig<T> = PostConfig<T>,\n >(\n url: T,\n data?: HttpPostData<TData>,\n config?: TConfig,\n ) => Promise<HttpResponse<HttpResponseData<T>, T, TConfig>>\n}\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nexport interface HttpConfig<TKey extends HttpKey = HttpKey> {}\n\nexport interface HttpEndpoint {}\nexport type HttpErrorGuard<TData = unknown, TError extends TData = TData> = (payload: TData) => payload is TError\nexport type HttpKey = Extract<keyof HttpSchema, string>\n\nexport type HttpParam = Record<string, boolean | number | string | string[] | undefined>\nexport type HttpPostData<TData extends Record<string, unknown> = Record<string, unknown>> = FormData | TData\n\nexport interface HttpResponse<\n T = unknown,\n TKey extends HttpKey = HttpKey,\n TConfig extends HttpConfigFull<TKey> = HttpConfigFull<TKey>,\n> {\n config: HttpResponseConfig<TKey, TConfig>\n data: T\n status: number\n}\nexport type HttpResponseConfig<\n TKey extends HttpKey = HttpKey,\n TConfig extends HttpConfig<TKey> = HttpConfig<TKey>,\n> = Omit<TConfig, 'signal'> & { url: string }\n\nexport type HttpResponseData<TKey extends HttpKey = HttpKey> = HttpSchema[TKey]\n\nexport type PostConfig<TKey extends HttpKey = HttpKey> = HttpConfigFull<TKey>\n\ntype HttpConfigFull<TKey extends HttpKey = HttpKey> = HttpConfig<TKey> & {\n params?: HttpParam\n signal?: AbortSignal | AbortSignal[]\n}\n\ntype HttpHeaders = Record<string, string | undefined>\n\ntype HttpSchema = keyof HttpEndpoint extends never ? Record<string, unknown> : HttpEndpoint\n\nexport function createHttp(options: CreateHttpOptions): HttpClient {\n const arrayMode = options.arrayMode ?? 'json'\n const clientFetch = options.fetch ?? fetch\n const timeout = options.timeout ?? 80000\n\n return {\n get<T extends HttpKey, TConfig extends GetConfig<T> = GetConfig<T>>(url: T, config?: TConfig) {\n const requestConfig = (config ?? {}) as TConfig\n const resolved = resolveUrlParams(url, requestConfig.params)\n const requestUrl = `${joinUrl(options.baseURL, resolved.url)}${toQueryString(resolved.params, arrayMode)}`\n const { delay = 300, retries = 3 } = requestConfig.retry ?? {}\n\n const attemptRequest = async (attempt: number): Promise<HttpResponse<HttpResponseData<T>, T, TConfig>> => {\n try {\n const result = await clientFetch(requestUrl, {\n credentials: 'include',\n headers: resolveHeaders(options.headers),\n method: 'GET',\n signal: createSignal(requestConfig.signal, timeout),\n })\n\n const parsedResult = await result.json()\n const response: HttpResponse<HttpResponseData<T>, T, TConfig> = {\n config: createResponseConfig<T, TConfig>(joinUrl(options.baseURL, resolved.url), {\n ...requestConfig,\n params: resolved.params,\n }),\n data: parsedResult,\n status: result.status,\n }\n\n if (!result.ok && isRetryableStatus(result.status) && attempt < retries) {\n await wait(getRetryDelay(attempt, delay))\n return attemptRequest(attempt + 1)\n }\n\n await options.onResponse?.(response as HttpAnyResponse)\n return response\n } catch (err) {\n if (isAbortError(err) || attempt >= retries) {\n throw err\n }\n\n await wait(getRetryDelay(attempt, delay))\n return attemptRequest(attempt + 1)\n }\n }\n\n return attemptRequest(0)\n },\n async post<\n T extends HttpKey,\n TData extends Record<string, unknown> = Record<string, unknown>,\n TConfig extends PostConfig<T> = PostConfig<T>,\n >(url: T, data?: HttpPostData<TData>, config?: TConfig) {\n const requestConfig = (config ?? {}) as TConfig\n const isForm = isFormData(data)\n const resolved = resolveUrlParams(url, requestConfig.params)\n const requestUrl = `${joinUrl(options.baseURL, resolved.url)}${toQueryString(resolved.params, arrayMode)}`\n const response = await clientFetch(requestUrl, {\n body: isForm || data === undefined ? data : JSON.stringify(data),\n credentials: 'include',\n headers: resolveHeaders(\n options.headers,\n data !== undefined && !isForm ? { 'Content-Type': 'application/json' } : undefined,\n ),\n method: 'POST',\n signal: createSignal(requestConfig.signal, timeout),\n })\n\n let parsedResult: Awaited<ReturnType<typeof response.json>> = {}\n try {\n parsedResult = await response.json()\n } catch {\n parsedResult = {}\n }\n\n const parsedResponse: HttpResponse<HttpResponseData<T>, T, TConfig> = {\n config: createResponseConfig<T, TConfig>(joinUrl(options.baseURL, resolved.url), {\n ...requestConfig,\n params: resolved.params,\n }),\n data: parsedResult,\n status: response.status,\n }\n\n await options.onResponse?.(parsedResponse as HttpAnyResponse)\n return parsedResponse\n },\n }\n}\n\nfunction createAnySignal(signals: AbortSignal[]): AbortSignal {\n if (typeof AbortSignal?.any === 'function') {\n return AbortSignal.any(signals)\n }\n\n const controller = new AbortController()\n\n signals.filter(Boolean).forEach((signal) => {\n signal.addEventListener('abort', () => controller.abort(), { once: true })\n })\n\n return controller.signal\n}\n\nfunction createResponseConfig<TKey extends HttpKey, TConfig extends HttpConfigFull<TKey>>(\n url: string,\n config: TConfig,\n): HttpResponseConfig<TKey, TConfig> {\n const responseConfig = { ...config } as Record<string, unknown>\n delete responseConfig.signal\n\n return {\n ...responseConfig,\n url,\n } as HttpResponseConfig<TKey, TConfig>\n}\n\nfunction createSignal(signal: AbortSignal | AbortSignal[] | undefined, timeout: number): AbortSignal {\n const timeoutSignal = createTimeoutSignal(timeout)\n\n if (Array.isArray(signal)) {\n return createAnySignal([...signal, timeoutSignal])\n }\n\n if (signal) {\n return createAnySignal([signal, timeoutSignal])\n }\n\n return timeoutSignal\n}\n\nfunction createTimeoutSignal(ms: number): AbortSignal {\n if (typeof AbortSignal?.timeout === 'function') {\n return AbortSignal.timeout(ms)\n }\n\n const controller = new AbortController()\n const timeoutId = setTimeout(() => controller.abort(), ms)\n\n controller.signal.addEventListener('abort', () => clearTimeout(timeoutId), {\n once: true,\n })\n\n return controller.signal\n}\n\nfunction getRetryDelay(attempt: number, delay: number): number {\n return delay * 2 ** attempt\n}\n\nfunction isAbortError(err: unknown): boolean {\n return err instanceof DOMException && err.name === 'AbortError'\n}\n\nfunction isFormData(value: unknown): value is FormData {\n return typeof FormData !== 'undefined' && value instanceof FormData\n}\n\nfunction isRetryableStatus(status: number): boolean {\n return status >= 500 || status === 429\n}\n\nfunction joinUrl(baseURL: string, url: string): string {\n const normalizedBase = baseURL.endsWith('/') ? baseURL.slice(0, -1) : baseURL\n const normalizedUrl = url.startsWith('/') ? url.slice(1) : url\n\n return `${normalizedBase}/${normalizedUrl}`\n}\n\nfunction resolveHeaders(\n value: CreateHttpOptions['headers'],\n extraHeaders?: Record<string, string>,\n): Record<string, string> {\n const headers = typeof value === 'function' ? value() : value\n\n return Object.entries({\n ...headers,\n ...extraHeaders,\n }).reduce<Record<string, string>>((acc, [key, headerValue]) => {\n if (typeof headerValue === 'string') {\n acc[key] = headerValue\n }\n\n return acc\n }, {})\n}\n\nfunction serializeQueryValue(\n urlParams: URLSearchParams,\n key: string,\n value: HttpParam[string],\n arrayMode: HttpArrayMode,\n): void {\n if (value === undefined) {\n return\n }\n\n if (Array.isArray(value)) {\n if (arrayMode === 'json') {\n urlParams.append(key, JSON.stringify(value))\n return\n }\n\n value.forEach((item) => {\n urlParams.append(`${key}[]`, item)\n })\n return\n }\n\n urlParams.append(key, String(value))\n}\n\nfunction toQueryString(params?: HttpParam, arrayMode: HttpArrayMode = 'json'): string {\n const urlParams = new URLSearchParams()\n\n Object.entries(params ?? {}).forEach(([key, value]) => {\n serializeQueryValue(urlParams, key, value, arrayMode)\n })\n\n return urlParams.size > 0 ? `?${urlParams}` : ''\n}\n\nfunction wait(ms: number): Promise<void> {\n return new Promise((resolve) => setTimeout(resolve, ms))\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.mjs","names":[],"sources":["../src/create-get.ts","../src/http.ts"],"sourcesContent":["import type { HttpClient, HttpKey, HttpParam, HttpResponseData } from './http'\nimport type { HttpError, UseHttpFn, UseHttpOptions, UseHttpResult } from './nuxt'\n\nexport interface CreateGetFactory<P extends HttpParam> {\n <T extends string>(\n url: T,\n payload?: CreateGetPayload<T, CreateGetParams<T, P>>,\n ): (options?: CreateGetOptions<T, CreateGetParams<T, P>>) => Promise<CreateGetResult<T, CreateGetParams<T, P>>>\n}\nexport type CreateGetOptions<T extends string, P extends HttpParam> = Omit<\n UseHttpOptions<HttpKey, P>,\n 'effect' | 'isError' | 'url'\n> & {\n effect?: CreateGetEffect<T, P>\n isError?: CreateGetIsError<T>\n}\nexport type CreateGetPayload<T extends string, P extends HttpParam> = {\n effect?: CreateGetEffect<T, P>\n isError?: CreateGetIsError<T>\n mapParams?: UseHttpOptions<HttpKey, P>['mapParams']\n}\nexport type CreateGetResult<T extends string, P extends HttpParam> = Omit<\n UseHttpResult<HttpKey, P>,\n 'data' | 'error'\n> & {\n data: Exclude<CreateGetData<T>, HttpError> | null\n error: Extract<CreateGetData<T>, HttpError> | null\n}\n\ntype CreateGetData<T extends string> = T extends HttpKey ? HttpResponseData<T> : unknown\ntype CreateGetEffect<T extends string, P extends HttpParam> = (\n data: CreateGetData<T>,\n config: CreateGetEffectConfig<P>,\n) => void\ntype CreateGetEffectConfig<P extends HttpParam> = {\n cached: boolean\n params: P\n}\ntype CreateGetEmptyParams = Record<never, never>\n\ntype CreateGetIsError<T extends string> = (payload: CreateGetData<T>) => boolean\n\ntype CreateGetParamKeys<T extends string> = T extends `${string}:${infer Rest}`\n ? Rest extends `${infer Key}/${infer Tail}`\n ? CreateGetParamKeys<`/${Tail}`> | Key\n : Rest\n : never\ntype CreateGetParams<T extends string, P extends HttpParam> = Omit<CreateGetPathParams<T>, keyof P> & P\ntype CreateGetPathParams<T extends string> = [CreateGetParamKeys<T>] extends [never]\n ? CreateGetEmptyParams\n : {\n [K in CreateGetParamKeys<T>]: string\n }\n\nexport function createUseCase<D>() {\n return <T>(\n callback: (payload: D & { httpClient: HttpClient }) => T,\n ): ((payload: D & { httpClient: HttpClient }) => T) => callback\n}\n\nexport function defineGet(useHttp: UseHttpFn) {\n return function withParams<P extends HttpParam = CreateGetEmptyParams>(): CreateGetFactory<P> {\n function withUrl<T extends string>(\n url: T,\n payload?: CreateGetPayload<T, CreateGetParams<T, P>>,\n ): (\n options?: CreateGetOptions<T, CreateGetParams<T, P>>,\n ) => Promise<CreateGetResult<T, CreateGetParams<T, P>>> {\n return async function request(\n options: CreateGetOptions<T, CreateGetParams<T, P>> = {},\n ): Promise<CreateGetResult<T, CreateGetParams<T, P>>> {\n const result = await useHttp({\n ...options,\n effect: (data, config) => {\n payload?.effect?.(data as CreateGetData<T>, config)\n options?.effect?.(data as CreateGetData<T>, config)\n },\n isError: options.isError ?? payload?.isError,\n mapParams: options.mapParams ?? payload?.mapParams,\n url,\n } as UseHttpOptions<HttpKey, CreateGetParams<T, P>>)\n\n return result as CreateGetResult<T, CreateGetParams<T, P>>\n }\n }\n\n return withUrl as CreateGetFactory<P>\n }\n}\n","import { resolveUrlParams } from './utils'\n\nexport interface CreateHttpOptions {\n arrayMode?: HttpArrayMode\n baseURL: string\n fetch?: typeof fetch\n headers?: (() => HttpHeaders) | HttpHeaders\n onResponse?: (response: HttpAnyResponse) => Promise<void> | void\n timeout?: number\n}\n\nexport type GetConfig<TKey extends HttpKey = HttpKey> = HttpConfigFull<TKey> & {\n retry?: {\n delay?: number\n retries?: number\n }\n}\n\nexport type HttpAnyResponse = HttpResponse<HttpResponseData<HttpKey>, HttpKey, HttpConfigFull<HttpKey>>\n\nexport type HttpArrayMode = 'json' | 'repeat'\nexport type HttpClient = {\n get: <T extends HttpKey, TConfig extends GetConfig<T> = GetConfig<T>>(\n url: T,\n config?: TConfig,\n ) => Promise<HttpResponse<HttpResponseData<T>, T, TConfig>>\n post: <\n T extends HttpKey,\n TData extends Record<string, unknown> = Record<string, unknown>,\n TConfig extends PostConfig<T> = PostConfig<T>,\n >(\n url: T,\n data?: HttpPostData<TData>,\n config?: TConfig,\n ) => Promise<HttpResponse<HttpResponseData<T>, T, TConfig>>\n}\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nexport interface HttpConfig<TKey extends HttpKey = HttpKey> {}\n\nexport interface HttpEndpoint {}\nexport type HttpErrorGuard<TData = unknown, TError extends TData = TData> = (payload: TData) => payload is TError\nexport type HttpKey = Extract<keyof HttpSchema, string>\n\nexport type HttpParam = Record<string, boolean | number | string | string[] | undefined>\nexport type HttpPostData<TData extends Record<string, unknown> = Record<string, unknown>> = FormData | TData\n\nexport interface HttpResponse<\n T = unknown,\n TKey extends HttpKey = HttpKey,\n TConfig extends HttpConfigFull<TKey> = HttpConfigFull<TKey>,\n> {\n config: HttpResponseConfig<TKey, TConfig>\n data: T\n status: number\n}\nexport type HttpResponseConfig<\n TKey extends HttpKey = HttpKey,\n TConfig extends HttpConfig<TKey> = HttpConfig<TKey>,\n> = Omit<TConfig, 'signal'> & { url: string }\n\nexport type HttpResponseData<TKey extends HttpKey = HttpKey> = HttpSchema[TKey]\n\nexport type PostConfig<TKey extends HttpKey = HttpKey> = HttpConfigFull<TKey>\n\ntype HttpConfigFull<TKey extends HttpKey = HttpKey> = HttpConfig<TKey> & {\n params?: HttpParam\n signal?: AbortSignal | AbortSignal[]\n}\n\ntype HttpHeaders = Record<string, string | undefined>\n\ntype HttpSchema = keyof HttpEndpoint extends never ? Record<string, unknown> : HttpEndpoint\n\nexport function createHttp(options: CreateHttpOptions): HttpClient {\n const arrayMode = options.arrayMode ?? 'json'\n const clientFetch = options.fetch ?? fetch\n const timeout = options.timeout ?? 80000\n\n return {\n get<T extends HttpKey, TConfig extends GetConfig<T> = GetConfig<T>>(url: T, config?: TConfig) {\n const requestConfig = (config ?? {}) as TConfig\n const resolved = resolveUrlParams(url, requestConfig.params)\n const requestUrl = `${joinUrl(options.baseURL, resolved.url)}${toQueryString(resolved.params, arrayMode)}`\n const { delay = 300, retries = 3 } = requestConfig.retry ?? {}\n\n const attemptRequest = async (attempt: number): Promise<HttpResponse<HttpResponseData<T>, T, TConfig>> => {\n try {\n const result = await clientFetch(requestUrl, {\n credentials: 'include',\n headers: resolveHeaders(options.headers),\n method: 'GET',\n signal: createSignal(requestConfig.signal, timeout),\n })\n\n const parsedResult = await result.json()\n const response: HttpResponse<HttpResponseData<T>, T, TConfig> = {\n config: createResponseConfig<T, TConfig>(joinUrl(options.baseURL, resolved.url), {\n ...requestConfig,\n params: resolved.params,\n }),\n data: parsedResult,\n status: result.status,\n }\n\n if (!result.ok && isRetryableStatus(result.status) && attempt < retries) {\n await wait(getRetryDelay(attempt, delay))\n return attemptRequest(attempt + 1)\n }\n\n await options.onResponse?.(response as HttpAnyResponse)\n return response\n } catch (err) {\n if (isAbortError(err) || attempt >= retries) {\n throw err\n }\n\n await wait(getRetryDelay(attempt, delay))\n return attemptRequest(attempt + 1)\n }\n }\n\n return attemptRequest(0)\n },\n async post<\n T extends HttpKey,\n TData extends Record<string, unknown> = Record<string, unknown>,\n TConfig extends PostConfig<T> = PostConfig<T>,\n >(url: T, data?: HttpPostData<TData>, config?: TConfig) {\n const requestConfig = (config ?? {}) as TConfig\n const isForm = isFormData(data)\n const resolved = resolveUrlParams(url, requestConfig.params)\n const requestUrl = `${joinUrl(options.baseURL, resolved.url)}${toQueryString(resolved.params, arrayMode)}`\n const response = await clientFetch(requestUrl, {\n body: isForm || data === undefined ? data : JSON.stringify(data),\n credentials: 'include',\n headers: resolveHeaders(\n options.headers,\n data !== undefined && !isForm ? { 'Content-Type': 'application/json' } : undefined,\n ),\n method: 'POST',\n signal: createSignal(requestConfig.signal, timeout),\n })\n\n let parsedResult: Awaited<ReturnType<typeof response.json>> = {}\n try {\n parsedResult = await response.json()\n } catch {\n parsedResult = {}\n }\n\n const parsedResponse: HttpResponse<HttpResponseData<T>, T, TConfig> = {\n config: createResponseConfig<T, TConfig>(joinUrl(options.baseURL, resolved.url), {\n ...requestConfig,\n params: resolved.params,\n }),\n data: parsedResult,\n status: response.status,\n }\n\n await options.onResponse?.(parsedResponse as HttpAnyResponse)\n return parsedResponse\n },\n }\n}\n\nfunction createAnySignal(signals: AbortSignal[]): AbortSignal {\n if (typeof AbortSignal?.any === 'function') {\n return AbortSignal.any(signals)\n }\n\n const controller = new AbortController()\n\n signals.filter(Boolean).forEach((signal) => {\n signal.addEventListener('abort', () => controller.abort(), { once: true })\n })\n\n return controller.signal\n}\n\nfunction createResponseConfig<TKey extends HttpKey, TConfig extends HttpConfigFull<TKey>>(\n url: string,\n config: TConfig,\n): HttpResponseConfig<TKey, TConfig> {\n const responseConfig = { ...config } as Record<string, unknown>\n delete responseConfig.signal\n\n return {\n ...responseConfig,\n url,\n } as HttpResponseConfig<TKey, TConfig>\n}\n\nfunction createSignal(signal: AbortSignal | AbortSignal[] | undefined, timeout: number): AbortSignal {\n const timeoutSignal = createTimeoutSignal(timeout)\n\n if (Array.isArray(signal)) {\n return createAnySignal([...signal, timeoutSignal])\n }\n\n if (signal) {\n return createAnySignal([signal, timeoutSignal])\n }\n\n return timeoutSignal\n}\n\nfunction createTimeoutSignal(ms: number): AbortSignal {\n if (typeof AbortSignal?.timeout === 'function') {\n return AbortSignal.timeout(ms)\n }\n\n const controller = new AbortController()\n const timeoutId = setTimeout(() => controller.abort(), ms)\n\n controller.signal.addEventListener('abort', () => clearTimeout(timeoutId), {\n once: true,\n })\n\n return controller.signal\n}\n\nfunction getRetryDelay(attempt: number, delay: number): number {\n return delay * 2 ** attempt\n}\n\nfunction isAbortError(err: unknown): boolean {\n return err instanceof DOMException && err.name === 'AbortError'\n}\n\nfunction isFormData(value: unknown): value is FormData {\n return typeof FormData !== 'undefined' && value instanceof FormData\n}\n\nfunction isRetryableStatus(status: number): boolean {\n return status >= 500 || status === 429\n}\n\nfunction joinUrl(baseURL: string, url: string): string {\n const normalizedBase = baseURL.endsWith('/') ? baseURL.slice(0, -1) : baseURL\n const normalizedUrl = url.startsWith('/') ? url.slice(1) : url\n\n return `${normalizedBase}/${normalizedUrl}`\n}\n\nfunction resolveHeaders(\n value: CreateHttpOptions['headers'],\n extraHeaders?: Record<string, string>,\n): Record<string, string> {\n const headers = typeof value === 'function' ? value() : value\n\n return Object.entries({\n ...headers,\n ...extraHeaders,\n }).reduce<Record<string, string>>((acc, [key, headerValue]) => {\n if (typeof headerValue === 'string') {\n acc[key] = headerValue\n }\n\n return acc\n }, {})\n}\n\nfunction serializeQueryValue(\n urlParams: URLSearchParams,\n key: string,\n value: HttpParam[string],\n arrayMode: HttpArrayMode,\n): void {\n if (value === undefined) {\n return\n }\n\n if (Array.isArray(value)) {\n if (arrayMode === 'json') {\n urlParams.append(key, JSON.stringify(value))\n return\n }\n\n value.forEach((item) => {\n urlParams.append(`${key}[]`, item)\n })\n return\n }\n\n urlParams.append(key, String(value))\n}\n\nfunction toQueryString(params?: HttpParam, arrayMode: HttpArrayMode = 'json'): string {\n const urlParams = new URLSearchParams()\n\n Object.entries(params ?? {}).forEach(([key, value]) => {\n serializeQueryValue(urlParams, key, value, arrayMode)\n })\n\n return urlParams.size > 0 ? `?${urlParams}` : ''\n}\n\nfunction wait(ms: number): Promise<void> {\n return new Promise((resolve) => setTimeout(resolve, ms))\n}\n"],"mappings":";;AAsDA,SAAgB,gBAAmB;CACjC,QACE,aACqD;AACzD;AAEA,SAAgB,UAAU,SAAoB;CAC5C,OAAO,SAAS,aAA8E;EAC5F,SAAS,QACP,KACA,SAGsD;GACtD,OAAO,eAAe,QACpB,UAAsD,CAAC,GACH;IAYpD,OAAO,MAXc,QAAQ;KAC3B,GAAG;KACH,SAAS,MAAM,WAAW;MACxB,SAAS,SAAS,MAA0B,MAAM;MAClD,SAAS,SAAS,MAA0B,MAAM;KACpD;KACA,SAAS,QAAQ,WAAW,SAAS;KACrC,WAAW,QAAQ,aAAa,SAAS;KACzC;IACF,CAAmD;GAGrD;EACF;EAEA,OAAO;CACT;AACF;;;ACdA,SAAgB,WAAW,SAAwC;CACjE,MAAM,YAAY,QAAQ,aAAa;CACvC,MAAM,cAAc,QAAQ,SAAS;CACrC,MAAM,UAAU,QAAQ,WAAW;CAEnC,OAAO;EACL,IAAoE,KAAQ,QAAkB;GAC5F,MAAM,gBAAiB,UAAU,CAAC;GAClC,MAAM,WAAW,iBAAiB,KAAK,cAAc,MAAM;GAC3D,MAAM,aAAa,GAAG,QAAQ,QAAQ,SAAS,SAAS,GAAG,IAAI,cAAc,SAAS,QAAQ,SAAS;GACvG,MAAM,EAAE,QAAQ,KAAK,UAAU,MAAM,cAAc,SAAS,CAAC;GAE7D,MAAM,iBAAiB,OAAO,YAA4E;IACxG,IAAI;KACF,MAAM,SAAS,MAAM,YAAY,YAAY;MAC3C,aAAa;MACb,SAAS,eAAe,QAAQ,OAAO;MACvC,QAAQ;MACR,QAAQ,aAAa,cAAc,QAAQ,OAAO;KACpD,CAAC;KAED,MAAM,eAAe,MAAM,OAAO,KAAK;KACvC,MAAM,WAA0D;MAC9D,QAAQ,qBAAiC,QAAQ,QAAQ,SAAS,SAAS,GAAG,GAAG;OAC/E,GAAG;OACH,QAAQ,SAAS;MACnB,CAAC;MACD,MAAM;MACN,QAAQ,OAAO;KACjB;KAEA,IAAI,CAAC,OAAO,MAAM,kBAAkB,OAAO,MAAM,KAAK,UAAU,SAAS;MACvE,MAAM,KAAK,cAAc,SAAS,KAAK,CAAC;MACxC,OAAO,eAAe,UAAU,CAAC;KACnC;KAEA,MAAM,QAAQ,aAAa,QAA2B;KACtD,OAAO;IACT,SAAS,KAAK;KACZ,IAAI,aAAa,GAAG,KAAK,WAAW,SAClC,MAAM;KAGR,MAAM,KAAK,cAAc,SAAS,KAAK,CAAC;KACxC,OAAO,eAAe,UAAU,CAAC;IACnC;GACF;GAEA,OAAO,eAAe,CAAC;EACzB;EACA,MAAM,KAIJ,KAAQ,MAA4B,QAAkB;GACtD,MAAM,gBAAiB,UAAU,CAAC;GAClC,MAAM,SAAS,WAAW,IAAI;GAC9B,MAAM,WAAW,iBAAiB,KAAK,cAAc,MAAM;GAE3D,MAAM,WAAW,MAAM,YAAY,GADb,QAAQ,QAAQ,SAAS,SAAS,GAAG,IAAI,cAAc,SAAS,QAAQ,SAAS,KACxD;IAC7C,MAAM,UAAU,SAAS,KAAA,IAAY,OAAO,KAAK,UAAU,IAAI;IAC/D,aAAa;IACb,SAAS,eACP,QAAQ,SACR,SAAS,KAAA,KAAa,CAAC,SAAS,EAAE,gBAAgB,mBAAmB,IAAI,KAAA,CAC3E;IACA,QAAQ;IACR,QAAQ,aAAa,cAAc,QAAQ,OAAO;GACpD,CAAC;GAED,IAAI,eAA0D,CAAC;GAC/D,IAAI;IACF,eAAe,MAAM,SAAS,KAAK;GACrC,QAAQ;IACN,eAAe,CAAC;GAClB;GAEA,MAAM,iBAAgE;IACpE,QAAQ,qBAAiC,QAAQ,QAAQ,SAAS,SAAS,GAAG,GAAG;KAC/E,GAAG;KACH,QAAQ,SAAS;IACnB,CAAC;IACD,MAAM;IACN,QAAQ,SAAS;GACnB;GAEA,MAAM,QAAQ,aAAa,cAAiC;GAC5D,OAAO;EACT;CACF;AACF;AAEA,SAAS,gBAAgB,SAAqC;CAC5D,IAAI,OAAO,aAAa,QAAQ,YAC9B,OAAO,YAAY,IAAI,OAAO;CAGhC,MAAM,aAAa,IAAI,gBAAgB;CAEvC,QAAQ,OAAO,OAAO,CAAC,CAAC,SAAS,WAAW;EAC1C,OAAO,iBAAiB,eAAe,WAAW,MAAM,GAAG,EAAE,MAAM,KAAK,CAAC;CAC3E,CAAC;CAED,OAAO,WAAW;AACpB;AAEA,SAAS,qBACP,KACA,QACmC;CACnC,MAAM,iBAAiB,EAAE,GAAG,OAAO;CACnC,OAAO,eAAe;CAEtB,OAAO;EACL,GAAG;EACH;CACF;AACF;AAEA,SAAS,aAAa,QAAiD,SAA8B;CACnG,MAAM,gBAAgB,oBAAoB,OAAO;CAEjD,IAAI,MAAM,QAAQ,MAAM,GACtB,OAAO,gBAAgB,CAAC,GAAG,QAAQ,aAAa,CAAC;CAGnD,IAAI,QACF,OAAO,gBAAgB,CAAC,QAAQ,aAAa,CAAC;CAGhD,OAAO;AACT;AAEA,SAAS,oBAAoB,IAAyB;CACpD,IAAI,OAAO,aAAa,YAAY,YAClC,OAAO,YAAY,QAAQ,EAAE;CAG/B,MAAM,aAAa,IAAI,gBAAgB;CACvC,MAAM,YAAY,iBAAiB,WAAW,MAAM,GAAG,EAAE;CAEzD,WAAW,OAAO,iBAAiB,eAAe,aAAa,SAAS,GAAG,EACzE,MAAM,KACR,CAAC;CAED,OAAO,WAAW;AACpB;AAEA,SAAS,cAAc,SAAiB,OAAuB;CAC7D,OAAO,QAAQ,KAAK;AACtB;AAEA,SAAS,aAAa,KAAuB;CAC3C,OAAO,eAAe,gBAAgB,IAAI,SAAS;AACrD;AAEA,SAAS,WAAW,OAAmC;CACrD,OAAO,OAAO,aAAa,eAAe,iBAAiB;AAC7D;AAEA,SAAS,kBAAkB,QAAyB;CAClD,OAAO,UAAU,OAAO,WAAW;AACrC;AAEA,SAAS,QAAQ,SAAiB,KAAqB;CAIrD,OAAO,GAHgB,QAAQ,SAAS,GAAG,IAAI,QAAQ,MAAM,GAAG,EAAE,IAAI,QAG7C,GAFH,IAAI,WAAW,GAAG,IAAI,IAAI,MAAM,CAAC,IAAI;AAG7D;AAEA,SAAS,eACP,OACA,cACwB;CACxB,MAAM,UAAU,OAAO,UAAU,aAAa,MAAM,IAAI;CAExD,OAAO,OAAO,QAAQ;EACpB,GAAG;EACH,GAAG;CACL,CAAC,CAAC,CAAC,QAAgC,KAAK,CAAC,KAAK,iBAAiB;EAC7D,IAAI,OAAO,gBAAgB,UACzB,IAAI,OAAO;EAGb,OAAO;CACT,GAAG,CAAC,CAAC;AACP;AAEA,SAAS,oBACP,WACA,KACA,OACA,WACM;CACN,IAAI,UAAU,KAAA,GACZ;CAGF,IAAI,MAAM,QAAQ,KAAK,GAAG;EACxB,IAAI,cAAc,QAAQ;GACxB,UAAU,OAAO,KAAK,KAAK,UAAU,KAAK,CAAC;GAC3C;EACF;EAEA,MAAM,SAAS,SAAS;GACtB,UAAU,OAAO,GAAG,IAAI,KAAK,IAAI;EACnC,CAAC;EACD;CACF;CAEA,UAAU,OAAO,KAAK,OAAO,KAAK,CAAC;AACrC;AAEA,SAAS,cAAc,QAAoB,YAA2B,QAAgB;CACpF,MAAM,YAAY,IAAI,gBAAgB;CAEtC,OAAO,QAAQ,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,WAAW;EACrD,oBAAoB,WAAW,KAAK,OAAO,SAAS;CACtD,CAAC;CAED,OAAO,UAAU,OAAO,IAAI,IAAI,cAAc;AAChD;AAEA,SAAS,KAAK,IAA2B;CACvC,OAAO,IAAI,SAAS,YAAY,WAAW,SAAS,EAAE,CAAC;AACzD"}
|
package/package.json
CHANGED
package/src/create-get.ts
CHANGED
|
@@ -2,36 +2,34 @@ import type { HttpClient, HttpKey, HttpParam, HttpResponseData } from './http'
|
|
|
2
2
|
import type { HttpError, UseHttpFn, UseHttpOptions, UseHttpResult } from './nuxt'
|
|
3
3
|
|
|
4
4
|
export interface CreateGetFactory<P extends HttpParam> {
|
|
5
|
-
<
|
|
5
|
+
<T extends string>(
|
|
6
6
|
url: T,
|
|
7
|
-
payload?: CreateGetPayload<T, CreateGetParams<T, P
|
|
8
|
-
): (
|
|
9
|
-
options?: CreateGetOptions<T, CreateGetParams<T, P>, D>,
|
|
10
|
-
) => Promise<CreateGetResult<T, CreateGetParams<T, P>, D>>
|
|
7
|
+
payload?: CreateGetPayload<T, CreateGetParams<T, P>>,
|
|
8
|
+
): (options?: CreateGetOptions<T, CreateGetParams<T, P>>) => Promise<CreateGetResult<T, CreateGetParams<T, P>>>
|
|
11
9
|
}
|
|
12
|
-
export type CreateGetOptions<T extends
|
|
13
|
-
UseHttpOptions<
|
|
10
|
+
export type CreateGetOptions<T extends string, P extends HttpParam> = Omit<
|
|
11
|
+
UseHttpOptions<HttpKey, P>,
|
|
14
12
|
'effect' | 'isError' | 'url'
|
|
15
13
|
> & {
|
|
16
|
-
effect?: CreateGetEffect<T, P
|
|
17
|
-
isError?: CreateGetIsError<T
|
|
14
|
+
effect?: CreateGetEffect<T, P>
|
|
15
|
+
isError?: CreateGetIsError<T>
|
|
18
16
|
}
|
|
19
|
-
export type CreateGetPayload<T extends
|
|
20
|
-
effect?: CreateGetEffect<T, P
|
|
21
|
-
isError?: CreateGetIsError<T
|
|
22
|
-
mapParams?: UseHttpOptions<
|
|
17
|
+
export type CreateGetPayload<T extends string, P extends HttpParam> = {
|
|
18
|
+
effect?: CreateGetEffect<T, P>
|
|
19
|
+
isError?: CreateGetIsError<T>
|
|
20
|
+
mapParams?: UseHttpOptions<HttpKey, P>['mapParams']
|
|
23
21
|
}
|
|
24
|
-
export type CreateGetResult<T extends
|
|
25
|
-
UseHttpResult<
|
|
22
|
+
export type CreateGetResult<T extends string, P extends HttpParam> = Omit<
|
|
23
|
+
UseHttpResult<HttpKey, P>,
|
|
26
24
|
'data' | 'error'
|
|
27
25
|
> & {
|
|
28
|
-
data: Exclude<CreateGetData<T
|
|
29
|
-
error: Extract<CreateGetData<T
|
|
26
|
+
data: Exclude<CreateGetData<T>, HttpError> | null
|
|
27
|
+
error: Extract<CreateGetData<T>, HttpError> | null
|
|
30
28
|
}
|
|
31
29
|
|
|
32
|
-
type CreateGetData<T extends
|
|
33
|
-
type CreateGetEffect<T extends
|
|
34
|
-
data: CreateGetData<T
|
|
30
|
+
type CreateGetData<T extends string> = T extends HttpKey ? HttpResponseData<T> : unknown
|
|
31
|
+
type CreateGetEffect<T extends string, P extends HttpParam> = (
|
|
32
|
+
data: CreateGetData<T>,
|
|
35
33
|
config: CreateGetEffectConfig<P>,
|
|
36
34
|
) => void
|
|
37
35
|
type CreateGetEffectConfig<P extends HttpParam> = {
|
|
@@ -40,15 +38,15 @@ type CreateGetEffectConfig<P extends HttpParam> = {
|
|
|
40
38
|
}
|
|
41
39
|
type CreateGetEmptyParams = Record<never, never>
|
|
42
40
|
|
|
43
|
-
type CreateGetIsError<T extends
|
|
41
|
+
type CreateGetIsError<T extends string> = (payload: CreateGetData<T>) => boolean
|
|
44
42
|
|
|
45
43
|
type CreateGetParamKeys<T extends string> = T extends `${string}:${infer Rest}`
|
|
46
44
|
? Rest extends `${infer Key}/${infer Tail}`
|
|
47
45
|
? CreateGetParamKeys<`/${Tail}`> | Key
|
|
48
46
|
: Rest
|
|
49
47
|
: never
|
|
50
|
-
type CreateGetParams<T extends
|
|
51
|
-
type CreateGetPathParams<T extends
|
|
48
|
+
type CreateGetParams<T extends string, P extends HttpParam> = Omit<CreateGetPathParams<T>, keyof P> & P
|
|
49
|
+
type CreateGetPathParams<T extends string> = [CreateGetParamKeys<T>] extends [never]
|
|
52
50
|
? CreateGetEmptyParams
|
|
53
51
|
: {
|
|
54
52
|
[K in CreateGetParamKeys<T>]: string
|
|
@@ -62,27 +60,27 @@ export function createUseCase<D>() {
|
|
|
62
60
|
|
|
63
61
|
export function defineGet(useHttp: UseHttpFn) {
|
|
64
62
|
return function withParams<P extends HttpParam = CreateGetEmptyParams>(): CreateGetFactory<P> {
|
|
65
|
-
function withUrl<T extends
|
|
63
|
+
function withUrl<T extends string>(
|
|
66
64
|
url: T,
|
|
67
|
-
payload?: CreateGetPayload<T, CreateGetParams<T, P
|
|
65
|
+
payload?: CreateGetPayload<T, CreateGetParams<T, P>>,
|
|
68
66
|
): (
|
|
69
|
-
options?: CreateGetOptions<T, CreateGetParams<T, P
|
|
70
|
-
) => Promise<CreateGetResult<T, CreateGetParams<T, P
|
|
67
|
+
options?: CreateGetOptions<T, CreateGetParams<T, P>>,
|
|
68
|
+
) => Promise<CreateGetResult<T, CreateGetParams<T, P>>> {
|
|
71
69
|
return async function request(
|
|
72
|
-
options: CreateGetOptions<T, CreateGetParams<T, P
|
|
73
|
-
): Promise<CreateGetResult<T, CreateGetParams<T, P
|
|
70
|
+
options: CreateGetOptions<T, CreateGetParams<T, P>> = {},
|
|
71
|
+
): Promise<CreateGetResult<T, CreateGetParams<T, P>>> {
|
|
74
72
|
const result = await useHttp({
|
|
75
73
|
...options,
|
|
76
74
|
effect: (data, config) => {
|
|
77
|
-
payload?.effect?.(data as CreateGetData<T
|
|
78
|
-
options?.effect?.(data as CreateGetData<T
|
|
75
|
+
payload?.effect?.(data as CreateGetData<T>, config)
|
|
76
|
+
options?.effect?.(data as CreateGetData<T>, config)
|
|
79
77
|
},
|
|
80
78
|
isError: options.isError ?? payload?.isError,
|
|
81
79
|
mapParams: options.mapParams ?? payload?.mapParams,
|
|
82
80
|
url,
|
|
83
|
-
} as UseHttpOptions<
|
|
81
|
+
} as UseHttpOptions<HttpKey, CreateGetParams<T, P>>)
|
|
84
82
|
|
|
85
|
-
return result as CreateGetResult<T, CreateGetParams<T, P
|
|
83
|
+
return result as CreateGetResult<T, CreateGetParams<T, P>>
|
|
86
84
|
}
|
|
87
85
|
}
|
|
88
86
|
|