diff --git a/package-lock.json b/package-lock.json index 6e17b62596..f3533798b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,6 +23,7 @@ "glob": "11.0.0", "hotkeys-js": "3.13.6", "immer": "9.0.21", + "kuromoji": "github:VOICEVOX/kuromoji.js#0.0.1", "markdown-it": "13.0.2", "move-file": "3.0.0", "multistream": "4.1.0", @@ -6753,6 +6754,12 @@ "url": "https://dotenvx.com" } }, + "node_modules/doublearray": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/doublearray/-/doublearray-0.0.2.tgz", + "integrity": "sha512-aw55FtZzT6AmiamEj2kvmR6BuFqvYgKZUkfQ7teqVRNqD5UE0rw8IeW/3gieHNKQ5sPuDKlljWEn4bzv5+1bHw==", + "license": "MIT" + }, "node_modules/earcut": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", @@ -8128,7 +8135,6 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", - "dev": true, "license": "MIT" }, "node_modules/figures": { @@ -10154,6 +10160,25 @@ "node": ">=6" } }, + "node_modules/kuromoji": { + "version": "0.0.1", + "resolved": "git+ssh://git@github.com/VOICEVOX/kuromoji.js.git#0e8d670cd3df64217d0502d3bb71f431531ff353", + "license": "Apache-2.0", + "dependencies": { + "async": "^2.0.1", + "doublearray": "0.0.2", + "fflate": "^0.8.2" + } + }, + "node_modules/kuromoji/node_modules/async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "license": "MIT", + "dependencies": { + "lodash": "^4.17.14" + } + }, "node_modules/lazy-val": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", @@ -10311,7 +10336,6 @@ "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true, "license": "MIT" }, "node_modules/lodash.clonedeep": { diff --git a/package.json b/package.json index 114b642d4b..c705d416d1 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "glob": "11.0.0", "hotkeys-js": "3.13.6", "immer": "9.0.21", + "kuromoji": "github:VOICEVOX/kuromoji.js#0.0.1", "markdown-it": "13.0.2", "move-file": "3.0.0", "multistream": "4.1.0", diff --git a/src/backend/browser/sandbox.ts b/src/backend/browser/sandbox.ts index a722a36189..38b0f12e7a 100644 --- a/src/backend/browser/sandbox.ts +++ b/src/backend/browser/sandbox.ts @@ -13,10 +13,10 @@ import { EngineId, EngineSettingType, EngineSettings, - HotkeySettingType, Sandbox, } from "@/type/preload"; import { AssetTextFileNames } from "@/type/staticResources"; +import { HotkeySettingType } from "@/domain/hotkeyAction"; const toStaticPath = (fileName: string) => `${import.meta.env.BASE_URL}/${fileName}`.replaceAll(/\/\/+/g, "/"); diff --git a/src/backend/common/ConfigManager.ts b/src/backend/common/ConfigManager.ts index 22f5db1d28..7c216464b1 100644 --- a/src/backend/common/ConfigManager.ts +++ b/src/backend/common/ConfigManager.ts @@ -5,15 +5,17 @@ import { ConfigType, configSchema, DefaultStyleId, - defaultHotkeySettings, - HotkeySettingType, ExperimentalSettingType, - HotkeyCombination, VoiceId, PresetKey, } from "@/type/preload"; import { ensureNotNullish } from "@/helpers/errorHelper"; import { loadEnvEngineInfos } from "@/domain/defaultEngine/envEngineInfo"; +import { + HotkeyCombination, + defaultHotkeySettings, + HotkeySettingType, +} from "@/domain/hotkeyAction"; const lockKey = "save"; @@ -341,6 +343,12 @@ export abstract class BaseConfigManager { this._save(); } + /** 全ての設定を取得する。テスト用。 */ + public getAll(): ConfigType { + if (!this.config) throw new Error("Config is not initialized"); + return this.config; + } + private _save() { void this.lock.acquire(lockKey, async () => { await this.save({ diff --git a/src/components/Dialog/HotkeyRecordingDialog.vue b/src/components/Dialog/HotkeyRecordingDialog.vue index 46047b9b65..b54bcc0d9e 100644 --- a/src/components/Dialog/HotkeyRecordingDialog.vue +++ b/src/components/Dialog/HotkeyRecordingDialog.vue @@ -83,7 +83,7 @@