@ugfoundation/swaralipi-js 0.4.0 → 0.6.0

package/dist/player/index.d.cts

@@ -1,7 +1,7 @@
-import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-D3wyNRqM.cjs';
+import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-D_86x4oV.cjs';
 import { T as TaalId } from '../taals-CjzBuZ35.cjs';
-import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-D3JyEhuO.cjs';
-export { b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, d as INSTRUMENTS, P as PlayEvent, e as SALAMANDER_BASE, f as SAMPLED_TAALS, g as ScheduleOptions, T as TABLA_BPMS, h as TABLA_VARIATIONS, i as TONEJS_INSTRUMENTS_BASE, j as ToneModule, k as buildSchedule, l as drumPattern, m as instrumentSampleUrl, n as nearestTablaBpm, o as normalizeBase, p as probeUrl, q as quantizeLoopEnd, s as santoorUrls, r as subsetUrls, t as tablaBpms, u as tablaUrl } from '../schedule-D3JyEhuO.cjs';
+import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-CjPcD-Hf.cjs';
+export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GlideLeg, d as INSTRUMENTS, M as MEEND_HOLD, P as PlayEvent, e as SALAMANDER_BASE, f as SAMPLED_TAALS, g as ScheduleOptions, T as TABLA_BPMS, h as TABLA_VARIATIONS, i as TONEJS_INSTRUMENTS_BASE, j as ToneModule, k as buildSchedule, l as createBuffers, m as drumPattern, n as glideTargets, o as instrumentSampleUrl, p as isArcRaw, q as meendContinuations, r as nearestSampleKey, s as nearestTablaBpm, t as normalizeBase, u as probeUrl, v as quantizeLoopEnd, w as santoorUrls, x as subsetUrls, y as tablaBpms, z as tablaUrl, B as triggerGlide } from '../schedule-CjPcD-Hf.cjs';
 import 'zod';
 import 'tone';
 
@@ -301,5 +301,17 @@ declare function svaraToMidi(note: Note, tonicPc: number, baseOctave?: number):
 declare function midiToSampleName(midi: number): string;
 /** MIDI → santoor sample filename stem (`cs4`): lowercase, `#` → `s`. */
 declare function sampleFileName(midi: number): string;
+/**
+ * Logistic S-curve on [0, 1], normalised so f(0) = 0 and f(1) = 1.
+ *
+ * A মীড় is **not** a linear ramp. The hand (or the voice) accelerates away
+ * from the source pitch and decelerates into the target — "if the pull is too
+ * fast, the melody loses its vocal quality; if it is too slow, the note dies
+ * before reaching its destination". That S shape is the established model for
+ * portamento pitch contours (Yang & Chew's logistic fit, ISMIR 2016), and its
+ * coefficient has a direct musical meaning: `steepness` is how abruptly the
+ * pitch leaves one svara for the next.
+ */
+declare function sCurve(x: number, steepness?: number): number;
 
-export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, DrumVoice, InstrumentDef, InstrumentId, type MidiExportOptions, type MidiExportResult, OCTAVE_OFFSET, type PlayerOptions, type PlayerState, type RhythmMode, SHUDDHA, Schedule, SwaralipiPlayer, encodeMidi, encodeMp3, encodeWav, exportAudio, exportMidi, midiToSampleName, parseTonic, sampleFileName, svaraSemitone, svaraToMidi };
+export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, DrumVoice, InstrumentDef, InstrumentId, type MidiExportOptions, type MidiExportResult, OCTAVE_OFFSET, type PlayerOptions, type PlayerState, type RhythmMode, SHUDDHA, Schedule, SwaralipiPlayer, encodeMidi, encodeMp3, encodeWav, exportAudio, exportMidi, midiToSampleName, parseTonic, sCurve, sampleFileName, svaraSemitone, svaraToMidi };

package/dist/player/index.d.ts

@@ -1,7 +1,7 @@
-import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-D3wyNRqM.js';
+import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-D_86x4oV.js';
 import { T as TaalId } from '../taals-CjzBuZ35.js';
