@viritura/score-engine 0.1.1-next.4 → 0.1.1-next.6

package/dist/index.js

@@ -47,6 +47,12 @@ var DURATION_BEATS = {
 };
 var SHARP_ORDER = ["F", "C", "G", "D", "A", "E", "B"], FLAT_ORDER = ["B", "E", "A", "D", "G", "C", "F"];
 
+// packages/core/src/model/text.ts
+init_define_import_meta_env();
+function plainTextContent(content) {
+  return content.map((chunk) => "text" in chunk ? chunk.text : "").join("");
+}
+
 // packages/core/src/model/event.ts
 init_define_import_meta_env();
 function isRest(event) {
@@ -1864,9 +1870,9 @@ function interpolateBeatAnchors(bounds, beat, endX) {
 
 // packages/score-engine/src/buildInfo.ts
 init_define_import_meta_env();
-var PACKAGE_VERSION = "0.1.1-next.4", BUNDLE_WORKER_FILE = "score-engine.worker.js";
+var PACKAGE_VERSION = "0.1.1-next.6", BUNDLE_WORKER_FILE = "score-engine.worker.js";
 function buildCommit() {
-  return "605f04579eb0a20c5485d31e073beff7216c9c0d";
+  return "3839ceae5b4e815e59efdacf32a0ea0520c0bbb8";
 }
 function bundledAssetBase() {
   let moduleUrl = import.meta.url;
@@ -2255,6 +2261,48 @@ init_define_import_meta_env();
 
 // packages/format/src/mnx/parseGlobal.ts
 init_define_import_meta_env();
+
+// packages/format/src/mnx/textContent.ts
+init_define_import_meta_env();
+var FONTS = /* @__PURE__ */ new Set(["serif", "sans-serif", "monospace"]), FONT_STYLES = /* @__PURE__ */ new Set(["normal", "italic", "oblique"]), DECORATIONS = /* @__PURE__ */ new Set(["underline", "overline", "strikethrough"]), ENCLOSURES = /* @__PURE__ */ new Set(["box", "circle"]), MAX_SIZE = 12, MIN_WEIGHT = 1, MAX_WEIGHT = 1e3;
+function parseStyle(raw) {
+  if (!raw || typeof raw != "object" || Array.isArray(raw)) return;
+  let value = raw, style = {};
+  typeof value.font == "string" && FONTS.has(value.font) && (style.font = value.font);
+  let size = value.size;
+  typeof size == "number" && Number.isFinite(size) && size > 0 && size <= MAX_SIZE && (style.size = size);
+  let weight = value.weight;
+  if ((weight === "normal" || weight === "bold" || typeof weight == "number" && Number.isFinite(weight) && weight >= MIN_WEIGHT && weight <= MAX_WEIGHT) && (style.weight = weight), typeof value.fontStyle == "string" && FONT_STYLES.has(value.fontStyle) && (style.fontStyle = value.fontStyle), Array.isArray(value.decorations)) {
+    let decorations = value.decorations.filter(
+      (item) => typeof item == "string" && DECORATIONS.has(item)
+    ), unique = [...new Set(decorations)];
+    unique.length > 0 && (style.decorations = unique);
+  }
+  return typeof value.enclosure == "string" && ENCLOSURES.has(value.enclosure) && (style.enclosure = value.enclosure), typeof value.color == "string" && (style.color = value.color), Object.keys(style).length > 0 ? style : void 0;
+}
+function parseChunk(raw) {
+  if (!raw || typeof raw != "object" || Array.isArray(raw)) return;
+  let value = raw, style = parseStyle(value.style);
+  if (typeof value.text == "string") {
+    let run = { text: value.text };
+    return style && (run.style = style), run;
+  }
+  let glyphs = value.glyphs;
+  if (Array.isArray(glyphs) && glyphs.every((name) => typeof name == "string")) {
+    let run = { glyphs };
+    style && (run.style = style);
+    let smuflStyle = parseStyle(value.smuflStyle);
+    return smuflStyle && (run.smuflStyle = smuflStyle), run;
+  }
+}
+function parseTextContent(raw) {
+  if (typeof raw == "string") return raw.length > 0 ? [{ text: raw }] : void 0;
+  if (!Array.isArray(raw)) return;
+  let chunks = raw.map(parseChunk).filter((chunk) => chunk !== void 0);
+  return chunks.length > 0 ? chunks : void 0;
+}
+
+// packages/format/src/mnx/parseGlobal.ts
 function parseGlobalSounds(raw) {
   let out = {};
   for (let key of Object.keys(raw)) {
@@ -2285,9 +2333,9 @@ function parseGlobalMeasure(raw) {
   if (viritura) {
     if (viritura.senzaMisura && measure.time && (measure.time.display = "senzaMisura"), viritura.rehearsalMark) {
       let rm = viritura.rehearsalMark;
-      measure.rehearsalMark = { text: rm.text }, rm.style && (measure.rehearsalMark.style = rm.style), applyManualPlacement(measure.rehearsalMark, rm);
+      measure.rehearsalMark = { text: parseTextContent(rm.text) ?? [] }, rm.style && (measure.rehearsalMark.style = rm.style), applyManualPlacement(measure.rehearsalMark, rm);
     }
-    viritura.coda && (measure.coda = parseCoda(viritura.coda)), viritura.jump && (measure.jump = parseJump(viritura.jump)), viritura.gradualTempo && (measure.gradualTempo = parseGradualTempo(viritura.gradualTempo)), viritura.chordSymbols && (measure.chordSymbols = viritura.chordSymbols.map(parseChordSymbol));
+    viritura.coda && (measure.coda = parseCoda(viritura.coda)), viritura.jump && (measure.jump = parseJump(viritura.jump)), applyMarkerTextExtension(measure, viritura.markerText), viritura.gradualTempo && (measure.gradualTempo = parseGradualTempo(viritura.gradualTempo)), viritura.chordSymbols && (measure.chordSymbols = viritura.chordSymbols.map(parseChordSymbol));
   }
   return measure;
 }
@@ -2325,7 +2373,11 @@ function parseTempo(raw) {
   };
   raw.location && (tempo.location = parseRhythmicPosition(raw.location));
   let viritura = raw._x?.viritura;
-  return viritura && (typeof viritura.text == "string" && (tempo.text = viritura.text), typeof viritura.showMetronomeMark == "boolean" && (tempo.showMetronomeMark = viritura.showMetronomeMark), typeof viritura.showText == "boolean" && (tempo.showText = viritura.showText), applyManualPlacement(tempo, viritura)), tempo;
+  if (viritura) {
+    let text = parseTextContent(viritura.text);
+    text !== void 0 && (tempo.text = text), typeof viritura.showMetronomeMark == "boolean" && (tempo.showMetronomeMark = viritura.showMetronomeMark), typeof viritura.showText == "boolean" && (tempo.showText = viritura.showText), applyManualPlacement(tempo, viritura);
+  }
+  return tempo;
 }
 function parseTempoNoteValue(raw) {
   let tnv = {
@@ -2410,7 +2462,7 @@ function parseChordSymbol(raw) {
 }
 function parseTextExpression(raw) {
   let expr = {
-    text: raw.text,
+    text: parseTextContent(raw.text) ?? [],
     position: parseRhythmicPosition(raw.position)
   };
   raw.placement && (expr.placement = raw.placement), raw.staff !== void 0 && (expr.staff = raw.staff), raw.voice && (expr.voice = raw.voice);
@@ -2439,6 +2491,22 @@ function parseJump(raw) {
     location: parseRhythmicPosition(raw.location)
   };
 }
+function parseMarkerText(raw, owner) {
+  let content = parseTextContent(raw.content);
+  if (!content) throw new Error(`markerText.${owner} must contain at least one text or glyph run.`);
+  return { content, placement: raw.placement };
+}
+function applyMarkerTextExtension(measure, raw) {
+  if (!raw) return;
+  let owners = { segno: measure.segno, coda: measure.coda, fine: measure.fine, jump: measure.jump };
+  for (let key of ["segno", "coda", "fine", "jump"]) {
+    let text = raw[key];
+    if (!text) continue;
+    let owner = owners[key];
+    if (!owner) throw new Error(`markerText.${key} requires a ${key} on the same measure.`);
+    owner.text = parseMarkerText(text, key);
+  }
+}
 function parseCoda(raw) {
   let coda = {
     location: parseRhythmicPosition(raw.location)
@@ -3453,7 +3521,7 @@ function detectToCodaMeasureIndex(score) {
   for (let part of score.parts)
     for (let i = 0; i < part.measures.length; i++) {
       let expressions = part.measures[i]?.expressions;
-      if (!(!expressions || expressions.length === 0) && expressions.some((expr) => /\bto\s*coda\b/i.test(expr.text)))
+      if (!(!expressions || expressions.length === 0) && expressions.some((expr) => /\bto\s*coda\b/i.test(plainTextContent(expr.text))))
         return i;
     }
   return -1;
@@ -4180,7 +4248,7 @@ function emitCc(ctx, time, cc, value) {
 function applyMeasureTechniques(expressions, ctx, state, caps, ratioForStaff = () => 1) {
   if (!expressions || expressions.length === 0) return state;
   let marks = expressions.map((e) => ({
-    action: classifyTechniqueText(e.text),
+    action: classifyTechniqueText(plainTextContent(e.text)),
     beat: fractionToBeats(e.position.fraction) * ratioForStaff(e.staff)
   })).filter((m) => m.action !== null).sort((a, b) => a.beat - b.beat), { program, muted } = state;
   for (let mark of marks) {
@@ -4553,7 +4621,7 @@ function collectMeasureDynamicGroups(pm, originalMeasureIndex, measureStartBeat,
 }
 function collectMeasureGradualTexts(pm, originalMeasureIndex, measureStartBeat, model, expandedIdx, gradualTexts, staffMeterTable) {
   for (let index = 0; index < (pm.expressions?.length ?? 0); index++) {
-    let expression = pm.expressions[index], dir = gradualTextDirection(expression.text);
+    let expression = pm.expressions[index], dir = gradualTextDirection(plainTextContent(expression.text));
     dir && gradualTexts.push({
       id: `text-gradual-${expandedIdx}-${index}`,
       startTime: model.timeAtBeat(