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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

feat: function to get default key #733

Merged
merged 1 commit into from
Mar 11, 2022
Merged

feat: function to get default key #733

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 25 additions & 9 deletions packages/aspida-swr/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ type AspidaSWROption<T> = T & {
* @deprecated
* Will be dropped next major release.
* Use key and fetcher options instead.
* key: (_opt, getOriginalKey) =>
* enabled ? getOriginalKey() : null,
* key: enabled ? undefined : null,
* fetcher: enabled ? undefined : null
*/
enabled?: boolean
key?: ValueKey | ((opt: AspidaSWROption<T>, getOriginalKey: () => string[]) => ValueKey)
key?: ValueKey | (() => ValueKey)
fetcher?:
| ((f: (opt: AspidaSWROption<T>) => any) => (opt: AspidaSWROption<T>) => any)
| null
Expand All @@ -29,6 +28,27 @@ type ResponseData<T extends (option: any) => Promise<any>> = ReturnType<T> exten
? S
: never

function getAspidaSWRDefaultKey<
T extends Record<string, any> & {
$get: (option: any) => Promise<any>
$path: (option?: any) => string
}
>(api: T, ...option: Options<T['$get']>): string[]
function getAspidaSWRDefaultKey<
T extends Record<string, any> & { $path: (option?: any) => string },
U extends { [K in keyof T]: T[K] extends (option: any) => Promise<any> ? K : never }[keyof T]
>(api: T, method: U, ...option: Options<T[U]>): string[]
function getAspidaSWRDefaultKey<
T extends Record<string, any> & { $path: (option?: any) => string },
U extends { [K in keyof T]: T[K] extends (option: any) => Promise<any> ? K : never }[keyof T]
>(api: T, maybeMethod: U, ...option: Parameters<T[U]>) {
const method = typeof maybeMethod === 'string' ? maybeMethod : '$get'
const opt = typeof maybeMethod === 'string' ? (option as any)[0] : maybeMethod

return [api.$path(opt), method]
}
export { getAspidaSWRDefaultKey as getSWRDefaultKey }

function useAspidaSWR<
T extends Record<string, any> & {
$get: (option: any) => Promise<any>
Expand All @@ -48,17 +68,13 @@ function useAspidaSWR<

const enabled = opt?.enabled ?? true

const getOriginalKey = (api => () => {
return api && [api.$path(opt), method]
})(api)

const key =
opt?.key !== undefined
? typeof opt.key === 'function'
? opt.key(opt, getOriginalKey)
? opt.key()
: opt.key
: enabled
? getOriginalKey()
? getAspidaSWRDefaultKey(api as any, method as any, opt)
: null

const fetcherInterv = opt?.fetcher === undefined ? (enabled ? (f: any) => f : null) : opt?.fetcher
Expand Down
38 changes: 29 additions & 9 deletions packages/aspida-swrv/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ type AspidaSWRVOption<T> = T & {
* @deprecated
* Will be dropped next major release.
* Use key and fetcher options instead.
* key: (_opt, getOriginalKey) =>
* enabled ? getOriginalKey() : null,
* key: enabled ? undefined : null,
* fetcher: enabled ? undefined : null
*/
enabled?: boolean
key?: keyType | ((opt: AspidaSWRVOption<T>, getOriginalKey: () => string[] | null) => keyType)
key?: keyType | (() => keyType)
fetcher?:
| ((f: (opt: AspidaSWRVOption<T>) => any) => (opt: AspidaSWRVOption<T>) => any)
| null
Expand All @@ -31,6 +30,31 @@ type Res<T extends (option: any) => Promise<any>> = IResponse<
any
>

function getAspidaSWRVDefaultKey<
T extends Record<string, any> & {
$get: (option: any) => Promise<any>
$path: (option?: any) => string
}
>(api: T, ...option: Options<T['$get']>): string[]
function getAspidaSWRVDefaultKey<
T extends Record<string, any> & { $path: (option?: any) => string },
U extends {
[K in keyof T]: T[K] extends (option: any) => Promise<any> ? K : never
}[keyof T]
>(api: T, method: U, ...option: Options<T[U]>): string[]
function getAspidaSWRVDefaultKey<
T extends Record<string, any> & { $path: (option?: any) => string },
U extends {
[K in keyof T]: T[K] extends (option: any) => Promise<any> ? K : never
}[keyof T]
>(api: T, maybeMethod: U, ...option: Parameters<T[U]>) {
const method = typeof maybeMethod === 'string' ? maybeMethod : '$get'
const opt = typeof maybeMethod === 'string' ? (option as any)[0] : maybeMethod

return [api.$path(opt), method]
}
export { getAspidaSWRVDefaultKey }

function useAspidaSWRV<
T extends Record<string, any> & {
$get: (option: any) => Promise<any>
Expand All @@ -55,17 +79,13 @@ function useAspidaSWRV<

const enabled = opt?.enabled ?? true

const getOriginalKey = (api => () => {
return api && [api.$path(opt), method]
})(api)

const key =
opt?.key !== undefined
? typeof opt.key === 'function'
? opt.key(opt, getOriginalKey)
? opt.key()
: opt.key
: enabled
? getOriginalKey()
? getAspidaSWRVDefaultKey(api as any, method, opt)
: null

const fetcherInterv = opt?.fetcher === undefined ? (enabled ? (f: any) => f : null) : opt?.fetcher
Expand Down