-import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-CAns78TD.js';
-export { b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, d as INSTRUMENTS, P as PlayEvent, e as SALAMANDER_BASE, f as SAMPLED_TAALS, g as ScheduleOptions, T as TABLA_BPMS, h as TABLA_VARIATIONS, i as TONEJS_INSTRUMENTS_BASE, j as ToneModule, k as buildSchedule, l as drumPattern, m as instrumentSampleUrl, n as nearestTablaBpm, o as normalizeBase, p as probeUrl, q as quantizeLoopEnd, s as santoorUrls, r as subsetUrls, t as tablaBpms, u as tablaUrl } from '../schedule-CAns78TD.js';
+import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-8WFUBJqB.js';
+export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GlideLeg, d as INSTRUMENTS, M as MEEND_HOLD, P as PlayEvent, e as SALAMANDER_BASE, f as SAMPLED_TAALS, g as ScheduleOptions, T as TABLA_BPMS, h as TABLA_VARIATIONS, i as TONEJS_INSTRUMENTS_BASE, j as ToneModule, k as buildSchedule, l as createBuffers, m as drumPattern, n as glideTargets, o as instrumentSampleUrl, p as isArcRaw, q as meendContinuations, r as nearestSampleKey, s as nearestTablaBpm, t as normalizeBase, u as probeUrl, v as quantizeLoopEnd, w as santoorUrls, x as subsetUrls, y as tablaBpms, z as tablaUrl, B as triggerGlide } from '../schedule-8WFUBJqB.js';
 import 'zod';
 import 'tone';
 
@@ -301,5 +301,17 @@ declare function svaraToMidi(note: Note, tonicPc: number, baseOctave?: number):
 declare function midiToSampleName(midi: number): string;
 /** MIDI → santoor sample filename stem (`cs4`): lowercase, `#` → `s`. */
 declare function sampleFileName(midi: number): string;
+/**
+ * Logistic S-curve on [0, 1], normalised so f(0) = 0 and f(1) = 1.
+ *
+ * A মীড় is **not** a linear ramp. The hand (or the voice) accelerates away
+ * from the source pitch and decelerates into the target — "if the pull is too
+ * fast, the melody loses its vocal quality; if it is too slow, the note dies
+ * before reaching its destination". That S shape is the established model for
+ * portamento pitch contours (Yang & Chew's logistic fit, ISMIR 2016), and its
+ * coefficient has a direct musical meaning: `steepness` is how abruptly the
+ * pitch leaves one svara for the next.
+ */
+declare function sCurve(x: number, steepness?: number): number;
 
-export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, DrumVoice, InstrumentDef, InstrumentId, type MidiExportOptions, type MidiExportResult, OCTAVE_OFFSET, type PlayerOptions, type PlayerState, type RhythmMode, SHUDDHA, Schedule, SwaralipiPlayer, encodeMidi, encodeMp3, encodeWav, exportAudio, exportMidi, midiToSampleName, parseTonic, sampleFileName, svaraSemitone, svaraToMidi };
+export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, DrumVoice, InstrumentDef, InstrumentId, type MidiExportOptions, type MidiExportResult, OCTAVE_OFFSET, type PlayerOptions, type PlayerState, type RhythmMode, SHUDDHA, Schedule, SwaralipiPlayer, encodeMidi, encodeMp3, encodeWav, exportAudio, exportMidi, midiToSampleName, parseTonic, sCurve, sampleFileName, svaraSemitone, svaraToMidi };

package/dist/player/index.js

