From 88fe28e5c7db558f289f56b6944ad525c7424117 Mon Sep 17 00:00:00 2001 From: Stefan Vukovic Date: Sat, 3 Feb 2024 21:14:03 +0100 Subject: [PATCH] move files --- .eslintrc.json | 4 ++-- ext/js/background/backend.js | 2 +- ext/js/comm/clipboard-monitor.js | 2 +- ext/js/data/anki-note-builder.js | 2 +- ext/js/data/sandbox/anki-note-data-creator.js | 2 +- ext/js/display/display-generator.js | 2 +- ext/js/display/query-parser.js | 8 ++++---- ext/js/display/sandbox/pronunciation-generator.js | 2 +- ext/js/display/sandbox/structured-content-generator.js | 2 +- ext/js/language/{ => ja}/japanese-wanakana.js | 6 +++--- ext/js/language/{ => ja}/japanese.js | 4 ++-- ext/js/language/translator.js | 4 ++-- ext/js/media/audio-downloader.js | 2 +- ext/js/templates/sandbox/anki-template-renderer.js | 2 +- test/japanese-util.test.js | 4 ++-- 15 files changed, 24 insertions(+), 24 deletions(-) rename ext/js/language/{ => ja}/japanese-wanakana.js (94%) rename ext/js/language/{ => ja}/japanese.js (99%) diff --git a/.eslintrc.json b/.eslintrc.json index 156b35b556..3557f83a3e 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -615,8 +615,8 @@ "ext/js/core.js", "ext/js/core/extension-error.js", "ext/js/**/sandbox/**/*.js", - "ext/js/language/japanese.js", - "ext/js/language/japanese-wanakana.js" + "ext/js/language/ja/japanese.js", + "ext/js/language/ja/japanese-wanakana.js" ], "env": { "webextensions": false diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js index b95626f5ac..435be7308a 100644 --- a/ext/js/background/backend.js +++ b/ext/js/background/backend.js @@ -33,7 +33,7 @@ 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/japanese.js'; +import {distributeFuriganaInflected, isCodePointJapanese, isStringPartiallyJapanese, convertKatakanaToHiragana as jpConvertKatakanaToHiragana} from '../language/ja/japanese.js'; import {Translator} from '../language/translator.js'; import {AudioDownloader} from '../media/audio-downloader.js'; import {getFileExtensionFromAudioMediaType, getFileExtensionFromImageMediaType} from '../media/media-util.js'; diff --git a/ext/js/comm/clipboard-monitor.js b/ext/js/comm/clipboard-monitor.js index a8e79a1b13..6ee93f5709 100644 --- a/ext/js/comm/clipboard-monitor.js +++ b/ext/js/comm/clipboard-monitor.js @@ -17,7 +17,7 @@ */ import {EventDispatcher} from '../core/event-dispatcher.js'; -import {isStringPartiallyJapanese} from '../language/japanese.js'; +import {isStringPartiallyJapanese} from '../language/ja/japanese.js'; /** * @augments EventDispatcher diff --git a/ext/js/data/anki-note-builder.js b/ext/js/data/anki-note-builder.js index a6e1aafcf2..52160abcb1 100644 --- a/ext/js/data/anki-note-builder.js +++ b/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/japanese.js'; +import {convertHiraganaToKatakana, convertKatakanaToHiragana} from '../language/ja/japanese.js'; import {cloneFieldMarkerPattern, getRootDeckName} from './anki-util.js'; export class AnkiNoteBuilder { diff --git a/ext/js/data/sandbox/anki-note-data-creator.js b/ext/js/data/sandbox/anki-note-data-creator.js index 79570532c2..f43595b627 100644 --- a/ext/js/data/sandbox/anki-note-data-creator.js +++ b/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/japanese.js'; +import {distributeFurigana} from '../../language/ja/japanese.js'; /** * Creates a compatibility representation of the specified data. diff --git a/ext/js/display/display-generator.js b/ext/js/display/display-generator.js index fdfe3d4a77..621ea83360 100644 --- a/ext/js/display/display-generator.js +++ b/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/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'; diff --git a/ext/js/display/query-parser.js b/ext/js/display/query-parser.js index 6ec803a0b3..c864617b25 100644 --- a/ext/js/display/query-parser.js +++ b/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/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/japanese-wanakana.js'))} */ + /** @type {?(import('../language/ja/japanese-wanakana.js'))} */ this._japaneseWanakanaModule = null; - /** @type {?Promise} */ + /** @type {?Promise} */ this._japaneseWanakanaModuleImport = null; } @@ -409,7 +409,7 @@ export class QueryParser extends EventDispatcher { /** */ _loadJapaneseWanakanaModule() { if (this._japaneseWanakanaModuleImport !== null) { return; } - this._japaneseWanakanaModuleImport = import('../language/japanese-wanakana.js'); + this._japaneseWanakanaModuleImport = import('../language/ja/japanese-wanakana.js'); this._japaneseWanakanaModuleImport.then((value) => { this._japaneseWanakanaModule = value; }); } } diff --git a/ext/js/display/sandbox/pronunciation-generator.js b/ext/js/display/sandbox/pronunciation-generator.js index 373ec8305c..f28520be56 100644 --- a/ext/js/display/sandbox/pronunciation-generator.js +++ b/ext/js/display/sandbox/pronunciation-generator.js @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import {getKanaDiacriticInfo, isMoraPitchHigh} from '../../language/japanese.js'; +import {getKanaDiacriticInfo, isMoraPitchHigh} from '../../language/ja/japanese.js'; /** * @param {string[]} morae diff --git a/ext/js/display/sandbox/structured-content-generator.js b/ext/js/display/sandbox/structured-content-generator.js index ff05cc026f..a04feaf2a0 100644 --- a/ext/js/display/sandbox/structured-content-generator.js +++ b/ext/js/display/sandbox/structured-content-generator.js @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import {isStringPartiallyJapanese} from '../../language/japanese.js'; +import {isStringPartiallyJapanese} from '../../language/ja/japanese.js'; export class StructuredContentGenerator { /** diff --git a/ext/js/language/japanese-wanakana.js b/ext/js/language/ja/japanese-wanakana.js similarity index 94% rename from ext/js/language/japanese-wanakana.js rename to ext/js/language/ja/japanese-wanakana.js index b48ab6d6a0..3226048977 100644 --- a/ext/js/language/japanese-wanakana.js +++ b/ext/js/language/ja/japanese-wanakana.js @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -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) { diff --git a/ext/js/language/japanese.js b/ext/js/language/ja/japanese.js similarity index 99% rename from ext/js/language/japanese.js rename to ext/js/language/ja/japanese.js index 88eb5af589..a450804032 100644 --- a/ext/js/language/japanese.js +++ b/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) { diff --git a/ext/js/language/translator.js b/ext/js/language/translator.js index 334eb5b786..007a7d1e42 100644 --- a/ext/js/language/translator.js +++ b/ext/js/language/translator.js @@ -18,8 +18,8 @@ import {applyTextReplacement} from '../general/regex-util.js'; import {TextSourceMap} from '../general/text-source-map.js'; -import {convertAlphabeticToKana} from './japanese-wanakana.js'; -import {collapseEmphaticSequences, convertHalfWidthKanaToFullWidth, convertHiraganaToKatakana, convertKatakanaToHiragana, convertNumericToFullWidth, isCodePointJapanese} from './japanese.js'; +import {convertAlphabeticToKana} from './ja/japanese-wanakana.js'; +import {collapseEmphaticSequences, convertHalfWidthKanaToFullWidth, convertHiraganaToKatakana, convertKatakanaToHiragana, convertNumericToFullWidth, isCodePointJapanese} from './ja/japanese.js'; import {LanguageTransformer} from './language-transformer.js'; /** diff --git a/ext/js/media/audio-downloader.js b/ext/js/media/audio-downloader.js index 968c935333..b594db7f52 100644 --- a/ext/js/media/audio-downloader.js +++ b/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/japanese.js'; +import {isStringEntirelyKana} from '../language/ja/japanese.js'; export class AudioDownloader { /** diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/sandbox/anki-template-renderer.js index 26d3f33653..8ece8e245c 100644 --- a/ext/js/templates/sandbox/anki-template-renderer.js +++ b/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/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'; diff --git a/test/japanese-util.test.js b/test/japanese-util.test.js index d7b05c3e32..8997df7344 100644 --- a/test/japanese-util.test.js +++ b/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/japanese-wanakana.js'; -import * as jp from '../ext/js/language/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() {