@onjmin/dtm 0.1.72 → 0.1.74

package/dist/index.d.mts

@@ -957,6 +957,8 @@ type PlayMmlOptions = {
     onStop?: () => void;
     /** 再生中のステップ更新（1/192小節ごと）時のコールバック */
     onTick?: (step: number) => void;
+    /** 再生開始位置（ステップ単位）。指定すると途中から再生する。 */
+    startStep?: number;
 };
 type MmlPlayback = {
     /** 再生を止める（ループ中でも停止）。 */

package/dist/index.d.ts

@@ -957,6 +957,8 @@ type PlayMmlOptions = {
     onStop?: () => void;
     /** 再生中のステップ更新（1/192小節ごと）時のコールバック */
     onTick?: (step: number) => void;
+    /** 再生開始位置（ステップ単位）。指定すると途中から再生する。 */
+    startStep?: number;
 };
 type MmlPlayback = {
     /** 再生を止める（ループ中でも停止）。 */

package/dist/index.js

@@ -271,7 +271,7 @@ async function buildNameToKeyMapping() {
 }
 var GM_INSTRUMENT_NAMES = FONT_NAME_SURIKOV.trim().split("\n").map((line) => line.slice(line.indexOf(" ") + 1));
 
-// node_modules/.pnpm/@onjmin+chord-parser@1.0.2/node_modules/@onjmin/chord-parser/dist/index.mjs
+// node_modules/.pnpm/@onjmin+chord-parser@1.0.4/node_modules/@onjmin/chord-parser/dist/index.mjs
 var SHARP_NAMES = [
   "C",
   "C#",
@@ -480,8 +480,11 @@ var parsePitch = (input, output) => {
   const pitch = pitchMatcher.parse(input);
   if (pitch === null) err(input, "Not found pitch");
   output.pitch = pitch;
-  const half = parseHalf(input, true);
-  if (half !== null) output.pitch += half;
+  for (let i = 0; i < 2; i++) {
+    const half = parseHalf(input, true);
+    if (half === null) break;
+    output.pitch += half;
+  }
   return parseBase(input, output);
 };
 var MAJOR = [0, 4, 7];
@@ -3548,7 +3551,7 @@ var playPlacements = (placements, options) => {
   const seq = createSequencer({
     getTracks: () => seqTracks,
     getBpm: () => bpm,
-    getPlayStartStep: () => 0,
+    getPlayStartStep: () => options.startStep ?? 0,
     getDrumPattern: () => drumPattern,
     getSoloTrackId: () => null,
     getLoop: () => options.loop ?? false,
@@ -3594,7 +3597,7 @@ var playPlacements = (placements, options) => {
     if (ctx.state === "suspended") resumes.push(ctx.resume());
     if (resumes.length > 0) await Promise.all(resumes);
     if (!playing) return;
-    seq.start(0);
+    seq.start(options.startStep ?? 0);
   })();
   const stop = () => {
     if (!playing) return;
@@ -6981,7 +6984,7 @@ var parseToneMeta = (chords) => {
   return m ? m[1].toLowerCase() : null;
 };
 var parseMetronomeMeta = (chords) => {
-  return /^#\s*metronome(?:\s*=\s*on)?\s*$/im.test(chords);
+  return !/^#\s*metronome\s*=\s*off\s*$/im.test(chords);
 };
 var _nameToKeyCache = null;
 var getNameToKey = async () => {
@@ -13242,7 +13245,7 @@ var playSingingMML = async (mml, options = {}) => {
   const seq = createSequencer({
     getTracks: () => seqTracks,
     getBpm: () => bpm,
-    getPlayStartStep: () => 0,
+    getPlayStartStep: () => options.startStep ?? 0,
     getDrumPattern: () => drumPattern,
     getSoloTrackId: () => null,
     getLoop: () => options.loop ?? false,
@@ -13343,7 +13346,7 @@ var playSingingMML = async (mml, options = {}) => {
           Object.fromEntries([...customVocalByKey].map(([k, d]) => [k, d.url]))
         );
       }
-      const streamTracks = buildStreamTracks(0);
+      const streamTracks = buildStreamTracks(options.startStep ?? 0);
       await voices.loadModels(streamTracks.map((t) => t.model));
       if (!playing || destroyed) {
         return playback;
@@ -13383,14 +13386,14 @@ var playSingingMML = async (mml, options = {}) => {
         loopStartSec = loopStartStep * secondsPerStep;
         loopLengthSec = (loopEndStep - loopStartStep) * secondsPerStep;
       }
-      seq.start(0);
+      seq.start(options.startStep ?? 0);
       voices.setVolume(trackVolume / 100 * (masterVolume / 100));
       voices.startStream(streamTracks, seq.getStartTime(), {
         loopLengthSec,
         loopStartSec
       });
     } else {
-      seq.start(0);
+      seq.start(options.startStep ?? 0);
     }
   } catch (err2) {
     stop();

package/dist/index.mjs

@@ -148,7 +148,7 @@ async function buildNameToKeyMapping() {
 }
 var GM_INSTRUMENT_NAMES = FONT_NAME_SURIKOV.trim().split("\n").map((line) => line.slice(line.indexOf(" ") + 1));
 
-// node_modules/.pnpm/@onjmin+chord-parser@1.0.2/node_modules/@onjmin/chord-parser/dist/index.mjs
+// node_modules/.pnpm/@onjmin+chord-parser@1.0.4/node_modules/@onjmin/chord-parser/dist/index.mjs
 var SHARP_NAMES = [
   "C",
   "C#",
@@ -357,8 +357,11 @@ var parsePitch = (input, output) => {
   const pitch = pitchMatcher.parse(input);
   if (pitch === null) err(input, "Not found pitch");
   output.pitch = pitch;
-  const half = parseHalf(input, true);
-  if (half !== null) output.pitch += half;
+  for (let i = 0; i < 2; i++) {
+    const half = parseHalf(input, true);
+    if (half === null) break;
+    output.pitch += half;
+  }
   return parseBase(input, output);
 };
 var MAJOR = [0, 4, 7];
@@ -3425,7 +3428,7 @@ var playPlacements = (placements, options) => {
   const seq = createSequencer({
     getTracks: () => seqTracks,
     getBpm: () => bpm,
-    getPlayStartStep: () => 0,
+    getPlayStartStep: () => options.startStep ?? 0,
     getDrumPattern: () => drumPattern,
     getSoloTrackId: () => null,
     getLoop: () => options.loop ?? false,
@@ -3471,7 +3474,7 @@ var playPlacements = (placements, options) => {
     if (ctx.state === "suspended") resumes.push(ctx.resume());
     if (resumes.length > 0) await Promise.all(resumes);
     if (!playing) return;
-    seq.start(0);
+    seq.start(options.startStep ?? 0);
   })();
   const stop = () => {
     if (!playing) return;
@@ -6858,7 +6861,7 @@ var parseToneMeta = (chords) => {
   return m ? m[1].toLowerCase() : null;
 };
 var parseMetronomeMeta = (chords) => {
-  return /^#\s*metronome(?:\s*=\s*on)?\s*$/im.test(chords);
+  return !/^#\s*metronome\s*=\s*off\s*$/im.test(chords);
 };
 var _nameToKeyCache = null;
 var getNameToKey = async () => {
@@ -13119,7 +13122,7 @@ var playSingingMML = async (mml, options = {}) => {
   const seq = createSequencer({
     getTracks: () => seqTracks,
     getBpm: () => bpm,
-    getPlayStartStep: () => 0,
+    getPlayStartStep: () => options.startStep ?? 0,
     getDrumPattern: () => drumPattern,
     getSoloTrackId: () => null,
     getLoop: () => options.loop ?? false,
@@ -13220,7 +13223,7 @@ var playSingingMML = async (mml, options = {}) => {
           Object.fromEntries([...customVocalByKey].map(([k, d]) => [k, d.url]))
         );
       }
-      const streamTracks = buildStreamTracks(0);
+      const streamTracks = buildStreamTracks(options.startStep ?? 0);
       await voices.loadModels(streamTracks.map((t) => t.model));
       if (!playing || destroyed) {
         return playback;
@@ -13260,14 +13263,14 @@ var playSingingMML = async (mml, options = {}) => {
         loopStartSec = loopStartStep * secondsPerStep;
         loopLengthSec = (loopEndStep - loopStartStep) * secondsPerStep;
       }
-      seq.start(0);
+      seq.start(options.startStep ?? 0);
       voices.setVolume(trackVolume / 100 * (masterVolume / 100));
       voices.startStream(streamTracks, seq.getStartTime(), {
         loopLengthSec,
         loopStartSec
       });
     } else {
-      seq.start(0);
+      seq.start(options.startStep ?? 0);
     }
   } catch (err2) {
     stop();

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {
@@ -54,7 +54,7 @@
     "typescript": "5.8.3"
   },
   "dependencies": {
-    "@onjmin/chord-parser": "1.0.2",
+    "@onjmin/chord-parser": "1.0.4",
     "@onjmin/koe": "1.0.4",
     "midi-json-parser": "8.1.74"
   },