Use defined() in Glyph, Modifier, Note, Ornament.

0xfe · Aug 31, 2021 · 9f0f53d · 9f0f53d
1 parent 9ca2f0a
commit 9f0f53d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/src/glyph.ts b/src/glyph.ts
@@ -200,9 +200,7 @@ export class Glyph extends Element {
   }
 
   static lookupGlyph(fontStack: Font[], code: string): { font: Font; glyph: FontGlyph } {
-    if (!fontStack) {
-      throw new RuntimeError('BAD_FONTSTACK', 'Font stack is misconfigured');
-    }
+    defined(fontStack, 'BadFontStack', 'Font stack is misconfigured');
 
     let glyph: FontGlyph;
     let font: Font;

diff --git a/src/modifier.ts b/src/modifier.ts
@@ -103,16 +103,16 @@ export class Modifier extends Element {
 
   /** Get attached note (`StaveNote`, `TabNote`, etc.) */
   getNote(): Note {
-    if (!this.note) throw new RuntimeError('NoNote', 'Modifier has no note.');
-    return this.note;
+    return defined(this.note, 'NoNote', 'Modifier has no note.');
   }
 
-  /** Check and get attached note (`StaveNote`, `TabNote`, etc.) */
+  /**
+   * Used in draw() to check and get the attached note (`StaveNote`, `TabNote`, etc.).
+   * Also verifies that the index is valid.
+   */
   checkAttachedNote(): Note {
-    if (!this.note || this.index === undefined) {
-      throw new RuntimeError('NoAttachedNote', `Can't draw ${this.getCategory()} without a note and index.`);
-    }
-    return this.note;
+    defined(this.index, 'NoIndex', `Can't draw ${this.getCategory()} without an index.`);
+    return defined(this.note, 'NoNote', `Can't draw ${this.getCategory()} without a note.`);
   }
 
   /**
@@ -131,10 +131,7 @@ export class Modifier extends Element {
 
   /** Check and get note index, which is a specific note in a chord. */
   checkIndex(): number {
-    if (this.index === undefined) {
-      throw new RuntimeError('NoIndex', 'Modifier has an invalid index.');
-    }
-    return this.index;
+    return defined(this.index, 'NoIndex', 'Modifier has an invalid index.');
   }
 
   /** Set note index, which is a specific note in a chord. */

diff --git a/src/note.ts b/src/note.ts
@@ -499,10 +499,7 @@ export abstract class Note extends Tickable {
 
   /** Check and get the beam. */
   checkBeam(): Beam {
-    if (!this.beam) {
-      throw new RuntimeError('NoBeam', 'No beam attached to instance');
-    }
-    return this.beam;
+    return defined(this.beam, 'NoBeam', 'No beam attached to instance');
   }
 
   /** Check it has a beam. */

diff --git a/src/ornament.ts b/src/ornament.ts
@@ -2,7 +2,7 @@
 // Author: Cyril Silverman
 // MIT License
 
-import { RuntimeError, log } from './util';
+import { RuntimeError, log, defined } from './util';
 import { Flow } from './flow';
 import { Modifier } from './modifier';
 import { TickContext } from './tickcontext';
@@ -83,10 +83,8 @@ export class Ornament extends Modifier {
       if (Ornament.ornamentArticulation.indexOf(ornament.type) >= 0) {
         // Unfortunately we don't know the stem direction.  So we base it
         // on the line number, but also allow it to be overridden.
-        if (!ornament.note) {
-          throw new RuntimeError('NoAttachedNote');
-        }
-        if (ornament.note.getLineNumber() >= 3 || ornament.getPosition() === Modifier.Position.ABOVE) {
+        const ornamentNote = defined(ornament.note, 'NoAttachedNote');
+        if (ornamentNote.getLineNumber() >= 3 || ornament.getPosition() === Modifier.Position.ABOVE) {
           state.top_text_line += increment;
           ornament.y_shift += yOffset;
           yOffset -= ornament.glyph.bbox.getH();