@libraz/libcantus 0.9.4 → 0.9.5

package/dist/{chunk-CAN76NCU.cjs → chunk-KQN2ZYND.cjs}

@@ -9,49 +9,54 @@
 
 
 
-var _chunkFNDWXRRIcjs = require('./chunk-FNDWXRRI.cjs');
+var _chunkBSLTLGM3cjs = require('./chunk-BSLTLGM3.cjs');
 
 
 
 
 
 
-var _chunk7MGZ7D62cjs = require('./chunk-7MGZ7D62.cjs');
+
+
+var _chunkPI3UXRWKcjs = require('./chunk-PI3UXRWK.cjs');
 
 // src/analyze/detect/index.ts
 function uniquePitchClasses(pitches) {
-  return [...new Set(pitches.map(_chunk7MGZ7D62cjs.pitchClassOf))].sort((a, b) => a - b);
+  return [...new Set(pitches.map(_chunkPI3UXRWKcjs.pitchClassOf))].sort((a, b) => a - b);
 }
-function assertPitches(pitches) {
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, pitches.length, "detection pitches");
+function assertPitches(pitches, name, budget = void 0) {
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, pitches.length, name, budget);
   for (let index = 0; index < pitches.length; index += 1) {
-    _chunk7MGZ7D62cjs.assertFiniteNumber.call(void 0, _nullishCoalesce(pitches[index], () => ( Number.NaN)), `pitches[${index}]`);
+    _chunkPI3UXRWKcjs.assertMidiPitch.call(void 0, _nullishCoalesce(pitches[index], () => ( Number.NaN)), `pitches[${index}]`);
   }
 }
 function detectChord(pitches, opts = {}) {
-  assertPitches(pitches);
-  if (opts.bassPc !== void 0) _chunk7MGZ7D62cjs.assertFiniteNumber.call(void 0, opts.bassPc, "bassPc");
+  assertPitches(pitches, "chord detection pitches");
+  if (opts.bassPc !== void 0) _chunkPI3UXRWKcjs.assertFiniteNumber.call(void 0, opts.bassPc, "bassPc");
   const input = uniquePitchClasses(pitches);
   if (input.length === 0) {
     return [];
   }
   const inputKind = opts.input === void 0 || opts.input === "auto" ? pitches.every((pitch) => Number.isInteger(pitch) && pitch >= 0 && pitch <= 11) ? "pitchClass" : "midi" : opts.input;
-  const bassPc = opts.bassPc !== void 0 ? _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, opts.bassPc) : inputKind === "midi" ? _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, pitches.reduce((lowest, pitch) => Math.min(lowest, pitch), Infinity)) : void 0;
+  const bassPc = opts.bassPc !== void 0 ? _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, opts.bassPc) : inputKind === "midi" ? _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, pitches.reduce((lowest, pitch) => Math.min(lowest, pitch), Infinity)) : void 0;
   const inputSet = new Set(input);
   const matches = [];
-  const qualities = _chunkFNDWXRRIcjs.chordQualities.call(void 0, );
+  const qualities = _chunkBSLTLGM3cjs.chordQualities.call(void 0, );
+  const toneCounts = new Map(
+    qualities.map((quality) => [quality, _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, _chunkBSLTLGM3cjs.makeChord.call(void 0, 0, quality)).length])
+  );
   for (const rootPc of input) {
     for (const quality of qualities) {
-      const chord = _chunkFNDWXRRIcjs.makeChord.call(void 0, rootPc, quality);
-      const tones = _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, chord);
+      const chord = _chunkBSLTLGM3cjs.makeChord.call(void 0, rootPc, quality);
+      const tones = _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, chord);
       const toneSet = new Set(tones);
       const missingPcs = tones.filter((pc) => !inputSet.has(pc));
-      const fifthPc = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, rootPc + 7);
+      const fifthPc = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, rootPc + 7);
       if (missingPcs.length > 1 || missingPcs.length === 1 && missingPcs[0] !== fifthPc) {
         continue;
       }
       const extraPcs = input.filter((pc) => !toneSet.has(pc));
