@ugfoundation/swaralipi-js 0.9.0 → 0.9.1

package/dist/player/index.d.cts

@@ -1,8 +1,8 @@
 import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-Cf_epUIC.cjs';
 import { a as LaySpeeds, T as TaalId } from '../lay-CfDlPhH2.cjs';
 export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-CfDlPhH2.cjs';
-import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice, T as TempoSegment } from '../schedule-TxSfHL-T.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, h as TABLA_BPMS, i as TABLA_VARIATIONS, j as TONEJS_INSTRUMENTS_BASE, k as ToneModule, l as buildSchedule, m as createBuffers, n as drumPattern, o as glideTargets, p as instrumentSampleUrl, q as isArcRaw, r as meendContinuations, s as nearestSampleKey, t as nearestTablaBpm, u as normalizeBase, v as probeUrl, w as quantizeLoopEnd, x as santoorUrls, y as subsetUrls, z as tablaBpms, B as tablaUrl, C as triggerGlide } from '../schedule-TxSfHL-T.cjs';
+import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice, T as TempoSegment } from '../schedule-CU-VECDH.cjs';
+export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GRACE_STEP, d as GlideLeg, e as INSTRUMENTS, M as MEEND_HOLD, P as PlayEvent, f as SALAMANDER_BASE, g as SAMPLED_TAALS, h as ScheduleOptions, i as TABLA_BPMS, j as TABLA_VARIATIONS, k as TONEJS_INSTRUMENTS_BASE, l as ToneModule, m as buildSchedule, n as createBuffers, o as drumPattern, p as glideTargets, q as graceTouches, r as instrumentSampleUrl, s as isArcRaw, t as meendContinuations, u as nearestSampleKey, v as nearestTablaBpm, w as normalizeBase, x as probeUrl, y as quantizeLoopEnd, z as santoorUrls, B as subsetUrls, C as tablaBpms, E as tablaUrl, F as triggerGlide } from '../schedule-CU-VECDH.cjs';
 import 'zod';
 import 'tone';
 

package/dist/player/index.d.ts

@@ -1,8 +1,8 @@
 import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-Cf_epUIC.js';
 import { a as LaySpeeds, T as TaalId } from '../lay-CZIzR9cM.js';
 export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-CZIzR9cM.js';
-import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice, T as TempoSegment } from '../schedule-9uvjnCG_.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, h as TABLA_BPMS, i as TABLA_VARIATIONS, j as TONEJS_INSTRUMENTS_BASE, k as ToneModule, l as buildSchedule, m as createBuffers, n as drumPattern, o as glideTargets, p as instrumentSampleUrl, q as isArcRaw, r as meendContinuations, s as nearestSampleKey, t as nearestTablaBpm, u as normalizeBase, v as probeUrl, w as quantizeLoopEnd, x as santoorUrls, y as subsetUrls, z as tablaBpms, B as tablaUrl, C as triggerGlide } from '../schedule-9uvjnCG_.js';
+import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice, T as TempoSegment } from '../schedule-BaovCtmf.js';
+export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GRACE_STEP, d as GlideLeg, e as INSTRUMENTS, M as MEEND_HOLD, P as PlayEvent, f as SALAMANDER_BASE, g as SAMPLED_TAALS, h as ScheduleOptions, i as TABLA_BPMS, j as TABLA_VARIATIONS, k as TONEJS_INSTRUMENTS_BASE, l as ToneModule, m as buildSchedule, n as createBuffers, o as drumPattern, p as glideTargets, q as graceTouches, r as instrumentSampleUrl, s as isArcRaw, t as meendContinuations, u as nearestSampleKey, v as nearestTablaBpm, w as normalizeBase, x as probeUrl, y as quantizeLoopEnd, z as santoorUrls, B as subsetUrls, C as tablaBpms, E as tablaUrl, F as triggerGlide } from '../schedule-BaovCtmf.js';
 import 'zod';
 import 'tone';
 

package/dist/player/index.js

@@ -1,5 +1,5 @@
-import { DEFAULT_SOUNDS_BASE, INSTRUMENTS, SAMPLED_TAALS, buildSchedule, quantizeLoopEnd, instrumentSampleUrl, probeUrl, normalizeBase, nearestTablaBpm, tablaBpms, midiToSampleName, glideTargets, triggerGlide, createSampler, createBuffers, tablaShiftSemitones, tablaUrl, TABLA_GRAIN_OVERLAP_SEC, TABLA_GRAIN_SEC, createDrumKit, drumPattern, createMetronome, TANPURA_PCS, createTanpura, parseTonic, MEEND_HOLD, sCurve } from '../chunk-7SMRG4IS.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-7SMRG4IS.js';
+import { DEFAULT_SOUNDS_BASE, INSTRUMENTS, SAMPLED_TAALS, buildSchedule, quantizeLoopEnd, instrumentSampleUrl, probeUrl, normalizeBase, nearestTablaBpm, tablaBpms, graceTouches, midiToSampleName, glideTargets, triggerGlide, createSampler, createBuffers, tablaShiftSemitones, tablaUrl, TABLA_GRAIN_OVERLAP_SEC, TABLA_GRAIN_SEC, createDrumKit, drumPattern, createMetronome, TANPURA_PCS, createTanpura, parseTonic, GRACE_STEP, MEEND_HOLD, sCurve } from '../chunk-SEN266BY.js';
+export { ARC_RAW_RE, DEFAULT_SOUNDS_BASE, DRUM_KIT_BASE, GRACE_STEP, INSTRUMENTS, MEEND_HOLD, OCTAVE_OFFSET, SALAMANDER_BASE, SAMPLED_TAALS, SHUDDHA, TABLA_BPMS, TABLA_VARIATIONS, TONEJS_INSTRUMENTS_BASE, buildSchedule, createBuffers, drumPattern, glideTargets, graceTouches, instrumentSampleUrl, isArcRaw, meendContinuations, midiToSampleName, nearestSampleKey, nearestTablaBpm, normalizeBase, parseTonic, probeUrl, quantizeLoopEnd, sCurve, sampleFileName, santoorUrls, subsetUrls, svaraSemitone, svaraToMidi, tablaBpms, tablaUrl, triggerGlide } from '../chunk-SEN266BY.js';
 import { TAALS } from '../chunk-MYVIQU4O.js';
 export { LAYS, LAY_SPEEDS, printedLay, resolveLaySpeeds, rowLay } from '../chunk-MYVIQU4O.js';
 
@@ -14,7 +14,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;
@@ -467,14 +467,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];
@@ -701,7 +702,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;
@@ -758,14 +759,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];
@@ -1041,17 +1042,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;