@onjmin/dtm 0.1.43 → 0.1.46

package/dist/index.d.mts

@@ -1690,6 +1690,20 @@ declare const DAW_CSS = "\n@font-face {\n  font-family: 'k8x12';\n  src: url('ht
  * スタイルを document.head に一度だけ注入する。
  */
 declare const injectStyles: (doc?: Document) => void;
+/**
+ * container 内にローディング画面を表示する。
+ *
+ * - `remove()` でオーバーレイを除去する。
+ * - `setProgress(done, total)` で進捗を反映する。total>0 のときはバーを実測値で
+ *   塗り、`done / total (NN%)` を表示する。total<=0 なら不確定（無限ループ）演出に戻す。
+ */
+declare const showLoadingOverlay: (container: HTMLElement, options?: {
+    onSkip?: () => void;
+    skipLabel?: string;
+}) => {
+    remove: () => void;
+    setProgress: (done: number, total: number, remainingTimeSec?: number | null) => void;
+};
 
 /**
  * 内蔵の簡易square-wave synth + ノイズ系ドラム音。
@@ -1719,4 +1733,4 @@ declare const createSynth: (ctx: AudioContext, destination?: AudioNode) => Synth
 
 declare const VOICE_IMAGES: Record<string, string>;
 
-export { type AddNoteOptions, type ApplyChordOptions, type ChordPatternType, type ChordPlacement, type ConsumedSyllable, type CoreEventHandlers, DAW_CSS, DEFAULT_BPM, DEFAULT_GATE, DEFAULT_PAN, DEFAULT_PLAYBACK_VELOCITY, DEFAULT_STEPS_PER_BAR, DEFAULT_VELOCITY, DEFAULT_VOCAL_VOLUME, DRUM_FONT, DRUM_KEYS, DRUM_PATTERNS, type DawInstance, type DawMode, type DawOptions, type DawViewState, type DrumPattern, type DtmStudio, type DtmStudioEngines, type DtmStudioOptions, type ExportMidiOptions, GM_INSTRUMENT_NAMES, INSTRUMENT_PRESETS, type InstrumentPreset, KOE_BASE_URL, KOE_VOICEBANKS, KOE_VOICEBANK_LABELS, KOE_VOICEBANK_TERMS, type KoeVoiceOptions, LinkedList, type LoopConfig, type LoopPoint, type LyricSyllable, type LyricSyncData, type LyricTrack, type LyricsConductor, MAX_VOCAL_VOLUME, MMLCore, type MMLDisplayToken, type MMLNotePlacement, MML_END_MARKER, type MidiExtraction, type MidiNotePlacement, type MidiTrackAnalysis, type MmlMeta, type MmlPlayback, type MmlPlayerInstance, type MmlPlayerOptions, type ModeSwitchInstance, type ModeSwitchOptions, type MountEditorOptions, type MountPlayerOptions, type Note, type NoteData, type NoteRemove, PITCH_MAP, PREWARM_NOTES, type ParseMMLOptions, type ParseMidiFn, type ParsedMML, type PianoRollInstance, type PianoRollOptions, type PitchToken, type PlayDrumEvent, type PlayMmlOptions, type PlayNoteEvent, type PlaySingingMmlOptions, type PlaybackCue, type PlaybackState, type PresetSelectInstance, type PresetSelectOptions, type PreviewSoundCallback, type RenderConfig, type Sequencer, type SequencerOptions, type SequencerTrack, type SingingVoices, type SingingVoicesOptions, type StreamPlaybackOptions, type StreamVoiceNote, type StreamVoiceTrack, type Synth, TRACKS_ADVANCED, TRACKS_SIMPLE, type ToolMode, type TrackConfig, VOICE_IMAGES, VOICE_IMAGE_KEY, type VoiceModel, type VoiceRegistry, analyzeMidiTracks, applyHarmonicFilter, applyMonophonic, buildChordPlacements, buildNameToKeyMapping, collectPitchTokens, createAudioContext, createDtmStudio, createKlattVoice, createKoeVoice, createLyricsConductor, createPianoRoll, createSequencer, createSingingVoices, createSynth, createVoiceRegistry, decodeMml, decomposeToMonophonic, drawGrid, drawHeader, drawKeyboard, drawNotes, drawSelectedNotes, drawSelectionRect, encodeMml, exportMIDI, extractMidiPlacements, extractMidiPlacementsByTrack, formatMmlMeta, freqFromPitch, generateRandomPattern, getDrawOffset, getGridCanvas, getGridContext, getGridPosition, getHeaderCanvas, getMidiBPM, getRenderConfig, getXY, icon, init, injectStyles, isChordHeavyTrack, koeUrl, mountDAW, mountMmlPlayer, normalizeLyrics, onClick, panToStereo, parseLyrics, parseMML, parseMmlMeta, playMML, playSingingMML, setDrawOffset, shiftNotes, stripLyrics, stripMmlMeta, vocalVolumeToGain };
+export { type AddNoteOptions, type ApplyChordOptions, type ChordPatternType, type ChordPlacement, type ConsumedSyllable, type CoreEventHandlers, DAW_CSS, DEFAULT_BPM, DEFAULT_GATE, DEFAULT_PAN, DEFAULT_PLAYBACK_VELOCITY, DEFAULT_STEPS_PER_BAR, DEFAULT_VELOCITY, DEFAULT_VOCAL_VOLUME, DRUM_FONT, DRUM_KEYS, DRUM_PATTERNS, type DawInstance, type DawMode, type DawOptions, type DawViewState, type DrumPattern, type DtmStudio, type DtmStudioEngines, type DtmStudioOptions, type ExportMidiOptions, GM_INSTRUMENT_NAMES, INSTRUMENT_PRESETS, type InstrumentPreset, KOE_BASE_URL, KOE_VOICEBANKS, KOE_VOICEBANK_LABELS, KOE_VOICEBANK_TERMS, type KoeVoiceOptions, LinkedList, type LoopConfig, type LoopPoint, type LyricSyllable, type LyricSyncData, type LyricTrack, type LyricsConductor, MAX_VOCAL_VOLUME, MMLCore, type MMLDisplayToken, type MMLNotePlacement, MML_END_MARKER, type MidiExtraction, type MidiNotePlacement, type MidiTrackAnalysis, type MmlMeta, type MmlPlayback, type MmlPlayerInstance, type MmlPlayerOptions, type ModeSwitchInstance, type ModeSwitchOptions, type MountEditorOptions, type MountPlayerOptions, type Note, type NoteData, type NoteRemove, PITCH_MAP, PREWARM_NOTES, type ParseMMLOptions, type ParseMidiFn, type ParsedMML, type PianoRollInstance, type PianoRollOptions, type PitchToken, type PlayDrumEvent, type PlayMmlOptions, type PlayNoteEvent, type PlaySingingMmlOptions, type PlaybackCue, type PlaybackState, type PresetSelectInstance, type PresetSelectOptions, type PreviewSoundCallback, type RenderConfig, type Sequencer, type SequencerOptions, type SequencerTrack, type SingingVoices, type SingingVoicesOptions, type StreamPlaybackOptions, type StreamVoiceNote, type StreamVoiceTrack, type Synth, TRACKS_ADVANCED, TRACKS_SIMPLE, type ToolMode, type TrackConfig, VOICE_IMAGES, VOICE_IMAGE_KEY, type VoiceModel, type VoiceRegistry, analyzeMidiTracks, applyHarmonicFilter, applyMonophonic, buildChordPlacements, buildNameToKeyMapping, collectPitchTokens, createAudioContext, createDtmStudio, createKlattVoice, createKoeVoice, createLyricsConductor, createPianoRoll, createSequencer, createSingingVoices, createSynth, createVoiceRegistry, decodeMml, decomposeToMonophonic, drawGrid, drawHeader, drawKeyboard, drawNotes, drawSelectedNotes, drawSelectionRect, encodeMml, exportMIDI, extractMidiPlacements, extractMidiPlacementsByTrack, formatMmlMeta, freqFromPitch, generateRandomPattern, getDrawOffset, getGridCanvas, getGridContext, getGridPosition, getHeaderCanvas, getMidiBPM, getRenderConfig, getXY, icon, init, injectStyles, isChordHeavyTrack, koeUrl, mountDAW, mountMmlPlayer, normalizeLyrics, onClick, panToStereo, parseLyrics, parseMML, parseMmlMeta, playMML, playSingingMML, setDrawOffset, shiftNotes, showLoadingOverlay, stripLyrics, stripMmlMeta, vocalVolumeToGain };

package/dist/index.d.ts

@@ -1690,6 +1690,20 @@ declare const DAW_CSS = "\n@font-face {\n  font-family: 'k8x12';\n  src: url('ht
  * スタイルを document.head に一度だけ注入する。
  */
 declare const injectStyles: (doc?: Document) => void;
