From 5ddceb5d9d5d59cce4937bcfa107dfab149ca919 Mon Sep 17 00:00:00 2001 From: Sakura Knoll Date: Sun, 9 Jul 2023 07:57:03 +0900 Subject: [PATCH] Move compile modules --- src/lib/v2-pre/server/buildData.spec.ts | 12 ------------ .../compileData/compileBattlesuitData.spec.ts | 12 ++++++++++++ .../compileBattlesuitData.ts} | 14 +++++++------- src/scripts/compileRawData.ts | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 src/lib/v2-pre/server/buildData.spec.ts create mode 100644 src/lib/v2-pre/server/compileData/compileBattlesuitData.spec.ts rename src/lib/v2-pre/server/{buildData.ts => compileData/compileBattlesuitData.ts} (95%) diff --git a/src/lib/v2-pre/server/buildData.spec.ts b/src/lib/v2-pre/server/buildData.spec.ts deleted file mode 100644 index bbb994f1..00000000 --- a/src/lib/v2-pre/server/buildData.spec.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { buildBattlesuitList } from './buildData' - -describe('buildBattlesuitList', () => { - it('build list', () => { - const list = buildBattlesuitList() - expect(list[0]).toMatchObject({ - id: expect.any(String), - tags: ['physical-dmg', 'stun', 'burst', 'time-mastery'] - }) - // console.log(list[0]) - }) -}) diff --git a/src/lib/v2-pre/server/compileData/compileBattlesuitData.spec.ts b/src/lib/v2-pre/server/compileData/compileBattlesuitData.spec.ts new file mode 100644 index 00000000..0dff6d74 --- /dev/null +++ b/src/lib/v2-pre/server/compileData/compileBattlesuitData.spec.ts @@ -0,0 +1,12 @@ +import { compileBattlesuitData } from './compileBattlesuitData' + +describe('compileBattlesuitData', () => { + it('converts tags', () => { + const list = compileBattlesuitData() + expect(list[0]).toMatchObject({ + id: expect.any(String), + tags: ['physical-dmg', 'stun', 'burst', 'time-mastery'] + }) + // console.log(list[0]) + }) +}) diff --git a/src/lib/v2-pre/server/buildData.ts b/src/lib/v2-pre/server/compileData/compileBattlesuitData.ts similarity index 95% rename from src/lib/v2-pre/server/buildData.ts rename to src/lib/v2-pre/server/compileData/compileBattlesuitData.ts index 07008915..2bebb6e0 100644 --- a/src/lib/v2-pre/server/buildData.ts +++ b/src/lib/v2-pre/server/compileData/compileBattlesuitData.ts @@ -8,19 +8,19 @@ import { SkillType, TagType, WeaponType -} from '../data/types' -import { getRawAvatarDataMap } from './raw/avatarData' -import { getRawAvatarSkillDataMap } from './raw/avatarSkillData' -import { getRawAvatarSubSkillDataMap } from './raw/avatarSubSkillData' -import { getRawAvatarTagUnLockDataMap } from './raw/avatarTagUnLockData' -import { getRawTextMap } from './raw/textMap' +} from '../../data/types' +import { getRawAvatarDataMap } from '../raw/avatarData' +import { getRawAvatarSkillDataMap } from '../raw/avatarSkillData' +import { getRawAvatarSubSkillDataMap } from '../raw/avatarSubSkillData' +import { getRawAvatarTagUnLockDataMap } from '../raw/avatarTagUnLockData' +import { getRawTextMap } from '../raw/textMap' export function getText(id: string | number) { const rawTextMap = getRawTextMap() return rawTextMap[id]?.Text || null } -export function buildBattlesuitList(): Battlesuit[] { +export function compileBattlesuitData(): Battlesuit[] { const rawAvatarDataMap = getRawAvatarDataMap() const rawSkillDataMap = getRawAvatarSkillDataMap() const rawSubSkillDataMap = getRawAvatarSubSkillDataMap() diff --git a/src/scripts/compileRawData.ts b/src/scripts/compileRawData.ts index 4cd390c3..3bb1c6ed 100644 --- a/src/scripts/compileRawData.ts +++ b/src/scripts/compileRawData.ts @@ -1,4 +1,3 @@ -import { buildBattlesuitList } from '../lib/v2-pre/server/buildData' import path from 'path' import { createDirIfNotExist } from '../lib/v2-pre/server/fsUtils' import fs from 'fs' @@ -6,6 +5,7 @@ import YAML from 'yaml' import { runScript } from './lib/utils' import { battlesuitCatalogPath, battlesuitsDir, dataDir } from '../lib/v2-pre/server/loadData' import { BattlesuitCatalogItem } from '../lib/v2-pre/data/types' +import { compileBattlesuitData } from '../lib/v2-pre/server/migration/compileBattlesuitData' runScript(async () => { createDirIfNotExist(dataDir) @@ -13,7 +13,7 @@ runScript(async () => { }) function writeBattlesuitData() { - const battlesuitList = buildBattlesuitList() + const battlesuitList = compileBattlesuitData() const simplifiedList: BattlesuitCatalogItem[] = battlesuitList.map(battlesuit => { return {