Ensure Song#getChords() returns unique chords (#1487)

martijnversluis · Dec 4, 2024 · 723f45f · 723f45f
1 parent a9f2ae5
commit 723f45f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/chord_sheet/song.ts b/src/chord_sheet/song.ts
@@ -17,6 +17,7 @@ import Tag, {
 } from './tag';
 import SongBuilder from '../song_builder';
 import ChordDefinition from './chord_pro/chord_definition';
+import Chord from '../chord';
 
 type EachItemCallback = (_item: Item) => void;
 
@@ -435,7 +436,11 @@ Or set the song key before changing key:
       const itemChords = (item as ChordLyricsPair).chords;
 
       if (itemChords && itemChords.length > 0) {
-        chords.add(itemChords);
+        const parsedChord = Chord.parse(itemChords);
+
+        if (parsedChord) {
+          chords.add(parsedChord.toString());
+        }
       }
     });
 

diff --git a/test/chord_sheet/song.test.ts b/test/chord_sheet/song.test.ts
@@ -308,15 +308,18 @@ describe('Song', () => {
           createChordLyricsPair('CM7', 'let'),
           createChordLyricsPair('', 'it'),
           createChordLyricsPair('Dm7', ''),
+          createChordLyricsPair('Dm7   ', ''),
         ]),
         createLine([]),
         createLine([
           createChordLyricsPair('F#', 'be'),
+          createChordLyricsPair('d#', 'be'),
+          createChordLyricsPair('     F#', 'be'),
           createChordLyricsPair('', 'changed'),
         ]),
       ]);
 
-      expect(song.getChords()).toEqual(['CM7', 'Dm7', 'F#']);
+      expect(song.getChords()).toEqual(['CM7', 'Dm7', 'F#', 'D#']);
     });
 
     it('returns an empty array if there are no chords in the song', () => {