natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: better getChart result type

This commit is contained in:
syuilo 2022-02-18 22:29:23 +09:00
parent 0d3757f2d3
commit 0cee1dfbd6
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/backend/src/services/chart/core.ts
View File

@ -70,6 +70,18 @@ type ChartResult<T extends Schema> = {
[P in keyof T]: number[]; [P in keyof T]: number[];
}; };
type UnionToIntersection<T> = (T extends any ? (x: T) => any : never) extends (x: infer R) => any ? R : never;
type UnflattenSingleton<K extends string, V> = K extends `${infer A}.${infer B}`
? { [_ in A]: UnflattenSingleton<B, V>; }
: { [_ in K]: V; };
type Unflatten<T extends Record<string, any>> = UnionToIntersection<
{
[K in Extract<keyof T, string>]: UnflattenSingleton<K, T[K]>;
}[Extract<keyof T, string>]
>;
/** /**
* 様々なチャートの管理を司るクラス * 様々なチャートの管理を司るクラス
*/ */
@ -642,12 +654,12 @@ export default abstract class Chart<T extends Schema> {
} }
@autobind @autobind
public async getChart(span: 'hour' | 'day', amount: number, cursor: Date | null, group: string | null = null): Promise<Record<string, unknown>> { public async getChart(span: 'hour' | 'day', amount: number, cursor: Date | null, group: string | null = null): Promise<Unflatten<ChartResult<T>>> {
const result = await this.getChartRaw(span, amount, cursor, group); const result = await this.getChartRaw(span, amount, cursor, group);
const object = {}; const object = {};
for (const [k, v] of Object.entries(result)) { for (const [k, v] of Object.entries(result)) {
nestedProperty.set(object, k, v); nestedProperty.set(object, k, v);
} }
return object; return object as Unflatten<ChartResult<T>>;
} }
} }