@viritura/score-engine 0.2.1-next.45 → 0.2.1-next.47

package/dist/index.js

@@ -2265,9 +2265,9 @@ function interpolateBeatAnchors(bounds, beat, endX) {
 
 // packages/score-engine/src/buildInfo.ts
 init_define_import_meta_env();
-var PACKAGE_VERSION = "0.2.1-next.45", BUNDLE_WORKER_FILE = "score-engine.worker.js";
+var PACKAGE_VERSION = "0.2.1-next.47", BUNDLE_WORKER_FILE = "score-engine.worker.js";
 function buildCommit() {
-  return "2d5b797c6600d93f903b46e4ce31ef2b057c1763";
+  return "78ae5d80a2cd938fb7b991f4bdebebbc72b18896";
 }
 function bundledAssetBase() {
   let moduleUrl = import.meta.url;
@@ -13058,7 +13058,7 @@ function validate460(data, { instancePath = "", parentData, parentDataProperty,
   return validate460.errors = vErrors, errors === 0;
 }
 validate460.evaluated = { props: !0, dynamicProps: !1, dynamicItems: !1 };
-var schema455 = { type: "string", enum: ["glissando", "portamento"], description: "Semantic kind of a glissando-family line." }, schema456 = { type: "string", enum: ["straight", "wavy"], description: "Glissando/portamento line style." };
+var schema454 = { type: "object", description: "A glissando or portamento connecting this event to a target event.", required: ["target"], properties: { target: { type: "string", description: "ID of the target event." }, kind: { $ref: "#/$defs/glissando-kind", description: "Semantic kind. Default: 'glissando'." }, style: { $ref: "#/$defs/glissando-style", description: "Line style. Default: 'straight'." }, playbackType: { type: "string", enum: ["chromatic", "diatonic", "pitch-bend"], description: "Playback interpolation. Omission means diatonic for glissando and pitch-bend for portamento." }, text: { type: "string", description: "Optional text label (e.g. 'gliss.', 'port.')." }, showText: { type: "boolean", description: "Whether to display the text label. Default: true." } }, additionalProperties: !1 }, schema455 = { type: "string", enum: ["glissando", "portamento"], description: "Semantic kind of a glissando-family line." }, schema456 = { type: "string", enum: ["straight", "wavy"], description: "Glissando/portamento line style." };
 function validate462(data, { instancePath = "", parentData, parentDataProperty, rootData = data, dynamicAnchors = {} } = {}) {
   let vErrors = null, errors = 0, evaluated0 = validate462.evaluated;
   if (evaluated0.dynamicProps && (evaluated0.props = void 0), evaluated0.dynamicItems && (evaluated0.items = void 0), data && typeof data == "object" && !Array.isArray(data)) {
@@ -13067,7 +13067,7 @@ function validate462(data, { instancePath = "", parentData, parentDataProperty,
       vErrors === null ? vErrors = [err0] : vErrors.push(err0), errors++;
     }
     for (let key0 in data)
-      if (!(key0 === "target" || key0 === "kind" || key0 === "style" || key0 === "text" || key0 === "showText")) {
+      if (!(key0 === "target" || key0 === "kind" || key0 === "style" || key0 === "playbackType" || key0 === "text" || key0 === "showText")) {
         let err1 = { instancePath, schemaPath: "#/additionalProperties", keyword: "additionalProperties", params: { additionalProperty: key0 }, message: "must NOT have additional properties" };
         vErrors === null ? vErrors = [err1] : vErrors.push(err1), errors++;
       }
@@ -13097,17 +13097,28 @@ function validate462(data, { instancePath = "", parentData, parentDataProperty,
         vErrors === null ? vErrors = [err6] : vErrors.push(err6), errors++;
       }
     }
+    if (data.playbackType !== void 0) {
+      let data3 = data.playbackType;
+      if (typeof data3 != "string") {
+        let err7 = { instancePath: instancePath + "/playbackType", schemaPath: "#/properties/playbackType/type", keyword: "type", params: { type: "string" }, message: "must be string" };
+        vErrors === null ? vErrors = [err7] : vErrors.push(err7), errors++;
+      }
+      if (!(data3 === "chromatic" || data3 === "diatonic" || data3 === "pitch-bend")) {
+        let err8 = { instancePath: instancePath + "/playbackType", schemaPath: "#/properties/playbackType/enum", keyword: "enum", params: { allowedValues: schema454.properties.playbackType.enum }, message: "must be equal to one of the allowed values" };
+        vErrors === null ? vErrors = [err8] : vErrors.push(err8), errors++;
+      }
+    }
     if (data.text !== void 0 && typeof data.text != "string") {
-      let err7 = { instancePath: instancePath + "/text", schemaPath: "#/properties/text/type", keyword: "type", params: { type: "string" }, message: "must be string" };
-      vErrors === null ? vErrors = [err7] : vErrors.push(err7), errors++;
+      let err9 = { instancePath: instancePath + "/text", schemaPath: "#/properties/text/type", keyword: "type", params: { type: "string" }, message: "must be string" };
+      vErrors === null ? vErrors = [err9] : vErrors.push(err9), errors++;
     }
     if (data.showText !== void 0 && typeof data.showText != "boolean") {
-      let err8 = { instancePath: instancePath + "/showText", schemaPath: "#/properties/showText/type", keyword: "type", params: { type: "boolean" }, message: "must be boolean" };
-      vErrors === null ? vErrors = [err8] : vErrors.push(err8), errors++;
+      let err10 = { instancePath: instancePath + "/showText", schemaPath: "#/properties/showText/type", keyword: "type", params: { type: "boolean" }, message: "must be boolean" };
+      vErrors === null ? vErrors = [err10] : vErrors.push(err10), errors++;
     }
   } else {
-    let err9 = { instancePath, schemaPath: "#/type", keyword: "type", params: { type: "object" }, message: "must be object" };
-    vErrors === null ? vErrors = [err9] : vErrors.push(err9), errors++;
+    let err11 = { instancePath, schemaPath: "#/type", keyword: "type", params: { type: "object" }, message: "must be object" };
+    vErrors === null ? vErrors = [err11] : vErrors.push(err11), errors++;
   }
   return validate462.errors = vErrors, errors === 0;
 }
@@ -16266,7 +16277,7 @@ function parseSlur(raw) {
 }
 function parseGlissando(raw) {
   let gliss = { target: raw.target };
-  return raw.kind && (gliss.kind = raw.kind), raw.style && (gliss.style = raw.style), raw.text && (gliss.text = raw.text), raw.showText !== void 0 && (gliss.showText = raw.showText), gliss;
+  return raw.kind && (gliss.kind = raw.kind), raw.style && (gliss.style = raw.style), raw.playbackType && (gliss.playbackType = raw.playbackType), raw.text && (gliss.text = raw.text), raw.showText !== void 0 && (gliss.showText = raw.showText), gliss;
 }
 function parseNotes(arr) {
   return arr.map(parseNote);
@@ -17765,7 +17776,7 @@ function realizeNavigation(timeline, spans, crossJumpContinuations = /* @__PURE_
       events
     ), outputBeat += span.endBeat - span.startBeat;
   }
-  let rank = { noteOff: 0, programChange: 1, controlChange: 2, noteOn: 3 };
+  let rank = { noteOff: 0, programChange: 1, controlChange: 2, pitchBend: 2, noteOn: 3 };
   return events.sort((a, b) => a.time - b.time || rank[a.type] - rank[b.type]), {
     ...timeline,
     events,
@@ -17906,6 +17917,159 @@ function expandScoreMeasureRepeats(score) {
   return parts.every((part, index) => part === score.parts[index]) ? score : { ...score, parts };
 }
 
+// packages/midi/src/glissandoPlayback/index.ts
+init_define_import_meta_env();
+function linesForPart(score, partIndex) {
+  let lines = [];
+  for (let measure of score.parts[partIndex]?.measures ?? [])
+    for (let sequence of measure.sequences)
+      for (let { event } of walkSequenceEvents(sequence.content))
+        if (event.glissandos?.length) {
+          if (!event.id) throw new Error("Glissando source event requires an ID.");
+          for (let glissando of event.glissandos) lines.push({ source: event.id, glissando });
+        }
+  return lines;
+}
+function noteKey(event) {
+  return JSON.stringify([event.partIndex, event.playbackLaneId, event.playbackInstrumentKey, event.midiNote]);
+}
+function releasesFor(events) {
+  let held = /* @__PURE__ */ new Map(), releases = /* @__PURE__ */ new Map();
+  for (let event of events) {
+    let key = noteKey(event);
+    if (event.type === "noteOn") {
+      let queue = held.get(key) ?? [];
+      queue.push(event), held.set(key, queue);
+    } else if (event.type === "noteOff") {
+      let onset = held.get(key)?.shift();
+      onset && releases.set(onset, event);
+    }
+  }
+  return releases;
+}
+function measureAt(timeline, beat) {
+  let index = 0;
+  for (; index + 1 < timeline.measureStartBeats.length && timeline.measureStartBeats[index + 1] <= beat + 1e-9; )
+    index++;
+  return index;
+}
+function continuousTo(timeline, start, end) {
+  let startBeat = start.scoreBeat ?? timeline.model.beatAtTime(start.time), endBeat = end.scoreBeat ?? timeline.model.beatAtTime(end.time);
+  for (let index = measureAt(timeline, startBeat); index < measureAt(timeline, endBeat); index++)
+    if (timeline.playedSpans) {
+      if (!playedSpansContinue(timeline.playedSpans[index], timeline.playedSpans[index + 1])) return !1;
+    } else if (timeline.expandedMeasureToOriginal[index + 1] !== timeline.expandedMeasureToOriginal[index] + 1)
+      return !1;
+  return !0;
+}
+function keyPitches(score, timeline, onset) {
+  let beat = onset.scoreBeat ?? timeline.model.beatAtTime(onset.time), measureIndex = timeline.expandedMeasureToOriginal[measureAt(timeline, beat)], fifths = 0;
+  for (let index = 0; index <= measureIndex; index++)
+    fifths = score.global.measures[index]?.key?.fifths ?? fifths;
+  let steps = ["C", "D", "E", "F", "G", "A", "B"], pitches = [0, 2, 4, 5, 7, 9, 11], order = fifths >= 0 ? SHARP_ORDER : FLAT_ORDER;
+  for (let index = 0; index < Math.abs(fifths); index++) {
+    let position = steps.indexOf(order[index % order.length]);
+    pitches[position] = pitches[position] + Math.sign(fifths);
+  }
+  return new Set(pitches.map((pitch) => (pitch % 12 + 12) % 12));
+}
+function steppedPitches(start, end, key) {
+  let direction = Math.sign(end - start), pitches = [start];
+  for (let pitch = start + direction; direction && direction * (end - pitch) > 0; pitch += direction)
+    (!key || key.has(pitch % 12)) && pitches.push(pitch);
+  return pitches;
+}
+function renderSteps(on, off, target, pitches, timeline) {
+  let events = [], duration2 = target.time - on.time;
+  return pitches.forEach((midiNote, index) => {
+    let time = on.time + duration2 * index / pitches.length, end = on.time + duration2 * (index + 1) / pitches.length;
+    events.push({
+      ...on,
+      midiNote,
+      time,
+      scoreBeat: timeline.model.beatAtTime(time),
+      scoreDurationBeats: timeline.model.beatAtTime(end) - timeline.model.beatAtTime(time)
+    }), events.push({ ...off, midiNote, time: end });
+  }), events;
+}
+function renderBend(on, off, target, lane) {
+  let base = { ...on, playbackLaneId: lane }, end = target.time, range = Math.max(2, Math.abs(target.midiNote - on.midiNote)), control = (cc, value) => ({
+    ...base,
+    type: "controlChange",
+    time: on.time,
+    cc,
+    value
+  }), events = [
+    control(101, 0),
+    control(100, 0),
+    control(6, range),
+    control(38, 0),
+    control(101, 127),
+    control(100, 127),
+    base,
+    { ...off, time: end, playbackLaneId: lane }
+  ], samples = Math.max(1, Math.ceil((end - on.time) * 200));
+  for (let index = 0; index < samples; index++) {
+    let fraction = index / samples, delta = (target.midiNote - on.midiNote) * fraction;
+    events.push({
+      ...base,
+      type: "pitchBend",
+      time: on.time + (end - on.time) * fraction,
+      bendRange: range,
+      value: Math.max(0, Math.min(16383, Math.round(8192 + delta * 8192 / range)))
+    });
+  }
+  return events.push({ ...base, type: "controlChange", time: end, cc: 120, value: 0 }), events.push({ ...base, type: "pitchBend", time: end, value: 8192, bendRange: range }), events;
+}
+function applyGlissandoPlayback(score, timeline) {
+  let partLines = score.parts.map((_part, partIndex) => linesForPart(score, partIndex));
+  if (partLines.every((lines) => lines.length === 0)) return [];
+  let diagnostics = [], original = [...timeline.events], releases = releasesFor(original), removed = /* @__PURE__ */ new Set(), added = [], mirroredLanes = /* @__PURE__ */ new Set();
+  return partLines.forEach((lines, partIndex) => {
+    for (let { source, glissando } of lines) {
+      let onsets = original.filter((event) => event.partIndex === partIndex && event.type === "noteOn"), sources = onsets.filter((event) => event.scoreEventId === source), exactTargets = onsets.filter((event) => event.scoreEventId === glissando.target), targets = exactTargets.length > 0 ? exactTargets : onsets.filter((event) => event.scoreEventId?.replaceAll("/", "_") === glissando.target), realized = !1;
+      for (let onset of sources) {
+        if (removed.has(onset)) continue;
+        let time = targets.find(
+          (target2) => target2.time > onset.time + 1e-9 && continuousTo(timeline, onset, target2)
+        )?.time;
+        if (time === void 0) continue;
+        let sourceChord = sources.filter((event) => Math.abs(event.time - onset.time) < 1e-9).sort((a, b) => a.midiNote - b.midiNote), targetChord = targets.filter((event) => Math.abs(event.time - time) < 1e-9).sort((a, b) => a.midiNote - b.midiNote), target = targetChord[Math.min(sourceChord.indexOf(onset), targetChord.length - 1)], off = releases.get(onset);
+        if (!off || onset.channel === 9) continue;
+        realized = !0;
+        let type = glissando.playbackType ?? (glissando.kind === "portamento" ? "pitch-bend" : "diatonic");
+        removed.add(onset), removed.add(off);
+        let lane = `${onset.playbackLaneId ?? `part:${partIndex}`}:gliss:${source}:${sourceChord.indexOf(onset)}`;
+        if (type === "pitch-bend") {
+          let bendEvents = renderBend(onset, off, target, lane), bendOnset = bendEvents.find((event) => event.type === "noteOn");
+          bendOnset.scoreDurationBeats = timeline.model.beatAtTime(target.time) - (onset.scoreBeat ?? timeline.model.beatAtTime(onset.time)), added.push(...bendEvents);
+        } else {
+          let key = type === "diatonic" ? keyPitches(score, timeline, onset) : void 0;
+          added.push(
+            ...renderSteps(
+              { ...onset, playbackLaneId: lane },
+              { ...off, playbackLaneId: lane },
+              target,
+              steppedPitches(onset.midiNote, target.midiNote, key),
+              timeline
+            )
+          );
+        }
+        if (!mirroredLanes.has(lane)) {
+          mirroredLanes.add(lane);
+          for (let event of original)
+            event.partIndex === partIndex && event.playbackLaneId === onset.playbackLaneId && (event.type === "programChange" || event.type === "controlChange") && added.push({ ...event, playbackLaneId: lane });
+        }
+      }
+      realized || diagnostics.push({
+        code: "glissando-playback-unsupported",
+        message: `Glissando from "${source}" to "${glissando.target}" has no forward pitched endpoints on a continuous playback route.`,
+        playbackLaneIds: sources.flatMap((event) => event.playbackLaneId ? [event.playbackLaneId] : [])
+      });
+    }
+  }), timeline.events = original.filter((event) => !removed.has(event)).concat(added), diagnostics;
+}
+
 // packages/midi/src/chordPlayback/index.ts
 init_define_import_meta_env();
 function getChordPlaybackPart(score) {
@@ -19260,18 +19424,13 @@ function generateTimeline(inputScore, options) {
     return aOrder !== bOrder ? aOrder - bOrder : a.instrumentChange !== b.instrumentChange ? a.instrumentChange ? -1 : 1 : a.midiNote - b.midiNote;
   };
   allEvents.sort(compareEvents);
-  let instrumentDiagnostics = applyInstrumentPlayback(
+  let diagnostics = [...applyInstrumentPlayback(
     score,
     allEvents,
     { model, measureStartBeats, measureOrder },
     options?.instrumentPrograms,
     options?.partPrograms
-  ), diagnostics = [
-    ...assignPhysicalMidiChannels(allEvents, score),
-    ...instrumentDiagnostics,
-    ...rhythm.diagnostics
-  ];
-  for (let diagnostic of diagnostics) options?.onDiagnostic?.(diagnostic);
+  ), ...rhythm.diagnostics];
   allEvents.sort(compareEvents);
   let duration2 = model.timeAtBeat(tempoBuild.totalBeats), measureTimeSignatures = measureOrder.map((origIdx) => {
     let ts = resolveActiveTime(globalMeasures, origIdx);
@@ -19287,8 +19446,10 @@ function generateTimeline(inputScore, options) {
     expandedMeasureToOriginal: measureOrder,
     measureTimeSignatures,
     diagnostics
-  };
-  return spans && (globalMeasures.some((measure) => measure.jump !== void 0) || spans.some((span) => span.startBeat > 0 || span.endBeat < span.measureBeats)) ? realizeNavigation(result, spans, crossJumpContinuations) : { ...result, playedSpans: spans };
+  }, realized = spans && (globalMeasures.some((measure) => measure.jump !== void 0) || spans.some((span) => span.startBeat > 0 || span.endBeat < span.measureBeats)) ? realizeNavigation(result, spans, crossJumpContinuations) : { ...result, playedSpans: spans };
+  diagnostics.push(...applyGlissandoPlayback(score, realized), ...assignPhysicalMidiChannels(realized.events, score));
+  for (let diagnostic of diagnostics) options?.onDiagnostic?.(diagnostic);
+  return realized.events.sort(compareEvents), realized;
 }
 function assignPhysicalMidiChannels(events, score) {
   let melodicChannels = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15], lanesByPart = /* @__PURE__ */ new Map();