simplify folder structure

.eslintrc.json

@@ -615,8 +615,8 @@
                 "ext/js/core.js",
                 "ext/js/core/extension-error.js",
                 "ext/js/**/sandbox/**/*.js",
-                "ext/js/language/languages/ja/japanese.js",
-                "ext/js/language/languages/ja/japanese-wanakana.js"
+                "ext/js/language/ja/japanese.js",
+                "ext/js/language/ja/japanese-wanakana.js"
             ],
             "env": {
                 "webextensions": false

ext/js/background/backend.js

@@ -32,8 +32,8 @@ import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js';
 import {DictionaryDatabase} from '../dictionary/dictionary-database.js';
 import {Environment} from '../extension/environment.js';
 import {ObjectPropertyAccessor} from '../general/object-property-accessor.js';
+import {distributeFuriganaInflected, isCodePointJapanese, isStringPartiallyJapanese, convertKatakanaToHiragana as jpConvertKatakanaToHiragana} from '../language/ja/japanese.js';
 import {LanguageUtil} from '../language/language-util.js';
-import {distributeFuriganaInflected, isCodePointJapanese, isStringPartiallyJapanese, convertKatakanaToHiragana as jpConvertKatakanaToHiragana} from '../language/languages/ja/japanese.js';
 import {Translator} from '../language/translator.js';
 import {AudioDownloader} from '../media/audio-downloader.js';
 import {getFileExtensionFromAudioMediaType, getFileExtensionFromImageMediaType} from '../media/media-util.js';

ext/js/comm/clipboard-monitor.js

@@ -17,7 +17,7 @@
  */
 
 import {EventDispatcher} from '../core/event-dispatcher.js';
-import {isStringPartiallyJapanese} from '../language/languages/ja/japanese.js';
+import {isStringPartiallyJapanese} from '../language/ja/japanese.js';
 
 /**
  * @augments EventDispatcher<import('clipboard-monitor').Events>

ext/js/data/anki-note-builder.js

@@ -18,7 +18,7 @@
 
 import {ExtensionError} from '../core/extension-error.js';
 import {deferPromise} from '../core/utilities.js';
-import {convertHiraganaToKatakana, convertKatakanaToHiragana} from '../language/languages/ja/japanese.js';
+import {convertHiraganaToKatakana, convertKatakanaToHiragana} from '../language/ja/japanese.js';
 import {cloneFieldMarkerPattern, getRootDeckName} from './anki-util.js';
 
 export class AnkiNoteBuilder {

ext/js/data/sandbox/anki-note-data-creator.js

@@ -17,7 +17,7 @@
  */
 
 import {getDisambiguations, getGroupedPronunciations, getPronunciationsOfType, getTermFrequency, groupTermTags} from '../../dictionary/dictionary-data-util.js';
-import {distributeFurigana} from '../../language/languages/ja/japanese.js';
+import {distributeFurigana} from '../../language/ja/japanese.js';
 
 /**
  * Creates a compatibility representation of the specified data.

ext/js/display/display-generator.js

@@ -20,7 +20,7 @@ import {ExtensionError} from '../core/extension-error.js';
 import {isObject} from '../core/utilities.js';
 import {getDisambiguations, getGroupedPronunciations, getTermFrequency, groupKanjiFrequencies, groupTermFrequencies, groupTermTags, isNonNounVerbOrAdjective} from '../dictionary/dictionary-data-util.js';
 import {HtmlTemplateCollection} from '../dom/html-template-collection.js';
-import {distributeFurigana, getKanaMorae, getPitchCategory, isCodePointKanji, isStringPartiallyJapanese} from '../language/languages/ja/japanese.js';
+import {distributeFurigana, getKanaMorae, getPitchCategory, isCodePointKanji, isStringPartiallyJapanese} from '../language/ja/japanese.js';
 import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from './sandbox/pronunciation-generator.js';
 import {StructuredContentGenerator} from './sandbox/structured-content-generator.js';
 

ext/js/display/query-parser.js

@@ -19,7 +19,7 @@
 import {EventDispatcher} from '../core/event-dispatcher.js';
 import {log} from '../core/logger.js';
 import {querySelectorNotNull} from '../dom/query-selector.js';
-import {convertHiraganaToKatakana, convertKatakanaToHiragana, isStringEntirelyKana} from '../language/languages/ja/japanese.js';
+import {convertHiraganaToKatakana, convertKatakanaToHiragana, isStringEntirelyKana} from '../language/ja/japanese.js';
 import {TextScanner} from '../language/text-scanner.js';
 
 /**
@@ -67,9 +67,9 @@ export class QueryParser extends EventDispatcher {
             searchOnClick: true,
             textSourceGenerator
         });
-        /** @type {?(import('../language/languages/ja/japanese-wanakana.js'))} */
+        /** @type {?(import('../language/ja/japanese-wanakana.js'))} */
         this._japaneseWanakanaModule = null;
-        /** @type {?Promise<import('../language/languages/ja/japanese-wanakana.js')>} */
+        /** @type {?Promise<import('../language/ja/japanese-wanakana.js')>} */
         this._japaneseWanakanaModuleImport = null;
     }
 
