Add: getOrThrow / deleteOrThrowを追加

src/components/Sing/SequencerPhraseIndicator.vue

@@ -19,10 +19,8 @@ const classNames: Record<PhraseState, string> = {
   PLAYABLE: "playable",
 };
 const className = computed(() => {
-  const phrase = store.state.phrases.get(props.phraseKey);
-  if (phrase == undefined) {
-    throw new Error("phrase is undefined.");
-  }
+  const phrase = store.state.phrases.getOrThrow(props.phraseKey);
+
   return classNames[phrase.state];
 });
 </script>

src/helpers/strictMap.ts

@@ -0,0 +1,39 @@
+// Mapの拡張。
+//
+// - Mapを継承したStrictMapはimmerにより通常のMapになってしまう。
+// - implements Map<K, V>のカスタムクラスはstructuredCloneにより{ map: Map<K, V> }になってしまう。
+// そのため、Mapを直接拡張する。
+
+const addProperty = (key: string, value: (...args: never[]) => unknown) => {
+  // @ts-expect-error 意図的にPrototype汚染をしている。
+  Map.prototype[key] = value;
+};
+
+addProperty(
+  "getOrThrow",
+  function (this: Map<unknown, unknown>, key: unknown): unknown {
+    if (!this.has(key)) {
+      throw new Error(`Key not found: ${key}`);
+    }
+    return this.get(key);
+  },
+);
+
+addProperty(
+  "deleteOrThrow",
+  function (this: Map<unknown, unknown>, key: unknown): void {
+    if (!this.has(key)) {
+      throw new Error(`Key not found: ${key}`);
+    }
+    this.delete(key);
+  },
+);
+
+declare global {
+  interface Map<K, V> {
+    getOrThrow(key: K): V;
+    deleteOrThrow(key: K): void;
+  }
+}
+
+export {};

src/main.ts

@@ -1,3 +1,4 @@
+import "@/helpers/strictMap";
 import { createApp } from "vue";
 import { createGtm } from "@gtm-support/vue-gtm";
 import { Quasar, Dialog, Loading, Notify } from "quasar";

src/store/singing.ts

@@ -607,10 +607,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         phraseState,
       }: { phraseKey: string; phraseState: PhraseState },
     ) {
-      const phrase = state.phrases.get(phraseKey);
-      if (phrase == undefined) {
-        throw new Error("phrase is undefined.");
-      }
+      const phrase = state.phrases.getOrThrow(phraseKey);
+
       phrase.state = phraseState;
     },
   },
@@ -626,10 +624,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         singingGuideKey: SingingGuideSourceHash | undefined;
       },
     ) {
-      const phrase = state.phrases.get(phraseKey);
-      if (phrase == undefined) {
-        throw new Error("phrase is undefined.");
-      }
+      const phrase = state.phrases.getOrThrow(phraseKey);
+
       phrase.singingGuideKey = singingGuideKey;
     },
   },
@@ -645,10 +641,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         singingVoiceKey: SingingVoiceSourceHash | undefined;
       },
     ) {
-      const phrase = state.phrases.get(phraseKey);
-      if (phrase == undefined) {
-        throw new Error("phrase is undefined.");
-      }
+      const phrase = state.phrases.getOrThrow(phraseKey);
+
       phrase.singingVoiceKey = singingVoiceKey;
     },
   },
@@ -1200,12 +1194,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               phrase.singingGuideKey != undefined &&
               phrase.singingVoiceKey != undefined
             ) {
-              let singingGuide = state.singingGuides.get(
+              let singingGuide = state.singingGuides.getOrThrow(
                 phrase.singingGuideKey,
               );
-              if (singingGuide == undefined) {
-                throw new Error("singingGuide is undefined.");
-              }
+
               // 歌い方をコピーして、ピッチ編集を適用する
               singingGuide = structuredClone(toRaw(singingGuide));
               applyPitchEdit(singingGuide, pitchEditData, editFrameRate);
@@ -1299,10 +1291,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
             let singingGuide: SingingGuide | undefined;
             if (phrase.singingGuideKey != undefined) {
-              singingGuide = state.singingGuides.get(phrase.singingGuideKey);
-              if (!singingGuide) {
-                throw new Error("singingGuide is undefined.");
-              }
+              singingGuide = state.singingGuides.getOrThrow(
+                phrase.singingGuideKey,
+              );
             } else {
               const singingGuideSourceHash =
                 await calculateSingingGuideSourceHash({
@@ -2353,16 +2344,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             ) {
               continue;
             }
-            const singingGuide = state.singingGuides.get(
+            const singingGuide = state.singingGuides.getOrThrow(
               phrase.singingGuideKey,
             );
-            const singingVoice = singingVoices.get(phrase.singingVoiceKey);
-            if (!singingGuide) {
-              throw new Error("singingGuide is undefined");
-            }
-            if (!singingVoice) {
-              throw new Error("singingVoice is undefined");
-            }
+            const singingVoice = singingVoices.getOrThrow(
+              phrase.singingVoiceKey,
+            );
+
             // TODO: この辺りの処理を共通化する
             const audioEvents = await generateAudioEvents(
               offlineAudioContext,