more dependencies, update vexflow for types

Author: AaronDavidNewman

package-lock.json

@@ -8,7 +8,6 @@
     "grunt": "^1.5.3",
     "grunt-typedoc": "^0.2.4",
     "grunt-webpack": "^4.0.3",
-    "@knodes/typedoc-plugin-pages": "^0.23.0",
     "jquery": "^3.6.0"
   },
   "dependencies": {
@@ -23,7 +22,7 @@
     "ts-loader": "^9.2.5",
     "typedoc": "^0.25.0",
     "typescript": "^5.2.2",
-    "vexflow_smoosic": "4.2.2",
+    "vexflow_smoosic": "4.2.6",
     "webpack": "^5.89.0",
     "xmldom": "^0.6.0"
   },

package.json

@@ -386,7 +386,7 @@ export function getChordSymbolMetricsForGlyph(code: string) {
     code = 'accidentalSharp';
   }
   const glyphMetrics = VexChordSymbol.metrics;
-  return glyphMetrics[code];
+  return (glyphMetrics as any)[code];
 }
 /**
  * Vex 5 compatibility.  yShift

src/common/vex.ts

@@ -10,10 +10,8 @@ import { smoSerialize } from '../../common/serializationHelpers';
 import { SmoScoreModifierBase, ScaledPageLayout } from './scoreModifiers';
 import { SmoAttrs, SmoModifierBase } from './common';
 import { SmoSelector } from '../xform/selections';
-import { VexFlow, FontInfo } from '../../common/vex';
+import { FontInfo } from '../../common/vex';
 import { TextFormatter } from '../../common/textformatter';
-const VF = VexFlow;
-
 
 /**
  * Parameters for a single text block.  Text blocks make up a text group.

src/smo/data/scoreText.ts

@@ -7,9 +7,6 @@ import { SmoNote } from '../data/note';
 import { Pitch, PitchLetter } from '../data/common';
 import { SmoSelector } from '../xform/selections';
 import { SmoBarline } from '../data/measureModifiers';
-import { VexFlow } from '../../common/vex';
-
-const VF = VexFlow;
 
 export interface XmlOrnamentData {
   ctor: string,
@@ -83,7 +80,7 @@ export class XmlHelpers {
   // ### closestStemType
   // smo infers the stem type from the duration, but other applications don't
   static closestStemType(ticks: number) {
-    const nticks = VF.durationToTicks(SmoMusic.vexStemType(ticks));
+    const nticks = SmoMusic.closestDurationTickLtEq(ticks);
     return XmlHelpers.ticksToNoteTypeMap[nticks];
   }
   static get beamStates(): Record<string, number> {

src/smo/mxml/xmlHelpers.ts

@@ -6,8 +6,6 @@ import { SmoAttrs, getId } from '../data/common';
 import { SmoMeasure, ISmoBeamGroup } from '../data/measure';
 import { TickMap } from './tickMap';
 import { smoSerialize } from '../../common/serializationHelpers';
-import { VexFlow } from '../../common/vex';
-const VF = VexFlow;
 
 export interface SmoBeamGroupParams {
   notes: SmoNote[],
@@ -154,8 +152,7 @@ export class SmoBeamer {
       }
 
       // is this beamable length-wise
-      const vexDuration = SmoMusic.closestVexDuration(note.tickCount);
-      const stemTicks = VF.durationToTicks(vexDuration);
+      const stemTicks = SmoMusic.closestDurationTickLtEq(note.tickCount);
       if (note.noteType === 'n' && stemTicks < 4096) {
         this.currentGroup.push(note);
       }

src/smo/xform/beamers.ts

@@ -22,10 +22,6 @@ import {
   SmoUnmakeTupletActor, SmoContractTupletActor
 } from './tickDuration';
 import { SmoBeamer } from './beamers';
-import { smoSerialize } from '../../common/serializationHelpers';
-import { VexFlow } from '../../common/vex';
-const VF = VexFlow;
-
 /**
  * supported operations for  {@link SmoOperation.batchSelectionOperation} to change a note's duration
  */
@@ -371,7 +367,7 @@ export class SmoOperation {
     // Don't dot if the thing on the right of the . is too small
     const dotCount = SmoMusic.smoTicksToVexDots(nticks);
     const multiplier = Math.pow(2, dotCount);
-    const baseDot = VF.durationToTicks(SmoMusic.closestVexDuration(nticks)) / (multiplier * 2);
+    const baseDot = SmoMusic.closestDurationTickLtEq(nticks) / (multiplier * 2);
     if (baseDot <= 128) {
       return;
     }

src/smo/xform/operations.ts

@@ -2,9 +2,8 @@
 // Copyright (c) Aaron David Newman 2021.
 import { SmoMusic } from '../data/music';
 import { TickMappable } from '../data/measure';
-import { Pitch, PitchLetter, TickAccidental } from '../data/common';
+import { Pitch, IsPitchLetter, TickAccidental } from '../data/common';
 import { SmoNote } from '../data/note';
-import { VexFlow } from '../../common/vex';
 
 /**
  * create a map note durations at each index into the voice, including the accidentals at each duration.
@@ -50,21 +49,22 @@ export class TickMap {
   // ### _getAccidentalsForKey
   // Update `map` with the correct accidental based on the key signature.
   _getAccidentalsForKey(map: Record<string, TickAccidental>) {
-    const music: any = new VexFlow.Music();
-    const keys = music.createScaleMap(this.keySignature);
+    const keys = SmoMusic.getScaleTonesForKey(this.keySignature);
     const keyKeys = Object.keys(keys);
     keyKeys.forEach((keyKey) => {
       const vexKey = keys[keyKey];
       if (vexKey.length > 1 && (vexKey[1] === 'b' || vexKey[1] === '#')) {
-        const pitch = {
-          letter: vexKey[0],
-          accidental: vexKey[1],
-          octave: 4
-        };
-        map[vexKey[0]] = {
-          duration: 0,
-          pitch
-        };
+        if (IsPitchLetter(vexKey[0])) {
+          const pitch = {
+            letter: vexKey[0],
+            accidental: vexKey[1],
+            octave: 4
+          };
+          map[vexKey[0]] = {
+            duration: 0,
+            pitch
+          };
+        }
       }
     });
   }