@@ -409,7 +409,7 @@ export class QueryParser extends EventDispatcher {
     /** */
     _loadJapaneseWanakanaModule() {
         if (this._japaneseWanakanaModuleImport !== null) { return; }
-        this._japaneseWanakanaModuleImport = import('../language/languages/ja/japanese-wanakana.js');
+        this._japaneseWanakanaModuleImport = import('../language/ja/japanese-wanakana.js');
         this._japaneseWanakanaModuleImport.then((value) => { this._japaneseWanakanaModule = value; });
     }
 }

ext/js/display/sandbox/pronunciation-generator.js

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {getKanaDiacriticInfo, isMoraPitchHigh} from '../../language/languages/ja/japanese.js';
+import {getKanaDiacriticInfo, isMoraPitchHigh} from '../../language/ja/japanese.js';
 
 /**
  * @param {string[]} morae

ext/js/display/sandbox/structured-content-generator.js

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {isStringPartiallyJapanese} from '../../language/languages/ja/japanese.js';
+import {isStringPartiallyJapanese} from '../../language/ja/japanese.js';
 
 export class StructuredContentGenerator {
     /**

ext/js/language/languages/ja/japanese-wanakana.js → ext/js/language/ja/japanese-wanakana.js

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import * as wanakana from '../../../../lib/wanakana.js';
+import * as wanakana from '../../../lib/wanakana.js';
 
 /**
  * @param {string} text
- * @param {?import('../../../general/text-source-map.js').TextSourceMap} sourceMap
+ * @param {?import('../../general/text-source-map.js').TextSourceMap} sourceMap
  * @param {number} sourceMapStart
  * @returns {string}
  */
