@ugfoundation/swaralipi-js 0.3.0 → 0.3.1

package/dist/player/index.d.cts

@@ -1,7 +1,7 @@
 import { S as Swaralipi, O as Octave, a as SvaraLetter, N as Note } from '../schema-D3wyNRqM.cjs';
 import { T as TaalId } from '../taals-FmEulsjY.cjs';
-import { I as InstrumentId, a as InstrumentDef, S as Schedule } from '../schedule-DhO_Xzz4.cjs';
-export { D as DEFAULT_SOUNDS_BASE, b as DRUM_KIT_BASE, c as DrumVoice, 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-DhO_Xzz4.cjs';
+import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-Dsb2paUE.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-Dsb2paUE.cjs';
 import 'zod';
 import 'tone';
 
@@ -204,10 +204,12 @@ declare function encodeMp3(channels: Float32Array[], sampleRate: number, kbps?:
  * tests) in plain Node, and carries no dependency (the SMF format is trivial),
  * which keeps it clear of any redistribution/license question.
  *
- * Scope = the **melody voice only**. Tabla is prerecorded audio loops with no
- * per-stroke note data, so there's nothing to turn into MIDI notes; tanpura is
- * a fixed background drone. A `.mid` here is the notation line — the user opens
- * it in any DAW / notation editor and assigns whatever instrument they like.
+ * Scope = the **melody voice**, plus — when `drums` is on — the Western-drumset
+ * translation of the taal (the same `drumPattern` the player sequences) written
+ * as a **separate GM channel-10 track**. Tabla is prerecorded audio loops with
+ * no per-stroke note data, so there's nothing to turn into MIDI notes; tanpura
+ * is a fixed background drone. A `.mid` here is the notation line (+ optional
+ * drums) — the user opens it in any DAW and assigns instruments.
  */
 
 interface MidiExportOptions {
@@ -219,6 +221,8 @@ interface MidiExportOptions {
     bpm?: number;
     /** Track name meta-event. Default the song title. */
     name?: string;
+    /** Also export the taal's drumset pattern as a separate GM channel-10 track. */
+    drums?: boolean;
 }
 interface MidiExportResult {
     blob: Blob;
@@ -227,12 +231,14 @@ interface MidiExportResult {
     mimeType: string;
 }
 /**
- * Encode a schedule to a format-0 Standard MIDI File (one track, one channel).
- * Pure — no Tone, no browser — so it's directly unit-testable.
+ * Encode a schedule to a Standard MIDI File. Melody rides channel 0; when
+ * `drums` is given, its per-beat voices ride a second GM channel-10 track
+ * (the file becomes format 1). Pure — no Tone, no browser — directly testable.
  */
 declare function encodeMidi(schedule: Schedule, opts: {
     bpm: number;
     name?: string;
+    drums?: DrumVoice[];
 }): Uint8Array;
 /**
  * Export a swaralipi doc to a `.mid` Blob (melody voice only). No browser APIs
@@ -283,4 +289,4 @@ declare function midiToSampleName(midi: number): string;
 /** MIDI → santoor sample filename stem (`cs4`): lowercase, `#` → `s`. */
 declare function sampleFileName(midi: number): string;
 
-export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, 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, sampleFileName, svaraSemitone, svaraToMidi };

package/dist/player/index.d.ts

@@ -1,7 +1,7 @@
 import { S as Swaralipi, O as Octave, a as SvaraLetter, N as Note } from '../schema-D3wyNRqM.js';
 import { T as TaalId } from '../taals-FmEulsjY.js';
-import { I as InstrumentId, a as InstrumentDef, S as Schedule } from '../schedule-PTHUONrA.js';
-export { D as DEFAULT_SOUNDS_BASE, b as DRUM_KIT_BASE, c as DrumVoice, 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-PTHUONrA.js';
+import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-BhiP_maG.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-BhiP_maG.js';
 import 'zod';
 import 'tone';
 
@@ -204,10 +204,12 @@ declare function encodeMp3(channels: Float32Array[], sampleRate: number, kbps?:
  * tests) in plain Node, and carries no dependency (the SMF format is trivial),
  * which keeps it clear of any redistribution/license question.
  *
- * Scope = the **melody voice only**. Tabla is prerecorded audio loops with no
- * per-stroke note data, so there's nothing to turn into MIDI notes; tanpura is
- * a fixed background drone. A `.mid` here is the notation line — the user opens
- * it in any DAW / notation editor and assigns whatever instrument they like.
+ * Scope = the **melody voice**, plus — when `drums` is on — the Western-drumset
+ * translation of the taal (the same `drumPattern` the player sequences) written
+ * as a **separate GM channel-10 track**. Tabla is prerecorded audio loops with
+ * no per-stroke note data, so there's nothing to turn into MIDI notes; tanpura
+ * is a fixed background drone. A `.mid` here is the notation line (+ optional
+ * drums) — the user opens it in any DAW and assigns instruments.
  */
 
 interface MidiExportOptions {
@@ -219,6 +221,8 @@ interface MidiExportOptions {
     bpm?: number;
     /** Track name meta-event. Default the song title. */
     name?: string;
+    /** Also export the taal's drumset pattern as a separate GM channel-10 track. */
+    drums?: boolean;
 }
 interface MidiExportResult {
     blob: Blob;
@@ -227,12 +231,14 @@ interface MidiExportResult {
     mimeType: string;
 }
 /**
- * Encode a schedule to a format-0 Standard MIDI File (one track, one channel).
- * Pure — no Tone, no browser — so it's directly unit-testable.
+ * Encode a schedule to a Standard MIDI File. Melody rides channel 0; when
+ * `drums` is given, its per-beat voices ride a second GM channel-10 track
+ * (the file becomes format 1). Pure — no Tone, no browser — directly testable.
  */
 declare function encodeMidi(schedule: Schedule, opts: {
     bpm: number;
     name?: string;
+    drums?: DrumVoice[];
 }): Uint8Array;
 /**
  * Export a swaralipi doc to a `.mid` Blob (melody voice only). No browser APIs
@@ -283,4 +289,4 @@ declare function midiToSampleName(midi: number): string;
 /** MIDI → santoor sample filename stem (`cs4`): lowercase, `#` → `s`. */
 declare function sampleFileName(midi: number): string;
 
-export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, 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, sampleFileName, svaraSemitone, svaraToMidi };

package/dist/player/index.js

@@ -700,34 +700,72 @@ function utf8(s) {
 function u32be(n) {
   return [n >>> 24 & 255, n >>> 16 & 255, n >>> 8 & 255, n & 255];
 }
+var DRUM_NOTE = {
+  kick: 36,
+  snare: 38,
+  hihat: 42,
+  // closed hi-hat
+  tom1: 48,
+  tom2: 45,
+  tom3: 41
+};
+function trackChunk(raw, head) {
+  raw.sort((a, b) => a.tick - b.tick || Number(a.on) - Number(b.on));
+  const track = [...head];
+  let last = 0;
+  for (const e of raw) {
+    const status = (e.on ? 144 : 128) | e.ch & 15;
+    track.push(...vlq(e.tick - last), status, e.note & 127, e.vel & 127);
+    last = e.tick;
+  }
+  track.push(...vlq(0), 255, 47, 0);
+  return [77, 84, 114, 107, ...u32be(track.length), ...track];
+}
 function encodeMidi(schedule, opts) {
-  const raw = [];
+  const melody = [];
   for (const ev of schedule.events) {
     if (ev.midi === null) continue;
     const start = Math.round(ev.beat * PPQ);
     const end = Math.max(Math.round((ev.beat + ev.durationBeats) * PPQ), start + 1);
     if (ev.kan !== null) {
       const kOn = Math.max(start - Math.round(0.12 * PPQ), 0);
-      raw.push({ tick: kOn, on: true, note: ev.kan, vel: 70 });
-      raw.push({ tick: start, on: false, note: ev.kan, vel: 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 });
     }
-    raw.push({ tick: start, on: true, note: ev.midi, vel: 100 });
-    raw.push({ tick: end, on: false, note: ev.midi, vel: 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 });
   }
-  raw.sort((a, b) => a.tick - b.tick || Number(a.on) - Number(b.on));
-  const track = [];
-  if (opts.name) track.push(...vlq(0), 255, 3, ...vlq(utf8(opts.name).length), ...utf8(opts.name));
   const usPerBeat = Math.round(6e7 / opts.bpm);
-  track.push(...vlq(0), 255, 81, 3, usPerBeat >> 16 & 255, usPerBeat >> 8 & 255, usPerBeat & 255);
-  let last = 0;
-  for (const e of raw) {
-    track.push(...vlq(e.tick - last), e.on ? 144 : 128, e.note & 127, e.vel & 127);
-    last = e.tick;
-  }
-  track.push(...vlq(0), 255, 47, 0);
-  const header = [77, 84, 104, 100, ...u32be(6), 0, 0, 0, 1, PPQ >> 8 & 255, PPQ & 255];
-  const trackChunk = [77, 84, 114, 107, ...u32be(track.length), ...track];
-  return new Uint8Array([...header, ...trackChunk]);
+  const head = [];
+  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) {
+    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 });
+    }
+    chunks.push(trackChunk(drum, [...vlq(0), 255, 3, ...vlq(5), 68, 114, 117, 109, 115]));
+  }
+  const format = chunks.length > 1 ? 1 : 0;
+  const header = [
+    77,
+    84,
+    104,
+    100,
+    ...u32be(6),
+    0,
+    format,
+    chunks.length >> 8 & 255,
+    chunks.length & 255,
+    PPQ >> 8 & 255,
+    PPQ & 255
+  ];
+  return new Uint8Array([...header, ...chunks.flat()]);
 }
 function safeName2(title) {
   return (title ?? "").replace(/[\\/:*?"<>|]+/g, "").trim() || "swaralipi";
@@ -735,7 +773,10 @@ function safeName2(title) {
 function exportMidi(doc, options = {}) {
   const schedule = buildSchedule(doc, { tonic: options.tonic, baseOctave: options.baseOctave });
   const bpm = options.bpm ?? doc.meta.bpm ?? 90;
-  const bytes = encodeMidi(schedule, { bpm, name: options.name ?? doc.meta.title });
+  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 bytes = encodeMidi(schedule, { bpm, name: options.name ?? doc.meta.title, drums });
   return {
     blob: new Blob([bytes], { type: "audio/midi" }),
     filename: `${safeName2(doc.meta.title)}.mid`,