-      const bassIndex = bassPc === void 0 ? -1 : chord.intervals.findIndex((iv) => _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, rootPc + iv) === bassPc);
+      const bassIndex = bassPc === void 0 ? -1 : chord.intervals.findIndex((iv) => _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, rootPc + iv) === bassPc);
       const inversion = bassPc === void 0 || bassIndex < 0 ? null : bassIndex;
       const match = {
         rootPc,
@@ -77,8 +82,8 @@ function detectChord(pitches, opts = {}) {
     if (a.inversion === 0 !== (b.inversion === 0)) {
       return a.inversion === 0 ? -1 : 1;
     }
-    const aSize = _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, _chunkFNDWXRRIcjs.makeChord.call(void 0, a.rootPc, a.quality)).length;
-    const bSize = _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, _chunkFNDWXRRIcjs.makeChord.call(void 0, b.rootPc, b.quality)).length;
+    const aSize = _nullishCoalesce(toneCounts.get(a.quality), () => ( 0));
+    const bSize = _nullishCoalesce(toneCounts.get(b.quality), () => ( 0));
     return bSize - aSize;
   });
   return matches;
@@ -88,39 +93,36 @@ function detectChordBest(pitches, opts = {}) {
   if (!best) {
     return null;
   }
-  return _chunkFNDWXRRIcjs.makeChord.call(void 0, best.rootPc, best.quality, best.bassPc);
+  return _chunkBSLTLGM3cjs.makeChord.call(void 0, best.rootPc, best.quality, best.bassPc);
 }
 var MINOR_VARIANTS = [
-  { variant: "natural", mask: _chunkFNDWXRRIcjs.NATURAL_MINOR_MASK },
-  { variant: "harmonic", mask: _chunkFNDWXRRIcjs.HARMONIC_MINOR_MASK },
-  { variant: "melodic", mask: _chunkFNDWXRRIcjs.MELODIC_MINOR_MASK }
+  { variant: "natural", mask: _chunkBSLTLGM3cjs.NATURAL_MINOR_MASK },
+  { variant: "harmonic", mask: _chunkBSLTLGM3cjs.HARMONIC_MINOR_MASK },
+  { variant: "melodic", mask: _chunkBSLTLGM3cjs.MELODIC_MINOR_MASK }
 ];
-var MAJOR_VARIANTS = [{ variant: "major", mask: _chunkFNDWXRRIcjs.MAJOR_MASK }];
+var MAJOR_VARIANTS = [{ variant: "major", mask: _chunkBSLTLGM3cjs.MAJOR_MASK }];
 function detectKey(pitches, opts = {}) {
-  assertPitches(pitches);
-  const input = uniquePitchClasses(pitches);
-  if (input.length === 0) {
-    return [];
-  }
+  assertPitches(pitches, "key detection pitches", opts.budget);
   const weights = opts.weights;
   if (weights !== void 0 && weights.length !== pitches.length) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)("weights must have one entry per pitch");
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)("weights must have one entry per pitch");
   }
   const counts = /* @__PURE__ */ new Map();
   let total = 0;
   for (let index = 0; index < pitches.length; index += 1) {
     const weight = weights === void 0 ? 1 : _nullishCoalesce(weights[index], () => ( 0));
-    _chunk7MGZ7D62cjs.assertFiniteNumber.call(void 0, weight, `weights[${index}]`);
+    _chunkPI3UXRWKcjs.assertFiniteNumber.call(void 0, weight, `weights[${index}]`);
     if (weight <= 0) {
       continue;
     }
-    const pc = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, _nullishCoalesce(pitches[index], () => ( 0)));
+    const pc = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, _nullishCoalesce(pitches[index], () => ( 0)));
     counts.set(pc, (_nullishCoalesce(counts.get(pc), () => ( 0))) + weight);
     total += weight;
   }
   if (total === 0) {
     return [];
   }
