summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-06-25 09:12:54 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-06-25 09:12:54 +0900
commit037f68858de5d6868fde5f462534126e7eb88f26 (patch)
treee97f3adcacac4d9b445b3b4f03731ec5fdd77de3
parentUpdate deps (diff)
downloadmisskey-037f68858de5d6868fde5f462534126e7eb88f26.tar.gz
misskey-037f68858de5d6868fde5f462534126e7eb88f26.tar.bz2
misskey-037f68858de5d6868fde5f462534126e7eb88f26.zip
fix type
-rw-r--r--src/api.ts14
-rw-r--r--src/api.types.ts6
2 files changed, 17 insertions, 3 deletions
diff --git a/src/api.ts b/src/api.ts
index 45ca2e9b56..9003a3edfb 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -46,9 +46,17 @@ export class APIClient {
public request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(
endpoint: E, params: P = {} as P, credential?: string | null | undefined,
): Promise<Endpoints[E]['res'] extends { $switch: { $cases: [any, any][]; $default: any; }; }
- ? IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][number], [P, any]>> extends true
- ? Endpoints[E]['res']['$switch']['$default']
- : StrictExtract<Endpoints[E]['res']['$switch']['$cases'][number], [P, any]>[1]
+ ? IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][0], [P, any]>> extends false
+ ? StrictExtract<Endpoints[E]['res']['$switch']['$cases'][0], [P, any]>[1]
+ : IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][1], [P, any]>> extends false
+ ? StrictExtract<Endpoints[E]['res']['$switch']['$cases'][1], [P, any]>[1]
+ : IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][2], [P, any]>> extends false
+ ? StrictExtract<Endpoints[E]['res']['$switch']['$cases'][2], [P, any]>[1]
+ : IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][3], [P, any]>> extends false
+ ? StrictExtract<Endpoints[E]['res']['$switch']['$cases'][3], [P, any]>[1]
+ : IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][4], [P, any]>> extends false
+ ? StrictExtract<Endpoints[E]['res']['$switch']['$cases'][4], [P, any]>[1]
+ : Endpoints[E]['res']['$switch']['$default']
: Endpoints[E]['res']>
{
const promise = new Promise((resolve, reject) => {
diff --git a/src/api.types.ts b/src/api.types.ts
index 242574a96b..fa80038f65 100644
--- a/src/api.types.ts
+++ b/src/api.types.ts
@@ -440,6 +440,12 @@ export type Endpoints = {
$cases: [[
{ detail: true; },
DetailedInstanceMetadata,
+ ], [
+ { detail: false; },
+ LiteInstanceMetadata,
+ ], [
+ { detail: boolean; },
+ LiteInstanceMetadata | DetailedInstanceMetadata,
]];
$default: LiteInstanceMetadata;
};