@@ -1,5 +1,5 @@
-import { DEFAULT_SOUNDS_BASE, INSTRUMENTS, SAMPLED_TAALS, instrumentSampleUrl, probeUrl, normalizeBase, nearestTablaBpm, tablaBpms, buildSchedule, quantizeLoopEnd, midiToSampleName, createSampler, tablaUrl, tablaShiftSemitones, TABLA_GRAIN_OVERLAP_SEC, TABLA_GRAIN_SEC, createDrumKit, drumPattern, createMetronome, TANPURA_PCS, createTanpura, parseTonic } from '../chunk-6QW7MSJO.js';
-export { DEFAULT_SOUNDS_BASE, DRUM_KIT_BASE, INSTRUMENTS, OCTAVE_OFFSET, SALAMANDER_BASE, SAMPLED_TAALS, SHUDDHA, TABLA_BPMS, TABLA_VARIATIONS, TONEJS_INSTRUMENTS_BASE, buildSchedule, drumPattern, instrumentSampleUrl, midiToSampleName, nearestTablaBpm, normalizeBase, parseTonic, probeUrl, quantizeLoopEnd, sampleFileName, santoorUrls, subsetUrls, svaraSemitone, svaraToMidi, tablaBpms, tablaUrl } from '../chunk-6QW7MSJO.js';
+import { DEFAULT_SOUNDS_BASE, INSTRUMENTS, SAMPLED_TAALS, instrumentSampleUrl, probeUrl, normalizeBase, nearestTablaBpm, tablaBpms, buildSchedule, quantizeLoopEnd, midiToSampleName, glideTargets, triggerGlide, createSampler, createBuffers, tablaUrl, tablaShiftSemitones, TABLA_GRAIN_OVERLAP_SEC, TABLA_GRAIN_SEC, createDrumKit, drumPattern, createMetronome, TANPURA_PCS, createTanpura, parseTonic, MEEND_HOLD, sCurve } from '../chunk-GHWURC4U.js';
+export { ARC_RAW_RE, DEFAULT_SOUNDS_BASE, DRUM_KIT_BASE, INSTRUMENTS, MEEND_HOLD, OCTAVE_OFFSET, SALAMANDER_BASE, SAMPLED_TAALS, SHUDDHA, TABLA_BPMS, TABLA_VARIATIONS, TONEJS_INSTRUMENTS_BASE, buildSchedule, createBuffers, drumPattern, glideTargets, instrumentSampleUrl, isArcRaw, meendContinuations, midiToSampleName, nearestSampleKey, nearestTablaBpm, normalizeBase, parseTonic, probeUrl, quantizeLoopEnd, sCurve, sampleFileName, santoorUrls, subsetUrls, svaraSemitone, svaraToMidi, tablaBpms, tablaUrl, triggerGlide } from '../chunk-GHWURC4U.js';
 import { TAALS } from '../chunk-6ETPFHZ6.js';
 
 // src/player/player.ts
@@ -17,6 +17,13 @@ function midiRange(schedule) {
   }
   return lo <= hi ? { lo, hi } : void 0;
 }
