Skip to content

Optimize typing #18

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
owjs3901 merged 1 commit into from
Dec 4, 2025
Merged

Optimize typing #18

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
1 change: 1 addition & 0 deletions .changepacks/changepack_log_D8fobT6BfrHUsnwTK0qDM.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"changes":{"packages/react-query/package.json":"Patch","packages/generator/package.json":"Patch","packages/core/package.json":"Patch","packages/fetch/package.json":"Patch"},"note":"Optimize typing","date":"2025-12-04T13:37:03.219785200Z"}
12 changes: 12 additions & 0 deletions packages/core/src/additional.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,15 @@ export type DevupApiRequestInit = Omit<RequestInit, 'body'> & {
export type ExtractValue<T, V extends string, F = any> = V extends keyof T
? T[V]
: F

export type BoildApiOption<O> = Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>
export type ConditionalApiOption<O> = IsCold extends true
? DevupApiRequestInit
: BoildApiOption<O>

export type ApiOption<O extends object, R extends unknown[] = []> = [
RequiredOptions<O>,
] extends [never]
? [options?: ConditionalApiOption<O>, ...R]
: [options: BoildApiOption<O>, ...R]
156 changes: 23 additions & 133 deletions packages/fetch/src/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type {
Additional,
ApiOption,
BoildApiOption,
ConditionalKeys,
DevupApiRequestInit,
DevupApiServers,
Expand All @@ -16,9 +18,7 @@ import type {
DevupPutApiStructKey,
DevupPutApiStructScope,
ExtractValue,
IsCold,
Middleware,
RequiredOptions,
} from '@devup-api/core'
import { convertResponse } from './response-converter'
import { getApiEndpointInfo } from './url-map'
Expand Down Expand Up @@ -59,267 +59,157 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
O extends Additional<T, DevupGetApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'GET',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

GET<
T extends DevupGetApiStructKey<S>,
O extends Additional<T, DevupGetApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'GET',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

post<
T extends DevupPostApiStructKey<S>,
O extends Additional<T, DevupPostApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'POST',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

POST<
T extends DevupPostApiStructKey<S>,
O extends Additional<T, DevupPostApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'POST',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

put<
T extends DevupPutApiStructKey<S>,
O extends Additional<T, DevupPutApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'PUT',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

PUT<
T extends DevupPutApiStructKey<S>,
O extends Additional<T, DevupPutApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'PUT',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

delete<
T extends DevupDeleteApiStructKey<S>,
O extends Additional<T, DevupDeleteApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'DELETE',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

DELETE<
T extends DevupDeleteApiStructKey<S>,
O extends Additional<T, DevupDeleteApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'DELETE',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

patch<
T extends DevupPatchApiStructKey<S>,
O extends Additional<T, DevupPatchApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'PATCH',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

PATCH<
T extends DevupPatchApiStructKey<S>,
O extends Additional<T, DevupPatchApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
return this.request(path, {
method: 'PATCH',
...options[0],
} as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
} as BoildApiOption<O>)
}

async request<
T extends DevupApiStructKey<S>,
O extends Additional<T, DevupApiStructScope<S>>,
>(
path: T,
...options: [RequiredOptions<O>] extends [never]
? [
options?: IsCold extends true
? DevupApiRequestInit
: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
: [
options: Omit<DevupApiRequestInit, 'params'> &
Omit<O, 'response' | 'error'>,
]
...options: ApiOption<O>
): Promise<
DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
> {
Expand Down
Loading