summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2024-02-18 08:09:42 -0500
committerGitHub <noreply@github.com>2024-02-18 13:09:42 +0000
commitc48cd6ff6d8dcced7baf1b27ce3ac2449944f5d7 (patch)
tree997b70dca3f2095f6f2c828e6ad183cf601a9195 /ext
parent251db0126c20ae159ce9d4cdf29413330f01dc65 (diff)
Language descriptors organization (#704)
* Move languageDescriptorMap * Move text preprocessors * Merge into language-descriptors.js * Merge typescript * Initialize inline * Move types * Update types * Update eslint * Update jsconfig reference * Rename
Diffstat (limited to 'ext')
-rw-r--r--ext/js/language/en/language-english.js29
-rw-r--r--ext/js/language/ja/japanese-text-preprocessors.js86
-rw-r--r--ext/js/language/ja/language-japanese.js77
-rw-r--r--ext/js/language/language-descriptors.js51
-rwxr-xr-xext/js/language/languages.js14
5 files changed, 138 insertions, 119 deletions
diff --git a/ext/js/language/en/language-english.js b/ext/js/language/en/language-english.js
deleted file mode 100644
index 8268653f..00000000
--- a/ext/js/language/en/language-english.js
+++ /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 {capitalizeFirstLetter, decapitalize} from '../text-preprocessors.js';
-
-/** @type {import('language-english').EnglishLanguageDescriptor} */
-export const descriptor = {
- name: 'English',
- iso: 'en',
- exampleText: 'read',
- textPreprocessors: {
- capitalizeFirstLetter,
- decapitalize
- }
-};
diff --git a/ext/js/language/ja/japanese-text-preprocessors.js b/ext/js/language/ja/japanese-text-preprocessors.js
new file mode 100644
index 00000000..ab4138c3
--- /dev/null
+++ b/ext/js/language/ja/japanese-text-preprocessors.js
@@ -0,0 +1,86 @@
+/*
+ * 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 {basicTextPreprocessorOptions} from '../text-preprocessors.js';
+import {convertAlphabeticToKana} from './japanese-wanakana.js';
+import {
+ collapseEmphaticSequences as collapseEmphaticSequencesFunction,
+ convertHalfWidthKanaToFullWidth,
+ convertHiraganaToKatakana as convertHiraganaToKatakanaFunction,
+ convertKatakanaToHiragana as convertKatakanaToHiraganaFunction,
+ convertNumericToFullWidth
+} from './japanese.js';
+
+/** @type {import('language').TextPreprocessor<boolean>} */
+export const convertHalfWidthCharacters = {
+ name: 'Convert half width characters to full width',
+ description: 'ヨミチャン → ヨミチャン',
+ options: basicTextPreprocessorOptions,
+ /** @type {import('language').TextPreprocessorFunction<boolean>} */
+ process: (str, setting, sourceMap) => (setting ? convertHalfWidthKanaToFullWidth(str, sourceMap) : str)
+};
+
+/** @type {import('language').TextPreprocessor<boolean>} */
+export const convertNumericCharacters = {
+ name: 'Convert numeric characters to full width',
+ description: '1234 → 1234',
+ options: basicTextPreprocessorOptions,
+ /** @type {import('language').TextPreprocessorFunction<boolean>} */
+ process: (str, setting) => (setting ? convertNumericToFullWidth(str) : str)
+};
+
+/** @type {import('language').TextPreprocessor<boolean>} */
+export const convertAlphabeticCharacters = {
+ name: 'Convert alphabetic characters to hiragana',
+ description: 'yomichan → よみちゃん',
+ options: basicTextPreprocessorOptions,
+ /** @type {import('language').TextPreprocessorFunction<boolean>} */
+ process: (str, setting, sourceMap) => (setting ? convertAlphabeticToKana(str, sourceMap) : str)
+};
+
+/** @type {import('language').TextPreprocessor<boolean>} */
+export const convertHiraganaToKatakana = {
+ name: 'Convert hiragana to katakana',
+ description: 'よみちゃん → ヨミチャン',
+ options: basicTextPreprocessorOptions,
+ /** @type {import('language').TextPreprocessorFunction<boolean>} */
+ process: (str, setting) => (setting ? convertHiraganaToKatakanaFunction(str) : str)
+};
+
+/** @type {import('language').TextPreprocessor<boolean>} */
+export const convertKatakanaToHiragana = {
+ name: 'Convert katakana to hiragana',
+ description: 'ヨミチャン → よみちゃん',
+ options: basicTextPreprocessorOptions,
+ /** @type {import('language').TextPreprocessorFunction<boolean>} */
+ process: (str, setting) => (setting ? convertKatakanaToHiraganaFunction(str) : str)
+};
+
+/** @type {import('language').TextPreprocessor<[collapseEmphatic: boolean, collapseEmphaticFull: boolean]>} */
+export const collapseEmphaticSequences = {
+ name: 'Collapse emphatic character sequences',
+ description: 'すっっごーーい → すっごーい / すごい',
+ options: [[false, false], [true, false], [true, true]],
+ /** @type {import('language').TextPreprocessorFunction<[collapseEmphatic: boolean, collapseEmphaticFull: boolean]>} */
+ process: (str, setting, sourceMap) => {
+ const [collapseEmphatic, collapseEmphaticFull] = setting;
+ if (collapseEmphatic) {
+ str = collapseEmphaticSequencesFunction(str, collapseEmphaticFull, sourceMap);
+ }
+ return str;
+ }
+};
diff --git a/ext/js/language/ja/language-japanese.js b/ext/js/language/ja/language-japanese.js
deleted file mode 100644
index ced34bcd..00000000
--- a/ext/js/language/ja/language-japanese.js
+++ /dev/null
@@ -1,77 +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 {basicTextPreprocessorOptions} from '../text-preprocessors.js';
-import {convertAlphabeticToKana} from './japanese-wanakana.js';
-import {collapseEmphaticSequences, convertHalfWidthKanaToFullWidth, convertHiraganaToKatakana, convertKatakanaToHiragana, convertNumericToFullWidth} from './japanese.js';
-
-/** @type {import('language-japanese').JapaneseLanguageDescriptor} */
-export const descriptor = {
- name: 'Japanese',
- iso: 'ja',
- exampleText: '読め',
- textPreprocessors: {
- convertHalfWidthCharacters: {
- name: 'Convert half width characters to full width',
- description: 'ヨミチャン → ヨミチャン',
- options: basicTextPreprocessorOptions,
- /** @type {import('language').TextPreprocessorFunction<boolean>} */
- process: (str, setting, sourceMap) => (setting ? convertHalfWidthKanaToFullWidth(str, sourceMap) : str)
- },
- convertNumericCharacters: {
- name: 'Convert numeric characters to full width',
- description: '1234 → 1234',
- options: basicTextPreprocessorOptions,
- /** @type {import('language').TextPreprocessorFunction<boolean>} */
- process: (str, setting) => (setting ? convertNumericToFullWidth(str) : str)
- },
- convertAlphabeticCharacters: {
- name: 'Convert alphabetic characters to hiragana',
- description: 'yomichan → よみちゃん',
- options: basicTextPreprocessorOptions,
- /** @type {import('language').TextPreprocessorFunction<boolean>} */
- process: (str, setting, sourceMap) => (setting ? convertAlphabeticToKana(str, sourceMap) : str)
- },
- convertHiraganaToKatakana: {
- name: 'Convert hiragana to katakana',
- description: 'よみちゃん → ヨミチャン',
- options: basicTextPreprocessorOptions,
- /** @type {import('language').TextPreprocessorFunction<boolean>} */
- process: (str, setting) => (setting ? convertHiraganaToKatakana(str) : str)
- },
- convertKatakanaToHiragana: {
- name: 'Convert katakana to hiragana',
- description: 'ヨミチャン → よみちゃん',
- options: basicTextPreprocessorOptions,
- /** @type {import('language').TextPreprocessorFunction<boolean>} */
- process: (str, setting) => (setting ? convertKatakanaToHiragana(str) : str)
- },
- collapseEmphaticSequences: {
- name: 'Collapse emphatic character sequences',
- description: 'すっっごーーい → すっごーい / すごい',
- options: [[false, false], [true, false], [true, true]],
- /** @type {import('language').TextPreprocessorFunction<[collapseEmphatic: boolean, collapseEmphaticFull: boolean]>} */
- process: (str, setting, sourceMap) => {
- const [collapseEmphatic, collapseEmphaticFull] = setting;
- if (collapseEmphatic) {
- str = collapseEmphaticSequences(str, collapseEmphaticFull, sourceMap);
- }
- return str;
- }
- }
- }
-};
diff --git a/ext/js/language/language-descriptors.js b/ext/js/language/language-descriptors.js
new file mode 100644
index 00000000..ee65a011
--- /dev/null
+++ b/ext/js/language/language-descriptors.js
@@ -0,0 +1,51 @@
+/*
+ * 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 {collapseEmphaticSequences, convertAlphabeticCharacters, convertHalfWidthCharacters, convertHiraganaToKatakana, convertKatakanaToHiragana, convertNumericCharacters} from './ja/japanese-text-preprocessors.js';
+import {capitalizeFirstLetter, decapitalize} from './text-preprocessors.js';
+
+/** @type {import('language-descriptors').LanguageDescriptorAny[]} */
+const languageDescriptors = [
+ {
+ iso: 'en',
+ name: 'English',
+ exampleText: 'read',
+ textPreprocessors: {
+ capitalizeFirstLetter,
+ decapitalize
+ }
+ },
+ {
+ iso: 'ja',
+ name: 'Japanese',
+ exampleText: '読め',
+ textPreprocessors: {
+ convertHalfWidthCharacters,
+ convertNumericCharacters,
+ convertAlphabeticCharacters,
+ convertHiraganaToKatakana,
+ convertKatakanaToHiragana,
+ collapseEmphaticSequences
+ }
+ }
+];
+
+/** @type {Map<string, import('language-descriptors').LanguageDescriptorAny>} */
+export const languageDescriptorMap = new Map();
+for (const languageDescriptor of languageDescriptors) {
+ languageDescriptorMap.set(languageDescriptor.iso, languageDescriptor);
+}
diff --git a/ext/js/language/languages.js b/ext/js/language/languages.js
index f51ca163..f964dfec 100755
--- a/ext/js/language/languages.js
+++ b/ext/js/language/languages.js
@@ -15,19 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import {descriptor as descriptorEnglish} from './en/language-english.js';
-import {descriptor as descriptorJapanese} from './ja/language-japanese.js';
-
-const languageDescriptors = [
- descriptorEnglish,
- descriptorJapanese
-];
-
-/** @type {Map<string, typeof languageDescriptors[0]>} */
-const languageDescriptorMap = new Map();
-for (const languageDescriptor of languageDescriptors) {
- languageDescriptorMap.set(languageDescriptor.iso, languageDescriptor);
-}
+import {languageDescriptorMap} from './language-descriptors.js';
/**
* @returns {import('language').LanguageSummary[]}