+async function loadedOrWarn(Tone) {
+  try {
+    await Tone.loaded();
+  } catch (err) {
+    console.warn("[swaralipi] some audio samples failed to load; continuing without them", err);
+  }
+}
 var SwaralipiPlayer = class {
   #opts;
   /** Per-song setBpm tweak: beats meta.bpm but is cleared by the next load(). */
@@ -32,6 +39,8 @@ var SwaralipiPlayer = class {
   /** Cached melody samplers keyed by instrument id, with the MIDI range each
    * was loaded for (rebuilt when a song needs a wider range). */
   #samplers = /* @__PURE__ */ new Map();
+  /** Raw sample buffers for the মীড় glide voice, keyed like #samplers. */
+  #glide = /* @__PURE__ */ new Map();
   #tanpura;
   #tanpuraKey = "";
   #metronome;
@@ -283,6 +292,8 @@ var SwaralipiPlayer = class {
     this.#halt();
     for (const { sampler } of this.#samplers.values()) sampler.dispose();
     this.#samplers.clear();
+    for (const { buffers } of this.#glide.values()) buffers.dispose();
+    this.#glide.clear();
     this.#tanpura?.dispose();
     this.#metronome?.dispose();
     this.#tabla?.dispose();
@@ -385,30 +396,54 @@ var SwaralipiPlayer = class {
       baseOctave: this.#opts.baseOctave
     });
     const range = midiRange(schedule);
-    const melody = this.#buildMelody(Tone, this.#effectiveInstrument(), base, range);
+    const id = this.#effectiveInstrument();
+    const def = this.#resolveDef(id) ?? INSTRUMENTS.harmonium;
+    const melody = this.#buildMelody(Tone, id, base, range);
+    const glide = schedule.events.some((ev) => ev.glide === true) ? this.#buildGlide(Tone, id, base, range) : void 0;
     this.#buildRhythm(Tone, transport, base, spb);
     this.#buildTanpura(Tone, transport, base, spb);
-    await Tone.loaded();
+    await loadedOrWarn(Tone);
     if (this.#tabla?.buffer?.loaded) {
       this.#tabla.loopEnd = quantizeLoopEnd(this.#tabla.buffer.duration, spb);
     }
     const draw = Tone.getDraw();
     const shift = this.#opts.rhythm !== "none" ? schedule.pickupBeats * spb : 0;
-    for (const ev of schedule.events) {
+    schedule.events.forEach((ev, i) => {
       const at = ev.beat * spb + shift;
-      if (ev.midi !== null) {
+      if (ev.midi !== null && ev.glide !== true) {
         const name = midiToSampleName(ev.midi);
         const dur = Math.max(ev.durationBeats * spb, 0.05);
         if (ev.kan !== null) {
           const kanName = midiToSampleName(ev.kan);
           transport.scheduleOnce((time) => melody.triggerAttackRelease(kanName, spb * 0.4, time), Math.max(at - spb * 0.12, 0));
         }
-        transport.scheduleOnce((time) => melody.triggerAttackRelease(name, dur, time), at);
+        const targets = glide !== void 0 ? glideTargets(schedule.events, i) : [];
+        if (targets.length > 0 && glide !== void 0) {
+          const last = targets[targets.length - 1];
+          const legs = [
+            { midi: ev.midi, at: 0 },
+            ...targets.map((t) => ({ midi: t.midi, at: (t.beat - ev.beat) * spb }))
+          ];
+          const end = (last.beat + last.durationBeats - ev.beat) * spb;
+          transport.scheduleOnce((time) => {
+            triggerGlide(
+              Tone,
+              glide.buffers,
+              glide.urls,
+              this.#ensureMaster(Tone),
+              legs.map((l) => ({ midi: l.midi, at: time + l.at })),
+              time + end,
+              def.release ?? 1
+            );
+          }, at);
+        } else {
+          transport.scheduleOnce((time) => melody.triggerAttackRelease(name, dur, time), at);
+        }
       }
       transport.scheduleOnce((time) => {
         draw.schedule(() => this.#emitHighlight(ev.path), time);
       }, at);
-    }
+    });
     const endAt = schedule.totalBeats * spb + shift + spb;
     transport.scheduleOnce((time) => {
       draw.schedule(() => this.#emitHighlight(null), time);
@@ -432,7 +467,7 @@ var SwaralipiPlayer = class {
     transport.bpm.value = bpm;
     const spb = 60 / bpm;
     this.#buildRhythm(Tone, transport, base, spb);
-    await Tone.loaded();
+    await loadedOrWarn(Tone);
     if (this.#tabla?.buffer?.loaded) {
       this.#tabla.loopEnd = quantizeLoopEnd(this.#tabla.buffer.duration, spb);
     }
@@ -464,6 +499,19 @@ var SwaralipiPlayer = class {
     this.#samplers.set(id, { sampler, lo: range?.lo ?? -Infinity, hi: range?.hi ?? Infinity });
     return sampler;
   }
+  /** Build (or reuse) the মীড় glide buffers for `id` — the same samples the
+   * Sampler uses, kept as raw buffers so a note can be started once and its
+   * playbackRate automated. Cached and range-widened exactly like #buildMelody. */
+  #buildGlide(Tone, id, base, range) {
+    const cached = this.#glide.get(id);
+    if (cached && (range === void 0 || cached.lo <= range.lo && cached.hi >= range.hi)) return cached;
+    cached?.buffers.dispose();
+    const def = this.#resolveDef(id) ?? INSTRUMENTS.harmonium;
+    const built = createBuffers(Tone, def, base, range);
+    const entry = { ...built, lo: range?.lo ?? -Infinity, hi: range?.hi ?? Infinity };
+    this.#glide.set(id, entry);
+    return entry;
+  }
   #buildRhythm(Tone, transport, base, spb) {
     this.#tabla?.dispose();
     this.#tabla = void 0;
@@ -592,17 +640,39 @@ async function exportAudio(doc, options = {}) {
       const master = new Tone.Gain(1).toDestination();
       if (withMelody) {
         const sampler = createSampler(Tone, def, base, range).connect(master);
-        for (const ev of schedule.events) {
-          if (ev.midi === null) continue;
+        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;
           const at = ev.beat * spb + shift;
           const dur = Math.max(ev.durationBeats * spb, 0.05);
           if (ev.kan !== null) {
-            const name2 = midiToSampleName(ev.kan);
-            transport.scheduleOnce((t) => sampler.triggerAttackRelease(name2, spb * 0.4, t), Math.max(at - spb * 0.12, 0));
+            const name = midiToSampleName(ev.kan);
+            transport.scheduleOnce((t) => sampler.triggerAttackRelease(name, spb * 0.4, t), Math.max(at - spb * 0.12, 0));
           }
-          const name = midiToSampleName(ev.midi);
-          transport.scheduleOnce((t) => sampler.triggerAttackRelease(name, dur, t), at);
-        }
+          const targets = glide !== void 0 ? glideTargets(schedule.events, i) : [];
+          if (targets.length > 0 && glide !== void 0) {
+            const last = targets[targets.length - 1];
+            const legs = [
+              { midi: ev.midi, at: 0 },
+              ...targets.map((t) => ({ midi: t.midi, at: (t.beat - ev.beat) * spb }))
+            ];
+            const end = (last.beat + last.durationBeats - ev.beat) * spb;
+            transport.scheduleOnce((t) => {
+              triggerGlide(
+                Tone,
+                glide.buffers,
+                glide.urls,
+                master,
+                legs.map((l) => ({ midi: l.midi, at: t + l.at })),
+                t + end,
+                def.release ?? 1
+              );
+            }, at);
+          } else {
+            const name = midiToSampleName(ev.midi);
+            transport.scheduleOnce((t) => sampler.triggerAttackRelease(name, dur, t), at);
+          }
+        });
       }
       let tabla;
       if (rhythm === "drums" && base) {
@@ -774,6 +844,17 @@ function utf8(s) {
 function u32be(n) {
   return [n >>> 24 & 255, n >>> 16 & 255, n >>> 8 & 255, n & 255];
 }
+var BEND_RANGE = 12;
+var BEND_STEPS = 16;
+function bendEvent(tick, semitones) {
+  const raw = Math.round(8192 + semitones / BEND_RANGE * 8192);
+  const value = Math.min(Math.max(raw, 0), 16383);
+  return { tick, on: false, status: 224, note: value & 127, vel: value >> 7 & 127, ch: 0 };
+}
+function bendRangeSetup() {
+  const cc = (num, val) => ({ tick: 0, on: false, status: 176, note: num, vel: val, ch: 0 });
+  return [cc(101, 0), cc(100, 0), cc(6, BEND_RANGE), cc(38, 0), cc(101, 127), cc(100, 127)];
+}
 var DRUM_NOTE = {
   kick: 36,
   snare: 38,
@@ -784,11 +865,12 @@ var DRUM_NOTE = {
   tom3: 41
 };
 function trackChunk(raw, head) {
-  raw.sort((a, b) => a.tick - b.tick || Number(a.on) - Number(b.on));
+  const rank = (e) => e.status !== void 0 ? 1 : e.on ? 2 : 0;
+  raw.sort((a, b) => a.tick - b.tick || rank(a) - rank(b));
   const track = [...head];
   let last = 0;
   for (const e of raw) {
-    const status = (e.on ? 144 : 128) | e.ch & 15;
+    const status = e.status !== void 0 ? e.status | e.ch & 15 : (e.on ? 144 : 128) | e.ch & 15;
     track.push(...vlq(e.tick - last), status, e.note & 127, e.vel & 127);
     last = e.tick;
   }
@@ -797,10 +879,14 @@ function trackChunk(raw, head) {
 }
 function encodeMidi(schedule, opts) {
   const melody = [];
-  for (const ev of schedule.events) {
-    if (ev.midi === null) continue;
+  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;
     const start = Math.round(ev.beat * PPQ);
-    const end = Math.max(Math.round((ev.beat + ev.durationBeats) * PPQ), start + 1);
+    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);
     if (ev.kan !== null) {
       const kOn = Math.max(start - Math.round(0.12 * PPQ), 0);
       melody.push({ tick: kOn, on: true, note: ev.kan, vel: 70, ch: 0 });
@@ -808,7 +894,19 @@ function encodeMidi(schedule, opts) {
     }
     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;
+    for (const to of targets) {
+      const glideStart = from.beat + (to.beat - from.beat) * MEEND_HOLD;
+      for (let n = 0; n <= BEND_STEPS; n++) {
+        const u = n / BEND_STEPS;
+        const beat = glideStart + (to.beat - glideStart) * u;
+        const semis = from.midi - ev.midi + (to.midi - from.midi) * sCurve(u);
+        melody.push(bendEvent(Math.round(beat * PPQ), semis));
+      }
+      from = to;
+    }
+    if (targets.length > 0) melody.push(bendEvent(end, 0));
+  });
   const usPerBeat = Math.round(6e7 / opts.bpm);
   const head = [];
   if (opts.name) head.push(...vlq(0), 255, 3, ...vlq(utf8(opts.name).length), ...utf8(opts.name));