+  const input = [...counts.keys()];
   const results = [];
   for (let tonic = 0; tonic < 12; tonic += 1) {
     for (const mode of ["major", "minor"]) {
@@ -163,11 +165,18 @@ function detectKey(pitches, opts = {}) {
   return results;
 }
 var DEFAULT_VELOCITY = 100;
-function detectKeyFromNotes(notes) {
+function detectKeyFromNotes(notes, opts = {}) {
+  _chunkPI3UXRWKcjs.assertNoteEvents.call(void 0, notes, "key detection notes", {
+    allowNonPositiveDuration: true,
+    budget: opts.budget
+  });
   const sounding = notes.filter((note) => note.durationBeat > 0);
   return detectKey(
     sounding.map((note) => note.pitch),
-    { weights: sounding.map((note) => note.durationBeat * (_nullishCoalesce(note.velocity, () => ( DEFAULT_VELOCITY)))) }
+    {
+      weights: sounding.map((note) => note.durationBeat * (_nullishCoalesce(note.velocity, () => ( DEFAULT_VELOCITY)))),
+      budget: opts.budget
+    }
   );
 }
 function detectKeyBest(pitches, opts = {}) {
@@ -176,34 +185,38 @@ function detectKeyBest(pitches, opts = {}) {
 
 // src/analyze/functional/internal.ts
 function degreeRootPc(degreeNumber, key) {
-  const tones = _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, key);
+  const tones = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, key);
   if (tones.length === 0) {
-    return _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc);
+    return _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc);
   }
   const index = ((degreeNumber - 1) % tones.length + tones.length) % tones.length;
-  return _nullishCoalesce(tones[index], () => ( _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc)));
+  return _nullishCoalesce(tones[index], () => ( _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc)));
 }
 function loweredDegrees(key) {
-  const tones = _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, key);
+  const tones = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, key);
   const out = /* @__PURE__ */ new Set();
   if (tones.length !== 7) {
     return out;
   }
-  const major = _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, { rootPc: _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc), modeMask12: _chunkFNDWXRRIcjs.MAJOR_MASK });
+  const major = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, { rootPc: _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc), modeMask12: _chunkBSLTLGM3cjs.MAJOR_MASK });
   for (let index = 0; index < 7; index += 1) {
     const tone = tones[index];
     const majorTone = major[index];
-    if (tone !== void 0 && majorTone !== void 0 && _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, majorTone - tone) === 1) {
+    if (tone !== void 0 && majorTone !== void 0 && _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, majorTone - tone) === 1) {
       out.add(index + 1);
     }
   }
   return out;
 }
 function romanReference(key) {
-  return _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, key).length === 7 ? key : _chunkFNDWXRRIcjs.majorKey.call(void 0, _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc));
+  return _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, key).length === 7 ? key : _chunkBSLTLGM3cjs.majorKey.call(void 0, _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc));
 }
 function isNeapolitan(chord, key) {
-  return _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc - key.rootPc) === 1 && chord.quality === "maj";
+  return _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc - key.rootPc) === 1 && chord.quality === "maj";
+}
+function isAppliedDominantSonority(chord) {
+  const has = (semitones) => chord.intervals.some((i) => _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, i) === semitones);
+  return chord.quality === "maj" || has(4) && has(10);
 }
 
 // src/analyze/functional/roman.ts
