@onjmin/dtm 0.1.68 → 0.1.70

package/dist/index.d.mts

@@ -1827,6 +1827,12 @@ type DtmStudio = {
     mountChordPlayer: (target: HTMLElement, chords: string, options?: Omit<MountChordPlayerOptions, "studio">) => ChordPlayerInstance;
     /** UIなしで高品質な楽器再生（SoundFont）を行う */
     play: (mml: string, options?: Omit<PlayMmlOptions, "audioContext" | "destination" | "onPlayNote" | "onPlayDrum" | "synth">) => MmlPlayback;
+    /** UIなしで高品質な楽器再生（SoundFont）＋歌声合成を行う */
+    playSingingMML: (mml: string, options?: Omit<PlaySingingMmlOptions, "audioContext" | "destination" | "onPlayNote" | "onPlayDrum" | "synth">) => Promise<MmlPlayback>;
+    /** SoundFontへ PlayNoteEvent を鳴らす（headless API の onPlayNote フック用） */
+    playNoteEvent: (e: PlayNoteEvent) => void;
+    /** SoundFontへ PlayDrumEvent を鳴らす（headless API の onPlayDrum フック用） */
+    playDrumEvent: (e: PlayDrumEvent) => void;
     /** SoundFontを用いた単音再生を行う */
     playNote: (options: {
         pitch: number;

package/dist/index.d.ts

@@ -1827,6 +1827,12 @@ type DtmStudio = {
     mountChordPlayer: (target: HTMLElement, chords: string, options?: Omit<MountChordPlayerOptions, "studio">) => ChordPlayerInstance;
     /** UIなしで高品質な楽器再生（SoundFont）を行う */
     play: (mml: string, options?: Omit<PlayMmlOptions, "audioContext" | "destination" | "onPlayNote" | "onPlayDrum" | "synth">) => MmlPlayback;
+    /** UIなしで高品質な楽器再生（SoundFont）＋歌声合成を行う */
+    playSingingMML: (mml: string, options?: Omit<PlaySingingMmlOptions, "audioContext" | "destination" | "onPlayNote" | "onPlayDrum" | "synth">) => Promise<MmlPlayback>;
+    /** SoundFontへ PlayNoteEvent を鳴らす（headless API の onPlayNote フック用） */
+    playNoteEvent: (e: PlayNoteEvent) => void;
+    /** SoundFontへ PlayDrumEvent を鳴らす（headless API の onPlayDrum フック用） */
+    playDrumEvent: (e: PlayDrumEvent) => void;
     /** SoundFontを用いた単音再生を行う */
     playNote: (options: {
         pitch: number;

package/dist/index.js

@@ -3417,6 +3417,13 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
   const wave = tone.wave ?? "square";
   const attack = tone.attack ?? 0;
   const gainScale = tone.gain ?? 1;
+  const compressor = ctx.createDynamicsCompressor();
+  compressor.threshold.value = -12;
+  compressor.knee.value = 6;
+  compressor.ratio.value = 8;
+  compressor.attack.value = 3e-3;
+  compressor.release.value = 0.15;
+  compressor.connect(destination);
   const playNote3 = (e) => {
     const osc = ctx.createOscillator();
     const gain = ctx.createGain();
@@ -3449,9 +3456,9 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
       panner = ctx.createStereoPanner();
       panner.pan.value = Math.max(-1, Math.min(1, e.pan));
       gain.connect(panner);
-      panner.connect(destination);
+      panner.connect(compressor);
     } else {
-      gain.connect(destination);
+      gain.connect(compressor);
     }
     osc.start(t0);
     osc.stop(t0 + e.duration + 0.02);
@@ -3473,7 +3480,7 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
       osc.frequency.exponentialRampToValueAtTime(50, t0 + 0.12);
       g2.gain.setValueAtTime(vol * 0.135, t0);
       g2.gain.exponentialRampToValueAtTime(1e-3, t0 + 0.18);
-      osc.connect(g2).connect(destination);
+      osc.connect(g2).connect(compressor);
       osc.start(t0);
       osc.stop(t0 + 0.2);
       osc.onended = () => osc.disconnect();
@@ -3492,7 +3499,7 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
     const g = ctx.createGain();
     g.gain.setValueAtTime(vol * (isSnareLike ? 0.105 : 0.06), t0);
     g.gain.exponentialRampToValueAtTime(1e-3, t0 + dur);
-    src.connect(filter).connect(g).connect(destination);
+    src.connect(filter).connect(g).connect(compressor);
     src.start(t0);
     src.stop(t0 + dur);
     src.onended = () => {
@@ -3506,6 +3513,7 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
 
 // src/headless-player.ts
 var STEPS_PER_BAR = 192;
+var TRACK_ID_BY_INDEX = ["melody", "submelody", "bass", "chord"];
 var playPlacements = (placements, options) => {
   const bpm = options.bpm;
   const drumPatternDict = options.drumPatterns ?? DRUM_PATTERNS;
@@ -3524,7 +3532,11 @@ var playPlacements = (placements, options) => {
       pitch: p.pitch,
       velocity: p.velocity
     }));
-    return { id: String(index), volume: masterVolume, notes };
+    return {
+      id: TRACK_ID_BY_INDEX[index] ?? `t${index}`,
+      volume: masterVolume,
+      notes
+    };
   });
   const ownsCtx = !options.audioContext;
   const ctx = options.audioContext ?? new AudioContext();
@@ -13150,6 +13162,7 @@ var mountDAW = (target, options = {}) => {
 // src/headless-singing-player.ts
 var STEPS_PER_BEAT4 = 48;
 var STEPS_PER_BAR3 = 192;
+var TRACK_ID_BY_INDEX2 = ["melody", "submelody", "bass", "chord"];
 var playSingingMML = async (mml, options = {}) => {
   const {
     placements,
@@ -13183,7 +13196,7 @@ var playSingingMML = async (mml, options = {}) => {
       velocity: p.velocity
     }));
     return {
-      id: String(index),
+      id: TRACK_ID_BY_INDEX2[index] ?? `t${index}`,
       volume: trackVolume / 100 * masterVolume,
       notes
     };
@@ -13198,7 +13211,9 @@ var playSingingMML = async (mml, options = {}) => {
   let destroyed = false;
   let voices = options.singingVoices ?? null;
   const buildStreamTracks = (fromStep) => [...lyricTracks.entries()].map(([index, lt]) => {
-    const seqTrack = seqTracks.find((t) => Number(t.id) === index);
+    const seqTrack = seqTracks.find(
+      (t) => t.id === (TRACK_ID_BY_INDEX2[index] ?? `t${index}`)
+    );
     const sorted = [...seqTrack?.notes ?? []].sort(
       (a, b) => a.startStep - b.startStep
     );
@@ -13217,7 +13232,7 @@ var playSingingMML = async (mml, options = {}) => {
       });
     }
     return {
-      id: String(index),
+      id: TRACK_ID_BY_INDEX2[index] ?? `t${index}`,
       model: lt.model,
       volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME),
       pan: panToStereo(lt.pan ?? DEFAULT_PAN),
@@ -13235,7 +13250,10 @@ var playSingingMML = async (mml, options = {}) => {
     onCue: options.onCue,
     getAudioTime: () => ctx.currentTime,
     onPlayNote: (e) => {
-      const trackIdx = Number(e.trackId);
+      const namedIdx = TRACK_ID_BY_INDEX2.indexOf(
+        e.trackId
+      );
+      const trackIdx = namedIdx >= 0 ? namedIdx : Number(e.trackId);
       if (lyricTracks.has(trackIdx)) return;
       options.onPlayNote?.(e);
       synth?.playNote(e);
@@ -13931,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;
@@ -14494,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"
         );
       }
@@ -14530,6 +14565,78 @@ var createDtmStudio = async (options = {}) => {
       onResumeAudio: resumeAudio
     });
   };
+  const playSingingMMLInstance = (mml, opts = {}) => {
+    const { placements } = parseMML(mml);
+    const trackIndices = [...new Set(placements.map((p) => p.trackIndex))].sort(
+      (a, b) => a - b
+    );
+    const isAdvancedMode = trackIndices.some((idx) => idx >= 4);
+    const playerPreset = defaultPreset;
+    void loadPreset(
+      playerPreset,
+      trackIndices.map(String),
+      isAdvancedMode ? "advanced" : "simple"
+    );
+    const playPlayerNote = (e) => {
+      const { role } = resolveTrackIdxAndRole(e.trackId);
+      let sfInst = resolveSoundFont(
+        playerPreset,
+        role,
+        isAdvancedMode ? "advanced" : "simple"
+      );
+      if (!sfInst) {
+        void loadPreset(
+          playerPreset,
+          [role],
+          isAdvancedMode ? "advanced" : "simple"
+        );
+        sfInst = resolveSoundFont(
+          playerPreset,
+          role,
+          isAdvancedMode ? "advanced" : "simple"
+        );
+      }
+      if (!sfInst) return;
+      sfInst.play({
+        ctx: audioCtx,
+        destination: masterGain,
+        pitch: e.pitch,
+        volume: e.volume,
+        when: e.when,
+        duration: e.duration
+      });
+    };
+    return playSingingMML(mml, {
+      ...opts,
+      audioContext: audioCtx,
+      destination: masterGain,
+      synth: false,
+      singingVoices,
+      onPlayNote: playPlayerNote,
+      onPlayDrum: playDrum,
+      onResumeAudio: resumeAudio
+    });
+  };
+  const playNoteEvent = (e) => {
+    const { role } = resolveTrackIdxAndRole(e.trackId);
+    let sfInst = resolveSoundFont(defaultPreset, role, "simple");
+    if (!sfInst) {
+      void loadPreset(defaultPreset, [role], "simple");
+      sfInst = resolveSoundFont(defaultPreset, role, "simple");
+    }
+    if (!sfInst) return;
+    sfInst.play({
+      ctx: audioCtx,
+      destination: masterGain,
+      pitch: e.pitch,
+      volume: e.volume,
+      when: e.when,
+      duration: e.duration
+    });
+  };
+  const playDrumEvent = (e) => {
+    playDrum(e);
+  };
   const playNote3 = async (options2) => {
     await listReady;
     const key = options2.instrument ? resolveNameToKey(options2.instrument) : void 0;
@@ -14635,6 +14742,9 @@ var createDtmStudio = async (options = {}) => {
     mountPlayer,
     mountChordPlayer: mountChordPlayerInstance,
     play,
+    playSingingMML: playSingingMMLInstance,
+    playNoteEvent,
+    playDrumEvent,
     playNote: playNote3,
     playChords: playChords3,
     loadPreset,

package/dist/index.mjs

@@ -3294,6 +3294,13 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
   const wave = tone.wave ?? "square";
   const attack = tone.attack ?? 0;
   const gainScale = tone.gain ?? 1;
+  const compressor = ctx.createDynamicsCompressor();
+  compressor.threshold.value = -12;
+  compressor.knee.value = 6;
+  compressor.ratio.value = 8;
+  compressor.attack.value = 3e-3;
+  compressor.release.value = 0.15;
+  compressor.connect(destination);
   const playNote3 = (e) => {
     const osc = ctx.createOscillator();
     const gain = ctx.createGain();
@@ -3326,9 +3333,9 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
       panner = ctx.createStereoPanner();
       panner.pan.value = Math.max(-1, Math.min(1, e.pan));
       gain.connect(panner);
-      panner.connect(destination);
+      panner.connect(compressor);
     } else {
-      gain.connect(destination);
+      gain.connect(compressor);
     }
     osc.start(t0);
     osc.stop(t0 + e.duration + 0.02);
@@ -3350,7 +3357,7 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
       osc.frequency.exponentialRampToValueAtTime(50, t0 + 0.12);
       g2.gain.setValueAtTime(vol * 0.135, t0);
       g2.gain.exponentialRampToValueAtTime(1e-3, t0 + 0.18);
-      osc.connect(g2).connect(destination);
+      osc.connect(g2).connect(compressor);
       osc.start(t0);
       osc.stop(t0 + 0.2);
       osc.onended = () => osc.disconnect();
@@ -3369,7 +3376,7 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
     const g = ctx.createGain();
     g.gain.setValueAtTime(vol * (isSnareLike ? 0.105 : 0.06), t0);
     g.gain.exponentialRampToValueAtTime(1e-3, t0 + dur);
-    src.connect(filter).connect(g).connect(destination);
+    src.connect(filter).connect(g).connect(compressor);
     src.start(t0);
     src.stop(t0 + dur);
     src.onended = () => {
@@ -3383,6 +3390,7 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
 
 // src/headless-player.ts
 var STEPS_PER_BAR = 192;
+var TRACK_ID_BY_INDEX = ["melody", "submelody", "bass", "chord"];
 var playPlacements = (placements, options) => {
   const bpm = options.bpm;
   const drumPatternDict = options.drumPatterns ?? DRUM_PATTERNS;
@@ -3401,7 +3409,11 @@ var playPlacements = (placements, options) => {
       pitch: p.pitch,
       velocity: p.velocity
     }));
-    return { id: String(index), volume: masterVolume, notes };
+    return {
+      id: TRACK_ID_BY_INDEX[index] ?? `t${index}`,
+      volume: masterVolume,
+      notes
+    };
   });
   const ownsCtx = !options.audioContext;
   const ctx = options.audioContext ?? new AudioContext();
@@ -13027,6 +13039,7 @@ var mountDAW = (target, options = {}) => {
 // src/headless-singing-player.ts
 var STEPS_PER_BEAT4 = 48;
 var STEPS_PER_BAR3 = 192;
+var TRACK_ID_BY_INDEX2 = ["melody", "submelody", "bass", "chord"];
 var playSingingMML = async (mml, options = {}) => {
   const {
     placements,
@@ -13060,7 +13073,7 @@ var playSingingMML = async (mml, options = {}) => {
       velocity: p.velocity
     }));
     return {
-      id: String(index),
+      id: TRACK_ID_BY_INDEX2[index] ?? `t${index}`,
       volume: trackVolume / 100 * masterVolume,
       notes
     };
@@ -13075,7 +13088,9 @@ var playSingingMML = async (mml, options = {}) => {
   let destroyed = false;
   let voices = options.singingVoices ?? null;
   const buildStreamTracks = (fromStep) => [...lyricTracks.entries()].map(([index, lt]) => {
-    const seqTrack = seqTracks.find((t) => Number(t.id) === index);
+    const seqTrack = seqTracks.find(
+      (t) => t.id === (TRACK_ID_BY_INDEX2[index] ?? `t${index}`)
+    );
     const sorted = [...seqTrack?.notes ?? []].sort(
       (a, b) => a.startStep - b.startStep
     );
@@ -13094,7 +13109,7 @@ var playSingingMML = async (mml, options = {}) => {
       });
     }
     return {
-      id: String(index),
+      id: TRACK_ID_BY_INDEX2[index] ?? `t${index}`,
       model: lt.model,
       volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME),
       pan: panToStereo(lt.pan ?? DEFAULT_PAN),
@@ -13112,7 +13127,10 @@ var playSingingMML = async (mml, options = {}) => {
     onCue: options.onCue,
     getAudioTime: () => ctx.currentTime,
     onPlayNote: (e) => {
-      const trackIdx = Number(e.trackId);
+      const namedIdx = TRACK_ID_BY_INDEX2.indexOf(
+        e.trackId
+      );
+      const trackIdx = namedIdx >= 0 ? namedIdx : Number(e.trackId);
       if (lyricTracks.has(trackIdx)) return;
       options.onPlayNote?.(e);
       synth?.playNote(e);
@@ -13807,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;
@@ -14370,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"
         );
       }
@@ -14406,6 +14441,78 @@ var createDtmStudio = async (options = {}) => {
       onResumeAudio: resumeAudio
     });
   };
+  const playSingingMMLInstance = (mml, opts = {}) => {
+    const { placements } = parseMML(mml);
+    const trackIndices = [...new Set(placements.map((p) => p.trackIndex))].sort(
+      (a, b) => a - b
+    );
+    const isAdvancedMode = trackIndices.some((idx) => idx >= 4);
+    const playerPreset = defaultPreset;
+    void loadPreset(
+      playerPreset,
+      trackIndices.map(String),
+      isAdvancedMode ? "advanced" : "simple"
+    );
+    const playPlayerNote = (e) => {
+      const { role } = resolveTrackIdxAndRole(e.trackId);
+      let sfInst = resolveSoundFont(
+        playerPreset,
+        role,
+        isAdvancedMode ? "advanced" : "simple"
+      );
+      if (!sfInst) {
+        void loadPreset(
+          playerPreset,
+          [role],
+          isAdvancedMode ? "advanced" : "simple"
+        );
+        sfInst = resolveSoundFont(
+          playerPreset,
+          role,
+          isAdvancedMode ? "advanced" : "simple"
+        );
+      }
+      if (!sfInst) return;
+      sfInst.play({
+        ctx: audioCtx,
+        destination: masterGain,
+        pitch: e.pitch,
+        volume: e.volume,
+        when: e.when,
+        duration: e.duration
+      });
+    };
+    return playSingingMML(mml, {
+      ...opts,
+      audioContext: audioCtx,
+      destination: masterGain,
+      synth: false,
+      singingVoices,
+      onPlayNote: playPlayerNote,
+      onPlayDrum: playDrum,
+      onResumeAudio: resumeAudio
+    });
+  };
+  const playNoteEvent = (e) => {
+    const { role } = resolveTrackIdxAndRole(e.trackId);
+    let sfInst = resolveSoundFont(defaultPreset, role, "simple");
+    if (!sfInst) {
+      void loadPreset(defaultPreset, [role], "simple");
+      sfInst = resolveSoundFont(defaultPreset, role, "simple");
+    }
+    if (!sfInst) return;
+    sfInst.play({
+      ctx: audioCtx,
+      destination: masterGain,
+      pitch: e.pitch,
+      volume: e.volume,
+      when: e.when,
+      duration: e.duration
+    });
+  };
+  const playDrumEvent = (e) => {
+    playDrum(e);
+  };
   const playNote3 = async (options2) => {
     await listReady;
     const key = options2.instrument ? resolveNameToKey(options2.instrument) : void 0;
@@ -14511,6 +14618,9 @@ var createDtmStudio = async (options = {}) => {
     mountPlayer,
     mountChordPlayer: mountChordPlayerInstance,
     play,
+    playSingingMML: playSingingMMLInstance,
+    playNoteEvent,
+    playDrumEvent,
     playNote: playNote3,
     playChords: playChords3,
     loadPreset,

package/package.json

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