From 79b46c0e99a6470543325d12b18718cbfe65e7de Mon Sep 17 00:00:00 2001 From: Rodrigo Vilar Date: Sun, 31 Oct 2021 07:21:34 +0100 Subject: [PATCH] paths included in imports, eslint warnings fixed --- src/chordsymbol.ts | 3 +- src/multimeasurerest.ts | 3 +- src/stave.ts | 3 +- src/stavetempo.ts | 3 +- src/stavetext.ts | 3 +- src/stringnumber.ts | 3 +- src/tabnote.ts | 3 +- tests/accidental_tests.ts | 33 +++--- tests/annotation_tests.ts | 29 +++-- tests/articulation_tests.ts | 27 +++-- tests/auto_beam_formatting_tests.ts | 11 +- tests/bach_tests.ts | 9 +- tests/barline_tests.ts | 3 +- tests/beam_tests.ts | 13 +-- tests/bend_tests.ts | 17 ++- tests/boundingbox_tests.ts | 2 +- tests/boundingboxcomputation_tests.ts | 7 +- tests/chordsymbol_tests.ts | 13 +-- tests/curve_tests.ts | 9 +- tests/dot_tests.ts | 17 ++- tests/easyscore_tests.ts | 15 ++- tests/factory_tests.ts | 5 +- tests/formatter_tests.ts | 25 ++--- tests/fraction_tests.ts | 2 +- tests/ghostnote_tests.ts | 9 +- tests/glyphnote_tests.ts | 13 +-- tests/gracenote_tests.ts | 11 +- tests/gracetabnote_tests.ts | 19 ++-- tests/key_clef_tests.ts | 11 +- tests/keymanager_tests.ts | 2 +- tests/keysignature_tests.ts | 15 ++- tests/mocks.ts | 12 +- tests/modifier_tests.ts | 4 +- tests/multimeasurerest_tests.ts | 5 +- tests/music_tests.ts | 4 +- tests/notehead_tests.ts | 19 ++-- tests/notesubgroup_tests.ts | 11 +- tests/ornament_tests.ts | 21 ++-- tests/parser_tests.ts | 2 +- tests/pedalmarking_tests.ts | 7 +- tests/percussion_tests.ts | 17 ++- tests/registry_tests.ts | 10 +- tests/renderer_tests.ts | 18 +-- tests/rests_tests.ts | 19 ++-- tests/rhythm_tests.ts | 15 ++- tests/run.ts | 3 +- tests/stave_tests.ts | 33 +++--- tests/staveconnector_tests.ts | 13 +-- tests/stavehairpin_tests.ts | 7 +- tests/stavemodifier_tests.ts | 9 +- tests/stavenote_tests.ts | 37 +++---- tests/stavetie_tests.ts | 11 +- tests/stringnumber_tests.ts | 13 +-- tests/strokes_tests.ts | 11 +- tests/style_tests.ts | 31 +++--- tests/support/qunit.js | 2 +- tests/tabnote_tests.ts | 21 ++-- tests/tabslide_tests.ts | 19 ++-- tests/tabstave_tests.ts | 5 +- tests/tabtie_tests.ts | 25 ++--- tests/textnote_tests.ts | 10 +- tests/threevoice_tests.ts | 11 +- tests/tickcontext_tests.ts | 5 +- tests/timesignature_tests.ts | 9 +- tests/tremolo_tests.ts | 5 +- tests/tuning_tests.ts | 2 +- tests/tuplet_tests.ts | 7 +- tests/typeguard_tests.ts | 8 +- tests/vexflow_test_helpers.ts | 11 +- tests/vf_prefix_tests.ts | 154 +++++++++++++------------- tests/vibrato_tests.ts | 13 +-- tests/vibratobracket_tests.ts | 7 +- tests/voice_tests.ts | 15 ++- 73 files changed, 470 insertions(+), 529 deletions(-) diff --git a/src/chordsymbol.ts b/src/chordsymbol.ts index 3f7466c4f2..ed67ec6336 100644 --- a/src/chordsymbol.ts +++ b/src/chordsymbol.ts @@ -8,10 +8,9 @@ // // See `tests/chordsymbol_tests.ts` for usage examples. -import { ModifierContextState } from 'modifiercontext'; - import { Glyph } from './glyph'; import { Modifier } from './modifier'; +import { ModifierContextState } from './modifiercontext'; import { StemmableNote } from './stemmablenote'; import { Tables } from './tables'; import { TextFont } from './textfont'; diff --git a/src/multimeasurerest.ts b/src/multimeasurerest.ts index 7cc5c1cc70..2c306d50a8 100644 --- a/src/multimeasurerest.ts +++ b/src/multimeasurerest.ts @@ -3,8 +3,6 @@ // // This class implements multiple measure rests. -import { isBarline } from 'typeguard'; - import { Element } from './element'; import { Glyph } from './glyph'; import { NoteHead } from './notehead'; @@ -13,6 +11,7 @@ import { Stave } from './stave'; import { StaveModifierPosition } from './stavemodifier'; import { Tables } from './tables'; import { TimeSignature } from './timesignature'; +import { isBarline } from './typeguard'; import { defined } from './util'; export interface MultimeasureRestRenderOptions { diff --git a/src/stave.ts b/src/stave.ts index dcc484298c..29c4cf1215 100644 --- a/src/stave.ts +++ b/src/stave.ts @@ -1,8 +1,6 @@ // [VexFlow](http://vexflow.com) - Copyright (c) Mohit Muthanna 2010. // MIT License -import { isBarline } from 'typeguard'; - import { BoundingBox } from './boundingbox'; import { Clef } from './clef'; import { Element, ElementStyle } from './element'; @@ -16,6 +14,7 @@ import { StaveText } from './stavetext'; import { Volta } from './stavevolta'; import { Tables } from './tables'; import { TimeSignature } from './timesignature'; +import { isBarline } from './typeguard'; import { Bounds, FontInfo } from './types/common'; import { RuntimeError } from './util'; diff --git a/src/stavetempo.ts b/src/stavetempo.ts index b25fc62f77..663341d5e6 100644 --- a/src/stavetempo.ts +++ b/src/stavetempo.ts @@ -1,12 +1,11 @@ // [VexFlow](http://vexflow.com) - Copyright (c) Mohit Muthanna 2010. // Author Radosaw Eichler 2012 -import { FontInfo } from 'types/common'; - import { Glyph } from './glyph'; import { Stave } from './stave'; import { StaveModifier, StaveModifierPosition } from './stavemodifier'; import { Tables } from './tables'; +import { FontInfo } from './types/common'; export interface StaveTempoOptions { bpm?: number; diff --git a/src/stavetext.ts b/src/stavetext.ts index 6e44cf691f..0adc63c0db 100644 --- a/src/stavetext.ts +++ b/src/stavetext.ts @@ -1,11 +1,10 @@ // [VexFlow](http://vexflow.com) - Copyright (c) Mohit Muthanna 2010. // Author Taehoon Moon 2014 -import { FontInfo } from 'types/common'; - import { Stave } from './stave'; import { StaveModifier, StaveModifierPosition } from './stavemodifier'; import { Justification, TextNote } from './textnote'; +import { FontInfo } from './types/common'; import { RuntimeError } from './util'; export class StaveText extends StaveModifier { diff --git a/src/stringnumber.ts b/src/stringnumber.ts index 4c0b542b9c..35f9d073f1 100644 --- a/src/stringnumber.ts +++ b/src/stringnumber.ts @@ -5,12 +5,11 @@ // This file implements the `StringNumber` class which renders string // number annotations beside notes. -import { Stem } from 'stem'; - import { Modifier } from './modifier'; import { ModifierContextState } from './modifiercontext'; import { Note } from './note'; import { Renderer } from './renderer'; +import { Stem } from './stem'; import { isStaveNote, isStemmableNote } from './typeguard'; import { FontInfo } from './types/common'; import { RuntimeError } from './util'; diff --git a/src/tabnote.ts b/src/tabnote.ts index 5f550e07cc..b23d7c616f 100644 --- a/src/tabnote.ts +++ b/src/tabnote.ts @@ -7,8 +7,6 @@ // // See `tests/tabnote_tests.ts` for usage examples. -import { isDot } from 'typeguard'; - import { Dot } from './dot'; import { Glyph, GlyphProps } from './glyph'; import { Modifier } from './modifier'; @@ -17,6 +15,7 @@ import { StaveNoteStruct } from './stavenote'; import { Stem } from './stem'; import { StemmableNote } from './stemmablenote'; import { Tables } from './tables'; +import { isDot } from './typeguard'; import { defined, RuntimeError } from './util'; export interface TabNotePosition { diff --git a/tests/accidental_tests.ts b/tests/accidental_tests.ts index dc7f208f79..1bf64088f3 100644 --- a/tests/accidental_tests.ts +++ b/tests/accidental_tests.ts @@ -3,23 +3,22 @@ // // Accidental Tests -import { Accidental } from 'accidental'; -import { Beam } from 'beam'; -import { Factory } from 'factory'; -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { Modifier } from 'modifier'; -import { ModifierContext } from 'modifiercontext'; -import { Note } from 'note'; -import { RenderContext } from 'rendercontext'; -import { Stave } from 'stave'; -import { StaveNote, StaveNoteStruct } from 'stavenote'; -import { Stem } from 'stem'; -import { TickContext } from 'tickcontext'; -import { TimeSigNote } from 'timesignote'; -import { isCategory } from 'typeguard'; -import { Voice } from 'voice'; - +import { Accidental } from '../src/accidental'; +import { Beam } from '../src/beam'; +import { Factory } from '../src/factory'; +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { Modifier } from '../src/modifier'; +import { ModifierContext } from '../src/modifiercontext'; +import { Note } from '../src/note'; +import { RenderContext } from '../src/rendercontext'; +import { Stave } from '../src/stave'; +import { StaveNote, StaveNoteStruct } from '../src/stavenote'; +import { Stem } from '../src/stem'; +import { TickContext } from '../src/tickcontext'; +import { TimeSigNote } from '../src/timesignote'; +import { isCategory } from '../src/typeguard'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const AccidentalTests = { diff --git a/tests/annotation_tests.ts b/tests/annotation_tests.ts index fe886e362d..3988b1365c 100644 --- a/tests/annotation_tests.ts +++ b/tests/annotation_tests.ts @@ -7,21 +7,20 @@ // Did a previous version of the API accept a number as the fourth argument? // We removed the fourth argument from all of our test cases. -import { Annotation } from 'annotation'; -import { Beam } from 'beam'; -import { Bend } from 'bend'; -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { Registry } from 'registry'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { StaveNote, StaveNoteStruct } from 'stavenote'; -import { TabNote, TabNoteStruct } from 'tabnote'; -import { TabStave } from 'tabstave'; -import { Tickable } from 'tickable'; -import { Vibrato } from 'vibrato'; -import { Voice } from 'voice'; - +import { Annotation } from '../src/annotation'; +import { Beam } from '../src/beam'; +import { Bend } from '../src/bend'; +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { Registry } from '../src/registry'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { StaveNote, StaveNoteStruct } from '../src/stavenote'; +import { TabNote, TabNoteStruct } from '../src/tabnote'; +import { TabStave } from '../src/tabstave'; +import { Tickable } from '../src/tickable'; +import { Vibrato } from '../src/vibrato'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const AnnotationTests = { diff --git a/tests/articulation_tests.ts b/tests/articulation_tests.ts index 1a64789b5d..97b6907946 100644 --- a/tests/articulation_tests.ts +++ b/tests/articulation_tests.ts @@ -3,19 +3,18 @@ // // Articulation Tests -import { Articulation } from 'articulation'; -import { Beam } from 'beam'; -import { Flow } from 'flow'; -import { Font } from 'font'; -import { Formatter } from 'formatter'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { Barline, BarlineType } from 'stavebarline'; -import { StaveNote } from 'stavenote'; -import { TabNote } from 'tabnote'; -import { TabStave } from 'tabstave'; -import { Voice } from 'voice'; - +import { Articulation } from '../src/articulation'; +import { Beam } from '../src/beam'; +import { Flow } from '../src/flow'; +import { Font } from '../src/font'; +import { Formatter } from '../src/formatter'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { Barline } from '../src/stavebarline'; +import { StaveNote } from '../src/stavenote'; +import { TabNote } from '../src/tabnote'; +import { TabStave } from '../src/tabstave'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const ArticulationTests = { @@ -301,7 +300,7 @@ function drawArticulations2(options: TestOptions): void { } // Helper function to justify and draw a 4/4 voice - x += formatAndDrawToWidth(x, y, width, notesBar4, Barline.type.END, []); + formatAndDrawToWidth(x, y, width, notesBar4, Barline.type.END, []); } function tabNotes(options: TestOptions, contextBuilder: ContextBuilder): void { diff --git a/tests/auto_beam_formatting_tests.ts b/tests/auto_beam_formatting_tests.ts index 02e2a8b0dd..abe87760dd 100644 --- a/tests/auto_beam_formatting_tests.ts +++ b/tests/auto_beam_formatting_tests.ts @@ -6,12 +6,11 @@ // TODO: Beam.generateBeams(voice.getTickables() as StemmableNote[], ...) requires a cast to StemmableNote[]. // Is there a cleaner way to handle this? -import { Beam } from 'beam'; -import { EasyScore } from 'easyscore'; -import { Fraction } from 'fraction'; -import { Stem } from 'stem'; -import { StemmableNote } from 'stemmablenote'; - +import { Beam } from '../src/beam'; +import { EasyScore } from '../src/easyscore'; +import { Fraction } from '../src/fraction'; +import { Stem } from '../src/stem'; +import { StemmableNote } from '../src/stemmablenote'; import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers'; const AutoBeamFormattingTests = { diff --git a/tests/bach_tests.ts b/tests/bach_tests.ts index 2428041f50..c784f7668d 100644 --- a/tests/bach_tests.ts +++ b/tests/bach_tests.ts @@ -3,11 +3,10 @@ // // Bach Demo -import { Factory } from 'factory'; -import { Registry } from 'registry'; -import { BarlineType } from 'stavebarline'; -import { StaveNote } from 'stavenote'; - +import { Factory } from '../src/factory'; +import { Registry } from '../src/registry'; +import { BarlineType } from '../src/stavebarline'; +import { StaveNote } from '../src/stavenote'; import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers'; const BachDemoTests = { diff --git a/tests/barline_tests.ts b/tests/barline_tests.ts index aedf685822..f26bbde62d 100644 --- a/tests/barline_tests.ts +++ b/tests/barline_tests.ts @@ -3,8 +3,7 @@ // // Barline Tests -import { Barline, BarlineType } from 'stavebarline'; - +import { Barline, BarlineType } from '../src/stavebarline'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const BarlineTests = { diff --git a/tests/beam_tests.ts b/tests/beam_tests.ts index 47195c130e..2ded1ee72d 100644 --- a/tests/beam_tests.ts +++ b/tests/beam_tests.ts @@ -5,13 +5,12 @@ // TODO: Factory.Beam()'s 'notes' argument is a StemmableNote[], but we only have access to Tickable[]. -import { Beam } from 'beam'; -import { StaveNoteStruct } from 'stavenote'; -import { Stem } from 'stem'; -import { StemmableNote } from 'stemmablenote'; -import { TabNoteStruct } from 'tabnote'; -import { Voice } from 'voice'; - +import { Beam } from '../src/beam'; +import { StaveNoteStruct } from '../src/stavenote'; +import { Stem } from '../src/stem'; +import { StemmableNote } from '../src/stemmablenote'; +import { TabNoteStruct } from '../src/tabnote'; +import { Voice } from '../src/voice'; import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers'; const BeamTests = { diff --git a/tests/bend_tests.ts b/tests/bend_tests.ts index 31093f5443..9ce1eb5a1d 100644 --- a/tests/bend_tests.ts +++ b/tests/bend_tests.ts @@ -3,15 +3,14 @@ // // Bend Tests -import { Bend, BendPhrase } from 'bend'; -import { Formatter } from 'formatter'; -import { ModifierContext } from 'modifiercontext'; -import { Note } from 'note'; -import { ContextBuilder } from 'renderer'; -import { TabNote, TabNoteStruct } from 'tabnote'; -import { TabStave } from 'tabstave'; -import { TickContext } from 'tickcontext'; - +import { Bend, BendPhrase } from '../src/bend'; +import { Formatter } from '../src/formatter'; +import { ModifierContext } from '../src/modifiercontext'; +import { Note } from '../src/note'; +import { ContextBuilder } from '../src/renderer'; +import { TabNote, TabNoteStruct } from '../src/tabnote'; +import { TabStave } from '../src/tabstave'; +import { TickContext } from '../src/tickcontext'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const BendTests = { diff --git a/tests/boundingbox_tests.ts b/tests/boundingbox_tests.ts index 7f83803e44..d3e54cb725 100644 --- a/tests/boundingbox_tests.ts +++ b/tests/boundingbox_tests.ts @@ -3,7 +3,7 @@ // // Bounding Box Tests -import { BoundingBox } from 'boundingbox'; +import { BoundingBox } from '../src/boundingbox'; const BoundingBoxTests = { Start(): void { diff --git a/tests/boundingboxcomputation_tests.ts b/tests/boundingboxcomputation_tests.ts index 0391b4dbb7..42d6ee1eb2 100644 --- a/tests/boundingboxcomputation_tests.ts +++ b/tests/boundingboxcomputation_tests.ts @@ -3,10 +3,9 @@ // // BoundingBoxComputation Tests -import { BoundingBoxComputation } from 'boundingboxcomputation'; -import { Glyph, OutlineCode } from 'glyph'; -import { RenderContext } from 'rendercontext'; - +import { BoundingBoxComputation } from '../src/boundingboxcomputation'; +import { Glyph, OutlineCode } from '../src/glyph'; +import { RenderContext } from '../src/rendercontext'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const BoundingBoxComputationTests = { diff --git a/tests/chordsymbol_tests.ts b/tests/chordsymbol_tests.ts index c8c2ed096b..f94e789841 100644 --- a/tests/chordsymbol_tests.ts +++ b/tests/chordsymbol_tests.ts @@ -3,13 +3,12 @@ // // ChordSymbol Tests -import { Accidental } from 'accidental'; -import { ChordSymbol } from 'chordsymbol'; -import { Factory } from 'factory'; -import { Formatter } from 'formatter'; -import { Stave } from 'stave'; -import { StaveNote } from 'stavenote'; - +import { Accidental } from '../src/accidental'; +import { ChordSymbol } from '../src/chordsymbol'; +import { Factory } from '../src/factory'; +import { Formatter } from '../src/formatter'; +import { Stave } from '../src/stave'; +import { StaveNote } from '../src/stavenote'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const ChordSymbolTests = { diff --git a/tests/curve_tests.ts b/tests/curve_tests.ts index d2db22e977..1eaca0971e 100644 --- a/tests/curve_tests.ts +++ b/tests/curve_tests.ts @@ -3,11 +3,10 @@ // // Curve Tests -import { CurvePosition } from 'curve'; -import { BuilderOptions } from 'easyscore'; -import { Factory } from 'factory'; -import { StaveNote } from 'stavenote'; - +import { CurvePosition } from '../src/curve'; +import { BuilderOptions } from '../src/easyscore'; +import { Factory } from '../src/factory'; +import { StaveNote } from '../src/stavenote'; import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers'; const CurveTests = { diff --git a/tests/dot_tests.ts b/tests/dot_tests.ts index f85421db62..70bd8514e2 100644 --- a/tests/dot_tests.ts +++ b/tests/dot_tests.ts @@ -3,15 +3,14 @@ // // Dot Tests -import { Beam } from 'beam'; -import { ModifierContext } from 'modifiercontext'; -import { Note } from 'note'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { StaveNote } from 'stavenote'; -import { TickContext } from 'tickcontext'; - +import { Beam } from '../src/beam'; +import { ModifierContext } from '../src/modifiercontext'; +import { Note } from '../src/note'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { StaveNote } from '../src/stavenote'; +import { TickContext } from '../src/tickcontext'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const DotTests = { diff --git a/tests/easyscore_tests.ts b/tests/easyscore_tests.ts index d2f48feab5..19cfd27872 100644 --- a/tests/easyscore_tests.ts +++ b/tests/easyscore_tests.ts @@ -3,14 +3,13 @@ // // EasyScore Tests -import { Articulation } from 'articulation'; -import { EasyScore } from 'easyscore'; -import { FretHandFinger } from 'frethandfinger'; -import { Modifier } from 'modifier'; -import { StaveConnector } from 'staveconnector'; -import { Stem } from 'stem'; -import { Tuplet } from 'tuplet'; - +import { Articulation } from '../src/articulation'; +import { EasyScore } from '../src/easyscore'; +import { FretHandFinger } from '../src/frethandfinger'; +import { Modifier } from '../src/modifier'; +import { StaveConnector } from '../src/staveconnector'; +import { Stem } from '../src/stem'; +import { Tuplet } from '../src/tuplet'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const EasyScoreTests = { diff --git a/tests/factory_tests.ts b/tests/factory_tests.ts index d867a41408..41559aae11 100644 --- a/tests/factory_tests.ts +++ b/tests/factory_tests.ts @@ -3,9 +3,8 @@ // // Factory Tests -import { Factory } from 'factory'; -import { Barline } from 'stavebarline'; - +import { Factory } from '../src/factory'; +import { Barline } from '../src/stavebarline'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const FactoryTests = { diff --git a/tests/formatter_tests.ts b/tests/formatter_tests.ts index d67968ded5..2e910e75d2 100644 --- a/tests/formatter_tests.ts +++ b/tests/formatter_tests.ts @@ -3,19 +3,18 @@ // // Formatter Tests -import { Annotation } from 'annotation'; -import { Beam } from 'beam'; -import { Bend } from 'bend'; -import { Flow } from 'flow'; -import { FontGlyph } from 'font'; -import { Formatter } from 'formatter'; -import { Note } from 'note'; -import { Registry } from 'registry'; -import { Stave } from 'stave'; -import { StaveConnector } from 'staveconnector'; -import { StaveNote } from 'stavenote'; -import { Voice, VoiceTime } from 'voice'; - +import { Annotation } from '../src/annotation'; +import { Beam } from '../src/beam'; +import { Bend } from '../src/bend'; +import { Flow } from '../src/flow'; +import { FontGlyph } from '../src/font'; +import { Formatter } from '../src/formatter'; +import { Note } from '../src/note'; +import { Registry } from '../src/registry'; +import { Stave } from '../src/stave'; +import { StaveConnector } from '../src/staveconnector'; +import { StaveNote } from '../src/stavenote'; +import { Voice, VoiceTime } from '../src/voice'; import { MockTickable } from './mocks'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; diff --git a/tests/fraction_tests.ts b/tests/fraction_tests.ts index 2f895b790b..2517fc6a42 100644 --- a/tests/fraction_tests.ts +++ b/tests/fraction_tests.ts @@ -3,7 +3,7 @@ // // Fraction Tests -import { Fraction } from 'fraction'; +import { Fraction } from '../src/fraction'; const FractionTests = { Start(): void { diff --git a/tests/ghostnote_tests.ts b/tests/ghostnote_tests.ts index e660cdf114..d555c2d407 100644 --- a/tests/ghostnote_tests.ts +++ b/tests/ghostnote_tests.ts @@ -3,11 +3,10 @@ // // GhostNote Tests -import { EasyScore } from 'easyscore'; -import { Factory } from 'factory'; -import { StaveNote } from 'stavenote'; -import { StemmableNote } from 'stemmablenote'; - +import { EasyScore } from '../src/easyscore'; +import { Factory } from '../src/factory'; +import { StaveNote } from '../src/stavenote'; +import { StemmableNote } from '../src/stemmablenote'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const GhostNoteTests = { diff --git a/tests/glyphnote_tests.ts b/tests/glyphnote_tests.ts index 5418f604bd..ab056cc104 100644 --- a/tests/glyphnote_tests.ts +++ b/tests/glyphnote_tests.ts @@ -3,13 +3,12 @@ // // GlyphNote Tests -import { ChordSymbol } from 'chordsymbol'; -import { Glyph } from 'glyph'; -import { Note } from 'note'; -import { Registry } from 'registry'; -import { StaveConnector } from 'staveconnector'; -import { Voice } from 'voice'; - +import { ChordSymbol } from '../src/chordsymbol'; +import { Glyph } from '../src/glyph'; +import { Note } from '../src/note'; +import { Registry } from '../src/registry'; +import { StaveConnector } from '../src/staveconnector'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const GlyphNoteTests = { diff --git a/tests/gracenote_tests.ts b/tests/gracenote_tests.ts index c12f63ffba..fd00c84af1 100644 --- a/tests/gracenote_tests.ts +++ b/tests/gracenote_tests.ts @@ -5,12 +5,11 @@ // TODO: In the 'stem' test (aka Grace Note Stem › SVG + Petaluma in flow.html), the Petaluma note heads are not scaled down properly. -import { Beam } from 'beam'; -import { Factory } from 'factory'; -import { Formatter } from 'formatter'; -import { GraceNote, GraceNoteStruct } from 'gracenote'; -import { StaveNote, StaveNoteStruct } from 'stavenote'; - +import { Beam } from '../src/beam'; +import { Factory } from '../src/factory'; +import { Formatter } from '../src/formatter'; +import { GraceNote, GraceNoteStruct } from '../src/gracenote'; +import { StaveNote, StaveNoteStruct } from '../src/stavenote'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const GraceNoteTests = { diff --git a/tests/gracetabnote_tests.ts b/tests/gracetabnote_tests.ts index 767ef2c677..cef9e87404 100644 --- a/tests/gracetabnote_tests.ts +++ b/tests/gracetabnote_tests.ts @@ -3,16 +3,15 @@ // // GraceTabNote Tests -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { GraceNoteGroup } from 'gracenotegroup'; -import { GraceTabNote } from 'gracetabnote'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { TabNote, TabNoteStruct } from 'tabnote'; -import { TabStave } from 'tabstave'; -import { Voice } from 'voice'; - +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { GraceNoteGroup } from '../src/gracenotegroup'; +import { GraceTabNote } from '../src/gracetabnote'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { TabNote, TabNoteStruct } from '../src/tabnote'; +import { TabStave } from '../src/tabstave'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const GraceTabNoteTests = { diff --git a/tests/key_clef_tests.ts b/tests/key_clef_tests.ts index b4c46455fa..e871d50154 100644 --- a/tests/key_clef_tests.ts +++ b/tests/key_clef_tests.ts @@ -4,12 +4,11 @@ // Clef Key Signature Tests // -import { Glyph } from 'glyph'; -import { KeySignature } from 'keysignature'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { Tables } from 'tables'; - +import { Glyph } from '../src/glyph'; +import { KeySignature } from '../src/keysignature'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { Tables } from '../src/tables'; import { MAJOR_KEYS, MINOR_KEYS, TestOptions, VexFlowTests } from './vexflow_test_helpers'; const ClefKeySignatureTests = { diff --git a/tests/keymanager_tests.ts b/tests/keymanager_tests.ts index c372c4385d..7b82ee741a 100644 --- a/tests/keymanager_tests.ts +++ b/tests/keymanager_tests.ts @@ -6,7 +6,7 @@ // TODO: KeyManager.getAccidental(key) specifies that the return value's .accidental property is string | undefined. // However, we check it against null. -import { KeyManager } from 'keymanager'; +import { KeyManager } from '../src/keymanager'; const KeyManagerTests = { Start(): void { diff --git a/tests/keysignature_tests.ts b/tests/keysignature_tests.ts index 09a12143a0..b72904d38a 100644 --- a/tests/keysignature_tests.ts +++ b/tests/keysignature_tests.ts @@ -4,14 +4,13 @@ // Key Signature Tests // -import { Flow } from 'flow'; -import { Glyph } from 'glyph'; -import { KeySignature } from 'keysignature'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { BarlineType } from 'stavebarline'; -import { Tables } from 'tables'; - +import { Flow } from '../src/flow'; +import { Glyph } from '../src/glyph'; +import { KeySignature } from '../src/keysignature'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { BarlineType } from '../src/stavebarline'; +import { Tables } from '../src/tables'; import { MAJOR_KEYS, MINOR_KEYS, TestOptions, VexFlowTests } from './vexflow_test_helpers'; const KeySignatureTests = { diff --git a/tests/mocks.ts b/tests/mocks.ts index 5eed707510..1b89153377 100644 --- a/tests/mocks.ts +++ b/tests/mocks.ts @@ -3,12 +3,12 @@ // // TickContext Mocks -import { Fraction } from 'fraction'; -import { NoteMetrics } from 'note'; -import { Stave } from 'stave'; -import { Tickable } from 'tickable'; -import { TickContext } from 'tickcontext'; -import { Voice } from 'voice'; +import { Fraction } from '../src/fraction'; +import { NoteMetrics } from '../src/note'; +import { Stave } from '../src/stave'; +import { Tickable } from '../src/tickable'; +import { TickContext } from '../src/tickcontext'; +import { Voice } from '../src/voice'; class MockTickable extends Tickable { tickContext?: TickContext; diff --git a/tests/modifier_tests.ts b/tests/modifier_tests.ts index f5c4585eba..6a11e4f858 100644 --- a/tests/modifier_tests.ts +++ b/tests/modifier_tests.ts @@ -3,8 +3,8 @@ // // ModifierContext Tests -import { Modifier } from 'modifier'; -import { ModifierContext } from 'modifiercontext'; +import { Modifier } from '../src/modifier'; +import { ModifierContext } from '../src/modifiercontext'; const ModifierContextTests = { Start(): void { diff --git a/tests/multimeasurerest_tests.ts b/tests/multimeasurerest_tests.ts index 93f2264243..b9e6a1e791 100644 --- a/tests/multimeasurerest_tests.ts +++ b/tests/multimeasurerest_tests.ts @@ -3,9 +3,8 @@ // // MultiMeasureRest Tests -import { Flow } from 'flow'; -import { MultimeasureRestRenderOptions } from 'multimeasurerest'; - +import { Flow } from '../src/flow'; +import { MultimeasureRestRenderOptions } from '../src/multimeasurerest'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const MultiMeasureRestTests = { diff --git a/tests/music_tests.ts b/tests/music_tests.ts index b13aa7c332..5dafac8084 100644 --- a/tests/music_tests.ts +++ b/tests/music_tests.ts @@ -3,8 +3,8 @@ // // Music Tests -import { KeyManager } from 'keymanager'; -import { Music } from 'music'; +import { KeyManager } from '../src/keymanager'; +import { Music } from '../src/music'; const MusicTests = { Start(): void { diff --git a/tests/notehead_tests.ts b/tests/notehead_tests.ts index 7d2eb32d1e..2ec9e335f6 100644 --- a/tests/notehead_tests.ts +++ b/tests/notehead_tests.ts @@ -10,16 +10,15 @@ // TODO: The middle C note head is missing a ledger line. Should it automatically draw one? In older versions of VexFlow, there is a ledger line. // See: https://www.vexflow.com/tests/?module=NoteHead -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { NoteHead } from 'notehead'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { StaveNote, StaveNoteStruct } from 'stavenote'; -import { TickContext } from 'tickcontext'; -import { Voice } from 'voice'; - +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { NoteHead } from '../src/notehead'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { StaveNote, StaveNoteStruct } from '../src/stavenote'; +import { TickContext } from '../src/tickcontext'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const NoteHeadTests = { diff --git a/tests/notesubgroup_tests.ts b/tests/notesubgroup_tests.ts index 14bc770b25..e20f1dd780 100644 --- a/tests/notesubgroup_tests.ts +++ b/tests/notesubgroup_tests.ts @@ -4,12 +4,11 @@ // // NoteSubGroup Tests -import { BarNote } from 'barnote'; -import { Factory } from 'factory'; -import { Note } from 'note'; -import { BarlineType } from 'stavebarline'; -import { StaveNote, StaveNoteStruct } from 'stavenote'; - +import { BarNote } from '../src/barnote'; +import { Factory } from '../src/factory'; +import { Note } from '../src/note'; +import { BarlineType } from '../src/stavebarline'; +import { StaveNote, StaveNoteStruct } from '../src/stavenote'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const NoteSubGroupTests = { diff --git a/tests/ornament_tests.ts b/tests/ornament_tests.ts index aad7241282..4aea136802 100644 --- a/tests/ornament_tests.ts +++ b/tests/ornament_tests.ts @@ -6,17 +6,16 @@ // TODO: Formatting for Jazz Ornaments is incorrect. The last note + ornament bleeds into the next measure. -import { Accidental } from 'accidental'; -import { Beam } from 'beam'; -import { Formatter } from 'formatter'; -import { Glyph } from 'glyph'; -import { Ornament } from 'ornament'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { StaveNote } from 'stavenote'; -import { Tables } from 'tables'; -import { Voice, VoiceMode } from 'voice'; - +import { Accidental } from '../src/accidental'; +import { Beam } from '../src/beam'; +import { Formatter } from '../src/formatter'; +import { Glyph } from '../src/glyph'; +import { Ornament } from '../src/ornament'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { StaveNote } from '../src/stavenote'; +import { Tables } from '../src/tables'; +import { Voice, VoiceMode } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const OrnamentTests = { diff --git a/tests/parser_tests.ts b/tests/parser_tests.ts index 95a206b923..c373940bb3 100644 --- a/tests/parser_tests.ts +++ b/tests/parser_tests.ts @@ -3,7 +3,7 @@ // // Parser Tests -import { Grammar, Parser, Result, RuleFunction } from 'parser'; +import { Grammar, Parser, Result, RuleFunction } from '../src/parser'; const ParserTests = { Start(): void { diff --git a/tests/pedalmarking_tests.ts b/tests/pedalmarking_tests.ts index d8ab20ced4..f670e601a0 100644 --- a/tests/pedalmarking_tests.ts +++ b/tests/pedalmarking_tests.ts @@ -5,10 +5,9 @@ // TODO: Fix Error => Type 'Tickable' is not assignable to type 'StaveNote'. -import { Factory } from 'factory'; -import { StaveNote } from 'stavenote'; -import { Tickable } from 'tickable'; - +import { Factory } from '../src/factory'; +import { StaveNote } from '../src/stavenote'; +import { Tickable } from '../src/tickable'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const PedalMarkingTests = { diff --git a/tests/percussion_tests.ts b/tests/percussion_tests.ts index 4d294c620d..480158caf7 100644 --- a/tests/percussion_tests.ts +++ b/tests/percussion_tests.ts @@ -6,15 +6,14 @@ // TODO: Type 'Tickable[]' is not assignable to type 'StemmableNote[]'. -import { Factory } from 'factory'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { StaveNote, StaveNoteStruct } from 'stavenote'; -import { StemmableNote } from 'stemmablenote'; -import { TickContext } from 'tickcontext'; -import { Tremolo } from 'tremolo'; - +import { Factory } from '../src/factory'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { StaveNote, StaveNoteStruct } from '../src/stavenote'; +import { StemmableNote } from '../src/stemmablenote'; +import { TickContext } from '../src/tickcontext'; +import { Tremolo } from '../src/tremolo'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const PercussionTests = { diff --git a/tests/registry_tests.ts b/tests/registry_tests.ts index 096b5dcbb5..e70c16dbde 100644 --- a/tests/registry_tests.ts +++ b/tests/registry_tests.ts @@ -3,11 +3,11 @@ // // Registry Tests -import { EasyScore } from 'easyscore'; -import { Element } from 'element'; -import { Factory } from 'factory'; -import { Registry } from 'registry'; -import { StaveNote } from 'stavenote'; +import { EasyScore } from '../src/easyscore'; +import { Element } from '../src/element'; +import { Factory } from '../src/factory'; +import { Registry } from '../src/registry'; +import { StaveNote } from '../src/stavenote'; const RegistryTests = { Start(): void { diff --git a/tests/renderer_tests.ts b/tests/renderer_tests.ts index 84618b4d1b..72784a5056 100644 --- a/tests/renderer_tests.ts +++ b/tests/renderer_tests.ts @@ -4,15 +4,14 @@ // // Renderer Tests -import { CanvasContext } from 'canvascontext'; -import { Factory, FactoryOptions } from 'factory'; -import { Formatter } from 'formatter'; -import { RenderContext } from 'rendercontext'; -import { Renderer } from 'renderer'; -import { Stave } from 'stave'; -import { StaveNote } from 'stavenote'; -import { SVGContext } from 'svgcontext'; - +import { CanvasContext } from '../src/canvascontext'; +import { Factory, FactoryOptions } from '../src/factory'; +import { Formatter } from '../src/formatter'; +import { RenderContext } from '../src/rendercontext'; +import { Renderer } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { StaveNote } from '../src/stavenote'; +import { SVGContext } from '../src/svgcontext'; import { RuntimeError } from '../src/util'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; @@ -80,6 +79,7 @@ function random(options: TestOptions): void { canvasOrDivElement(options); } + // eslint-disable-next-line const element: any = document.getElementById(options.elementId); const colorForElementType = useElementIDString ? '#CCCCCC' /* light gray */ : '#0074d9'; /* blue */ const lineStyleForWhichAPI = useRendererAPI ? 'solid' : 'dashed'; diff --git a/tests/rests_tests.ts b/tests/rests_tests.ts index 61abfa6e26..44efad86dd 100644 --- a/tests/rests_tests.ts +++ b/tests/rests_tests.ts @@ -3,16 +3,15 @@ // // Rests Tests -import { Beam } from 'beam'; -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { StaveNote, StaveNoteStruct } from 'stavenote'; -import { Tuplet } from 'tuplet'; -import { Voice } from 'voice'; - +import { Beam } from '../src/beam'; +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { StaveNote, StaveNoteStruct } from '../src/stavenote'; +import { Tuplet } from '../src/tuplet'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const RestsTests = { diff --git a/tests/rhythm_tests.ts b/tests/rhythm_tests.ts index 7160fd3692..e97f796122 100644 --- a/tests/rhythm_tests.ts +++ b/tests/rhythm_tests.ts @@ -3,14 +3,13 @@ // // Rhythm Tests -import { Annotation } from 'annotation'; -import { Beam } from 'beam'; -import { Formatter } from 'formatter'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { BarlineType } from 'stavebarline'; -import { StaveNote } from 'stavenote'; - +import { Annotation } from '../src/annotation'; +import { Beam } from '../src/beam'; +import { Formatter } from '../src/formatter'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { BarlineType } from '../src/stavebarline'; +import { StaveNote } from '../src/stavenote'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const RhythmTests = { diff --git a/tests/run.ts b/tests/run.ts index 0ffd92d1e0..fc15b72a9c 100644 --- a/tests/run.ts +++ b/tests/run.ts @@ -1,5 +1,4 @@ -import { Vex } from 'vex'; - +import { Vex } from '../src/vex'; import { AccidentalTests } from './accidental_tests'; import { AnnotationTests } from './annotation_tests'; import { ArticulationTests } from './articulation_tests'; diff --git a/tests/stave_tests.ts b/tests/stave_tests.ts index 6e617ae5bc..29b7c696c7 100644 --- a/tests/stave_tests.ts +++ b/tests/stave_tests.ts @@ -6,23 +6,22 @@ // TODO: Like Stave.setTempo(t: StaveTempoOptions, ...), Stave.setText(...) could declare an interface called StaveTextOptions. // This helps developers because they can use the named type in their code for type checking. -import { Accidental } from 'accidental'; -import { Beam } from 'beam'; -import { Clef } from 'clef'; -import { Formatter } from 'formatter'; -import { KeySignature } from 'keysignature'; -import { Modifier } from 'modifier'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { Barline, BarlineType } from 'stavebarline'; -import { StaveModifier } from 'stavemodifier'; -import { StaveNote } from 'stavenote'; -import { Repetition } from 'staverepetition'; -import { StaveTempoOptions } from 'stavetempo'; -import { VoltaType } from 'stavevolta'; -import { Justification } from 'textnote'; -import { TimeSignature } from 'timesignature'; - +import { Accidental } from '../src/accidental'; +import { Beam } from '../src/beam'; +import { Clef } from '../src/clef'; +import { Formatter } from '../src/formatter'; +import { KeySignature } from '../src/keysignature'; +import { Modifier } from '../src/modifier'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { Barline, BarlineType } from '../src/stavebarline'; +import { StaveModifier } from '../src/stavemodifier'; +import { StaveNote } from '../src/stavenote'; +import { Repetition } from '../src/staverepetition'; +import { StaveTempoOptions } from '../src/stavetempo'; +import { VoltaType } from '../src/stavevolta'; +import { Justification } from '../src/textnote'; +import { TimeSignature } from '../src/timesignature'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StaveTests = { diff --git a/tests/staveconnector_tests.ts b/tests/staveconnector_tests.ts index d7f94ebcbc..dbd505d3d0 100644 --- a/tests/staveconnector_tests.ts +++ b/tests/staveconnector_tests.ts @@ -5,13 +5,12 @@ // TODO: Should we change StaveConnector.type => StaveConnectorType? We are inconsistent with this. -import { Flow } from 'flow'; -import { Modifier } from 'modifier'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { BarlineType } from 'stavebarline'; -import { StaveConnector } from 'staveconnector'; - +import { Flow } from '../src/flow'; +import { Modifier } from '../src/modifier'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { BarlineType } from '../src/stavebarline'; +import { StaveConnector } from '../src/staveconnector'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StaveConnectorTests = { diff --git a/tests/stavehairpin_tests.ts b/tests/stavehairpin_tests.ts index 8801db507c..79dffa2102 100644 --- a/tests/stavehairpin_tests.ts +++ b/tests/stavehairpin_tests.ts @@ -6,10 +6,9 @@ // TODO: Incorrect property names in the options object: vo, left_ho, right_ho. -import { RenderContext } from 'rendercontext'; -import { StaveHairpin, StaveHairpinRenderOptions } from 'stavehairpin'; -import { StaveNote } from 'stavenote'; - +import { RenderContext } from '../src/rendercontext'; +import { StaveHairpin, StaveHairpinRenderOptions } from '../src/stavehairpin'; +import { StaveNote } from '../src/stavenote'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StaveHairpinTests = { diff --git a/tests/stavemodifier_tests.ts b/tests/stavemodifier_tests.ts index 36b00c322d..91e5e0b0e2 100644 --- a/tests/stavemodifier_tests.ts +++ b/tests/stavemodifier_tests.ts @@ -3,11 +3,10 @@ // // StaveModifier Tests -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { BarlineType } from 'stavebarline'; -import { StaveModifierPosition } from 'stavemodifier'; - +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { BarlineType } from '../src/stavebarline'; +import { StaveModifierPosition } from '../src/stavemodifier'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StaveModifierTests = { diff --git a/tests/stavenote_tests.ts b/tests/stavenote_tests.ts index 056f9e7c9a..216560603d 100644 --- a/tests/stavenote_tests.ts +++ b/tests/stavenote_tests.ts @@ -6,25 +6,24 @@ // TODO: In StaveNote.preFormat() line 929, should noteHeadPadding default to StaveNote.minNoteheadPadding? // The bounding box of a note changes slightly when we add a ModifierContext (even if we add zero modifiers). -import { Accidental } from 'accidental'; -import { Annotation } from 'annotation'; -import { Articulation } from 'articulation'; -import { Beam } from 'beam'; -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { Fraction } from 'fraction'; -import { FretHandFinger } from 'frethandfinger'; -import { Modifier, ModifierPosition } from 'modifier'; -import { ModifierContext } from 'modifiercontext'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { StaveNote, StaveNoteStruct } from 'stavenote'; -import { Stem } from 'stem'; -import { StringNumber } from 'stringnumber'; -import { Stroke } from 'strokes'; -import { TickContext } from 'tickcontext'; - +import { Accidental } from '../src/accidental'; +import { Annotation } from '../src/annotation'; +import { Articulation } from '../src/articulation'; +import { Beam } from '../src/beam'; +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { Fraction } from '../src/fraction'; +import { FretHandFinger } from '../src/frethandfinger'; +import { Modifier, ModifierPosition } from '../src/modifier'; +import { ModifierContext } from '../src/modifiercontext'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { StaveNote, StaveNoteStruct } from '../src/stavenote'; +import { Stem } from '../src/stem'; +import { StringNumber } from '../src/stringnumber'; +import { Stroke } from '../src/strokes'; +import { TickContext } from '../src/tickcontext'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StaveNoteTests = { diff --git a/tests/stavetie_tests.ts b/tests/stavetie_tests.ts index 70dd2bf874..93654ff4fc 100644 --- a/tests/stavetie_tests.ts +++ b/tests/stavetie_tests.ts @@ -3,12 +3,11 @@ // // StaveTie Tests -import { BuilderOptions } from 'easyscore'; -import { Factory } from 'factory'; -import { Stave } from 'stave'; -import { StaveNote } from 'stavenote'; -import { Stem } from 'stem'; - +import { BuilderOptions } from '../src/easyscore'; +import { Factory } from '../src/factory'; +import { Stave } from '../src/stave'; +import { StaveNote } from '../src/stavenote'; +import { Stem } from '../src/stem'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StaveTieTests = { diff --git a/tests/stringnumber_tests.ts b/tests/stringnumber_tests.ts index 2eccdc5899..c2c82936ab 100644 --- a/tests/stringnumber_tests.ts +++ b/tests/stringnumber_tests.ts @@ -3,13 +3,12 @@ // // StringNumber Tests -import { Glyph } from 'glyph'; -import { Renderer } from 'renderer'; -import { Stave } from 'stave'; -import { BarlineType } from 'stavebarline'; -import { Stroke } from 'strokes'; -import { Tables } from 'tables'; - +import { Glyph } from '../src/glyph'; +import { Renderer } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { BarlineType } from '../src/stavebarline'; +import { Stroke } from '../src/strokes'; +import { Tables } from '../src/tables'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StringNumberTests = { diff --git a/tests/strokes_tests.ts b/tests/strokes_tests.ts index 910cff8d68..f6c477db0a 100644 --- a/tests/strokes_tests.ts +++ b/tests/strokes_tests.ts @@ -3,12 +3,11 @@ // // Strokes Tests -import { Beam } from 'beam'; -import { Bend } from 'bend'; -import { GraceNote, GraceNoteStruct } from 'gracenote'; -import { Barline } from 'stavebarline'; -import { Stroke } from 'strokes'; - +import { Beam } from '../src/beam'; +import { Bend } from '../src/bend'; +import { GraceNote, GraceNoteStruct } from '../src/gracenote'; +import { Barline } from '../src/stavebarline'; +import { Stroke } from '../src/strokes'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StrokesTests = { diff --git a/tests/style_tests.ts b/tests/style_tests.ts index 90d72888dd..45fa66714e 100644 --- a/tests/style_tests.ts +++ b/tests/style_tests.ts @@ -9,22 +9,21 @@ // TabNote sets its own font. // Is there a way to set all the text fonts in one go? -import { Annotation } from 'annotation'; -import { Articulation } from 'articulation'; -import { Bend } from 'bend'; -import { ElementStyle } from 'element'; -import { Formatter } from 'formatter'; -import { KeySignature } from 'keysignature'; -import { NoteSubGroup } from 'notesubgroup'; -import { Ornament } from 'ornament'; -import { ContextBuilder } from 'renderer'; -import { StaveModifierPosition } from 'stavemodifier'; -import { StaveNote } from 'stavenote'; -import { Stroke } from 'strokes'; -import { TabNote, TabNoteStruct } from 'tabnote'; -import { TabStave } from 'tabstave'; -import { TimeSignature } from 'timesignature'; - +import { Annotation } from '../src/annotation'; +import { Articulation } from '../src/articulation'; +import { Bend } from '../src/bend'; +import { ElementStyle } from '../src/element'; +import { Formatter } from '../src/formatter'; +import { KeySignature } from '../src/keysignature'; +import { NoteSubGroup } from '../src/notesubgroup'; +import { Ornament } from '../src/ornament'; +import { ContextBuilder } from '../src/renderer'; +import { StaveModifierPosition } from '../src/stavemodifier'; +import { StaveNote } from '../src/stavenote'; +import { Stroke } from '../src/strokes'; +import { TabNote, TabNoteStruct } from '../src/tabnote'; +import { TabStave } from '../src/tabstave'; +import { TimeSignature } from '../src/timesignature'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const StyleTests = { diff --git a/tests/support/qunit.js b/tests/support/qunit.js index 2fbd37d7e2..51315b6e9f 100644 --- a/tests/support/qunit.js +++ b/tests/support/qunit.js @@ -1268,7 +1268,7 @@ QUnit.assert = Assert.prototype = { popped = true; resumeProcessing(); } else { - test.pushFailure( "Called the callback returned from `assert.async` more than once", + test.pushFailure( "Called the callback returned from 'assert.async` more than once", sourceFromStacktrace( 2 ) ); } }; diff --git a/tests/tabnote_tests.ts b/tests/tabnote_tests.ts index 769c691615..b2fea02211 100644 --- a/tests/tabnote_tests.ts +++ b/tests/tabnote_tests.ts @@ -3,17 +3,16 @@ // // TabNote Tests -import { Flow } from 'flow'; -import { Font } from 'font'; -import { Formatter } from 'formatter'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { TabNote, TabNoteStruct } from 'tabnote'; -import { TabStave } from 'tabstave'; -import { TickContext } from 'tickcontext'; -import { Voice, VoiceMode } from 'voice'; - +import { Flow } from '../src/flow'; +import { Font } from '../src/font'; +import { Formatter } from '../src/formatter'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { TabNote, TabNoteStruct } from '../src/tabnote'; +import { TabStave } from '../src/tabstave'; +import { TickContext } from '../src/tickcontext'; +import { Voice, VoiceMode } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const TabNoteTests = { diff --git a/tests/tabslide_tests.ts b/tests/tabslide_tests.ts index f570dae75a..d7c8ce1e33 100644 --- a/tests/tabslide_tests.ts +++ b/tests/tabslide_tests.ts @@ -3,16 +3,15 @@ // // TabSlide Tests -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { TieNotes } from 'stavetie'; -import { TabNote, TabNoteStruct } from 'tabnote'; -import { TabSlide } from 'tabslide'; -import { TabStave } from 'tabstave'; -import { Voice } from 'voice'; - +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { TieNotes } from '../src/stavetie'; +import { TabNote, TabNoteStruct } from '../src/tabnote'; +import { TabSlide } from '../src/tabslide'; +import { TabStave } from '../src/tabstave'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const TabSlideTests = { diff --git a/tests/tabstave_tests.ts b/tests/tabstave_tests.ts index 7c459000f6..3bb122d89d 100644 --- a/tests/tabstave_tests.ts +++ b/tests/tabstave_tests.ts @@ -3,9 +3,8 @@ // // TabStave Tests -import { ContextBuilder } from 'renderer'; -import { TabStave } from 'tabstave'; - +import { ContextBuilder } from '../src/renderer'; +import { TabStave } from '../src/tabstave'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const TabStaveTests = { diff --git a/tests/tabtie_tests.ts b/tests/tabtie_tests.ts index ca61ec31c1..766f6bee98 100644 --- a/tests/tabtie_tests.ts +++ b/tests/tabtie_tests.ts @@ -3,19 +3,18 @@ // // TabTie Tests -import { Annotation } from 'annotation'; -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { Note } from 'note'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { TieNotes } from 'stavetie'; -import { TabNote, TabNoteStruct } from 'tabnote'; -import { TabStave } from 'tabstave'; -import { TabTie } from 'tabtie'; -import { Voice } from 'voice'; - +import { Annotation } from '../src/annotation'; +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { Note } from '../src/note'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { TieNotes } from '../src/stavetie'; +import { TabNote, TabNoteStruct } from '../src/tabnote'; +import { TabStave } from '../src/tabstave'; +import { TabTie } from '../src/tabtie'; +import { Voice } from '../src/voice'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const TabTieTests = { diff --git a/tests/textnote_tests.ts b/tests/textnote_tests.ts index 8a35f7c39b..689078b43e 100644 --- a/tests/textnote_tests.ts +++ b/tests/textnote_tests.ts @@ -8,11 +8,11 @@ // TODO: TextNote needs a setFont() accessor. -import { Crescendo } from 'crescendo'; -import { Flow } from 'flow'; -import { Note } from 'note'; -import { TextNote } from 'textnote'; -import { Stave } from 'stave'; +import { Crescendo } from '../src/crescendo'; +import { Flow } from '../src/flow'; +import { Note } from '../src/note'; +import { TextNote } from '../src/textnote'; +import { Stave } from '../src/stave'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; diff --git a/tests/threevoice_tests.ts b/tests/threevoice_tests.ts index 22d3812084..0bcd30bba0 100644 --- a/tests/threevoice_tests.ts +++ b/tests/threevoice_tests.ts @@ -3,12 +3,11 @@ // // Three Voices Tests - Three voices in single staff. -import { Beam } from 'beam'; -import { BuilderOptions } from 'easyscore'; -import { Factory } from 'factory'; -import { Note } from 'note'; -import { Voice } from 'voice'; - +import { Beam } from '../src/beam'; +import { BuilderOptions } from '../src/easyscore'; +import { Factory } from '../src/factory'; +import { Note } from '../src/note'; +import { Voice } from '../src/voice'; import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers'; const ThreeVoicesTests = { diff --git a/tests/tickcontext_tests.ts b/tests/tickcontext_tests.ts index 8fd9c3ede0..49eafccb34 100644 --- a/tests/tickcontext_tests.ts +++ b/tests/tickcontext_tests.ts @@ -3,9 +3,8 @@ // // TickContext Tests -import { Flow } from 'flow'; -import { TickContext } from 'tickcontext'; - +import { Flow } from '../src/flow'; +import { TickContext } from '../src/tickcontext'; import { MockTickable } from './mocks'; const TickContextTests = { diff --git a/tests/timesignature_tests.ts b/tests/timesignature_tests.ts index bc7d63f36c..ba3ffb6446 100644 --- a/tests/timesignature_tests.ts +++ b/tests/timesignature_tests.ts @@ -3,11 +3,10 @@ // // TimeSignature Tests -import { ContextBuilder } from 'renderer'; -import { Stave, StaveLineConfig } from 'stave'; -import { StaveConnector } from 'staveconnector'; -import { TimeSignature } from 'timesignature'; - +import { ContextBuilder } from '../src/renderer'; +import { Stave, StaveLineConfig } from '../src/stave'; +import { StaveConnector } from '../src/staveconnector'; +import { TimeSignature } from '../src/timesignature'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const TimeSignatureTests = { diff --git a/tests/tremolo_tests.ts b/tests/tremolo_tests.ts index 6ef0665cab..b80b00f34a 100644 --- a/tests/tremolo_tests.ts +++ b/tests/tremolo_tests.ts @@ -3,9 +3,8 @@ // // Tremolo Tests -import { Barline } from 'stavebarline'; -import { Tremolo } from 'tremolo'; - +import { Barline } from '../src/stavebarline'; +import { Tremolo } from '../src/tremolo'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const TremoloTests = { diff --git a/tests/tuning_tests.ts b/tests/tuning_tests.ts index 8aeff95c30..314212f52f 100644 --- a/tests/tuning_tests.ts +++ b/tests/tuning_tests.ts @@ -3,7 +3,7 @@ // // Tuning Tests -import { Tuning } from 'tuning'; +import { Tuning } from '../src/tuning'; const TuningTests = { Start(): void { diff --git a/tests/tuplet_tests.ts b/tests/tuplet_tests.ts index 29ec3fb783..6123f0c1d0 100644 --- a/tests/tuplet_tests.ts +++ b/tests/tuplet_tests.ts @@ -3,10 +3,9 @@ // // Tuplet Tests -import { Formatter } from 'formatter'; -import { Stem } from 'stem'; -import { Tuplet } from 'tuplet'; - +import { Formatter } from '../src/formatter'; +import { Stem } from '../src/stem'; +import { Tuplet } from '../src/tuplet'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const TupletTests = { diff --git a/tests/typeguard_tests.ts b/tests/typeguard_tests.ts index 98a0a4dbae..79b60da41c 100644 --- a/tests/typeguard_tests.ts +++ b/tests/typeguard_tests.ts @@ -7,10 +7,10 @@ // eslint-disable-next-line // @ts-nocheck to support ES5 style class declaration in the fakeES5() test case. -import { StaveNote } from 'stavenote'; -import { StemmableNote } from 'stemmablenote'; -import { TabNote } from 'tabnote'; -import { isCategory, isNote, isStaveNote, isStemmableNote, isTabNote } from 'typeguard'; +import { StaveNote } from '../src/stavenote'; +import { StemmableNote } from '../src/stemmablenote'; +import { TabNote } from '../src/tabnote'; +import { isCategory, isNote, isStaveNote, isStemmableNote, isTabNote } from '../src/typeguard'; const TypeGuardTests = { Start(): void { diff --git a/tests/vexflow_test_helpers.ts b/tests/vexflow_test_helpers.ts index c62e5c0cff..1cea0f7601 100644 --- a/tests/vexflow_test_helpers.ts +++ b/tests/vexflow_test_helpers.ts @@ -3,12 +3,11 @@ // // VexFlow Test Support Library -import { Factory } from 'factory'; -import { Flow } from 'flow'; -import { Font, Fonts } from 'font'; -import { RenderContext } from 'rendercontext'; -import { ContextBuilder, Renderer } from 'renderer'; - +import { Factory } from '../src/factory'; +import { Flow } from '../src/flow'; +import { Font, Fonts } from '../src/font'; +import { RenderContext } from '../src/rendercontext'; +import { ContextBuilder, Renderer } from '../src/renderer'; import { Assert } from './types/qunit'; /* eslint-disable */ diff --git a/tests/vf_prefix_tests.ts b/tests/vf_prefix_tests.ts index 3704e8f0cc..1d4a3c98f7 100644 --- a/tests/vf_prefix_tests.ts +++ b/tests/vf_prefix_tests.ts @@ -5,83 +5,83 @@ // // VexFlow classes are available under the global Vex.Flow.* namespace. -import { Accidental } from 'accidental'; -import { Annotation } from 'annotation'; -import { Articulation } from 'articulation'; -import { BarNote } from 'barnote'; -import { Beam } from 'beam'; -import { Bend } from 'bend'; -import { BoundingBox } from 'boundingbox'; -import { BoundingBoxComputation } from 'boundingboxcomputation'; -import { ChordSymbol } from 'chordsymbol'; -import { Clef } from 'clef'; -import { ClefNote } from 'clefnote'; -import { Crescendo } from 'crescendo'; -import { Curve } from 'curve'; -import { Dot } from 'dot'; -import { EasyScore } from 'easyscore'; -import { Element } from 'element'; -import { Factory } from 'factory'; -import { Flow } from 'flow'; -import { Font, Fonts } from 'font'; -import { Formatter } from 'formatter'; -import { Fraction } from 'fraction'; -import { FretHandFinger } from 'frethandfinger'; -import { GhostNote } from 'ghostnote'; -import { Glyph } from 'glyph'; -import { GlyphNote } from 'glyphnote'; -import { GraceNote } from 'gracenote'; -import { GraceNoteGroup } from 'gracenotegroup'; -import { GraceTabNote } from 'gracetabnote'; -import { KeyManager } from 'keymanager'; -import { KeySignature } from 'keysignature'; -import { KeySigNote } from 'keysignote'; -import { Modifier } from 'modifier'; -import { ModifierContext } from 'modifiercontext'; -import { MultiMeasureRest } from 'multimeasurerest'; -import { Music } from 'music'; -import { Note } from 'note'; -import { NoteHead } from 'notehead'; -import { NoteSubGroup } from 'notesubgroup'; -import { Ornament } from 'ornament'; -import { Parser } from 'parser'; -import { PedalMarking } from 'pedalmarking'; -import { Registry } from 'registry'; -import { Renderer } from 'renderer'; -import { RepeatNote } from 'repeatnote'; -import { Stave } from 'stave'; -import { Barline } from 'stavebarline'; -import { StaveConnector } from 'staveconnector'; -import { StaveHairpin } from 'stavehairpin'; -import { StaveLine } from 'staveline'; -import { StaveModifier } from 'stavemodifier'; -import { StaveNote } from 'stavenote'; -import { Repetition } from 'staverepetition'; -import { StaveTempo } from 'stavetempo'; -import { StaveText } from 'stavetext'; -import { StaveTie } from 'stavetie'; -import { Volta } from 'stavevolta'; -import { Stem } from 'stem'; -import { StringNumber } from 'stringnumber'; -import { Stroke } from 'strokes'; -import { System } from 'system'; -import { TabNote } from 'tabnote'; -import { TabSlide } from 'tabslide'; -import { TabStave } from 'tabstave'; -import { TabTie } from 'tabtie'; -import { TextBracket } from 'textbracket'; -import { TextDynamics } from 'textdynamics'; -import { TextFont } from 'textfont'; -import { TextNote } from 'textnote'; -import { TickContext } from 'tickcontext'; -import { TimeSignature } from 'timesignature'; -import { TimeSigNote } from 'timesignote'; -import { Tremolo } from 'tremolo'; -import { Tuning } from 'tuning'; -import { Tuplet } from 'tuplet'; -import { Vibrato } from 'vibrato'; -import { VibratoBracket } from 'vibratobracket'; -import { Voice } from 'voice'; +import { Accidental } from '../src/accidental'; +import { Annotation } from '../src/annotation'; +import { Articulation } from '../src/articulation'; +import { BarNote } from '../src/barnote'; +import { Beam } from '../src/beam'; +import { Bend } from '../src/bend'; +import { BoundingBox } from '../src/boundingbox'; +import { BoundingBoxComputation } from '../src/boundingboxcomputation'; +import { ChordSymbol } from '../src/chordsymbol'; +import { Clef } from '../src/clef'; +import { ClefNote } from '../src/clefnote'; +import { Crescendo } from '../src/crescendo'; +import { Curve } from '../src/curve'; +import { Dot } from '../src/dot'; +import { EasyScore } from '../src/easyscore'; +import { Element } from '../src/element'; +import { Factory } from '../src/factory'; +import { Flow } from '../src/flow'; +import { Font, Fonts } from '../src/font'; +import { Formatter } from '../src/formatter'; +import { Fraction } from '../src/fraction'; +import { FretHandFinger } from '../src/frethandfinger'; +import { GhostNote } from '../src/ghostnote'; +import { Glyph } from '../src/glyph'; +import { GlyphNote } from '../src/glyphnote'; +import { GraceNote } from '../src/gracenote'; +import { GraceNoteGroup } from '../src/gracenotegroup'; +import { GraceTabNote } from '../src/gracetabnote'; +import { KeyManager } from '../src/keymanager'; +import { KeySignature } from '../src/keysignature'; +import { KeySigNote } from '../src/keysignote'; +import { Modifier } from '../src/modifier'; +import { ModifierContext } from '../src/modifiercontext'; +import { MultiMeasureRest } from '../src/multimeasurerest'; +import { Music } from '../src/music'; +import { Note } from '../src/note'; +import { NoteHead } from '../src/notehead'; +import { NoteSubGroup } from '../src/notesubgroup'; +import { Ornament } from '../src/ornament'; +import { Parser } from '../src/parser'; +import { PedalMarking } from '../src/pedalmarking'; +import { Registry } from '../src/registry'; +import { Renderer } from '../src/renderer'; +import { RepeatNote } from '../src/repeatnote'; +import { Stave } from '../src/stave'; +import { Barline } from '../src/stavebarline'; +import { StaveConnector } from '../src/staveconnector'; +import { StaveHairpin } from '../src/stavehairpin'; +import { StaveLine } from '../src/staveline'; +import { StaveModifier } from '../src/stavemodifier'; +import { StaveNote } from '../src/stavenote'; +import { Repetition } from '../src/staverepetition'; +import { StaveTempo } from '../src/stavetempo'; +import { StaveText } from '../src/stavetext'; +import { StaveTie } from '../src/stavetie'; +import { Volta } from '../src/stavevolta'; +import { Stem } from '../src/stem'; +import { StringNumber } from '../src/stringnumber'; +import { Stroke } from '../src/strokes'; +import { System } from '../src/system'; +import { TabNote } from '../src/tabnote'; +import { TabSlide } from '../src/tabslide'; +import { TabStave } from '../src/tabstave'; +import { TabTie } from '../src/tabtie'; +import { TextBracket } from '../src/textbracket'; +import { TextDynamics } from '../src/textdynamics'; +import { TextFont } from '../src/textfont'; +import { TextNote } from '../src/textnote'; +import { TickContext } from '../src/tickcontext'; +import { TimeSignature } from '../src/timesignature'; +import { TimeSigNote } from '../src/timesignote'; +import { Tremolo } from '../src/tremolo'; +import { Tuning } from '../src/tuning'; +import { Tuplet } from '../src/tuplet'; +import { Vibrato } from '../src/vibrato'; +import { VibratoBracket } from '../src/vibratobracket'; +import { Voice } from '../src/voice'; const VFPrefixTests = { Start(): void { diff --git a/tests/vibrato_tests.ts b/tests/vibrato_tests.ts index 0ff768cee2..c19a62db50 100644 --- a/tests/vibrato_tests.ts +++ b/tests/vibrato_tests.ts @@ -3,13 +3,12 @@ // // Vibrato Tests -import { Bend } from 'bend'; -import { Formatter } from 'formatter'; -import { ContextBuilder } from 'renderer'; -import { TabNote, TabNoteStruct } from 'tabnote'; -import { TabStave } from 'tabstave'; -import { Vibrato } from 'vibrato'; - +import { Bend } from '../src/bend'; +import { Formatter } from '../src/formatter'; +import { ContextBuilder } from '../src/renderer'; +import { TabNote, TabNoteStruct } from '../src/tabnote'; +import { TabStave } from '../src/tabstave'; +import { Vibrato } from '../src/vibrato'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const VibratoTests = { diff --git a/tests/vibratobracket_tests.ts b/tests/vibratobracket_tests.ts index 6e425f5ef6..17294b64f2 100644 --- a/tests/vibratobracket_tests.ts +++ b/tests/vibratobracket_tests.ts @@ -6,10 +6,9 @@ // TODO: It's annoying to have to cast "as Note" or "as Note[]". Could we add a method to Voice to get the tickables as Note[]? Voice.getTickables() vs Voice.getNotes()? -import { Factory } from 'factory'; -import { Note } from 'note'; -import { Tickable } from 'tickable'; - +import { Factory } from '../src/factory'; +import { Note } from '../src/note'; +import { Tickable } from '../src/tickable'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers'; const VibratoBracketTests = { diff --git a/tests/voice_tests.ts b/tests/voice_tests.ts index 37010f3157..f983f99ca4 100644 --- a/tests/voice_tests.ts +++ b/tests/voice_tests.ts @@ -3,14 +3,13 @@ // // Voice Tests -import { Flow } from 'flow'; -import { Formatter } from 'formatter'; -import { ContextBuilder } from 'renderer'; -import { Stave } from 'stave'; -import { Barline } from 'stavebarline'; -import { StaveNote } from 'stavenote'; -import { Voice } from 'voice'; - +import { Flow } from '../src/flow'; +import { Formatter } from '../src/formatter'; +import { ContextBuilder } from '../src/renderer'; +import { Stave } from '../src/stave'; +import { Barline } from '../src/stavebarline'; +import { StaveNote } from '../src/stavenote'; +import { Voice } from '../src/voice'; import { MockTickable } from './mocks'; import { TestOptions, VexFlowTests } from './vexflow_test_helpers';