@onjmin/dtm 0.1.69 → 0.1.70

package/dist/index.js

@@ -13949,6 +13949,23 @@ var TRACK_ROLES = [
   "t13",
   "t14"
 ];
+var resolveTrackIdxAndRole = (trackId) => {
+  const roleIdx = TRACK_ROLES.indexOf(trackId);
+  if (roleIdx >= 0) {
+    return { trackIdx: roleIdx, role: trackId };
+  }
+  if (trackId.startsWith("t")) {
+    const parsed2 = Number(trackId.slice(1));
+    const validIdx2 = Number.isNaN(parsed2) ? 0 : parsed2;
+    return {
+      trackIdx: validIdx2,
+      role: TRACK_ROLES[validIdx2] ?? `t${validIdx2}`
+    };
+  }
+  const parsed = Number(trackId);
+  const validIdx = Number.isNaN(parsed) ? 0 : parsed;
+  return { trackIdx: validIdx, role: TRACK_ROLES[validIdx] ?? `t${validIdx}` };
+};
 var resolveDefaultVoiceWorkerUrl = () => {
   try {
     return new URL("./voice-worker.js", import_meta.url).href;
@@ -14512,19 +14529,19 @@ var createDtmStudio = async (options = {}) => {
       loadPlayerTrackInstruments()
     ]);
     const playPlayerNote = (e) => {
-      const idx = Number(e.trackId);
-      const overrideKey = playerTrackInstKeys.get(idx);
+      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
+      const overrideKey = playerTrackInstKeys.get(trackIdx);
       let sfInst;
       if (overrideKey) {
         sfInst = soundFonts.get(overrideKey);
       } else {
-        const role = getRoleForTrackIndex(
-          idx,
+        const roleFromIdx = getRoleForTrackIndex(
+          trackIdx,
           isAdvancedMode ? "advanced" : "simple"
         );
         sfInst = resolveSoundFont(
           playerPreset,
-          role,
+          roleFromIdx,
           isAdvancedMode ? "advanced" : "simple"
         );
       }
@@ -14561,8 +14578,7 @@ var createDtmStudio = async (options = {}) => {
       isAdvancedMode ? "advanced" : "simple"
     );
     const playPlayerNote = (e) => {
-      const trackIdx = Number(e.trackId);
-      const role = TRACK_ROLES[trackIdx] ?? "melody";
+      const { role } = resolveTrackIdxAndRole(e.trackId);
       let sfInst = resolveSoundFont(
         playerPreset,
         role,
@@ -14602,8 +14618,7 @@ var createDtmStudio = async (options = {}) => {
     });
   };
   const playNoteEvent = (e) => {
-    const idx = Number(e.trackId);
-    const role = TRACK_ROLES[idx] ?? "melody";
+    const { role } = resolveTrackIdxAndRole(e.trackId);
     let sfInst = resolveSoundFont(defaultPreset, role, "simple");
     if (!sfInst) {
       void loadPreset(defaultPreset, [role], "simple");

package/dist/index.mjs

@@ -13825,6 +13825,23 @@ var TRACK_ROLES = [
   "t13",
   "t14"
 ];
+var resolveTrackIdxAndRole = (trackId) => {
+  const roleIdx = TRACK_ROLES.indexOf(trackId);
+  if (roleIdx >= 0) {
+    return { trackIdx: roleIdx, role: trackId };
+  }
+  if (trackId.startsWith("t")) {
+    const parsed2 = Number(trackId.slice(1));
+    const validIdx2 = Number.isNaN(parsed2) ? 0 : parsed2;
+    return {
+      trackIdx: validIdx2,
+      role: TRACK_ROLES[validIdx2] ?? `t${validIdx2}`
+    };
+  }
+  const parsed = Number(trackId);
+  const validIdx = Number.isNaN(parsed) ? 0 : parsed;
+  return { trackIdx: validIdx, role: TRACK_ROLES[validIdx] ?? `t${validIdx}` };
+};
 var resolveDefaultVoiceWorkerUrl = () => {
   try {
     return new URL("./voice-worker.js", import.meta.url).href;
@@ -14388,19 +14405,19 @@ var createDtmStudio = async (options = {}) => {
       loadPlayerTrackInstruments()
     ]);
     const playPlayerNote = (e) => {
-      const idx = Number(e.trackId);
-      const overrideKey = playerTrackInstKeys.get(idx);
+      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
+      const overrideKey = playerTrackInstKeys.get(trackIdx);
       let sfInst;
       if (overrideKey) {
         sfInst = soundFonts.get(overrideKey);
       } else {
-        const role = getRoleForTrackIndex(
-          idx,
+        const roleFromIdx = getRoleForTrackIndex(
+          trackIdx,
           isAdvancedMode ? "advanced" : "simple"
         );
         sfInst = resolveSoundFont(
           playerPreset,
-          role,
+          roleFromIdx,
           isAdvancedMode ? "advanced" : "simple"
         );
       }
@@ -14437,8 +14454,7 @@ var createDtmStudio = async (options = {}) => {
       isAdvancedMode ? "advanced" : "simple"
     );
     const playPlayerNote = (e) => {
-      const trackIdx = Number(e.trackId);
-      const role = TRACK_ROLES[trackIdx] ?? "melody";
+      const { role } = resolveTrackIdxAndRole(e.trackId);
       let sfInst = resolveSoundFont(
         playerPreset,
         role,
@@ -14478,8 +14494,7 @@ var createDtmStudio = async (options = {}) => {
     });
   };
   const playNoteEvent = (e) => {
-    const idx = Number(e.trackId);
-    const role = TRACK_ROLES[idx] ?? "melody";
+    const { role } = resolveTrackIdxAndRole(e.trackId);
     let sfInst = resolveSoundFont(defaultPreset, role, "simple");
     if (!sfInst) {
       void loadPreset(defaultPreset, [role], "simple");

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "0.1.69",
+  "version": "0.1.70",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {