FIX: MorphingInfo型からundefinedを除去

VOICEVOX · Dec 5, 2022 · ce49463 · ce49463
1 parent a35afc6
commit ce49463
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/store/audio.ts b/src/store/audio.ts
@@ -684,7 +684,7 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
       {
         audioKey,
         morphingInfo,
-      }: { audioKey: string; morphingInfo: MorphingInfo }
+      }: { audioKey: string; morphingInfo: MorphingInfo | undefined }
     ) {
       const item = state.audioItems[audioKey];
       item.morphingInfo = morphingInfo;
@@ -2505,7 +2505,7 @@ export const audioCommandStore = transformCommandStore(
         draft,
         payload: {
           audioKey: string;
-          morphingInfo: MorphingInfo;
+          morphingInfo: MorphingInfo | undefined;
         }
       ) {
         audioStore.mutations.SET_MORPHING_INFO(draft, payload);
@@ -2514,7 +2514,7 @@ export const audioCommandStore = transformCommandStore(
         { commit },
         payload: {
           audioKey: string;
-          morphingInfo: MorphingInfo;
+          morphingInfo: MorphingInfo | undefined;
         }
       ) {
         commit("COMMAND_SET_MORPHING_INFO", payload);

diff --git a/src/store/type.ts b/src/store/type.ts
@@ -269,7 +269,7 @@ export type AudioStoreTypes = {
   SET_MORPHING_INFO: {
     mutation: {
       audioKey: string;
-      morphingInfo: MorphingInfo;
+      morphingInfo: MorphingInfo | undefined;
     };
   };
 
@@ -588,9 +588,12 @@ export type AudioCommandStoreTypes = {
   COMMAND_SET_MORPHING_INFO: {
     mutation: {
       audioKey: string;
-      morphingInfo: MorphingInfo;
+      morphingInfo: MorphingInfo | undefined;
     };
-    action(payload: { audioKey: string; morphingInfo: MorphingInfo }): void;
+    action(payload: {
+      audioKey: string;
+      morphingInfo: MorphingInfo | undefined;
+    }): void;
   };
 
   COMMAND_SET_AUDIO_PRESET: {

diff --git a/src/type/preload.ts b/src/type/preload.ts
@@ -203,16 +203,15 @@ export type Preset = {
   volumeScale: number;
   prePhonemeLength: number;
   postPhonemeLength: number;
+  morphingInfo?: MorphingInfo;
 };
 
-export type MorphingInfo =
-  | {
-      rate: number;
-      targetEngineId: string;
-      targetSpeakerId: string;
-      targetStyleId: number;
-    }
-  | undefined;
+export type MorphingInfo = {
+  rate: number;
+  targetEngineId: string;
+  targetSpeakerId: string;
+  targetStyleId: number;
+};
 
 export type PresetConfig = {
   items: Record<string, Preset>;