4 files changed, 55 insertions, 66 deletions
diff --git a/types/ext/language-descriptors.d.ts b/types/ext/language-descriptors.d.ts
new file mode 100644
index 00000000..00a95883
--- /dev/null
+++ b/types/ext/language-descriptors.d.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2024  Yomitan Authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import type {TextPreprocessor} from './language';
+import type {SafeAny} from './core';
+
+type LanguageDescriptor<TIso extends string, TTextPreprocessorDescriptor extends TextPreprocessorDescriptor> = {
+    iso: TIso;
+    name: string;
+    exampleText: string;
+    textPreprocessors: TTextPreprocessorDescriptor;
+};
+
+type TextPreprocessorDescriptor = {
+    [key: string]: TextPreprocessor<SafeAny>;
+};
+
+type LanguageDescriptorObjectMap = {
+    [key in keyof AllTextPreprocessors]: LanguageDescriptor<key, AllTextPreprocessors[key]>;
+};
+
+export type LanguageDescriptorAny = LanguageDescriptorObjectMap[keyof LanguageDescriptorObjectMap];
+
+/**
+ * This is a mapping of the iso tag to all of the preprocessors for that language.
+ * Any new language should be added to this object.
+ */
+type AllTextPreprocessors = {
+    en: {
+        capitalizeFirstLetter: TextPreprocessor<boolean>;
+        decapitalize: TextPreprocessor<boolean>;
+    };
+    ja: {
+        convertHalfWidthCharacters: TextPreprocessor<boolean>;
+        convertNumericCharacters: TextPreprocessor<boolean>;
+        convertAlphabeticCharacters: TextPreprocessor<boolean>;
+        convertHiraganaToKatakana: TextPreprocessor<boolean>;
+        convertKatakanaToHiragana: TextPreprocessor<boolean>;
+        collapseEmphaticSequences: TextPreprocessor<[collapseEmphatic: boolean, collapseEmphaticFull: boolean]>;
+    };
+};
diff --git a/types/ext/language-english.d.ts b/types/ext/language-english.d.ts
deleted file mode 100644
index ed501d57..00000000
--- a/types/ext/language-english.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2024  Yomitan Authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import type {LanguageDescriptor, TextPreprocessor} from './language';
-
-export type EnglishTextPreprocessorDescriptor = {
-    capitalizeFirstLetter: TextPreprocessor<boolean>;
-    decapitalize: TextPreprocessor<boolean>;
-};
-
-export type EnglishLanguageDescriptor = LanguageDescriptor<EnglishTextPreprocessorDescriptor>;
diff --git a/types/ext/language-japanese.d.ts b/types/ext/language-japanese.d.ts
deleted file mode 100644
index 1a627ed1..00000000
--- a/types/ext/language-japanese.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2024  Yomitan Authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import type {LanguageDescriptor, TextPreprocessor} from './language';
-
-export type JapaneseTextPreprocessorDescriptor = {
-    convertHalfWidthCharacters: TextPreprocessor<boolean>;
-    convertNumericCharacters: TextPreprocessor<boolean>;
-    convertAlphabeticCharacters: TextPreprocessor<boolean>;
-    convertHiraganaToKatakana: TextPreprocessor<boolean>;
-    convertKatakanaToHiragana: TextPreprocessor<boolean>;
-    collapseEmphaticSequences: TextPreprocessor<[collapseEmphatic: boolean, collapseEmphaticFull: boolean]>;
-};
-
-export type JapaneseLanguageDescriptor = LanguageDescriptor<JapaneseTextPreprocessorDescriptor>;
diff --git a/types/ext/language.d.ts b/types/ext/language.d.ts
index 247c7795..efbb16c6 100644
--- a/types/ext/language.d.ts
+++ b/types/ext/language.d.ts
@@ -16,7 +16,6 @@
  */
 
 import type {TextSourceMap} from '../../ext/js/general/text-source-map.js';
-import type {SafeAny} from './core';
 
 export type TextPreprocessorOptions<T = unknown> = T[];
 
@@ -44,14 +43,3 @@ export type LanguageSummary = {
     iso: string;
     exampleText: string;
 };
-
-export type LanguageDescriptor<TTextPreprocessorDescriptor extends TextPreprocessorDescriptor> = {
-    name: string;
-    iso: string;
-    exampleText: string;
-    textPreprocessors: TTextPreprocessorDescriptor;
-};
-
-export type TextPreprocessorDescriptor = {
-    [key: string]: TextPreprocessor<SafeAny>;
-};