+/**
+ * container 内にローディング画面を表示する。
+ *
+ * - `remove()` でオーバーレイを除去する。
+ * - `setProgress(done, total)` で進捗を反映する。total>0 のときはバーを実測値で
+ *   塗り、`done / total (NN%)` を表示する。total<=0 なら不確定（無限ループ）演出に戻す。
+ */
+declare const showLoadingOverlay: (container: HTMLElement, options?: {
+    onSkip?: () => void;
+    skipLabel?: string;
+}) => {
+    remove: () => void;
+    setProgress: (done: number, total: number, remainingTimeSec?: number | null) => void;
+};
 
 /**
  * 内蔵の簡易square-wave synth + ノイズ系ドラム音。
@@ -1719,4 +1733,4 @@ declare const createSynth: (ctx: AudioContext, destination?: AudioNode) => Synth
 
 declare const VOICE_IMAGES: Record<string, string>;
 
-export { type AddNoteOptions, type ApplyChordOptions, type ChordPatternType, type ChordPlacement, type ConsumedSyllable, type CoreEventHandlers, DAW_CSS, DEFAULT_BPM, DEFAULT_GATE, DEFAULT_PAN, DEFAULT_PLAYBACK_VELOCITY, DEFAULT_STEPS_PER_BAR, DEFAULT_VELOCITY, DEFAULT_VOCAL_VOLUME, DRUM_FONT, DRUM_KEYS, DRUM_PATTERNS, type DawInstance, type DawMode, type DawOptions, type DawViewState, type DrumPattern, type DtmStudio, type DtmStudioEngines, type DtmStudioOptions, type ExportMidiOptions, GM_INSTRUMENT_NAMES, INSTRUMENT_PRESETS, type InstrumentPreset, KOE_BASE_URL, KOE_VOICEBANKS, KOE_VOICEBANK_LABELS, KOE_VOICEBANK_TERMS, type KoeVoiceOptions, LinkedList, type LoopConfig, type LoopPoint, type LyricSyllable, type LyricSyncData, type LyricTrack, type LyricsConductor, MAX_VOCAL_VOLUME, MMLCore, type MMLDisplayToken, type MMLNotePlacement, MML_END_MARKER, type MidiExtraction, type MidiNotePlacement, type MidiTrackAnalysis, type MmlMeta, type MmlPlayback, type MmlPlayerInstance, type MmlPlayerOptions, type ModeSwitchInstance, type ModeSwitchOptions, type MountEditorOptions, type MountPlayerOptions, type Note, type NoteData, type NoteRemove, PITCH_MAP, PREWARM_NOTES, type ParseMMLOptions, type ParseMidiFn, type ParsedMML, type PianoRollInstance, type PianoRollOptions, type PitchToken, type PlayDrumEvent, type PlayMmlOptions, type PlayNoteEvent, type PlaySingingMmlOptions, type PlaybackCue, type PlaybackState, type PresetSelectInstance, type PresetSelectOptions, type PreviewSoundCallback, type RenderConfig, type Sequencer, type SequencerOptions, type SequencerTrack, type SingingVoices, type SingingVoicesOptions, type StreamPlaybackOptions, type StreamVoiceNote, type StreamVoiceTrack, type Synth, TRACKS_ADVANCED, TRACKS_SIMPLE, type ToolMode, type TrackConfig, VOICE_IMAGES, VOICE_IMAGE_KEY, type VoiceModel, type VoiceRegistry, analyzeMidiTracks, applyHarmonicFilter, applyMonophonic, buildChordPlacements, buildNameToKeyMapping, collectPitchTokens, createAudioContext, createDtmStudio, createKlattVoice, createKoeVoice, createLyricsConductor, createPianoRoll, createSequencer, createSingingVoices, createSynth, createVoiceRegistry, decodeMml, decomposeToMonophonic, drawGrid, drawHeader, drawKeyboard, drawNotes, drawSelectedNotes, drawSelectionRect, encodeMml, exportMIDI, extractMidiPlacements, extractMidiPlacementsByTrack, formatMmlMeta, freqFromPitch, generateRandomPattern, getDrawOffset, getGridCanvas, getGridContext, getGridPosition, getHeaderCanvas, getMidiBPM, getRenderConfig, getXY, icon, init, injectStyles, isChordHeavyTrack, koeUrl, mountDAW, mountMmlPlayer, normalizeLyrics, onClick, panToStereo, parseLyrics, parseMML, parseMmlMeta, playMML, playSingingMML, setDrawOffset, shiftNotes, stripLyrics, stripMmlMeta, vocalVolumeToGain };
+export { type AddNoteOptions, type ApplyChordOptions, type ChordPatternType, type ChordPlacement, type ConsumedSyllable, type CoreEventHandlers, DAW_CSS, DEFAULT_BPM, DEFAULT_GATE, DEFAULT_PAN, DEFAULT_PLAYBACK_VELOCITY, DEFAULT_STEPS_PER_BAR, DEFAULT_VELOCITY, DEFAULT_VOCAL_VOLUME, DRUM_FONT, DRUM_KEYS, DRUM_PATTERNS, type DawInstance, type DawMode, type DawOptions, type DawViewState, type DrumPattern, type DtmStudio, type DtmStudioEngines, type DtmStudioOptions, type ExportMidiOptions, GM_INSTRUMENT_NAMES, INSTRUMENT_PRESETS, type InstrumentPreset, KOE_BASE_URL, KOE_VOICEBANKS, KOE_VOICEBANK_LABELS, KOE_VOICEBANK_TERMS, type KoeVoiceOptions, LinkedList, type LoopConfig, type LoopPoint, type LyricSyllable, type LyricSyncData, type LyricTrack, type LyricsConductor, MAX_VOCAL_VOLUME, MMLCore, type MMLDisplayToken, type MMLNotePlacement, MML_END_MARKER, type MidiExtraction, type MidiNotePlacement, type MidiTrackAnalysis, type MmlMeta, type MmlPlayback, type MmlPlayerInstance, type MmlPlayerOptions, type ModeSwitchInstance, type ModeSwitchOptions, type MountEditorOptions, type MountPlayerOptions, type Note, type NoteData, type NoteRemove, PITCH_MAP, PREWARM_NOTES, type ParseMMLOptions, type ParseMidiFn, type ParsedMML, type PianoRollInstance, type PianoRollOptions, type PitchToken, type PlayDrumEvent, type PlayMmlOptions, type PlayNoteEvent, type PlaySingingMmlOptions, type PlaybackCue, type PlaybackState, type PresetSelectInstance, type PresetSelectOptions, type PreviewSoundCallback, type RenderConfig, type Sequencer, type SequencerOptions, type SequencerTrack, type SingingVoices, type SingingVoicesOptions, type StreamPlaybackOptions, type StreamVoiceNote, type StreamVoiceTrack, type Synth, TRACKS_ADVANCED, TRACKS_SIMPLE, type ToolMode, type TrackConfig, VOICE_IMAGES, VOICE_IMAGE_KEY, type VoiceModel, type VoiceRegistry, analyzeMidiTracks, applyHarmonicFilter, applyMonophonic, buildChordPlacements, buildNameToKeyMapping, collectPitchTokens, createAudioContext, createDtmStudio, createKlattVoice, createKoeVoice, createLyricsConductor, createPianoRoll, createSequencer, createSingingVoices, createSynth, createVoiceRegistry, decodeMml, decomposeToMonophonic, drawGrid, drawHeader, drawKeyboard, drawNotes, drawSelectedNotes, drawSelectionRect, encodeMml, exportMIDI, extractMidiPlacements, extractMidiPlacementsByTrack, formatMmlMeta, freqFromPitch, generateRandomPattern, getDrawOffset, getGridCanvas, getGridContext, getGridPosition, getHeaderCanvas, getMidiBPM, getRenderConfig, getXY, icon, init, injectStyles, isChordHeavyTrack, koeUrl, mountDAW, mountMmlPlayer, normalizeLyrics, onClick, panToStereo, parseLyrics, parseMML, parseMmlMeta, playMML, playSingingMML, setDrawOffset, shiftNotes, showLoadingOverlay, stripLyrics, stripMmlMeta, vocalVolumeToGain };

package/dist/index.js

@@ -103,6 +103,7 @@ __export(index_exports, {
   playSingingMML: () => playSingingMML,
   setDrawOffset: () => setDrawOffset,
   shiftNotes: () => shiftNotes,
+  showLoadingOverlay: () => showLoadingOverlay,
   stripLyrics: () => stripLyrics,
   stripMmlMeta: () => stripMmlMeta,
   vocalVolumeToGain: () => vocalVolumeToGain
@@ -7954,8 +7955,25 @@ var mountDAW = (target, options = {}) => {
   const initScrollbarDrag = () => {
     let draggingH = false;
     let draggingV = false;
+    let hScrollWasPlaying = false;
+    const finishHScroll = () => {
+      if (!draggingH) return;
+      draggingH = false;
+      if (hScrollWasPlaying) {
+        hScrollWasPlaying = false;
+        const snappedStep = Math.max(
+          0,
+          Math.floor(currentOffsetX / renderConfig.stepWidth / snapGridSteps) * snapGridSteps
+        );
+        pausedPlayStep = snappedStep;
+        currentPlayStep = snappedStep;
+        void play();
+      }
+    };
     refs.hScroll.addEventListener("pointerdown", (e) => {
       draggingH = true;
+      hScrollWasPlaying = playbackState === "playing";
+      if (hScrollWasPlaying) pause();
       e.preventDefault();
       refs.hScroll.setPointerCapture(e.pointerId);
       moveH(e.clientX);
@@ -7972,9 +7990,7 @@ var mountDAW = (target, options = {}) => {
     refs.vScroll.addEventListener("pointermove", (e) => {
       if (draggingV) moveV(e.clientY);
     });
-    refs.hScroll.addEventListener("pointerup", () => {
-      draggingH = false;
-    });
+    refs.hScroll.addEventListener("pointerup", finishHScroll);
     refs.vScroll.addEventListener("pointerup", () => {
       draggingV = false;
     });
@@ -7983,7 +7999,7 @@ var mountDAW = (target, options = {}) => {
       if (draggingV) moveV(e.clientY);
     });
     document.addEventListener("pointerup", () => {
-      draggingH = false;
+      finishHScroll();
       draggingV = false;
     });
     const moveH = (clientX) => {
@@ -10997,9 +11013,9 @@ var createDtmStudio = async (options = {}) => {
     const daw = mountDAW(target, base);
     mountedEditors.push(daw);
     const wantPresetUI = presetUI ?? features.presetUI;
+    const rollEl = target.querySelector('[data-dtm="roll"]');
     if (wantPresetUI) {
       editorPresetSelects.get(target)?.destroy();
-      const rollEl = target.querySelector('[data-dtm="roll"]');
       presetSelect = mountPresetSelect(target, {
         getDaw: () => daw,
         getTrackIds: () => trackIds,
@@ -11014,12 +11030,14 @@ var createDtmStudio = async (options = {}) => {
       editorPresetSelects.set(target, presetSelect);
     }
     daw.setInstrument(initialPreset);
+    const initialOverlay = rollEl ? showLoadingOverlay(rollEl) : null;
     daw.setLoading?.(true);
     void loadPreset(
       initialPreset,
       trackIds,
       isAdvancedMode ? "advanced" : "simple"
     ).finally(() => {
+      initialOverlay?.remove();
       daw.setLoading?.(false);
     });
     const destroy = () => {
@@ -11318,6 +11336,7 @@ var createDtmStudio = async (options = {}) => {
   playSingingMML,
   setDrawOffset,
   shiftNotes,
+  showLoadingOverlay,
   stripLyrics,
   stripMmlMeta,
   vocalVolumeToGain

package/dist/index.mjs

@@ -7843,8 +7843,25 @@ var mountDAW = (target, options = {}) => {
   const initScrollbarDrag = () => {
     let draggingH = false;
     let draggingV = false;
+    let hScrollWasPlaying = false;
+    const finishHScroll = () => {
+      if (!draggingH) return;
+      draggingH = false;
+      if (hScrollWasPlaying) {
+        hScrollWasPlaying = false;
+        const snappedStep = Math.max(
+          0,
+          Math.floor(currentOffsetX / renderConfig.stepWidth / snapGridSteps) * snapGridSteps
+        );
+        pausedPlayStep = snappedStep;
+        currentPlayStep = snappedStep;
+        void play();
+      }
+    };
     refs.hScroll.addEventListener("pointerdown", (e) => {
       draggingH = true;
+      hScrollWasPlaying = playbackState === "playing";
+      if (hScrollWasPlaying) pause();
       e.preventDefault();
       refs.hScroll.setPointerCapture(e.pointerId);
       moveH(e.clientX);
@@ -7861,9 +7878,7 @@ var mountDAW = (target, options = {}) => {
     refs.vScroll.addEventListener("pointermove", (e) => {
       if (draggingV) moveV(e.clientY);
     });
-    refs.hScroll.addEventListener("pointerup", () => {
-      draggingH = false;
-    });
+    refs.hScroll.addEventListener("pointerup", finishHScroll);
     refs.vScroll.addEventListener("pointerup", () => {
       draggingV = false;
     });
@@ -7872,7 +7887,7 @@ var mountDAW = (target, options = {}) => {
       if (draggingV) moveV(e.clientY);
     });
     document.addEventListener("pointerup", () => {
-      draggingH = false;
+      finishHScroll();
       draggingV = false;
     });
     const moveH = (clientX) => {
@@ -10885,9 +10900,9 @@ var createDtmStudio = async (options = {}) => {
     const daw = mountDAW(target, base);
     mountedEditors.push(daw);
     const wantPresetUI = presetUI ?? features.presetUI;
+    const rollEl = target.querySelector('[data-dtm="roll"]');
     if (wantPresetUI) {
       editorPresetSelects.get(target)?.destroy();
-      const rollEl = target.querySelector('[data-dtm="roll"]');
       presetSelect = mountPresetSelect(target, {
         getDaw: () => daw,
         getTrackIds: () => trackIds,
@@ -10902,12 +10917,14 @@ var createDtmStudio = async (options = {}) => {
       editorPresetSelects.set(target, presetSelect);
     }
     daw.setInstrument(initialPreset);
+    const initialOverlay = rollEl ? showLoadingOverlay(rollEl) : null;
     daw.setLoading?.(true);
     void loadPreset(
       initialPreset,
       trackIds,
       isAdvancedMode ? "advanced" : "simple"
     ).finally(() => {
+      initialOverlay?.remove();
       daw.setLoading?.(false);
     });
     const destroy = () => {
@@ -11205,6 +11222,7 @@ export {
   playSingingMML,
   setDrawOffset,
   shiftNotes,
+  showLoadingOverlay,
   stripLyrics,
   stripMmlMeta,
   vocalVolumeToGain

package/package.json

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