@@ -255,6 +268,9 @@ var ROMAN_STYLE = {
   dim7: { lower: true, suffix: "o7" },
   m7b5: { lower: true, suffix: "\xF87" },
   minMaj7: { lower: true, suffix: "maj7" },
+  minMaj9: { lower: true, suffix: "maj9" },
+  minMaj11: { lower: true, suffix: "maj11" },
+  minMaj13: { lower: true, suffix: "maj13" },
   aug7: { lower: false, suffix: "+7" },
   augMaj7: { lower: false, suffix: "+maj7" },
   majb5: { lower: false, suffix: "b5" },
@@ -315,26 +331,33 @@ function parseInversion(figures) {
 function parseSimpleRoman(text, key) {
   const match = /^([b#]?)([iIvV]+)(.*)$/.exec(text.trim());
   if (!match) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(`Invalid Roman numeral: ${text}`);
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(`Invalid Roman numeral: ${text}`);
+  }
+  const glyphText = _nullishCoalesce(match[2], () => ( ""));
+  if (glyphText !== glyphText.toUpperCase() && glyphText !== glyphText.toLowerCase()) {
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(`Roman numeral must use one case: ${text}`);
   }
   const accidental = match[1] === "b" ? -1 : match[1] === "#" ? 1 : 0;
-  const glyph = (_nullishCoalesce(match[2], () => ( ""))).toUpperCase();
+  const glyph = glyphText.toUpperCase();
   const degreeNumber = ROMAN_TO_DEGREE[glyph];
   if (degreeNumber === void 0) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(`Invalid Roman numeral: ${text}`);
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(`Invalid Roman numeral: ${text}`);
   }
-  const isUpper = (_nullishCoalesce(match[2], () => ( "")))[0] === _optionalChain([(_nullishCoalesce(match[2], () => ( ""))), 'access', _ => _[0], 'optionalAccess', _2 => _2.toUpperCase, 'call', _3 => _3()]);
+  const isUpper = glyphText[0] === _optionalChain([glyphText, 'access', _ => _[0], 'optionalAccess', _2 => _2.toUpperCase, 'call', _3 => _3()]);
   const suffix = _nullishCoalesce(match[3], () => ( ""));
   const frame = romanReference(key);
   const redundantFlat = accidental === -1 && loweredDegrees(frame).has(degreeNumber);
-  const rootPc = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, degreeRootPc(degreeNumber, frame) + (redundantFlat ? 0 : accidental));
+  const diatonicRootPc = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, 
+    degreeRootPc(degreeNumber, frame) + (redundantFlat ? 0 : accidental)
+  );
+  const rootForQuality = (quality2) => accidental === 0 && degreeNumber === 7 && loweredDegrees(frame).has(7) && (quality2 === "dim" || quality2 === "dim7") ? _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, diatonicRootPc + 1) : diatonicRootPc;
   const canonical = SUFFIX_QUALITY.get(`${isUpper ? "u" : "l"}:${suffix}`);
   if (canonical !== void 0) {
-    return { rootPc, quality: canonical, inversion: 0 };
+    return { rootPc: rootForQuality(canonical), quality: canonical, inversion: 0 };
   }
   const parsedSuffix = /^(o|°|dim|ø|\+|aug)?(maj7|M7)?(65|64|43|42|7|6|2)?$/.exec(suffix);
   if (!parsedSuffix) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(`Unsupported suffix "${suffix}" in Roman numeral: ${text}`);
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(`Unsupported suffix "${suffix}" in Roman numeral: ${text}`);
   }
   const qualityMarker = _nullishCoalesce(parsedSuffix[1], () => ( ""));
   const isDim = qualityMarker === "o" || qualityMarker === "\xB0" || qualityMarker === "dim";
@@ -343,7 +366,7 @@ function parseSimpleRoman(text, key) {
   const explicitMaj7 = parsedSuffix[2] !== void 0;
   const figures = _nullishCoalesce(parsedSuffix[3], () => ( ""));
   if (figures !== "" && !INVERSION_FIGURES.has(figures)) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(
       `Unsupported figured-bass or extension "${figures}" in Roman numeral: ${text}`
     );
   }
@@ -369,23 +392,23 @@ function parseSimpleRoman(text, key) {
   } else {
     quality = base;
   }
