@ugfoundation/swaralipi-js 0.8.2 → 0.9.1

package/dist/player/index.cjs

@@ -22,6 +22,11 @@ var TAALS = {
   dhamaar: { id: "dhamaar", numBeats: 14, bhaags: [5, 2, 3, 4], sam: 0, khaali: [7] }
   // ধামার
 };
+function sameTaal(a, b) {
+  if (a === b) return true;
+  if (!a || !b) return false;
+  return a.id === b.id && a.numBeats === b.numBeats && a.variation === b.variation && String(a.bhaags) === String(b.bhaags);
+}
 
 // src/spec/grace.ts
 function graceNotes(grace) {
@@ -173,6 +178,13 @@ function glideTargets(events, i) {
   }
   return out;
 }
+var GRACE_STEP = 0.12;
+function graceTouches(ev) {
+  return [
+    ...ev.kan.map((midi, g) => ({ midi, beat: ev.beat - GRACE_STEP * (ev.kan.length - g) })),
+    ...ev.resh.map((midi, g) => ({ midi, beat: ev.beat + GRACE_STEP * (g + 1) }))
+  ];
+}
 var SAM_TICK = /^\d+[fF]$/;
 function buildSchedule(doc, opts = {}) {
   const tonicPc = parseTonic(opts.tonic ?? doc.meta.tonic);
@@ -184,18 +196,23 @@ function buildSchedule(doc, opts = {}) {
   let matra = 0;
   const speeds = resolveLaySpeeds(doc.meta.laySpeeds, opts.laySpeeds);
   const withLay = opts.lay !== false;
-  const tempo = [{ beat: 0, endBeat: 0, scale: 1, lay: "drut" }];
+  const tempo = [{ beat: 0, endBeat: 0, scale: 1, lay: "drut", taal: doc.meta.taal }];
   let scale = 1;
+  let taal = doc.meta.taal;
   doc.parts.forEach((part, p) => {
     part.rows.forEach((row, r) => {
       const lay = withLay ? rowLay(row) : void 0;
-      if (lay !== void 0 && speeds[lay] !== scale) {
-        scale = speeds[lay];
+      const layChanged = lay !== void 0 && speeds[lay] !== scale;
+      const nextTaal = row.taal !== void 0 ? row.taal : taal;
+      if (layChanged || !sameTaal(nextTaal, taal)) {
+        if (layChanged) scale = speeds[lay];
+        taal = nextTaal;
         const last = tempo[tempo.length - 1];
-        if (last.beat === cursor) tempo[tempo.length - 1] = { beat: cursor, endBeat: cursor, scale, lay };
+        const seg = { beat: cursor, endBeat: cursor, scale, lay: layChanged ? lay : last.lay, taal };
+        if (last.beat === cursor) tempo[tempo.length - 1] = seg;
         else {
           last.endBeat = cursor;
-          tempo.push({ beat: cursor, endBeat: cursor, scale, lay });
+          tempo.push(seg);
         }
       }
       const glides = meendContinuations(row.notes);
@@ -212,12 +229,15 @@ function buildSchedule(doc, opts = {}) {
         const path = `${p}.${r}.${i}`;
         const written = note.durationMatra ?? 1;
         const dur = written / scale;
+        const kan = graceMidis(note.kan, tonicPc, baseOctave);
+        const resh = graceMidis(note.resh, tonicPc, baseOctave);
         if (note.svara !== void 0) {
           events.push({
             beat: cursor,
             durationBeats: dur,
             midi: svaraToMidi(note, tonicPc, baseOctave),
-            kan: graceMidis(note.kan, tonicPc, baseOctave),
+            kan,
+            resh,
             path,
             kind: note.sustain === true ? "sustain" : "note",
             ...glides.has(i) && lastPitched >= 0 ? { glide: true } : {}
@@ -225,16 +245,16 @@ function buildSchedule(doc, opts = {}) {
           lastPitched = events.length - 1;
         } else if (note.sustain === true) {
           if (lastPitched >= 0) events[lastPitched].durationBeats += dur;
-          events.push({ beat: cursor, durationBeats: dur, midi: null, kan: [], path, kind: "sustain" });
+          events.push({ beat: cursor, durationBeats: dur, midi: null, kan, resh, path, kind: "sustain" });
         } else {
-          events.push({ beat: cursor, durationBeats: dur, midi: null, kan: [], path, kind: "rest" });
+          events.push({ beat: cursor, durationBeats: dur, midi: null, kan, resh, path, kind: "rest" });
         }
         cursor += dur;
         matra += written;
       });
     });
   });
-  const numBeats = doc.meta.taal?.numBeats;
+  const numBeats = tempo[0].taal?.numBeats;
   const pickupMatra = samMatra !== void 0 && numBeats !== void 0 && numBeats > 0 ? (numBeats - samMatra % numBeats) % numBeats : 0;
   tempo[tempo.length - 1].endBeat = cursor;
   return { events, totalBeats: cursor, pickupBeats: pickupMatra / tempo[0].scale, tempo };
@@ -545,7 +565,7 @@ function midiRange(schedule) {
   let lo = Infinity;
   let hi = -Infinity;
   for (const ev of schedule.events) {
-    for (const m of [ev.midi, ...ev.kan]) {
+    for (const m of [ev.midi, ...ev.kan, ...ev.resh]) {
       if (m !== null) {
         if (m < lo) lo = m;
         if (m > hi) hi = m;
@@ -888,16 +908,26 @@ var SwaralipiPlayer = class {
   #emitHighlight(path) {
     this.#opts.onHighlight?.(path);
   }
-  /** The tabla variation to play: taal-mode taal's, the doc's own (auto mode),
-   * else none — an explicit setTaal override plays the taal's default variation. */
-  #variation() {
+  /** The taal one accompaniment segment plays: taal mode's, an explicit
+   * setTaal override (pinned across the whole song, তালফেরতা included), else
+   * the segment's own. `null` = a মুক্তছন্দ passage. */
+  #segmentTaal(seg) {
+    if (this.#taal !== void 0) return this.#taal;
+    if (!this.#taalAuto && this.#taalOverride !== void 0) return TAALS[this.#taalOverride];
+    return seg.taal;
+  }
+  /** The tabla variation to play: taal-mode taal's, the segment's own (auto
+   * mode), else none — an explicit setTaal override plays the default variation. */
+  #variation(taal) {
     if (this.#taal !== void 0) return this.#taal.variation;
-    return this.#taalAuto ? this.#doc?.meta.taal?.variation : void 0;
+    return this.#taalAuto ? taal?.variation : void 0;
   }
   /** Resolve the active taal id: taal mode's taal, an explicit override, else
-   * the doc's — but only when it names a sampled taal. */
+   * the doc's opening one (a তালফেরতা doc may carry it on its first row) — but
+   * only when it names a sampled taal. */
   #taalId() {
-    const id = this.#taal?.id ?? (!this.#taalAuto && this.#taalOverride !== void 0 ? this.#taalOverride : this.#doc?.meta.taal?.id);
+    const opening = this.#doc?.parts[0]?.rows[0]?.taal || this.#doc?.meta.taal;
+    const id = this.#taal?.id ?? (!this.#taalAuto && this.#taalOverride !== void 0 ? this.#taalOverride : opening?.id);
     return id !== void 0 && id in TAALS ? id : void 0;
   }
   /** Resolve an instrument id to its def (custom overrides built-ins; the
@@ -988,14 +1018,15 @@ var SwaralipiPlayer = class {
     const mediaLead = Math.min(MEDIA_LEAD_SEC, spb);
     schedule.events.forEach((ev, i) => {
       const at = ev.beat * spb + shift;
+      if (ev.glide !== true) {
+        for (const g of graceTouches(ev)) {
+          const graceName = midiToSampleName(g.midi);
+          transport.scheduleOnce((time) => melody.triggerAttackRelease(graceName, spb * 0.4, time), Math.max(g.beat * spb + shift, 0));
+        }
+      }
       if (ev.midi !== null && ev.glide !== true) {
         const name = midiToSampleName(ev.midi);
         const dur = Math.max(ev.durationBeats * spb, 0.05);
-        ev.kan.forEach((k, gi) => {
-          const kanName = midiToSampleName(k);
-          const lead = spb * 0.12 * (ev.kan.length - gi);
-          transport.scheduleOnce((time) => melody.triggerAttackRelease(kanName, spb * 0.4, time), Math.max(at - lead, 0));
-        });
         const targets = glide !== void 0 ? glideTargets(schedule.events, i) : [];
         if (targets.length > 0 && glide !== void 0) {
           const last = targets[targets.length - 1];
@@ -1092,34 +1123,35 @@ var SwaralipiPlayer = class {
     return entry;
   }
   /**
-   * Accompaniment, one লয় segment at a time. A tempo change under the melody
-   * is a real tempo change under the drum: the tabla loop is rebuilt at the
-   * segment's own bpm — its own recorded file when the set has one at that
+   * Accompaniment, one লয় / তাল segment at a time. A tempo change under the
+   * melody is a real tempo change under the drum: the tabla loop is rebuilt at
+   * the segment's own bpm — its own recorded file when the set has one at that
    * tempo, else the nearest file time-stretched by `GrainPlayer` (which
    * stretches *without* transposing, unlike a plain playbackRate) — and the
-   * click / drum / drone patterns re-space their interval. A document with no
-   * লয় marks has exactly one segment, so this is the old single-loop path.
+   * click / drum / drone patterns re-space their interval. A তালফেরতা swaps the
+   * theka the same way: each segment loops its own taal's file (or pattern, or
+   * click cycle), and a মুক্তছন্দ segment rests. A document with neither mark
+   * has exactly one segment, so this is the old single-loop path.
    */
   #buildRhythm(Tone, transport, base, spb, segments, shift) {
     this.#disposeTabla();
     const master = this.#ensureMaster(Tone);
-    const taalId = this.#taalId();
-    const wantsTabla = this.#opts.rhythm === "tabla" && taalId !== void 0 && SAMPLED_TAALS.has(taalId) && base !== void 0;
-    if (!wantsTabla && this.#opts.rhythm !== "drums" && (this.#opts.rhythm === "none" || base === void 0)) return;
-    const taal = this.#taal ?? (taalId !== void 0 ? TAALS[taalId] : this.#doc?.meta.taal) ?? { numBeats: 4, sam: 0 };
-    const pattern = this.#opts.rhythm === "drums" ? drumPattern(taal) : [];
-    const cycle = this.#taal?.numBeats ?? this.#doc?.meta.taal?.numBeats ?? 4;
+    const rhythm = this.#opts.rhythm;
+    if (rhythm === "none" || base === void 0 && rhythm !== "drums") return;
     segments.forEach((seg, i) => {
+      const own = this.#segmentTaal(seg);
+      if (own === null) return;
+      const taalId = own !== void 0 && own.id in TAALS ? own.id : void 0;
       const from = i === 0 ? 0 : seg.beat * spb + shift;
       const to = i === segments.length - 1 ? Infinity : seg.endBeat * spb + shift;
       const beatSec = spb / seg.scale;
       const span = to === Infinity ? void 0 : to - from;
-      if (wantsTabla) {
+      if (rhythm === "tabla" && taalId !== void 0 && SAMPLED_TAALS.has(taalId) && base !== void 0) {
         const bpm = 60 / beatSec;
         const fileBpm = nearestTablaBpm(bpm, tablaBpms(taalId));
         const rate = bpm / fileBpm;
         const semis = tablaShiftSemitones(this.#tonicSemitone());
-        const url = tablaUrl(base, taalId, fileBpm, this.#variation());
+        const url = tablaUrl(base, taalId, fileBpm, this.#variation(own));
         const loop = (rate === 1 && semis === 0 ? new Tone.Player({ url, loop: true }) : new Tone.GrainPlayer({
           url,
           loop: true,
@@ -1141,9 +1173,10 @@ var SwaralipiPlayer = class {
         this.#tabla.push({ loop, fileSpb: 60 / fileBpm });
         return;
       }
-      if (this.#opts.rhythm === "drums") {
+      if (rhythm === "drums") {
         this.#drums ??= createDrumKit(Tone).connect(master);
         const drums = this.#drums;
+        const pattern = drumPattern(this.#taal ?? (taalId !== void 0 ? TAALS[taalId] : own) ?? { numBeats: 4, sam: 0 });
         let beat2 = 0;
         this.#scheduleIds.push(
           transport.scheduleRepeat(
@@ -1161,6 +1194,7 @@ var SwaralipiPlayer = class {
       }
       this.#metronome ??= createMetronome(Tone, base).connect(master);
       const metro = this.#metronome;
+      const cycle = (this.#taal ?? seg.taal)?.numBeats ?? 4;
       let beat = 0;
       this.#scheduleIds.push(
         transport.scheduleRepeat(
@@ -1219,7 +1253,7 @@ function midiRange2(schedule) {
   let lo = Infinity;
   let hi = -Infinity;
   for (const ev of schedule.events) {
-    for (const m of [ev.midi, ...ev.kan]) {
+    for (const m of [ev.midi, ...ev.kan, ...ev.resh]) {
       if (m !== null) {
         if (m < lo) lo = m;
         if (m > hi) hi = m;
@@ -1236,7 +1270,7 @@ function pickDef(id, o) {
   return def;
 }
 function resolveTaal(doc, taal) {
-  const id = taal !== void 0 && taal !== "auto" ? taal : doc.meta.taal?.id;
+  const id = taal !== void 0 && taal !== "auto" ? taal : (doc.parts[0]?.rows[0]?.taal || doc.meta.taal)?.id;
   return id !== void 0 && id in TAALS ? id : void 0;
 }
 function safeName(title) {
@@ -1259,7 +1293,7 @@ async function exportAudio(doc, options = {}) {
   });
   const range = midiRange2(schedule);
   const taalId = resolveTaal(doc, options.taal);
-  const variation = options.taal === void 0 || options.taal === "auto" ? doc.meta.taal?.variation : void 0;
+  const pinned = options.taal !== void 0 && options.taal !== "auto" && taalId !== void 0 ? TAALS[taalId] : void 0;
   const usesTabla = rhythm === "tabla" && taalId !== void 0 && SAMPLED_TAALS.has(taalId) && !!base;
   const reqBpm = options.bpm ?? doc.meta.bpm ?? 90;
   const bpm = usesTabla && taalId ? nearestTablaBpm(reqBpm, tablaBpms(taalId)) : reqBpm;
@@ -1276,14 +1310,14 @@ async function exportAudio(doc, options = {}) {
         const sampler = createSampler(Tone, def, base, range).connect(master);
         const glide = schedule.events.some((ev) => ev.glide === true) ? createBuffers(Tone, def, base, range) : void 0;
         schedule.events.forEach((ev, i) => {
-          if (ev.midi === null || ev.glide === true) return;
+          if (ev.glide === true) return;
+          for (const g of graceTouches(ev)) {
+            const name = midiToSampleName(g.midi);
+            transport.scheduleOnce((t) => sampler.triggerAttackRelease(name, spb * 0.4, t), Math.max(g.beat * spb + shift, 0));
+          }
+          if (ev.midi === null) return;
           const at = ev.beat * spb + shift;
           const dur = Math.max(ev.durationBeats * spb, 0.05);
-          ev.kan.forEach((k, gi) => {
-            const name = midiToSampleName(k);
-            const lead = spb * 0.12 * (ev.kan.length - gi);
-            transport.scheduleOnce((t) => sampler.triggerAttackRelease(name, spb * 0.4, t), Math.max(at - lead, 0));
-          });
           const targets = glide !== void 0 ? glideTargets(schedule.events, i) : [];
           if (targets.length > 0 && glide !== void 0) {
             const last = targets[targets.length - 1];
@@ -1311,22 +1345,22 @@ async function exportAudio(doc, options = {}) {
       }
       const tablas = [];
       if (rhythm !== "none" && base) {
-        const taal = taalId !== void 0 ? TAALS[taalId] : doc.meta.taal ?? { numBeats: 4, sam: 0 };
-        const pattern = rhythm === "drums" ? drumPattern(taal) : [];
         const drums = rhythm === "drums" ? createDrumKit(Tone).connect(master) : void 0;
-        const metro = rhythm !== "drums" && !usesTabla ? createMetronome(Tone, base).connect(master) : void 0;
-        const cycle = taalId !== void 0 ? TAALS[taalId].numBeats : doc.meta.taal?.numBeats ?? 4;
+        let metro;
         const semis = tablaShiftSemitones(parseTonic(options.tonic ?? doc.meta.tonic));
         schedule.tempo.forEach((seg, i) => {
+          const own = pinned ?? seg.taal;
+          if (own === null) return;
+          const segId = own !== void 0 && own.id in TAALS ? own.id : void 0;
           const from = i === 0 ? 0 : seg.beat * spb + shift;
           const to = i === schedule.tempo.length - 1 ? Infinity : seg.endBeat * spb + shift;
           const beatSec = spb / seg.scale;
           const span = to === Infinity ? void 0 : to - from;
-          if (usesTabla && taalId) {
+          if (rhythm === "tabla" && segId !== void 0 && SAMPLED_TAALS.has(segId)) {
             const segBpm = 60 / beatSec;
-            const fileBpm = nearestTablaBpm(segBpm, tablaBpms(taalId));
+            const fileBpm = nearestTablaBpm(segBpm, tablaBpms(segId));
             const rate = segBpm / fileBpm;
-            const url = tablaUrl(base, taalId, fileBpm, variation);
+            const url = tablaUrl(base, segId, fileBpm, pinned === void 0 ? own?.variation : void 0);
             const loop = (rate === 1 && semis === 0 ? new Tone.Player({ url, loop: true }) : new Tone.GrainPlayer({
               url,
               loop: true,
@@ -1345,6 +1379,7 @@ async function exportAudio(doc, options = {}) {
             }
             tablas.push({ loop, fileSpb: 60 / fileBpm });
           } else if (drums !== void 0) {
+            const pattern = drumPattern(segId !== void 0 ? TAALS[segId] : own ?? { numBeats: 4, sam: 0 });
             let beat = 0;
             transport.scheduleRepeat(
               (time) => {
@@ -1356,12 +1391,14 @@ async function exportAudio(doc, options = {}) {
               from,
               span
             );
-          } else if (metro !== void 0) {
+          } else {
+            const click = metro ??= createMetronome(Tone, base).connect(master);
+            const cycle = own?.numBeats ?? 4;
             let beat = 0;
             transport.scheduleRepeat(
               (time) => {
-                metro.volume.setValueAtTime(beat % cycle === 0 ? 0 : -8, time);
-                metro.start(time);
+                click.volume.setValueAtTime(beat % cycle === 0 ? 0 : -8, time);
+                click.start(time);
                 beat += 1;
               },
               beatSec,
@@ -1556,17 +1593,17 @@ function encodeMidi(schedule, opts) {
   const hasGlide = schedule.events.some((ev) => ev.glide === true);
   if (hasGlide) melody.push(...bendRangeSetup());
   schedule.events.forEach((ev, i) => {
-    if (ev.midi === null || ev.glide === true) return;
+    if (ev.glide === true) return;
+    for (const g of graceTouches(ev)) {
+      const on = Math.max(Math.round(g.beat * PPQ), 0);
+      melody.push({ tick: on, on: true, note: g.midi, vel: 70, ch: 0 });
+      melody.push({ tick: Math.max(on + 1, Math.round((g.beat + GRACE_STEP) * PPQ)), on: false, note: g.midi, vel: 0, ch: 0 });
+    }
+    if (ev.midi === null) return;
     const start = Math.round(ev.beat * PPQ);
     const targets = glideTargets(schedule.events, i);
     const last = targets[targets.length - 1] ?? ev;
     const end = Math.max(Math.round((last.beat + last.durationBeats) * PPQ), start + 1);
-    ev.kan.forEach((k, gi) => {
-      const gap = Math.round(0.12 * PPQ);
-      const kOn = Math.max(start - gap * (ev.kan.length - gi), 0);
-      melody.push({ tick: kOn, on: true, note: k, vel: 70, ch: 0 });
-      melody.push({ tick: Math.max(kOn + 1, start - gap * (ev.kan.length - gi - 1)), on: false, note: k, vel: 0, ch: 0 });
-    });
     melody.push({ tick: start, on: true, note: ev.midi, vel: 100, ch: 0 });
     melody.push({ tick: end, on: false, note: ev.midi, vel: 0, ch: 0 });
     let from = ev;
@@ -1587,14 +1624,18 @@ function encodeMidi(schedule, opts) {
   if (opts.name) head.push(...vlq(0), 255, 3, ...vlq(utf8(opts.name).length), ...utf8(opts.name));
   head.push(...vlq(0), 255, 81, 3, usPerBeat >> 16 & 255, usPerBeat >> 8 & 255, usPerBeat & 255);
   const chunks = [trackChunk(melody, head)];
-  if (opts.drums && opts.drums.length > 0) {
+  if (typeof opts.drums === "function" || opts.drums && opts.drums.length > 0) {
     const drum = [];
-    const totalBeats = Math.ceil(schedule.totalBeats);
-    for (let beat = 0; beat < totalBeats; beat++) {
-      const note = DRUM_NOTE[opts.drums[beat % opts.drums.length]];
-      const t = beat * PPQ;
-      drum.push({ tick: t, on: true, note, vel: 100, ch: 9 });
-      drum.push({ tick: t + Math.round(PPQ / 4), on: false, note, vel: 0, ch: 9 });
+    for (const seg of schedule.tempo) {
+      const pattern = typeof opts.drums === "function" ? opts.drums(seg) : opts.drums;
+      if (!pattern?.length) continue;
+      const end = seg === schedule.tempo[schedule.tempo.length - 1] ? Math.ceil(schedule.totalBeats) : seg.endBeat;
+      for (let k = 0; seg.beat + k / seg.scale < end - 1e-6; k++) {
+        const note = DRUM_NOTE[pattern[k % pattern.length]];
+        const t = Math.round((seg.beat + k / seg.scale) * PPQ);
+        drum.push({ tick: t, on: true, note, vel: 100, ch: 9 });
+        drum.push({ tick: t + Math.round(PPQ / 4), on: false, note, vel: 0, ch: 9 });
+      }
     }
     chunks.push(trackChunk(drum, [...vlq(0), 255, 3, ...vlq(5), 68, 114, 117, 109, 115]));
   }
@@ -1624,9 +1665,11 @@ function exportMidi(doc, options = {}) {
     laySpeeds: options.laySpeeds
   });
   const bpm = options.bpm ?? doc.meta.bpm ?? 90;
-  const taalId = doc.meta.taal?.id;
-  const taal = taalId !== void 0 && taalId in TAALS ? TAALS[taalId] : { numBeats: 4, sam: 0 };
-  const drums = options.drums ? drumPattern(taal) : void 0;
+  const drums = options.drums ? (seg) => {
+    const id = seg.taal?.id;
+    if (seg.taal === null) return void 0;
+    return drumPattern(id !== void 0 && id in TAALS ? TAALS[id] : { numBeats: 4, sam: 0 });
+  } : void 0;
   const bytes = encodeMidi(schedule, { bpm, name: options.name ?? doc.meta.title, drums });
   return {
     blob: new Blob([bytes], { type: "audio/midi" }),
@@ -1638,6 +1681,7 @@ function exportMidi(doc, options = {}) {
 exports.ARC_RAW_RE = ARC_RAW_RE;
 exports.DEFAULT_SOUNDS_BASE = DEFAULT_SOUNDS_BASE;
 exports.DRUM_KIT_BASE = DRUM_KIT_BASE;
+exports.GRACE_STEP = GRACE_STEP;
 exports.INSTRUMENTS = INSTRUMENTS;
 exports.LAYS = LAYS;
 exports.LAY_SPEEDS = LAY_SPEEDS;
@@ -1659,6 +1703,7 @@ exports.encodeWav = encodeWav;
 exports.exportAudio = exportAudio;
 exports.exportMidi = exportMidi;
 exports.glideTargets = glideTargets;
+exports.graceTouches = graceTouches;
 exports.instrumentSampleUrl = instrumentSampleUrl;
 exports.isArcRaw = isArcRaw;
 exports.meendContinuations = meendContinuations;