@libraz/libcantus 1.3.0 → 1.4.0

package/dist/{chunk-AGOVW7U6.js → chunk-YYVXRV3V.js}

@@ -169,29 +169,52 @@ function describesMap(index, map) {
   }
   return true;
 }
-function buildMeterIndex(map, validated) {
-  const startBeats = new Array(map.length);
-  const signatures = new Array(map.length);
-  const barAnchors = new Array(map.length);
-  const barBeats = new Array(map.length);
-  const barsBefore = new Array(map.length);
+function meterSegments(map) {
+  const segments = new Array(map.length);
   let bars = 0;
+  let atZero = 0;
   for (let i = 0; i < map.length; i += 1) {
     const entry = map[i];
     const startBeat = entry?.startBeat ?? 0;
     const barLen = entry === void 0 ? 0 : barBeatsOf(entry.ts);
-    const anchor = i === 0 ? 0 : startBeat;
-    startBeats[i] = startBeat;
-    signatures[i] = entry === void 0 ? { numerator: 4, denominator: 4 } : copyTimeSignature(entry.ts);
-    barAnchors[i] = anchor;
-    barBeats[i] = barLen;
-    barsBefore[i] = bars;
+    const barAnchor = i === 0 ? 0 : startBeat;
+    segments[i] = {
+      startBeat,
+      ts: entry === void 0 ? { numerator: 4, denominator: 4 } : copyTimeSignature(entry.ts),
+      barAnchor,
+      barBeats: barLen,
+      barsBefore: bars
+    };
+    if (i > 0 && startBeat <= BEAT_EPS) {
+      atZero = i;
+    }
     const next = map[i + 1];
     if (next !== void 0 && barLen > 0) {
-      bars += Math.max(1, Math.ceil((next.startBeat - anchor) / barLen - BEAT_EPS));
+      const span = Math.ceil((next.startBeat - barAnchor) / barLen - BEAT_EPS);
+      bars += i === 0 ? span : Math.max(1, span);
     }
   }
-  const index = { startBeats, signatures, barAnchors, barBeats, barsBefore, validated };
+  const zero = segments[atZero];
+  if (atZero > 0 && zero !== void 0 && zero.barBeats > 0) {
+    const shift = zero.barsBefore + Math.floor(-zero.barAnchor / zero.barBeats + BEAT_EPS);
+    if (shift !== 0) {
+      for (const segment of segments) {
+        segment.barsBefore -= shift;
+      }
+    }
+  }
+  return segments;
+}
+function buildMeterIndex(map, validated) {
+  const segments = meterSegments(map);
+  const index = {
+    startBeats: segments.map((segment) => segment.startBeat),
+    signatures: segments.map((segment) => segment.ts),
+    barAnchors: segments.map((segment) => segment.barAnchor),
+    barBeats: segments.map((segment) => segment.barBeats),
+    barsBefore: segments.map((segment) => segment.barsBefore),
+    validated
+  };
   INDEX_CACHE.set(map, index);
   return rememberRead(map, index);
 }
@@ -285,9 +308,16 @@ function describeRejected(value) {
   }
   return value.length <= MAX_ECHOED_LENGTH ? JSON.stringify(value) : `${JSON.stringify(value.slice(0, MAX_ECHOED_LENGTH))} (truncated from ${value.length} characters)`;
 }
+function receivedText(value) {
+  try {
+    return `${value}`;
+  } catch {
+    return describeRejected(value);
+  }
+}
 function assertFiniteNumber(value, name) {
   if (!Number.isFinite(value)) {
-    throw new InvalidInputError(`${name} must be finite; received ${value}`);
+    throw new InvalidInputError(`${name} must be finite; received ${receivedText(value)}`);
   }
   return value;
 }