-  return { rootPc, quality, inversion };
+  return { rootPc: rootForQuality(quality), quality, inversion };
 }
 function chordFromParsed(parsed) {
-  const chord = _chunkFNDWXRRIcjs.makeChord.call(void 0, parsed.rootPc, parsed.quality);
+  const chord = _chunkBSLTLGM3cjs.makeChord.call(void 0, parsed.rootPc, parsed.quality);
   if (parsed.inversion > 0 && parsed.inversion < chord.intervals.length) {
-    chord.bassPc = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, parsed.rootPc + (_nullishCoalesce(chord.intervals[parsed.inversion], () => ( 0))));
+    chord.bassPc = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, parsed.rootPc + (_nullishCoalesce(chord.intervals[parsed.inversion], () => ( 0))));
   }
   return chord;
 }
 function romanToChord(text, key) {
-  const trimmed = text.trim();
+  const trimmed = text.trim().replace(/(\d)\/(?=\d)/g, "$1");
   const slash = trimmed.indexOf("/");
   if (slash >= 0) {
     const applied = trimmed.slice(0, slash);
     const target = trimmed.slice(slash + 1);
     const targetRoot = parseSimpleRoman(target, key).rootPc;
-    const localKey = _chunkFNDWXRRIcjs.majorKey.call(void 0, targetRoot);
+    const localKey = _chunkBSLTLGM3cjs.majorKey.call(void 0, targetRoot);
     return chordFromParsed(parseSimpleRoman(applied, localKey));
   }
   return chordFromParsed(parseSimpleRoman(trimmed, key));
@@ -394,14 +417,14 @@ function romanStyle(quality) {
   return ROMAN_STYLE[quality];
 }
 function romanSpelling(rootPc, key) {
-  const tones = _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, romanReference(key));
-  const diatonic = tones.indexOf(_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, rootPc));
+  const tones = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, romanReference(key));
+  const diatonic = tones.indexOf(_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, rootPc));
   if (diatonic >= 0) {
     return { degreeNumber: diatonic + 1, accidental: "" };
   }
   const lowered = loweredDegrees(romanReference(key));
   for (let i = 0; i < tones.length; i += 1) {
-    if (lowered.has(i + 1) && _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[i], () => ( 0))) + 1) === _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, rootPc)) {
+    if (lowered.has(i + 1) && _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[i], () => ( 0))) + 1) === _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, rootPc)) {
       return { degreeNumber: i + 1, accidental: "#" };
     }
   }
@@ -410,16 +433,16 @@ function romanSpelling(rootPc, key) {
     if (degreeNumber2 === 1 || degreeNumber2 === 5) {
       continue;
     }
-    if (_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[i], () => ( 0))) - 1) === _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, rootPc)) {
+    if (_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[i], () => ( 0))) - 1) === _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, rootPc)) {
       return { degreeNumber: degreeNumber2, accidental: "b" };
     }
   }
   for (let i = 0; i < tones.length; i += 1) {
-    if (_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[i], () => ( 0))) + 1) === _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, rootPc)) {
+    if (_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[i], () => ( 0))) + 1) === _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, rootPc)) {
       return { degreeNumber: i + 1, accidental: "#" };
     }
   }
