refactor: replace languageToCodeMap with formatLanguage and formatLanguages functions

Author: zhyupe

packages/cli/src/commands/exd.ts

@@ -2,7 +2,7 @@ import { mkdir } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createExdFilter, ExdCSVFormat } from '@ffcafe/ixion-exd'
 import { servers } from '@ffcafe/ixion-server'
-import { languageToCodeMap } from '@ffcafe/ixion-utils'
+import { formatLanguages } from '@ffcafe/ixion-utils'
 import type { Command } from 'commander'
 import { parseServerVersions } from '../actions/exd-base'
 import { buildExdFiles } from '../actions/exd-build'
@@ -406,9 +406,7 @@ export function registerExdCommand(program: Command) {
 
           console.log(`📊 Exporting EXD files${description}...`)
           console.log(`  Format: ${options.format || 'single'}`)
-          console.log(
-            `  Languages: ${languages.map((l) => languageToCodeMap[l]).join(', ')}`,
-          )
+          console.log(`  Languages: ${formatLanguages(languages)}`)
           await exportExdFilesToCSV({
             server,
             version: options.version,

packages/exd/src/csv.ts

@@ -8,7 +8,7 @@ import {
   getExdPath,
   type SqPackReader,
 } from '@ffcafe/ixion-sqpack'
-import { Language, languageToCodeMap } from '@ffcafe/ixion-utils'
+import { formatLanguage, Language } from '@ffcafe/ixion-utils'
 import { SingleBar } from 'cli-progress'
 import type { DefinitionProvider } from './schema/interface'
 import { getSaintcoinachType } from './schema/utils'
@@ -42,7 +42,7 @@ export enum ExdCSVFormat {
 
 const csvName = (sheet: string, language?: Language) => {
   if (language) {
-    return `${sheet}.${languageToCodeMap[language]}.csv`
+    return `${sheet}.${formatLanguage(language)}.csv`
   }
   return `${sheet}.csv`
 }

packages/exd/src/strings.ts

@@ -1,7 +1,7 @@
 import { mkdirSync, writeFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { ExcelColumnDataType, type SqPackReader } from '@ffcafe/ixion-sqpack'
-import { Language, languageToCodeMap } from '@ffcafe/ixion-utils'
+import { formatLanguage, Language } from '@ffcafe/ixion-utils'
 import { SingleBar } from 'cli-progress'
 import { formatSeString, parseSeString } from './sestring'
 import {
@@ -97,28 +97,24 @@ export class StringsExporter {
     const stringMap: Record<string, Map<string, any[]>> = {}
     const idSet = new Set<string>()
     for (const [language, reader] of readers.entries()) {
+      const code = formatLanguage(language)
       try {
         const header = await readExhHeaderFromReader(reader, sheet)
         const columnIndexes = getStringColumnIndexes(header)
         columnCount = Math.max(columnCount, columnIndexes.length)
 
-        stringMap[languageToCodeMap[language]] = await readColumnsFromSheet(
-          reader,
-          {
-            sheetName: sheet,
-            header,
-            language,
-            columnIndexes,
-          },
-        )
-
-        for (const id of stringMap[languageToCodeMap[language]].keys()) {
+        stringMap[code] = await readColumnsFromSheet(reader, {
+          sheetName: sheet,
+          header,
+          language,
+          columnIndexes,
+        })
+
+        for (const id of stringMap[code].keys()) {
           idSet.add(id)
         }
       } catch {
-        console.error(
-          `${sheet}: Failed reading language ${languageToCodeMap[language]}`,
-        )
+        console.error(`${sheet}: Failed reading language ${code}`)
       }
     }
 

packages/utils/src/language.ts

@@ -32,3 +32,11 @@ export const languageToCodeMap: Record<Language, string> = {
   [Language.Korean]: 'ko',
   [Language.ChineseTraditional2]: 'tc',
 }
+
+export function formatLanguage(lang: Language) {
+  return languageToCodeMap[lang] || `unk(${lang})`
+}
+
+export function formatLanguages(arr: Language[]) {
+  return arr.map(formatLanguage).join(', ')
+}