@@ -433,7 +463,7 @@ function assertTimeSignature(ts, name = "time signature") {
 }
 function assertMeterMap(meters, name = "meters") {
   if (!Array.isArray(meters)) {
-    throw new InvalidInputError(`${name} must be an array; received ${typeof meters}`);
+    throw new InvalidInputError(`${name} must be an array; received ${describeRejected(meters)}`);
   }
   if (meters.length === 0) {
     throw new InvalidInputError(`${name} must not be empty`);
@@ -496,7 +526,7 @@ function assertNoteEvent(event, name = "note event", options = {}) {
 function assertNoteEvents(events, name = "note events", options = {}) {
   const asked = assertOptions(options, `${name} options`);
   if (!Array.isArray(events)) {
-    throw new InvalidInputError(`${name} must be an array; received ${typeof events}`);
+    throw new InvalidInputError(`${name} must be an array; received ${describeRejected(events)}`);
   }
   assertGenerationBudget(events.length, `${name} count`, asked.budget);
   for (let index = 0; index < events.length; index += 1) {
@@ -592,7 +622,7 @@ function parseEnglish(text) {
   }
   const note = { letter, alter };
   if (match[3] !== void 0) {
-    note.octave = Number.parseInt(match[3], 10);
+    note.octave = octaveOf(match[3]);
   }
   return note;
 }
@@ -733,7 +763,11 @@ function splitOctave(text) {
     return { name: text, octave: void 0 };
   }
   const signed = start > 0 && text.charAt(start - 1) === "-" ? start - 1 : start;
-  return { name: text.slice(0, signed), octave: Number.parseInt(text.slice(signed), 10) };
+  return { name: text.slice(0, signed), octave: octaveOf(text.slice(signed)) };
+}
+function octaveOf(digits) {
+  const octave = Number.parseInt(digits, 10);
+  return octave === 0 ? 0 : octave;
 }
 function parseIn(text, system) {
   const table = tableOf(system);
@@ -999,12 +1033,16 @@ function transposeNote(note, semitones, opts) {
   const octaves = Math.floor(magnitude / 12);
   const withinOctave = magnitude % 12;
   const letterSteps = direction * ((LETTER_STEPS_BY_SEMITONE[withinOctave] ?? 0) + 7 * octaves);
-  const absoluteLetter = mod7(note.letter) + letterSteps;
+  return landOnLetter(note, mod7(note.letter) + letterSteps, steps);
+}
+function landOnLetter(note, absoluteLetter, steps) {
   const letter = mod7(absoluteLetter);
   const natural = LETTER_SEMITONES[letter] ?? 0;
   if (note.octave === void 0) {
+    const source = LETTER_SEMITONES[mod7(note.letter)] ?? 0;
+    const wrapped = 12 * Math.floor(absoluteLetter / 7);
     return assertNote(
-      { letter, alter: alterFor(natural, mod12(noteToPitchClass(note) + steps)) },
+      { letter, alter: note.alter + source + steps - wrapped - natural },
       "transposed note"
     );
   }
@@ -1017,10 +1055,6 @@ function transposeNote(note, semitones, opts) {
 function bareOf(note) {
   return { letter: note.letter, alter: note.alter };
 }
-function alterFor(natural, pc) {
-  const d = mod12(pc - natural);
-  return d > 6 ? d - 12 : d;
-}
 var SIMPLE_REFERENCE = [0, 0, 2, 4, 5, 7, 9, 11];
 function isPerfectNumber(simpleNumber) {
   return simpleNumber === 1 || simpleNumber === 4 || simpleNumber === 5;
@@ -1030,7 +1064,7 @@ function qualityFromSpan(numberValue, semitones) {
   const simple = numberValue - 7 * octaves;
   const reference = (SIMPLE_REFERENCE[simple] ?? 0) + 12 * octaves;
   const delta = semitones - reference;
-  const repeat = (glyph, count) => `${glyph}${glyph.repeat(Math.min(count, MAX_ALTER * 2) - 1)}`;
+  const repeat = (glyph, count) => `${glyph}${glyph.repeat(Math.min(count, MAX_ALTER * 2 + 1) - 1)}`;
   if (isPerfectNumber(simple)) {
     if (delta === 0) {
       return "P";
@@ -1170,21 +1204,7 @@ function transposeByInterval(given, named) {
   assertInteger(interval.number, "interval.number", 1, MAX_INTERVAL_NUMBER);
   assertFiniteNumber(interval.semitones, "interval.semitones");
   const letterSteps = (interval.number - 1) * (isDescendingInterval(interval) ? -1 : 1);
-  const absoluteLetter = mod7(note.letter) + letterSteps;
-  const letter = mod7(absoluteLetter);
-  const natural = LETTER_SEMITONES[letter] ?? 0;
-  const steps = Math.round(interval.semitones);
-  if (note.octave === void 0) {
-    return assertNote(
-      { letter, alter: alterFor(natural, mod12(noteToPitchClass(note) + steps)) },
-      "transposed note"
-    );
-  }
-  const octave = note.octave + Math.floor(absoluteLetter / 7);
-  return assertNote(
-    { letter, alter: noteToMidi(note) + steps - ((octave + 1) * 12 + natural), octave },
-    "transposed note"
-  );
+  return landOnLetter(note, mod7(note.letter) + letterSteps, Math.round(interval.semitones));
 }
 function diatonicIndex(note) {
   return mod7(note.letter) + 7 * (note.octave ?? 0);
@@ -1204,15 +1224,11 @@ function spelledInterval(a, b) {
     letterSteps = diatonicIndex(b) - diatonicIndex(a);
     semitones = noteToMidi(b) - noteToMidi(a);
   } else {
-    letterSteps = mod7(b.letter - a.letter);
-    let rawSemis = mod12(noteToPitchClass(b) - noteToPitchClass(a));
-    const reference = SIMPLE_REFERENCE[letterSteps + 1] ?? 0;
-    if (reference - rawSemis > 6) {
-      rawSemis += 12;
-    } else if (rawSemis - reference > 6) {
-      rawSemis -= 12;
-    }
-    semitones = rawSemis;
+    const fromLetter = mod7(a.letter);
+    const toLetter = mod7(b.letter);
+    letterSteps = mod7(toLetter - fromLetter);
+    const wrapped = toLetter < fromLetter ? 12 : 0;
+    semitones = (LETTER_SEMITONES[toLetter] ?? 0) + wrapped - (LETTER_SEMITONES[fromLetter] ?? 0) + b.alter - a.alter;
   }
   const absSteps = Math.abs(letterSteps);
   const number = absSteps + 1;
@@ -1519,17 +1535,17 @@ function metricGridUnit(meter) {
   if (!isMeterMap(resolved)) {
     return pulseBeatsOf(resolved);
   }
+  const segments = meterSegments(resolved);
   let unit = 0;
-  for (const change of resolved) {
-    unit = commonStep(unit, pulseBeatsOf(change.ts));
+  for (const segment of segments) {
+    unit = commonStep(unit, pulseBeatsOf(segment.ts));
   }
   if (unit <= 0) {
     return pulseBeatsOf(DEFAULT_TS);
   }
-  const origin = resolved[0]?.startBeat ?? 0;
   let onChanges = unit;
-  for (const change of resolved) {
-    onChanges = commonStep(onChanges, Math.abs(change.startBeat - origin));
+  for (const segment of segments) {
+    onChanges = commonStep(onChanges, Math.abs(segment.barAnchor));
   }
   return onChanges * MAX_CHANGE_DIVISIONS >= unit - BEAT_EPS ? onChanges : unit;
 }
@@ -1637,4 +1653,4 @@ export {
   isStrongBeat,
   tuplet
 };
-//# sourceMappingURL=chunk-AGOVW7U6.js.map
+//# sourceMappingURL=chunk-YYVXRV3V.js.map