Use correct metadata separator in TextFormatter (#1603)

Author: martijnversluis

package.json

@@ -68,6 +68,7 @@
     "debug:chords-over-words": "yarn build && tsx script/debug_parser.ts chords_over_words --include-chord-grammar",
     "eslint": "node_modules/.bin/eslint",
     "lint": "yarn unibuild lint",
+    "lint:fix": "yarn unibuild lint --fix",
     "prepare": "yarn install && yarn build",
     "release": "yarn unibuild release",
     "test": "yarn unibuild lint && yarn unibuild test",

src/formatter/text_formatter.ts

@@ -2,7 +2,7 @@ import Formatter from './formatter';
 import ChordLyricsPair from '../chord_sheet/chord_lyrics_pair';
 import Tag from '../chord_sheet/tag';
 import { renderChord } from '../helpers';
-import { hasTextContents, renderSection } from '../template_helpers';
+import { evaluate, hasTextContents, renderSection } from '../template_helpers';
 import Song from '../chord_sheet/song';
 import { hasRemarkContents, isEmptyString, padLeft } from '../utilities';
 import Paragraph from '../chord_sheet/paragraph';
@@ -169,7 +169,7 @@ class TextFormatter extends Formatter {
     }
 
     if ('evaluate' in item) {
-      return item.evaluate(metadata, this.configuration.metadataSeparator);
+      return evaluate(item, metadata, this.configuration);
     }
 
     return '';

test/formatter/text_formatter.test.ts

@@ -6,7 +6,7 @@ import { GRID } from '../../src/constants';
 import { ContentType } from '../../src/serialized_types';
 
 import {
-  ABC, LILYPOND, TAB, TextFormatter,
+  ABC, ChordProParser, LILYPOND, TAB, TextFormatter,
 } from '../../src';
 
 import {
@@ -237,6 +237,24 @@ Let it be, let it be, let it be, let it be`;
     expect(formatted).toEqual('Asus2\nLet it be');
   });
 
+  it('can use a custom metadata separator', () => {
+    const song = new ChordProParser().parse(heredoc`
+      {composer: John}
+      {composer: Jane}
+
+      Composers: %{composer}
+    `);
+
+    const rendered = new TextFormatter({
+      metadata: {
+        separator: ' and ',
+      },
+    })
+      .format(song);
+
+    expect(rendered).toEqual('Composers: John and Jane');
+  });
+
   describe('delegates', () => {
     [ABC, GRID, LILYPOND, TAB].forEach((type) => {
       describe(`for ${type}`, () => {