-  const [degreeNumber, accidental] = _nullishCoalesce(OFFSET_SPELLING[_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, rootPc - key.rootPc)], () => ( [1, ""]));
+  const [degreeNumber, accidental] = _nullishCoalesce(OFFSET_SPELLING[_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, rootPc - key.rootPc)], () => ( [1, ""]));
   return { degreeNumber, accidental };
 }
 function baseMarker(quality) {
@@ -456,23 +479,19 @@ var SEVENTH_FIGURE_QUALITIES = /* @__PURE__ */ new Set([
 function numeralFor(degreeNumber, lower) {
   const glyph = ROMAN[degreeNumber - 1];
   if (glyph === void 0) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(`no Roman numeral for scale degree ${degreeNumber}`);
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(`no Roman numeral for scale degree ${degreeNumber}`);
   }
   return lower ? glyph.toLowerCase() : glyph;
 }
 function isDiatonicChord(chord, key) {
-  return _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, chord).every((pc) => _chunkFNDWXRRIcjs.isScaleTone.call(void 0, pc, key));
-}
-function isAppliedDominantSonority(chord) {
-  const has = (semitones) => chord.intervals.some((i) => _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, i) === semitones);
-  return chord.quality === "maj" || has(4) && has(10);
+  return _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, chord).every((pc) => _chunkBSLTLGM3cjs.isScaleTone.call(void 0, pc, key));
 }
 var LEADING_TONE_QUALITIES = /* @__PURE__ */ new Set(["dim", "dim7", "m7b5"]);
 function degreeTriad(tones, index) {
   const root = _nullishCoalesce(tones[index], () => ( 0));
   return {
-    third: _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[(index + 2) % tones.length], () => ( 0))) - root),
-    fifth: _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[(index + 4) % tones.length], () => ( 0))) - root)
+    third: _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[(index + 2) % tones.length], () => ( 0))) - root),
+    fifth: _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, (_nullishCoalesce(tones[(index + 4) % tones.length], () => ( 0))) - root)
   };
 }
 function appliedTarget(chord, key) {
@@ -481,18 +500,15 @@ function appliedTarget(chord, key) {
   if (!dominant && !leadingTone) {
     return null;
   }
-  const tones = _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, romanReference(key));
+  const tones = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, romanReference(key));
   for (let index = 1; index < tones.length; index += 1) {
     const targetRoot = tones[index];
     if (targetRoot === void 0) {
       continue;
     }
     const triad = degreeTriad(tones, index);
-    if (triad.fifth === 6) {
-      continue;
-    }
-    const expectedRoot = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, targetRoot + (dominant ? 7 : -1));
-    if (expectedRoot === _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc)) {
+    const expectedRoot = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, targetRoot + (dominant ? 7 : -1));
+    if (expectedRoot === _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc)) {
       return { degreeNumber: index + 1, rootPc: targetRoot, lower: triad.third === 3 };
     }
   }
@@ -502,16 +518,17 @@ function chordToRoman(chord, key, opts = {}) {
   if (opts.applied === true && !isDiatonicChord(chord, key)) {
     const target = appliedTarget(chord, key);
     if (target !== null) {
-      const local = chordToRoman(chord, _chunkFNDWXRRIcjs.majorKey.call(void 0, target.rootPc));
+      const local = chordToRoman(chord, _chunkBSLTLGM3cjs.majorKey.call(void 0, target.rootPc));
       return `${local}/${numeralFor(target.degreeNumber, target.lower)}`;
     }
   }
-  const { degreeNumber, accidental } = romanSpelling(chord.rootPc, key);
+  const { degreeNumber, accidental: spelledAccidental } = romanSpelling(chord.rootPc, key);
   const { lower, suffix } = romanStyle(chord.quality);
   const cased = numeralFor(degreeNumber, lower);
+  const accidental = spelledAccidental === "#" && degreeNumber === 7 && loweredDegrees(romanReference(key)).has(7) && (chord.quality === "dim" || chord.quality === "dim7") ? "" : spelledAccidental;
   let inversion = 0;
   if (chord.bassPc !== void 0) {
-    const idx = chord.intervals.findIndex((iv) => _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc + iv) === chord.bassPc);
+    const idx = chord.intervals.findIndex((iv) => _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc + iv) === chord.bassPc);
     if (idx > 0) {
       inversion = idx;
     }
@@ -526,14 +543,20 @@ function chordToRoman(chord, key, opts = {}) {
 }
 
 // src/analyze/functional/borrowed.ts
