From 12f1796d3cfbbadbe6117c085bcbd73357b0bdef Mon Sep 17 00:00:00 2001 From: zkldi Date: Sat, 21 Aug 2021 01:58:14 +0100 Subject: [PATCH] Move BatchManual declarations to tachi-common --- .../import-types/common/batch-manual/parser.ts | 12 ++++++++++-- .../import-types/file/batch-manual/parser.ts | 3 ++- .../import-types/ir/direct-manual/parser.ts | 3 ++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts index b61f618c1..92d5c63f6 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts @@ -1,8 +1,16 @@ import { KtLogger } from "lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; +import { BatchManualContext } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; -import { Game, ImportTypes, GetGamePTConfig, Playtypes, GetGameConfig } from "tachi-common"; +import { + Game, + ImportTypes, + GetGamePTConfig, + Playtypes, + GetGameConfig, + BatchManualScore, + BatchManual, +} from "tachi-common"; import deepmerge from "deepmerge"; import { FormatPrError } from "utils/prudence"; import { ParserFunctionReturns } from "../types"; diff --git a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts index e244ec00f..f8f84cc89 100644 --- a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts @@ -1,7 +1,8 @@ import { KtLogger } from "lib/logger/logger"; +import { BatchManualScore } from "tachi-common"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; -import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; +import { BatchManualContext } from "../../common/batch-manual/types"; import { ParserFunctionReturns } from "../../common/types"; /** diff --git a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts index fc6ce806c..d304e53b0 100644 --- a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts +++ b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts @@ -1,6 +1,7 @@ import { KtLogger } from "lib/logger/logger"; +import { BatchManualScore } from "tachi-common"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; -import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; +import { BatchManualContext } from "../../common/batch-manual/types"; import { ParserFunctionReturns } from "../../common/types"; /**