@ugfoundation/swaralipi-js 0.7.5 → 0.7.7

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { SPEC_VERSION, graceNotes, parseSwaralipi, safeParseSwaralipi } from './spec/index.js';
+export { SPEC_VERSION, graceNotes, hasKomal, hasTivra, parseSwaralipi, safeParseSwaralipi } from './spec/index.js';
 export { B as Bar, b as Bracket, G as Grace, M as Meta, c as Microtone, N as Note, O as Octave, P as Part, R as Row, d as Svara, a as SvaraLetter, S as Swaralipi, T as Taal, e as barSchema, f as bracketSchema, g as graceSchema, m as metaSchema, h as microtoneSchema, n as noteSchema, o as octaveSchema, p as partSchema, r as rowSchema, s as svaraLetterSchema, i as svaraSchema, j as swaralipiSchema, t as taalSchema } from './schema-DqBXPGkL.js';
 export { a as TAALS, T as TaalId } from './taals-CjzBuZ35.js';
 import 'zod';

package/dist/index.js

@@ -1,4 +1,4 @@
-export { SPEC_VERSION, barSchema, bracketSchema, graceSchema, metaSchema, microtoneSchema, noteSchema, octaveSchema, parseSwaralipi, partSchema, rowSchema, safeParseSwaralipi, svaraLetterSchema, svaraSchema, swaralipiSchema, taalSchema } from './chunk-YAXYP7BR.js';
-export { TAALS, graceNotes } from './chunk-UF5OSJRP.js';
+export { SPEC_VERSION, barSchema, bracketSchema, graceSchema, metaSchema, microtoneSchema, noteSchema, octaveSchema, parseSwaralipi, partSchema, rowSchema, safeParseSwaralipi, svaraLetterSchema, svaraSchema, swaralipiSchema, taalSchema } from './chunk-ALN4SWMS.js';
+export { TAALS, graceNotes, hasKomal, hasTivra } from './chunk-QM4CXKW2.js';
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/player/index.cjs

@@ -29,6 +29,14 @@ function graceNotes(grace) {
   return typeof grace[0] === "string" ? [{ svara: grace }] : grace;
 }
 
+// src/spec/svara.ts
+function hasKomal(letter) {
+  return letter === "r" || letter === "g" || letter === "d" || letter === "n";
+}
+function hasTivra(letter) {
+  return letter === "m";
+}
+
 // src/player/pitch.ts
 var OCTAVE_OFFSET = {
   "ati-mandra": -2,
@@ -79,8 +87,8 @@ function svaraSemitone(note) {
   if (note.svara === void 0) return null;
   const [, letter] = note.svara;
   let semi = SHUDDHA[letter];
-  if (note.komal === true || note.microtone !== void 0) semi -= 1;
-  if (note.tivra === true) semi += 1;
+  if ((note.komal === true || note.microtone !== void 0) && hasKomal(letter)) semi -= 1;
+  if (note.tivra === true && hasTivra(letter)) semi += 1;
   return semi;
 }
 function svaraToMidi(note, tonicPc, baseOctave = 4) {
@@ -489,6 +497,7 @@ function createTanpura(Tone, base, stems = TANPURA_PCS) {
 
 // src/player/player.ts
 var STOP_FADE_SEC = 0.5;
+var MEDIA_LEAD_SEC = 0.25;
 function midiRange(schedule) {
   let lo = Infinity;
   let hi = -Infinity;
@@ -502,6 +511,9 @@ function midiRange(schedule) {
   }
   return lo <= hi ? { lo, hi } : void 0;
 }
+function playDurationSec(schedule, spb, rhythm) {
+  return schedule.totalBeats * spb + (rhythm !== "none" ? schedule.pickupBeats * spb : 0) + spb;
+}
 async function loadedOrWarn(Tone) {
   try {
     await Tone.loaded();
@@ -582,6 +594,27 @@ var SwaralipiPlayer = class {
     const id = this.#taalId();
     return this.#opts.rhythm === "tabla" && id !== void 0 && SAMPLED_TAALS.has(id) && !!this.#opts.soundsBaseUrl;
   }
+  /**
+   * Length of one play-through in seconds, for a progress bar (the OS media
+   * session's, typically). Derived from the loaded notation on every read and
+   * never stored, because every input can move: re-engrave the document, drag
+   * the tempo, switch the rhythm off, and this changes with it. `Infinity` in
+   * taal mode (one avartan looping, no end — the value the Media Session spec
+   * reserves for exactly that), 0 with nothing loaded, and clamped by a preview
+   * cap when one is set, since that is when playback will really stop.
+   */
+  get durationSec() {
+    if (this.#taal !== void 0) return Infinity;
+    if (this.#doc === void 0) return 0;
+    const schedule = buildSchedule(this.#doc, { tonic: this.#opts.tonic, baseOctave: this.#opts.baseOctave });
+    const full = playDurationSec(schedule, 60 / this.#effectiveBpm(), this.#opts.rhythm);
+    return Math.min(full, this.#opts.previewLimitSec);
+  }
+  /** Seconds played so far, off the Transport's own clock — so it holds while
+   * paused, and reads 0 before the first play and after stop(). */
+  get positionSec() {
+    return this.#tone?.getTransport().seconds ?? 0;
+  }
   /* ----------------------------------------------------------------- */
   /* Loading + transport control                                        */
   /* ----------------------------------------------------------------- */
@@ -894,6 +927,7 @@ var SwaralipiPlayer = class {
     }
     const draw = Tone.getDraw();
     const shift = this.#opts.rhythm !== "none" ? schedule.pickupBeats * spb : 0;
+    const mediaLead = Math.min(MEDIA_LEAD_SEC, spb);
     schedule.events.forEach((ev, i) => {
       const at = ev.beat * spb + shift;
       if (ev.midi !== null && ev.glide !== true) {
@@ -927,12 +961,12 @@ var SwaralipiPlayer = class {
           transport.scheduleOnce((time) => melody.triggerAttackRelease(name, dur, time), at);
         }
       }
-      transport.scheduleOnce((time) => {
-        this.#opts.onEvent?.(ev.path);
-        draw.schedule(() => this.#emitHighlight(ev.path), time);
-      }, at);
+      if (this.#opts.onEvent !== void 0) {
+        transport.scheduleOnce(() => this.#opts.onEvent?.(ev.path), Math.max(at - mediaLead, 0));
+      }
+      transport.scheduleOnce((time) => draw.schedule(() => this.#emitHighlight(ev.path), time), at);
     });
-    const endAt = schedule.totalBeats * spb + shift + spb;
+    const endAt = playDurationSec(schedule, spb, this.#opts.rhythm);
     transport.scheduleOnce((time) => {
       this.#opts.onEvent?.(null);
       draw.schedule(() => this.#emitHighlight(null), time);