@onjmin/dtm 0.1.73 → 0.1.75

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];
@@ -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 () => {
@@ -7917,6 +7920,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
     currentPlaySec = playOffsetSec;
     ownCtx ??= options.audioContext ? null : new AudioContext();
     const ctx = options.audioContext ?? ownCtx;
+    const resumePromise = ctx.state === "suspended" ? ctx.resume() : Promise.resolve();
     const cutGain = ctx.createGain();
     cutGain.connect(ctx.destination);
     activeCut = { gain: cutGain, ctx };
@@ -7928,18 +7932,15 @@ var mountChordPlayer = (target, chords, options = {}) => {
       setProgress(totalSec > 0 ? playOffsetSec / totalSec : 0);
       playInternal(startIdx, ctx, cutGain);
     };
-    if (activeGmName && !_wafCache.has(activeGmName)) {
-      const myAbortId = ++loadAbortId;
-      setLoadingUI(true);
-      loadWafFont(ctx, activeGmName).then(() => {
-        if (loadAbortId !== myAbortId) return;
-        setLoadingUI(false);
-        startPlayback();
-      });
-    } else {
+    const myAbortId = ++loadAbortId;
+    setLoadingUI(true);
+    const wafPromise = activeGmName && !_wafCache.has(activeGmName) ? loadWafFont(ctx, activeGmName) : Promise.resolve(null);
+    Promise.all([resumePromise, wafPromise]).then(() => {
+      if (loadAbortId !== myAbortId) return;
+      setLoadingUI(false);
       startPlayback();
-    }
-    preloadInstruments();
+      preloadInstruments();
+    });
   };
   const seekTo = (idx) => {
     if (isLoading) {

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];
@@ -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 () => {
@@ -7794,6 +7797,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
     currentPlaySec = playOffsetSec;
     ownCtx ??= options.audioContext ? null : new AudioContext();
     const ctx = options.audioContext ?? ownCtx;
+    const resumePromise = ctx.state === "suspended" ? ctx.resume() : Promise.resolve();
     const cutGain = ctx.createGain();
     cutGain.connect(ctx.destination);
     activeCut = { gain: cutGain, ctx };
@@ -7805,18 +7809,15 @@ var mountChordPlayer = (target, chords, options = {}) => {
       setProgress(totalSec > 0 ? playOffsetSec / totalSec : 0);
       playInternal(startIdx, ctx, cutGain);
     };
-    if (activeGmName && !_wafCache.has(activeGmName)) {
-      const myAbortId = ++loadAbortId;
-      setLoadingUI(true);
-      loadWafFont(ctx, activeGmName).then(() => {
-        if (loadAbortId !== myAbortId) return;
-        setLoadingUI(false);
-        startPlayback();
-      });
-    } else {
+    const myAbortId = ++loadAbortId;
+    setLoadingUI(true);
+    const wafPromise = activeGmName && !_wafCache.has(activeGmName) ? loadWafFont(ctx, activeGmName) : Promise.resolve(null);
+    Promise.all([resumePromise, wafPromise]).then(() => {
+      if (loadAbortId !== myAbortId) return;
+      setLoadingUI(false);
       startPlayback();
-    }
-    preloadInstruments();
+      preloadInstruments();
+    });
   };
   const seekTo = (idx) => {
     if (isLoading) {

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "0.1.73",
+  "version": "0.1.75",
   "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"
   },