refactor: トラックの変換処理を関数化 (#2739)

Author: sigprogramming

src/infrastructures/projectFile/conversion.ts

@@ -0,0 +1,35 @@
+import { ProjectFileTrack } from "./type";
+import { Track } from "@/domain/project/type";
+import { mapToRecord, recordToMap } from "@/sing/utility";
+
+export function toProjectFileTrack(track: Track): ProjectFileTrack {
+  return {
+    name: track.name,
+    singer: track.singer,
+    keyRangeAdjustment: track.keyRangeAdjustment,
+    volumeRangeAdjustment: track.volumeRangeAdjustment,
+    notes: track.notes,
+    pitchEditData: track.pitchEditData,
+    phonemeTimingEditData: mapToRecord(track.phonemeTimingEditData),
+    solo: track.solo,
+    mute: track.mute,
+    gain: track.gain,
+    pan: track.pan,
+  };
+}
+
+export function toEditorTrack(projectFileTrack: ProjectFileTrack): Track {
+  return {
+    name: projectFileTrack.name,
+    singer: projectFileTrack.singer,
+    keyRangeAdjustment: projectFileTrack.keyRangeAdjustment,
+    volumeRangeAdjustment: projectFileTrack.volumeRangeAdjustment,
+    notes: projectFileTrack.notes,
+    pitchEditData: projectFileTrack.pitchEditData,
+    phonemeTimingEditData: recordToMap(projectFileTrack.phonemeTimingEditData),
+    solo: projectFileTrack.solo,
+    mute: projectFileTrack.mute,
+    gain: projectFileTrack.gain,
+    pan: projectFileTrack.pan,
+  };
+}

src/store/project/index.ts

@@ -31,9 +31,9 @@ import {
   showQuestionDialog,
 } from "@/components/Dialog/Dialog";
 import { uuid4 } from "@/helpers/random";
-import { recordToMap } from "@/sing/utility";
 import type { Track } from "@/domain/project/type";
 import { migrateProjectFileObject } from "@/infrastructures/projectFile/migration";
+import { toEditorTrack } from "@/infrastructures/projectFile/conversion";
 
 export const projectStoreState: ProjectStoreState = {
   savedLastCommandIds: { talk: null, song: null },
@@ -73,25 +73,12 @@ const applySongProjectToStore = async (
   await actions.SET_TRACKS({
     tracks: new Map(
       trackOrder.map((trackId): [TrackId, Track] => {
-        const track = tracks[trackId];
-        if (!track) throw new Error("track == undefined");
-        // TODO: トラックの変換処理を関数化する
-        return [
-          trackId,
-          {
-            name: track.name,
-            singer: track.singer,
-            keyRangeAdjustment: track.keyRangeAdjustment,
-            volumeRangeAdjustment: track.volumeRangeAdjustment,
-            notes: track.notes,
-            pitchEditData: track.pitchEditData,
-            phonemeTimingEditData: recordToMap(track.phonemeTimingEditData),
-            solo: track.solo,
-            mute: track.mute,
-            gain: track.gain,
-            pan: track.pan,
-          },
-        ];
+        const projectFileTrack = tracks[trackId];
+        if (projectFileTrack == undefined) {
+          throw new Error("projectFileTrack == undefined");
+        }
+        const track = toEditorTrack(projectFileTrack);
+        return [trackId, track];
       }),
     ),
   });

src/store/project/saveProjectHelper.ts

@@ -1,14 +1,10 @@
 import { ActionContext } from "../type";
 import { showErrorDialog } from "@/components/Dialog/Dialog";
 import { getAppInfos } from "@/domain/appInfo";
-import {
-  LatestProjectType,
-  ProjectFileTrack,
-} from "@/infrastructures/projectFile/type";
+import { LatestProjectType } from "@/infrastructures/projectFile/type";
 import { DisplayableError } from "@/helpers/errorHelper";
-import { mapToRecord } from "@/sing/utility";
 import { ResultError } from "@/type/result";
-import { TrackId } from "@/type/preload";
+import { toProjectFileTrack } from "@/infrastructures/projectFile/conversion";
 
 export async function promptProjectSaveFilePath(
   context: ActionContext,
@@ -51,27 +47,10 @@ export async function writeProjectFile(
       tempos,
       timeSignatures,
       tracks: Object.fromEntries(
-        [...tracks.entries()].map(
-          ([trackId, track]): [TrackId, ProjectFileTrack] => {
-            // TODO: トラックの変換処理を関数化する
-            return [
-              trackId,
-              {
-                name: track.name,
-                singer: track.singer,
-                keyRangeAdjustment: track.keyRangeAdjustment,
-                volumeRangeAdjustment: track.volumeRangeAdjustment,
-                notes: track.notes,
-                pitchEditData: track.pitchEditData,
-                phonemeTimingEditData: mapToRecord(track.phonemeTimingEditData),
-                solo: track.solo,
-                mute: track.mute,
-                gain: track.gain,
-                pan: track.pan,
-              },
-            ];
-          },
-        ),
+        [...tracks.entries()].map(([trackId, track]) => {
+          const projectFileTrack = toProjectFileTrack(track);
+          return [trackId, projectFileTrack];
+        }),
       ),
       trackOrder,
     },

src/store/singing.ts

@@ -88,7 +88,6 @@ import {
   AnimationTimer,
   createArray,
   createPromiseThatResolvesWhen,
-  recordToMap,
   round,
 } from "@/sing/utility";
 import { getWorkaroundKeyRangeAdjustment } from "@/sing/workaroundKeyRangeAdjustment";
@@ -130,6 +129,7 @@ import type {
   Track,
 } from "@/domain/project/type";
 import { noteSchema } from "@/domain/project/schema";
+import { toEditorTrack } from "@/infrastructures/projectFile/conversion";
 
 const logger = createLogger("store/singing");
 
@@ -3516,34 +3516,24 @@ export const singingCommandStore = transformCommandStore(
             throw new Error("TPQN does not match. Must be converted.");
           }
 
-          const filteredTracks = trackIndexes.map((trackIndex): Track => {
+          const filteredTracks = trackIndexes.map((trackIndex) => {
             const importedTrack = cloneWithUnwrapProxy(
               tracks[trackOrder[trackIndex]],
             );
             if (!importedTrack) {
               throw new Error("Track not found.");
             }
-            // TODO: トラックの変換処理を関数化する
-            return {
-              name: importedTrack.name,
-              singer: importedTrack.singer,
-              keyRangeAdjustment: importedTrack.keyRangeAdjustment,
-              volumeRangeAdjustment: importedTrack.volumeRangeAdjustment,
-              notes: importedTrack.notes.map((note) => ({
-                ...note,
-                id: NoteId(uuid4()),
-              })),
-              pitchEditData: importedTrack.pitchEditData,
-              phonemeTimingEditData: recordToMap(
-                importedTrack.phonemeTimingEditData,
-              ),
-              solo: importedTrack.solo,
-              mute: importedTrack.mute,
-              gain: importedTrack.gain,
-              pan: importedTrack.pan,
-            };
+            return toEditorTrack(importedTrack);
           });
 
+          // インポートなので、ノートIDは新しく振り直す
+          for (const track of filteredTracks) {
+            track.notes = track.notes.map((note) => ({
+              ...note,
+              id: NoteId(uuid4()),
+            }));
+          }
+
           await actions.COMMAND_IMPORT_TRACKS({
             tpqn,
             tempos,