-function isHarmonicMinorAlteration(chord, key) {
-  return isMinorKey(key) && isDiatonic(chord, { rootPc: _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc), modeMask12: _chunkFNDWXRRIcjs.HARMONIC_MINOR_MASK });
+function isMinorScaleAlteration(chord, key) {
+  if (!isMinorKey(key)) return false;
+  const alteredKey = { rootPc: _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc), modeMask12: _chunkBSLTLGM3cjs.HARMONIC_MINOR_MASK };
+  if (isDiatonic(chord, alteredKey)) return true;
+  return _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc - key.rootPc) === 11 && isDiatonic(chord, { rootPc: _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc), modeMask12: _chunkBSLTLGM3cjs.MELODIC_MINOR_MASK });
 }
 function isBorrowedChord(chord, key) {
   if (isDiatonic(chord, key)) {
     return false;
   }
-  if (isHarmonicMinorAlteration(chord, key)) {
+  if (isNeapolitan(chord, key)) {
+    return true;
+  }
+  if (isMinorScaleAlteration(chord, key)) {
     return false;
   }
   return isDiatonic(chord, parallelKey(key));
@@ -542,9 +565,7 @@ function borrowedSource(chord, key) {
   if (isDiatonic(chord, key)) {
     return null;
   }
-  if (isNeapolitan(chord, key)) {
-    return "neapolitan";
-  }
+  if (isNeapolitan(chord, key)) return "neapolitan";
   if (isBorrowedChord(chord, key)) {
     return isMinorKey(key) ? "parallelMajor" : "parallelMinor";
   }
@@ -578,13 +599,27 @@ var FUNCTION_BY_OFFSET = [
   "dominant"
   // 11 vii
 ];
+var MINOR_FUNCTION_BY_OFFSET = [
+  "tonic",
+  "subdominant",
+  "subdominant",
+  "tonic",
+  "dominant",
+  "subdominant",
+  "dominant",
+  "dominant",
+  "tonic",
+  "tonic",
+  "subdominant",
+  "dominant"
+];
 function isMinorKey(key) {
   const hasMinorThird = key.modeMask12 >> 3 & 1;
   const hasMajorThird2 = key.modeMask12 >> 4 & 1;
   return Boolean(hasMinorThird) && !hasMajorThird2;
 }
 function functionOf(chord, key) {
-  const offset = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc - key.rootPc);
+  const offset = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc - key.rootPc);
   if (isNeapolitan(chord, key)) {
     return "subdominant";
   }
@@ -594,65 +629,75 @@ function functionOf(chord, key) {
   if (!isMinorKey(key) && hasMajorThird(chord) && (offset === 8 || offset === 10)) {
     return "subdominant";
   }
-  return _nullishCoalesce(FUNCTION_BY_OFFSET[offset], () => ( "tonic"));
+  const functions = isMinorKey(key) ? MINOR_FUNCTION_BY_OFFSET : FUNCTION_BY_OFFSET;
+  return _nullishCoalesce(functions[offset], () => ( "tonic"));
 }
 function isAppliedDominant(chord, key) {
   if (isDiatonic(chord, key)) {
     return false;
   }
-  const root = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc);
-  const resolvesTo = (step) => _chunkFNDWXRRIcjs.isScaleTone.call(void 0, _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, root + step), key);
-  if (hasMajorThird(chord) && chord.intervals.some((i) => _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, i) === 10)) {
-    return resolvesTo(5) || resolvesTo(11);
+  const root = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc);
+  const resolvesTo = (step) => _chunkBSLTLGM3cjs.isScaleTone.call(void 0, _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, root + step), key);
+  if (isAppliedDominantSonority(chord)) {
+    return chord.quality === "maj" ? resolvesTo(5) : resolvesTo(5) || resolvesTo(11);
   }
   return isDiminishedQuality(chord.quality) && resolvesTo(1);
 }
 function isDiatonic(chord, key) {
-  return _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, chord).every((pc) => _chunkFNDWXRRIcjs.isScaleTone.call(void 0, pc, key));
+  return _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, chord).every((pc) => _chunkBSLTLGM3cjs.isScaleTone.call(void 0, pc, key));
 }
 function parallelKey(key) {
   return {
-    rootPc: _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc),
-    modeMask12: isMinorKey(key) ? _chunkFNDWXRRIcjs.MAJOR_MASK : _chunkFNDWXRRIcjs.NATURAL_MINOR_MASK
+    rootPc: _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc),
+    modeMask12: isMinorKey(key) ? _chunkBSLTLGM3cjs.MAJOR_MASK : _chunkBSLTLGM3cjs.NATURAL_MINOR_MASK
   };
 }
 function isDiminishedQuality(quality) {
   return quality === "dim" || quality === "dim7" || quality === "m7b5";
 }
 function hasMajorThird(chord) {
-  return chord.intervals.some((interval) => _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, interval) === 4);
+  return chord.intervals.some((interval) => _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, interval) === 4);
 }
