diff --git a/common/js/types.d.ts b/common/js/types.d.ts index 357da329b..eea4a34b5 100644 --- a/common/js/types.d.ts +++ b/common/js/types.d.ts @@ -677,13 +677,13 @@ export interface ScoreDocument { +export interface ImportProcessInfoKTDataNotFound { success: false; type: "KTDataNotFound"; message: string | null; content: { - data: D; - context: C; + data: unknown; + context: unknown; }; } export interface ImportProcessInfoScoreExists { @@ -702,7 +702,7 @@ export interface ImportProcessInfoInvalidDatapoint { field?: string; }; } -export interface ImportProcessInfoScoreImported { +export interface ImportProcessInfoScoreImported { success: true; type: "ScoreImported"; message: string | null; @@ -710,5 +710,5 @@ export interface ImportProcessInfoScoreImported; }; } -export declare type ImportProcessingInfo = ImportProcessInfoKTDataNotFound | ImportProcessInfoScoreExists | ImportProcessInfoScoreImported | ImportProcessInfoInvalidDatapoint; +export declare type ImportProcessingInfo = ImportProcessInfoKTDataNotFound | ImportProcessInfoScoreExists | ImportProcessInfoScoreImported | ImportProcessInfoInvalidDatapoint; export {}; diff --git a/common/src/types.ts b/common/src/types.ts index dfeb253de..f58a9db9e 100644 --- a/common/src/types.ts +++ b/common/src/types.ts @@ -919,13 +919,13 @@ export type FileUploadImportTypes = "iidx:eamusement-csv"; export type ImportTypes = FileUploadImportTypes; -export interface ImportProcessInfoKTDataNotFound { +export interface ImportProcessInfoKTDataNotFound { success: false; type: "KTDataNotFound"; message: string | null; content: { - data: D; - context: C; + data: unknown; + context: unknown; // TEMP }; } @@ -947,7 +947,10 @@ export interface ImportProcessInfoInvalidDatapoint { }; } -export interface ImportProcessInfoScoreImported { +export interface ImportProcessInfoScoreImported< + G extends Game = Game, + P extends Playtypes[G] = Playtypes[G] +> { success: true; type: "ScoreImported"; message: string | null; @@ -956,8 +959,8 @@ export interface ImportProcessInfoScoreImported = - | ImportProcessInfoKTDataNotFound +export type ImportProcessingInfo = + | ImportProcessInfoKTDataNotFound | ImportProcessInfoScoreExists | ImportProcessInfoScoreImported | ImportProcessInfoInvalidDatapoint;