@ugfoundation/swaralipi-js 0.7.2 → 0.7.3

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-D_86x4oV.cjs';
+import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-DqBXPGkL.cjs';
 import { T as TaalId } from '../taals-CjzBuZ35.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 { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-BpBYGXPL.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-BpBYGXPL.cjs';
 import 'zod';
 import 'tone';
 
@@ -259,15 +259,6 @@ declare function encodeMidi(schedule: Schedule, opts: {
  */
 declare function exportMidi(doc: Swaralipi, options?: MidiExportOptions): MidiExportResult;
 
-/**
- * Pure svara → pitch math for the player. No Tone, no audio — unit-testable
- * in plain Node and shared by the scheduler.
- *
- * The model: a tonic (Sa) pitch-class + a per-note scale degree + octave
- * register + komal/tivra/microtone accidentals → an absolute MIDI number,
- * which the Tone.Sampler pitch-shifts from the nearest santoor sample.
- */
-
 /** Octave register offset in octaves, relative to madhyam (middle). */
 declare const OCTAVE_OFFSET: Record<Octave, number>;
 /**

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-D_86x4oV.js';
+import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-DqBXPGkL.js';
 import { T as TaalId } from '../taals-CjzBuZ35.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 { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-Tzk01FKj.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-Tzk01FKj.js';
 import 'zod';
 import 'tone';
 
@@ -259,15 +259,6 @@ declare function encodeMidi(schedule: Schedule, opts: {
  */
 declare function exportMidi(doc: Swaralipi, options?: MidiExportOptions): MidiExportResult;
 
-/**
- * Pure svara → pitch math for the player. No Tone, no audio — unit-testable
- * in plain Node and shared by the scheduler.
- *
- * The model: a tonic (Sa) pitch-class + a per-note scale degree + octave
- * register + komal/tivra/microtone accidentals → an absolute MIDI number,
- * which the Tone.Sampler pitch-shifts from the nearest santoor sample.
- */
-
 /** Octave register offset in octaves, relative to madhyam (middle). */
 declare const OCTAVE_OFFSET: Record<Octave, number>;
 /**

package/dist/player/index.js

@@ -1,6 +1,6 @@
-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';
+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-2SAZWTTK.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-2SAZWTTK.js';
+import { TAALS } from '../chunk-UF5OSJRP.js';
 
 // src/player/player.ts
 var STOP_FADE_SEC = 0.5;
@@ -8,7 +8,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]) {
       if (m !== null) {
         if (m < lo) lo = m;
         if (m > hi) hi = m;
@@ -413,10 +413,11 @@ var SwaralipiPlayer = class {
       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));
-        }
+        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];
@@ -589,7 +590,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]) {
       if (m !== null) {
         if (m < lo) lo = m;
         if (m > hi) hi = m;
@@ -645,10 +646,11 @@ async function exportAudio(doc, options = {}) {
           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 name = midiToSampleName(ev.kan);
-            transport.scheduleOnce((t) => sampler.triggerAttackRelease(name, spb * 0.4, t), Math.max(at - spb * 0.12, 0));
-          }
+          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];
@@ -887,11 +889,12 @@ function encodeMidi(schedule, opts) {
     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 });
-      melody.push({ tick: start, on: false, note: ev.kan, vel: 0, ch: 0 });
-    }
+    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;