@@ -84,7 +84,7 @@ export function convertToRomaji(text) {
 
 /**
  * @param {string} text
- * @param {?import('../../../general/text-source-map.js').TextSourceMap} sourceMap
+ * @param {?import('../../general/text-source-map.js').TextSourceMap} sourceMap
  * @returns {string}
  */
 export function convertAlphabeticToKana(text, sourceMap = null) {

ext/js/language/languages/ja/japanese.js → ext/js/language/ja/japanese.js

@@ -539,7 +539,7 @@ export function convertNumericToFullWidth(text) {
 
 /**
  * @param {string} text
- * @param {?import('../../../general/text-source-map.js').TextSourceMap} [sourceMap]
+ * @param {?import('../../general/text-source-map.js').TextSourceMap} [sourceMap]
  * @returns {string}
  */
 export function convertHalfWidthKanaToFullWidth(text, sourceMap = null) {
@@ -705,7 +705,7 @@ export function distributeFuriganaInflected(term, reading, source) {
 /**
  * @param {string} text
  * @param {boolean} fullCollapse
- * @param {?import('../../../general/text-source-map.js').TextSourceMap} [sourceMap]
+ * @param {?import('../../general/text-source-map.js').TextSourceMap} [sourceMap]
  * @returns {string}
  */
 export function collapseEmphaticSequences(text, fullCollapse, sourceMap = null) {

ext/js/language/language-util.js

@@ -16,7 +16,7 @@
  */
 
 import {fetchJson} from '../core/utilities.js';
-import {languageFeatures} from './languages/index.js';
+import {languageFeatures} from './index.js';
 
 export class LanguageUtil {
     constructor() {
@@ -27,7 +27,7 @@ export class LanguageUtil {
     /** */
     async prepare() {
         /** @type {import('language').Language[]} */
-        const languages = await fetchJson('/js/language/languages/index.json');
+        const languages = await fetchJson('/js/language/index.json');
         for (const {iso, name, flag, exampleText} of languages) {
             const features = languageFeatures.get(iso) || {textTransformations: []};
             this.languages.set(iso, {...features, iso, name, flag, exampleText});

ext/js/language/translator.js

@@ -18,9 +18,9 @@
 
 import {applyTextReplacement} from '../general/regex-util.js';
 import {TextSourceMap} from '../general/text-source-map.js';
+import {isCodePointJapanese} from './ja/japanese.js';
 import {LanguageTransformer} from './language-transformer.js';
 import {LanguageUtil} from './language-util.js';
-import {isCodePointJapanese} from './languages/ja/japanese.js';
 /**
  * Class which finds term and kanji dictionary entries for text.
  */

ext/js/media/audio-downloader.js

@@ -23,7 +23,7 @@ import {JsonSchema} from '../data/json-schema.js';
 import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js';
 import {NativeSimpleDOMParser} from '../dom/native-simple-dom-parser.js';
 import {SimpleDOMParser} from '../dom/simple-dom-parser.js';
-import {isStringEntirelyKana} from '../language/languages/ja/japanese.js';
+import {isStringEntirelyKana} from '../language/ja/japanese.js';
 
 export class AudioDownloader {
     /**

ext/js/templates/sandbox/anki-template-renderer.js

@@ -22,7 +22,7 @@ import {getPronunciationsOfType, isNonNounVerbOrAdjective} from '../../dictionar
 import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from '../../display/sandbox/pronunciation-generator.js';
 import {StructuredContentGenerator} from '../../display/sandbox/structured-content-generator.js';
 import {CssStyleApplier} from '../../dom/sandbox/css-style-applier.js';
-import {convertHiraganaToKatakana, convertKatakanaToHiragana, distributeFurigana, getKanaMorae, getPitchCategory, isMoraPitchHigh} from '../../language/languages/ja/japanese.js';
+import {convertHiraganaToKatakana, convertKatakanaToHiragana, distributeFurigana, getKanaMorae, getPitchCategory, isMoraPitchHigh} from '../../language/ja/japanese.js';
 import {AnkiTemplateRendererContentManager} from './anki-template-renderer-content-manager.js';
 import {TemplateRendererMediaProvider} from './template-renderer-media-provider.js';
 import {TemplateRenderer} from './template-renderer.js';

test/data/json.json

@@ -96,7 +96,7 @@
             "type": "LanguageTransformDescriptor"
         },
         {
-            "path": "ext/js/language/languages/index.json",
+            "path": "ext/js/language/index.json",
             "typeFile": "types/ext/language.d.ts",
             "type": "LanguagePropertiesArray"
         },

test/japanese-util.test.js

@@ -18,8 +18,8 @@
 
 import {describe, expect, test} from 'vitest';
 import {TextSourceMap} from '../ext/js/general/text-source-map.js';
-import * as jpw from '../ext/js/language/languages/ja/japanese-wanakana.js';
-import * as jp from '../ext/js/language/languages/ja/japanese.js';
+import * as jpw from '../ext/js/language/ja/japanese-wanakana.js';
+import * as jp from '../ext/js/language/ja/japanese.js';
 
 /** */
 function testIsCodePointKanji() {