-function analyzeChord(chord, key) {
+function analyzeChord(chord, key, opts = {}) {
   const source = borrowedSource(chord, key);
   return {
     function: functionOf(chord, key),
     borrowed: source !== null,
     source,
-    roman: chordToRoman(chord, key)
+    roman: chordToRoman(chord, key, opts)
   };
 }
 function secondaryDominant(targetDegree, key) {
-  _chunk7MGZ7D62cjs.assertInteger.call(void 0, targetDegree, "targetDegree", 0, 6);
+  const degreeCount = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, key).length;
+  _chunkPI3UXRWKcjs.assertInteger.call(void 0, targetDegree, "targetDegree", 0, degreeCount - 1);
   const targetRoot = degreeRootPc(targetDegree + 1, key);
-  return _chunkFNDWXRRIcjs.makeChord.call(void 0, _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, targetRoot + 7), "dom7");
+  return _chunkBSLTLGM3cjs.makeChord.call(void 0, _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, targetRoot + 7), "dom7");
 }
 
 // src/analyze/functional/cadence.ts
+function hasDominantThird(chord) {
+  return chord.intervals.some((interval) => _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, interval) === 4);
+}
+function isLeadingToneDiminished(chord) {
+  return chord.quality === "dim" || chord.quality === "dim7" || chord.quality === "m7b5";
+}
 function detectCadence(from, to, key) {
-  const tonic = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc);
-  const fromOffset = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, from.rootPc - tonic);
-  const toOffset = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, to.rootPc - tonic);
+  const tonic = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc);
+  const fromOffset = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, from.rootPc - tonic);
+  const toOffset = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, to.rootPc - tonic);
   const deceptiveTargets = isMinorKey(key) ? [8] : [8, 9];
-  if (fromOffset === 7 && toOffset === 0) {
+  const dominant = fromOffset === 7 && hasDominantThird(from);
+  const leadingTone = fromOffset === 11 && isLeadingToneDiminished(from);
+  if ((dominant || leadingTone) && toOffset === 0) {
     return "authentic";
   }
   if (fromOffset === 5 && toOffset === 0) {
     return "plagal";
   }
-  if (fromOffset === 7 && deceptiveTargets.includes(toOffset)) {
+  if (dominant && deceptiveTargets.includes(toOffset)) {
     return "deceptive";
   }
-  if (toOffset === 7 && fromOffset !== 7) {
+  if (toOffset === 7 && hasDominantThird(to) && fromOffset !== 7) {
     return "half";
   }
   return null;
@@ -676,4 +721,4 @@ function detectCadence(from, to, key) {
 
 
 exports.detectChord = detectChord; exports.detectChordBest = detectChordBest; exports.detectKey = detectKey; exports.detectKeyFromNotes = detectKeyFromNotes; exports.detectKeyBest = detectKeyBest; exports.romanToChord = romanToChord; exports.chordToRoman = chordToRoman; exports.isMinorKey = isMinorKey; exports.functionOf = functionOf; exports.isDiatonic = isDiatonic; exports.parallelKey = parallelKey; exports.analyzeChord = analyzeChord; exports.secondaryDominant = secondaryDominant; exports.isBorrowedChord = isBorrowedChord; exports.borrowedSource = borrowedSource; exports.detectCadence = detectCadence;
-//# sourceMappingURL=chunk-CAN76NCU.cjs.map
+//# sourceMappingURL=chunk-KQN2ZYND.cjs.map