Merge pull request #38 from ishythefishy/theoretical-scale-bug-fix

bugfix(theoretical-scales): Construct full harmonic to compare with to prevent wrong co…

Author: whitep4nth3r

apps/fretonator-web/src/app/common/fretonator/scale-map/get-enharmonic-router-link.pipe.spec.ts

@@ -12,4 +12,8 @@ describe('GetEnharmonicRouterLinkPipe', () => {
   it('returns correctly for g sharp ionian', () => {
     expect(pipe.transform('g', 'sharp', 'ionian')).toStrictEqual(['/', 'a', 'flat', 'ionian']);
   });
+
+  it('returns correctly for g flat minorPentatonic', () => {
+    expect(pipe.transform('g', 'flat', 'minorPentatonic')).toStrictEqual(['/', 'f', 'sharp', 'minorPentatonic']);
+  });
 });

apps/fretonator-web/src/app/common/fretonator/scale-map/get-enharmonic-router-link.pipe.ts

@@ -10,12 +10,13 @@ export class GetEnharmonicRouterLinkPipe implements PipeTransform {
   transform(note: string, noteExtenderString: string, mode: string): string[] {
     let newNote;
 
+    const extenderStringAsSymbol = noteExtenderString === 'sharp' ? '#' : '♭';
+    const enharmonicItem = note.toUpperCase() + extenderStringAsSymbol;
+
     for(const group of Enharmonics) {
-        if (group[0].includes(note.toUpperCase())) {
+        if (group[0] === enharmonicItem) {
             newNote = group[1].charAt(0).toLowerCase();
-        }
-
-        if (group[1].includes(note.toUpperCase())) {
+        } else if (group[1] === enharmonicItem) {
           newNote = group[0].charAt(0).toLowerCase();
         }
     }