@onjmin/dtm 0.1.93 → 0.1.95

package/dist/index.js

@@ -2368,7 +2368,7 @@ var kanaTable = {
   \u307D: ["p", "o"],
   \u3093: ["N", "N"]
 };
-var SMALL_KANA = "\u3041\u3043\u3045\u3047\u3049\u3083\u3085\u3087\u3063";
+var SMALL_KANA = "\u3041\u3043\u3045\u3047\u3049\u3083\u3085\u3087";
 var VOWEL_KANA = {
   a: "\u3042",
   i: "\u3044",
@@ -2376,7 +2376,7 @@ var VOWEL_KANA = {
   e: "\u3048",
   o: "\u304A"
 };
-var sanitizeText = (text) => text.normalize("NFKC").replace(/[ァ-ヶ]/g, (c) => String.fromCharCode(c.charCodeAt(0) - 96)).replace(/[^ぁ-ゖー]/g, "");
+var sanitizeText = (text) => text.normalize("NFKC").replace(/[ァ-ヶ]/g, (c) => String.fromCharCode(c.charCodeAt(0) - 96)).replace(/[っー]/g, "").replace(/[^ぁ-ゖ]/g, "");
 var splitSyllables = (text) => {
   const result = [];
   for (const ch of text) {
@@ -2408,7 +2408,7 @@ var analyzeSyllable = (syllable) => {
   const row = kanaTable[head];
   const consonant = row ? row[0] : "";
   let vowel = row ? row[1] : kanaToVowel(head);
-  if (syllable.length === 2 && syllable[1] !== "\u3063") {
+  if (syllable.length === 2) {
     const v = kanaToVowel(syllable[1]);
     if (v) vowel = v;
   }
@@ -11534,7 +11534,7 @@ var buildUI = (target, options) => {
         <span class="dtm-label" data-dtm="master-volume-label">50%</span>
       </div>
       <div class="dtm-row">
-        <button class="dtm-btn dtm-btn--ghost dtm-btn--xs" data-dtm="auto-master" title="\u97F3\u5727\u30FB\u30B9\u30C6\u30EC\u30AA\u5E45\u30FB\u30EA\u30D0\u30FC\u30D6\u3092\u5546\u696D\u66F2\u5BC4\u308A\u306E\u5024\u306B\u4E00\u62EC\u8A2D\u5B9A\u3057\u307E\u3059">\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0</button>
+        <button class="dtm-btn dtm-btn--ghost dtm-btn--xs" data-dtm="auto-master" title="\u97F3\u5727\u30FB\u30B9\u30C6\u30EC\u30AA\u5E45\u30FB\u30EA\u30D0\u30FC\u30D6\u306B\u52A0\u3048\u3001\u5404\u30C8\u30E9\u30C3\u30AF\u306E\u697D\u5668\u30FB\u97F3\u91CF\u3082\u81EA\u52D5\u63A8\u5B9A\u3057\u3066\u4E00\u62EC\u8A2D\u5B9A\u3057\u307E\u3059">\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0</button>
         <button class="dtm-infobtn" data-dtm="auto-master-info" title="\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
         <span class="dtm-grow"></span>
       </div>
@@ -13655,6 +13655,15 @@ var AUTO_MASTER_INFO_HTML = `
     <li>\u5168\u30C8\u30E9\u30C3\u30AF\u306E\u30B9\u30C6\u30EC\u30AA\u5E45: 115%\uFF08\u308F\u305A\u304B\u306B\u5E83\u3052\u308B\uFF09</li>
     <li>\u6B4C\u8A5E\u306E\u3042\u308B\u30C8\u30E9\u30C3\u30AF: \u81EA\u52D5\u30D3\u30D6\u30E9\u30FC\u30C8ON</li>
   </ul>
+  <h4>\u697D\u5668\u30FB\u97F3\u91CF\u306E\u81EA\u52D5\u5272\u308A\u5F53\u3066</h4>
+  <p>\u6B4C\u8A5E\u306E\u306A\u3044\u30C8\u30E9\u30C3\u30AF\u306F\u3001\u7F6E\u304B\u308C\u3066\u3044\u308B\u30CE\u30FC\u30C8\u306E\u97F3\u9AD8\u30FB\u30BF\u30A4\u30DF\u30F3\u30B0\u30FB\u548C\u97F3\u306E\u539A\u307F\u304B\u3089\u5F79\u5272\u3092\u63A8\u5B9A\u3057\u3001\u697D\u5668\u3068\u97F3\u91CF\u3092\u81EA\u52D5\u3067\u5F53\u3066\u307E\u3059\u3002</p>
+  <ul>
+    <li><strong>\u4F4E\u97F3\u57DF\uFF08C3\u672A\u6E80\uFF09\u304C\u4E2D\u5FC3</strong> \u2192 \u30D9\u30FC\u30B9\u697D\u5668\u30FB\u97F3\u91CF85</li>
+    <li><strong>\u548C\u97F3\uFF08\u540C\u6642\u767A\u97F3\uFF09\u304C\u591A\u304F\u97F3\u4FA1\u3082\u9577\u3044</strong> \u2192 \u4F34\u594F\uFF08\u30B3\u30FC\u30C9/\u30D1\u30C3\u30C9\uFF09\u697D\u5668\u30FB\u97F3\u91CF72</li>
+    <li><strong>\u5358\u97F3\u3067\u97F3\u6570\u304C\u5C11\u306A\u304F\u97F3\u4FA1\u304C\u9577\u3044</strong> \u2192 \u30B5\u30D6\u30E1\u30ED\uFF08\u30AA\u30D6\u30EA\u30AC\u30FC\u30C8\u5BC4\u308A\uFF09\u697D\u5668\u30FB\u97F3\u91CF92</li>
+    <li><strong>\u305D\u308C\u4EE5\u5916\uFF08\u5358\u97F3\u3067\u52D5\u304D\u304C\u591A\u3044\uFF09</strong> \u2192 \u30E1\u30ED\u30C7\u30A3\u697D\u5668\u30FB\u97F3\u91CF100</li>
+  </ul>
+  <p style="margin-top:4px;"><small>\u697D\u5668\u540D\u306F\u73FE\u5728\u9078\u629E\u4E2D\u306E\u697D\u5668\u30D7\u30EA\u30BB\u30C3\u30C8\uFF08\u672A\u9078\u629E\u306A\u3089\u30B0\u30E9\u30F3\u30C9\u30D4\u30A2\u30CE\uFF09\u304B\u3089\u5F79\u5272\u306B\u5BFE\u5FDC\u3059\u308B\u3082\u306E\u3092\u5F15\u304D\u307E\u3059\u3002\u97F3\u306E\u5C11\u306A\u3044\u30C8\u30E9\u30C3\u30AF\uFF08\u7121\u97F3\uFF09\u306F\u5224\u5B9A\u3067\u304D\u306A\u3044\u305F\u3081\u5BFE\u8C61\u5916\u3067\u3059\u3002\u3042\u304F\u307E\u3067\u81EA\u52D5\u63A8\u5B9A\u306A\u306E\u3067\u3001\u610F\u56F3\u3068\u9055\u3046\u5834\u5408\u306F\u5404\u30C8\u30E9\u30C3\u30AF\u306E\u300C\u697D\u5668\u300D\u6B04\u304B\u3089\u500B\u5225\u306B\u9078\u3073\u76F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002</small></p>
   <h4>\u30E1\u30A4\u30F3\u30DC\u30FC\u30AB\u30EB\u306E\u81EA\u52D5\u5224\u5B9A</h4>
   <p>\u6B4C\u8A5E\u306E\u3042\u308B\u30C8\u30E9\u30C3\u30AF\u304C\u8907\u6570\u3042\u308B\u5834\u5408\uFF08\u30CF\u30E2\u30EA\u30FB\u30B3\u30FC\u30E9\u30B9\u30FB\u639B\u3051\u58F0\u7B49\uFF09\u3001\u767A\u97F3\u6642\u9593\u304C\u6700\u3082\u9577\u3044\u30C8\u30E9\u30C3\u30AF\u3092\u300C\u30E1\u30A4\u30F3\u30DC\u30FC\u30AB\u30EB\u300D\u3068\u307F\u306A\u3057\u3001\u4ED6\u3068\u306F\u9055\u3046\u6271\u3044\u306B\u3057\u307E\u3059\u3002</p>
   <ul>
@@ -13905,6 +13914,31 @@ var normalizeInstrumentName = (name) => {
     (n) => n.replace(/\s+/g, "").toLowerCase() === stripped
   ) ?? name;
 };
+var AUTO_ROLE_STEPS_PER_BEAT = 48;
+var AUTO_ROLE_VOLUME = {
+  melody: 100,
+  submelody: 92,
+  bass: 85,
+  chord: 72
+};
+var classifyTrackRole = (notes) => {
+  const avgPitch = notes.reduce((s, n) => s + n.pitch, 0) / notes.length;
+  if (avgPitch < 48) return "bass";
+  const avgDur = notes.reduce((s, n) => s + n.durationSteps, 0) / notes.length;
+  const byStart = /* @__PURE__ */ new Map();
+  for (const n of notes)
+    byStart.set(n.startStep, (byStart.get(n.startStep) ?? 0) + 1);
+  let maxPoly = 0;
+  for (const c of byStart.values()) if (c > maxPoly) maxPoly = c;
+  if (maxPoly >= 2 && avgDur >= AUTO_ROLE_STEPS_PER_BEAT) return "chord";
+  const minStart = Math.min(...notes.map((n) => n.startStep));
+  const maxEnd = Math.max(...notes.map((n) => n.startStep + n.durationSteps));
+  const spanBeats = Math.max(1, (maxEnd - minStart) / AUTO_ROLE_STEPS_PER_BEAT);
+  const notesPerBeat = notes.length / spanBeats;
+  if (notesPerBeat < 1.2 && avgDur >= AUTO_ROLE_STEPS_PER_BEAT * 1.5)
+    return "submelody";
+  return "melody";
+};
 var mountDAW = (target, options = {}) => {
   injectStyles();
   const getAudioTime = options.getAudioTime ?? (() => performance.now() / 1e3);
@@ -16681,6 +16715,20 @@ var mountDAW = (target, options = {}) => {
           mainVocalId = t.config.id;
         }
       }
+      const autoPreset = INSTRUMENT_PRESETS[currentInstrument] ?? INSTRUMENT_PRESETS.piano;
+      for (const t of trackStates) {
+        if (t.lyricModel) continue;
+        const notes = t.core.getNotes();
+        if (notes.length === 0) continue;
+        const role = classifyTrackRole(notes);
+        const instName = autoPreset[role];
+        t.trackInstrument = instName;
+        const trackIndex = trackStates.indexOf(t);
+        options.onTrackInstrumentChange?.(trackIndex, instName);
+        const vol = AUTO_ROLE_VOLUME[role];
+        t.volume = vol;
+        t.core.setVolume(vol);
+      }
       for (const t of trackStates) {
         const isMainVocal = !!t.lyricModel && t.config.id === mainVocalId;
         const comp = !t.lyricModel ? 35 : isMainVocal ? 30 : 25;

package/dist/index.mjs

@@ -2237,7 +2237,7 @@ var kanaTable = {
   \u307D: ["p", "o"],
   \u3093: ["N", "N"]
 };
-var SMALL_KANA = "\u3041\u3043\u3045\u3047\u3049\u3083\u3085\u3087\u3063";
+var SMALL_KANA = "\u3041\u3043\u3045\u3047\u3049\u3083\u3085\u3087";
 var VOWEL_KANA = {
   a: "\u3042",
   i: "\u3044",
@@ -2245,7 +2245,7 @@ var VOWEL_KANA = {
   e: "\u3048",
   o: "\u304A"
 };
-var sanitizeText = (text) => text.normalize("NFKC").replace(/[ァ-ヶ]/g, (c) => String.fromCharCode(c.charCodeAt(0) - 96)).replace(/[^ぁ-ゖー]/g, "");
+var sanitizeText = (text) => text.normalize("NFKC").replace(/[ァ-ヶ]/g, (c) => String.fromCharCode(c.charCodeAt(0) - 96)).replace(/[っー]/g, "").replace(/[^ぁ-ゖ]/g, "");
 var splitSyllables = (text) => {
   const result = [];
   for (const ch of text) {
@@ -2277,7 +2277,7 @@ var analyzeSyllable = (syllable) => {
   const row = kanaTable[head];
   const consonant = row ? row[0] : "";
   let vowel = row ? row[1] : kanaToVowel(head);
-  if (syllable.length === 2 && syllable[1] !== "\u3063") {
+  if (syllable.length === 2) {
     const v = kanaToVowel(syllable[1]);
     if (v) vowel = v;
   }
@@ -11403,7 +11403,7 @@ var buildUI = (target, options) => {
         <span class="dtm-label" data-dtm="master-volume-label">50%</span>
       </div>
       <div class="dtm-row">
-        <button class="dtm-btn dtm-btn--ghost dtm-btn--xs" data-dtm="auto-master" title="\u97F3\u5727\u30FB\u30B9\u30C6\u30EC\u30AA\u5E45\u30FB\u30EA\u30D0\u30FC\u30D6\u3092\u5546\u696D\u66F2\u5BC4\u308A\u306E\u5024\u306B\u4E00\u62EC\u8A2D\u5B9A\u3057\u307E\u3059">\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0</button>
+        <button class="dtm-btn dtm-btn--ghost dtm-btn--xs" data-dtm="auto-master" title="\u97F3\u5727\u30FB\u30B9\u30C6\u30EC\u30AA\u5E45\u30FB\u30EA\u30D0\u30FC\u30D6\u306B\u52A0\u3048\u3001\u5404\u30C8\u30E9\u30C3\u30AF\u306E\u697D\u5668\u30FB\u97F3\u91CF\u3082\u81EA\u52D5\u63A8\u5B9A\u3057\u3066\u4E00\u62EC\u8A2D\u5B9A\u3057\u307E\u3059">\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0</button>
         <button class="dtm-infobtn" data-dtm="auto-master-info" title="\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
         <span class="dtm-grow"></span>
       </div>
@@ -13524,6 +13524,15 @@ var AUTO_MASTER_INFO_HTML = `
     <li>\u5168\u30C8\u30E9\u30C3\u30AF\u306E\u30B9\u30C6\u30EC\u30AA\u5E45: 115%\uFF08\u308F\u305A\u304B\u306B\u5E83\u3052\u308B\uFF09</li>
     <li>\u6B4C\u8A5E\u306E\u3042\u308B\u30C8\u30E9\u30C3\u30AF: \u81EA\u52D5\u30D3\u30D6\u30E9\u30FC\u30C8ON</li>
   </ul>
+  <h4>\u697D\u5668\u30FB\u97F3\u91CF\u306E\u81EA\u52D5\u5272\u308A\u5F53\u3066</h4>
+  <p>\u6B4C\u8A5E\u306E\u306A\u3044\u30C8\u30E9\u30C3\u30AF\u306F\u3001\u7F6E\u304B\u308C\u3066\u3044\u308B\u30CE\u30FC\u30C8\u306E\u97F3\u9AD8\u30FB\u30BF\u30A4\u30DF\u30F3\u30B0\u30FB\u548C\u97F3\u306E\u539A\u307F\u304B\u3089\u5F79\u5272\u3092\u63A8\u5B9A\u3057\u3001\u697D\u5668\u3068\u97F3\u91CF\u3092\u81EA\u52D5\u3067\u5F53\u3066\u307E\u3059\u3002</p>
+  <ul>
+    <li><strong>\u4F4E\u97F3\u57DF\uFF08C3\u672A\u6E80\uFF09\u304C\u4E2D\u5FC3</strong> \u2192 \u30D9\u30FC\u30B9\u697D\u5668\u30FB\u97F3\u91CF85</li>
+    <li><strong>\u548C\u97F3\uFF08\u540C\u6642\u767A\u97F3\uFF09\u304C\u591A\u304F\u97F3\u4FA1\u3082\u9577\u3044</strong> \u2192 \u4F34\u594F\uFF08\u30B3\u30FC\u30C9/\u30D1\u30C3\u30C9\uFF09\u697D\u5668\u30FB\u97F3\u91CF72</li>
+    <li><strong>\u5358\u97F3\u3067\u97F3\u6570\u304C\u5C11\u306A\u304F\u97F3\u4FA1\u304C\u9577\u3044</strong> \u2192 \u30B5\u30D6\u30E1\u30ED\uFF08\u30AA\u30D6\u30EA\u30AC\u30FC\u30C8\u5BC4\u308A\uFF09\u697D\u5668\u30FB\u97F3\u91CF92</li>
+    <li><strong>\u305D\u308C\u4EE5\u5916\uFF08\u5358\u97F3\u3067\u52D5\u304D\u304C\u591A\u3044\uFF09</strong> \u2192 \u30E1\u30ED\u30C7\u30A3\u697D\u5668\u30FB\u97F3\u91CF100</li>
+  </ul>
+  <p style="margin-top:4px;"><small>\u697D\u5668\u540D\u306F\u73FE\u5728\u9078\u629E\u4E2D\u306E\u697D\u5668\u30D7\u30EA\u30BB\u30C3\u30C8\uFF08\u672A\u9078\u629E\u306A\u3089\u30B0\u30E9\u30F3\u30C9\u30D4\u30A2\u30CE\uFF09\u304B\u3089\u5F79\u5272\u306B\u5BFE\u5FDC\u3059\u308B\u3082\u306E\u3092\u5F15\u304D\u307E\u3059\u3002\u97F3\u306E\u5C11\u306A\u3044\u30C8\u30E9\u30C3\u30AF\uFF08\u7121\u97F3\uFF09\u306F\u5224\u5B9A\u3067\u304D\u306A\u3044\u305F\u3081\u5BFE\u8C61\u5916\u3067\u3059\u3002\u3042\u304F\u307E\u3067\u81EA\u52D5\u63A8\u5B9A\u306A\u306E\u3067\u3001\u610F\u56F3\u3068\u9055\u3046\u5834\u5408\u306F\u5404\u30C8\u30E9\u30C3\u30AF\u306E\u300C\u697D\u5668\u300D\u6B04\u304B\u3089\u500B\u5225\u306B\u9078\u3073\u76F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002</small></p>
   <h4>\u30E1\u30A4\u30F3\u30DC\u30FC\u30AB\u30EB\u306E\u81EA\u52D5\u5224\u5B9A</h4>
   <p>\u6B4C\u8A5E\u306E\u3042\u308B\u30C8\u30E9\u30C3\u30AF\u304C\u8907\u6570\u3042\u308B\u5834\u5408\uFF08\u30CF\u30E2\u30EA\u30FB\u30B3\u30FC\u30E9\u30B9\u30FB\u639B\u3051\u58F0\u7B49\uFF09\u3001\u767A\u97F3\u6642\u9593\u304C\u6700\u3082\u9577\u3044\u30C8\u30E9\u30C3\u30AF\u3092\u300C\u30E1\u30A4\u30F3\u30DC\u30FC\u30AB\u30EB\u300D\u3068\u307F\u306A\u3057\u3001\u4ED6\u3068\u306F\u9055\u3046\u6271\u3044\u306B\u3057\u307E\u3059\u3002</p>
   <ul>
@@ -13774,6 +13783,31 @@ var normalizeInstrumentName = (name) => {
     (n) => n.replace(/\s+/g, "").toLowerCase() === stripped
   ) ?? name;
 };
+var AUTO_ROLE_STEPS_PER_BEAT = 48;
+var AUTO_ROLE_VOLUME = {
+  melody: 100,
+  submelody: 92,
+  bass: 85,
+  chord: 72
+};
+var classifyTrackRole = (notes) => {
+  const avgPitch = notes.reduce((s, n) => s + n.pitch, 0) / notes.length;
+  if (avgPitch < 48) return "bass";
+  const avgDur = notes.reduce((s, n) => s + n.durationSteps, 0) / notes.length;
+  const byStart = /* @__PURE__ */ new Map();
+  for (const n of notes)
+    byStart.set(n.startStep, (byStart.get(n.startStep) ?? 0) + 1);
+  let maxPoly = 0;
+  for (const c of byStart.values()) if (c > maxPoly) maxPoly = c;
+  if (maxPoly >= 2 && avgDur >= AUTO_ROLE_STEPS_PER_BEAT) return "chord";
+  const minStart = Math.min(...notes.map((n) => n.startStep));
+  const maxEnd = Math.max(...notes.map((n) => n.startStep + n.durationSteps));
+  const spanBeats = Math.max(1, (maxEnd - minStart) / AUTO_ROLE_STEPS_PER_BEAT);
+  const notesPerBeat = notes.length / spanBeats;
+  if (notesPerBeat < 1.2 && avgDur >= AUTO_ROLE_STEPS_PER_BEAT * 1.5)
+    return "submelody";
+  return "melody";
+};
 var mountDAW = (target, options = {}) => {
   injectStyles();
   const getAudioTime = options.getAudioTime ?? (() => performance.now() / 1e3);
@@ -16550,6 +16584,20 @@ var mountDAW = (target, options = {}) => {
           mainVocalId = t.config.id;
         }
       }
+      const autoPreset = INSTRUMENT_PRESETS[currentInstrument] ?? INSTRUMENT_PRESETS.piano;
+      for (const t of trackStates) {
+        if (t.lyricModel) continue;
+        const notes = t.core.getNotes();
+        if (notes.length === 0) continue;
+        const role = classifyTrackRole(notes);
+        const instName = autoPreset[role];
+        t.trackInstrument = instName;
+        const trackIndex = trackStates.indexOf(t);
+        options.onTrackInstrumentChange?.(trackIndex, instName);
+        const vol = AUTO_ROLE_VOLUME[role];
+        t.volume = vol;
+        t.core.setVolume(vol);
+      }
       for (const t of trackStates) {
         const isMainVocal = !!t.lyricModel && t.config.id === mainVocalId;
         const comp = !t.lyricModel ? 35 : isMainVocal ? 30 : 25;

package/package.json

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