chordsheetjs 12.1.2 → 12.1.3

package/lib/bundle.js

@@ -2724,6 +2724,9 @@ var ChordSheetJS = (() => {
         "": ""
       };
       var $5f19a6aa6bc347f1$export$2e2bcd8739ae039 = $5f19a6aa6bc347f1$var$mapping;
+      function $28a2fcb6fb95a147$export$79570e60478bce41(value, functions) {
+        return functions.reduce((acc, fn) => fn(acc), value);
+      }
       function $28a2fcb6fb95a147$export$d332d76d125f0cbe(line) {
         return line.items.some((item) => item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039) && !!item.chords);
       }
@@ -5241,10 +5244,26 @@ to a key`);
           return line.items.map((item) => this.formatItem(item, metadata)).join("");
         }
         formatItem(item, metadata) {
-          if (item instanceof (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)) return this.formatTag(item);
-          if (item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039)) return this.formatChordLyricsPair(item);
-          if (item instanceof (0, $0bd084786477abba$export$2e2bcd8739ae039)) return this.formatComment(item);
-          if (item instanceof (0, $4b6dd3e4b817bd81$export$2e2bcd8739ae039)) return "\\ ";
+          const handlers = /* @__PURE__ */ new Map([
+            [
+              (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039),
+              (i) => this.formatTag(i)
+            ],
+            [
+              (0, $551a223fc13b5c10$export$2e2bcd8739ae039),
+              (i) => this.formatChordLyricsPair(i)
+            ],
+            [
+              (0, $0bd084786477abba$export$2e2bcd8739ae039),
+              (i) => this.formatComment(i)
+            ],
+            [
+              (0, $4b6dd3e4b817bd81$export$2e2bcd8739ae039),
+              (_i) => "\\ "
+            ]
+          ]);
+          const handler = handlers.get(item.constructor);
+          if (handler) return handler(item);
           if ("evaluate" in item) return this.formatOrEvaluateItem(item, metadata);
           throw new Error(`Don't know how to format a ${item}`);
         }
@@ -5397,16 +5416,17 @@ to a key`);
       function $51ced2cf8b50f946$var$combinableChordLyricsPairs(itemA, itemB) {
         return $51ced2cf8b50f946$var$isChordLyricsPair(itemA) && $51ced2cf8b50f946$var$isChordLyricsPair(itemB) && itemA.chords.length > 0 && itemB.chords.length === 0;
       }
+      function $51ced2cf8b50f946$var$combineLyrics(pairA, pairB) {
+        return {
+          ...pairA,
+          lyrics: `${pairA.lyrics}${pairB.lyrics}`
+        };
+      }
       function $51ced2cf8b50f946$export$ce8f3be11402ed10(items, chopFirstWord) {
         if (chopFirstWord !== false) return items;
         const combinedItems = [];
         for (let i = 0, { length } = items; i < length; i += 1) if ($51ced2cf8b50f946$var$combinableChordLyricsPairs(items[i], items[i + 1])) {
-          const item = items[i];
-          const nextItem = items[i + 1];
-          combinedItems.push({
-            ...item,
-            lyrics: `${item.lyrics}${nextItem.lyrics}`
-          });
+          combinedItems.push($51ced2cf8b50f946$var$combineLyrics(items[i], items[i + 1]));
           i += 1;
         } else combinedItems.push(items[i]);
         return combinedItems;
@@ -9703,6 +9723,9 @@ to a key`);
             this.metadata[key] = value;
             return;
           }
+          this.appendValue(key, value);
+        }
+        appendValue(key, value) {
           const currentValue = this.metadata[key];
           if (currentValue === value) return;
           if (currentValue instanceof Array) {
@@ -10044,64 +10067,88 @@ to a key`);
         }
       };
       var $69c885ea9d252cfd$export$2e2bcd8739ae039 = $69c885ea9d252cfd$var$SongBuilder;
+      var $e02a17f5a26edf19$var$ChordRenderer = class {
+        constructor({ capo, contextKey, decapo, normalizeChords, renderKey, songKey, style, transposeKey, useUnicodeModifier } = {
+          capo: 0,
+          contextKey: null,
+          decapo: false,
+          normalizeChords: true,
+          renderKey: null,
+          songKey: null,
+          style: null,
+          transposeKey: null,
+          useUnicodeModifier: false
+        }) {
+          this.capo = decapo ? capo : 0;
+          this.contextKey = contextKey;
+          this.normalizeChords = normalizeChords;
+          this.renderKey = renderKey;
+          this.songKey = songKey;
+          this.style = style;
+          this.transposeKey = transposeKey;
+          this.useUnicodeModifier = useUnicodeModifier;
+        }
+        render(chordString) {
+          const chord = (0, $177a605b8569b31c$export$2e2bcd8739ae039).parse(chordString);
+          if (!chord) return chordString;
+          return (0, $28a2fcb6fb95a147$export$79570e60478bce41)(chord, [
+            (c) => c.transpose(this.effectiveTransposeDistance),
+            (c) => this.modifier ? c.useModifier(this.modifier) : c,
+            (c) => this.normalizeChords ? c.normalize(this.effectiveKey) : c,
+            (c) => this.changeChordType(c)
+          ]).toString({
+            useUnicodeModifier: this.useUnicodeModifier
+          });
+        }
+        changeChordType(chord) {
+          switch (this.style) {
+            case "symbol":
+              return chord.toChordSymbol(this.effectiveKey);
+            case "solfege":
+              return chord.toChordSolfege(this.effectiveKey);
+            case "numeral":
+              return chord.toNumeral(this.effectiveKey);
+            case "number":
+              return chord.toNumeric(this.effectiveKey);
+            default:
+              return chord;
+          }
+        }
+        get modifier() {
+          return this.renderKey?.modifier || this.contextKey?.modifier || null;
+        }
+        get effectiveKey() {
+          if (this.renderKey) return this.renderKey;
+          if (!this.contextKey) return null;
+          return this.contextKey.transpose(this.effectiveTransposeDistance);
+        }
+        get effectiveTransposeDistance() {
+          let transpose = -1 * this.capo;
+          if (this.songKey) {
+            if (this.transposeKey) transpose += (0, $2ce1086ce25c9ac0$export$fd31a53e6281557e)(this.transposeKey, this.songKey);
+            if (this.renderKey) transpose += (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).distance(this.songKey, this.renderKey);
+          }
+          return transpose;
+        }
+      };
+      var $e02a17f5a26edf19$export$2e2bcd8739ae039 = $e02a17f5a26edf19$var$ChordRenderer;
       function $2ce1086ce25c9ac0$export$fd31a53e6281557e(transposeKey, songKey) {
         if (/^\d+$/.test(transposeKey)) return parseInt(transposeKey, 10);
         return (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).distance(songKey, transposeKey);
       }
-      function $2ce1086ce25c9ac0$var$chordTransposeDistance(capo, transposeKey, songKey, renderKey) {
-        let transpose = -1 * (capo || 0);
-        if (songKey) {
-          if (transposeKey) transpose += $2ce1086ce25c9ac0$export$fd31a53e6281557e(transposeKey, songKey);
-          if (renderKey) transpose += (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).distance(songKey, renderKey);
-        }
-        return transpose;
-      }
-      function $2ce1086ce25c9ac0$var$changeChordType(chord, type, referenceKey) {
-        switch (type) {
-          case "symbol":
-            return chord.toChordSymbol(referenceKey);
-          case "solfege":
-            return chord.toChordSolfege(referenceKey);
-          case "numeral":
-            return chord.toNumeral(referenceKey);
-          case "number":
-            return chord.toNumeric(referenceKey);
-          default:
-            return chord;
-        }
-      }
-      function $2ce1086ce25c9ac0$var$effectiveModifier(renderKey, contextKey) {
-        if (renderKey?.modifier) return renderKey.modifier;
-        if (contextKey?.modifier) return contextKey.modifier;
-        return null;
-      }
-      function $2ce1086ce25c9ac0$var$shapeChord({ chord, effectiveTransposeDistance, modifier, normalizeChords, effectiveKey, chordStyle }) {
-        const transposedChord = chord.transpose(effectiveTransposeDistance);
-        const correctedChord = modifier ? transposedChord.useModifier(modifier) : transposedChord;
-        const normalizedChord = normalizeChords ? correctedChord.normalize(effectiveKey) : transposedChord;
-        return $2ce1086ce25c9ac0$var$changeChordType(normalizedChord, chordStyle, effectiveKey);
-      }
       function $2ce1086ce25c9ac0$export$596ec52955da9472(chordString, line, song, { renderKey = null, useUnicodeModifier = false, normalizeChords = true, decapo = false } = {}) {
-        const chord = (0, $177a605b8569b31c$export$2e2bcd8739ae039).parse(chordString);
-        if (!chord) return chordString;
-        const songKey = song.key;
         const capoString = song.metadata.getSingle((0, $d21c5c7a462f3c34$export$866f445d49bad88e));
-        const capo = decapo && capoString ? parseInt(capoString, 10) : null;
-        const chordStyle = song.metadata.getSingle((0, $d21c5c7a462f3c34$export$d8cbdf44b1f66df1));
-        const effectiveTransposeDistance = $2ce1086ce25c9ac0$var$chordTransposeDistance(capo, line.transposeKey, songKey, renderKey);
-        const contextKey = (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).wrap(line.key || song.key);
-        const modifier = $2ce1086ce25c9ac0$var$effectiveModifier(renderKey, contextKey);
-        const effectiveKey = renderKey || contextKey?.transpose(effectiveTransposeDistance) || null;
-        return $2ce1086ce25c9ac0$var$shapeChord({
-          chord,
-          effectiveTransposeDistance,
-          modifier,
+        return new (0, $e02a17f5a26edf19$export$2e2bcd8739ae039)({
+          capo: capoString ? parseInt(capoString, 10) : 0,
+          contextKey: (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).wrap(line.key || song.key),
+          decapo,
           normalizeChords,
-          effectiveKey,
-          chordStyle
-        }).toString({
+          renderKey,
+          songKey: (0, $c2d6ab25ad00308f$export$2e2bcd8739ae039).wrap(song.key),
+          style: song.metadata.getSingle((0, $d21c5c7a462f3c34$export$d8cbdf44b1f66df1)),
+          transposeKey: line.transposeKey,
           useUnicodeModifier
-        });
+        }).render(chordString);
       }
       function $2ce1086ce25c9ac0$export$efb38dd75b8e2957({ selector, isNegated }, { configuration, metadata }) {
         if (selector === configuration.instrument?.type) return !isNegated;
@@ -10143,6 +10190,44 @@ to a key`);
         }
       };
       var $4ff43932a550a629$export$2e2bcd8739ae039 = $4ff43932a550a629$var$ChordDefinitionSet;
+      var $cbaaf2a368d4190f$var$LineExpander = class _$cbaaf2a368d4190f$var$LineExpander {
+        static expand(line, song) {
+          return new _$cbaaf2a368d4190f$var$LineExpander(line, song).expand();
+        }
+        constructor(line, song) {
+          this.line = line;
+          this.song = song;
+        }
+        expand() {
+          const expandedLines = this.line.items.flatMap((item) => {
+            if (item instanceof (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039) && item.name === (0, $dce48cb70c4120bb$export$8db6c706fc9142b2)) return this.getLastChorusBefore(this.line.lineNumber);
+            return [];
+          });
+          return [
+            this.line,
+            ...expandedLines
+          ];
+        }
+        getLastChorusBefore(lineNumber) {
+          const lines = [];
+          if (!lineNumber) return lines;
+          for (let i = lineNumber - 1; i >= 0; i -= 1) {
+            const line = this.song.lines[i];
+            if (line.type !== (0, $dce48cb70c4120bb$export$8db6c706fc9142b2) && lines.length > 0) break;
+            if (line.type === (0, $dce48cb70c4120bb$export$8db6c706fc9142b2) && (line.isEmpty() || this.lineHasMoreThanChorusDirectives(line))) lines.unshift(line);
+          }
+          return lines;
+        }
+        lineHasMoreThanChorusDirectives(line) {
+          return line.items.some((item) => {
+            if (item instanceof (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)) {
+              if (item.name === (0, $d21c5c7a462f3c34$export$4f5168acae064e01) || item.name === (0, $d21c5c7a462f3c34$export$473c1a4819e5180b)) return false;
+            }
+            return true;
+          });
+        }
+      };
+      var $cbaaf2a368d4190f$export$2e2bcd8739ae039 = $cbaaf2a368d4190f$var$LineExpander;
       var $c53141c05fae8382$var$Song = class _$c53141c05fae8382$var$Song extends (0, $9047ab737bb447ce$export$2e2bcd8739ae039) {
         /**
         * Creates a new {Song} instance
@@ -10182,36 +10267,6 @@ to a key`);
           while (copy.length && !copy[0].hasRenderableItems()) copy.shift();
           return copy;
         }
-        expandLine(line) {
-          const expandedLines = line.items.flatMap((item) => {
-            if (item instanceof (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039) && item.name === (0, $dce48cb70c4120bb$export$8db6c706fc9142b2)) return this.getLastChorusBefore(line.lineNumber);
-            return [];
-          });
-          return [
-            line,
-            ...expandedLines
-          ];
-        }
-        getLastChorusBefore(lineNumber) {
-          const lines = [];
-          if (!lineNumber) return lines;
-          for (let i = lineNumber - 1; i >= 0; i -= 1) {
-            const line = this.lines[i];
-            if (line.type === (0, $dce48cb70c4120bb$export$8db6c706fc9142b2)) {
-              const filteredLine = this.filterChorusStartEndDirectives(line);
-              if (!(line.isNotEmpty() && filteredLine.isEmpty())) lines.unshift(line);
-            } else if (lines.length > 0) break;
-          }
-          return lines;
-        }
-        filterChorusStartEndDirectives(line) {
-          return line.mapItems((item) => {
-            if (item instanceof (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)) {
-              if (item.name === (0, $d21c5c7a462f3c34$export$4f5168acae064e01) || item.name === (0, $d21c5c7a462f3c34$export$473c1a4819e5180b)) return null;
-            }
-            return item;
-          });
-        }
         /**
         * The {@link Paragraph} items of which the song consists
         * @member {Paragraph[]}
@@ -10224,7 +10279,7 @@ to a key`);
         * @type {Paragraph[]}
         */
         get expandedBodyParagraphs() {
-          return this.selectRenderableItems(this.linesToParagraphs(this.lines.flatMap((line) => this.expandLine(line))));
+          return this.selectRenderableItems(this.linesToParagraphs(this.lines.flatMap((line) => (0, $cbaaf2a368d4190f$export$2e2bcd8739ae039).expand(line, this))));
         }
         linesToParagraphs(lines) {
           let currentParagraph = new (0, $8906e348466806fd$export$2e2bcd8739ae039)();
@@ -10309,16 +10364,23 @@ to a key`);
                 value: transposedKey.toString()
               });
             }
-            if (item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039)) {
-              let chord = item.transpose(delta, transposedKey, {
-                normalizeChordSuffix
-              });
-              if (modifier) chord = chord.useModifier(modifier);
-              return chord;
-            }
+            if (item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039)) return _$c53141c05fae8382$var$Song.transposeChordLyricsPair({
+              item,
+              delta,
+              transposedKey,
+              normalizeChordSuffix,
+              modifier: modifier || null
+            });
             return item;
           });
         }
+        static transposeChordLyricsPair({ item, delta, transposedKey, normalizeChordSuffix, modifier }) {
+          let chord = item.transpose(delta, transposedKey, {
+            normalizeChordSuffix
+          });
+          if (modifier) chord = chord.useModifier(modifier);
+          return chord;
+        }
         /**
         * Transposes the song up by one semitone. It will:
         * - transpose all chords, see: {@link Chord#transpose}
@@ -10599,15 +10661,37 @@ Or set the song key before changing key:
           };
         }
         serializeItem(item) {
-          if (item instanceof (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)) return this.serializeTag(item);
-          if (item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039)) return this.serializeChordLyricsPair(item);
-          if (item instanceof (0, $15f1d40e3d1ed3a0$export$2e2bcd8739ae039)) return this.serializeTernary(item);
-          if (item instanceof (0, $11953cb6035032a3$export$2e2bcd8739ae039)) return this.serializeLiteral(item);
-          if (item instanceof (0, $0bd084786477abba$export$2e2bcd8739ae039)) return this.serializeComment(item);
-          if (item instanceof (0, $4b6dd3e4b817bd81$export$2e2bcd8739ae039)) return {
-            type: $8b93ef43471b6ed2$var$SOFT_LINE_BREAK
-          };
-          throw new Error(`Don't know how to serialize ${item.constructor.name}`);
+          const serializers = /* @__PURE__ */ new Map([
+            [
+              (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039),
+              this.serializeTag.bind(this)
+            ],
+            [
+              (0, $551a223fc13b5c10$export$2e2bcd8739ae039),
+              this.serializeChordLyricsPair.bind(this)
+            ],
+            [
+              (0, $15f1d40e3d1ed3a0$export$2e2bcd8739ae039),
+              this.serializeTernary.bind(this)
+            ],
+            [
+              (0, $11953cb6035032a3$export$2e2bcd8739ae039),
+              this.serializeLiteral.bind(this)
+            ],
+            [
+              (0, $0bd084786477abba$export$2e2bcd8739ae039),
+              this.serializeComment.bind(this)
+            ],
+            [
+              (0, $4b6dd3e4b817bd81$export$2e2bcd8739ae039),
+              () => ({
+                type: $8b93ef43471b6ed2$var$SOFT_LINE_BREAK
+              })
+            ]
+          ]);
+          const serializer = serializers.get(item.constructor);
+          if (!serializer) throw new Error(`Don't know how to serialize ${item.constructor.name}`);
+          return serializer(item);
         }
         serializeChordDefinition(chordDefinition) {
           return {
@@ -23708,23 +23792,32 @@ Or set the song key before changing key:
         }
         parseLine(line) {
           if (this.isSectionEnd()) this.endSection();
-          if ($a5a21ced491ea51f$var$VERSE_LINE_REGEX.test(line)) {
-            this.startNewLine();
-            const label = line.match($a5a21ced491ea51f$var$VERSE_LINE_REGEX)[1];
-            this.startSection((0, $dce48cb70c4120bb$export$4b194284baed1659), label);
-          } else if ($a5a21ced491ea51f$var$CHORUS_LINE_REGEX.test(line)) {
-            this.startNewLine();
-            const label = line.match($a5a21ced491ea51f$var$CHORUS_LINE_REGEX)[1];
-            this.startSection((0, $dce48cb70c4120bb$export$8db6c706fc9142b2), label);
-          } else if ($a5a21ced491ea51f$var$OTHER_METADATA_LINE_REGEX.test(line)) this.parseMetadataLine(line);
-          else super.parseLine(line);
-        }
-        parseMetadataLine(line) {
+          if (!(this.parseVerseDirective(line) || this.parseChorusDirective(line) || this.parseMetadata(line))) super.parseLine(line);
+        }
+        parseVerseDirective(line) {
+          const match = line.match($a5a21ced491ea51f$var$VERSE_LINE_REGEX);
+          if (!match) return false;
+          this.startNewLine();
+          const label = match[1];
+          this.startSection((0, $dce48cb70c4120bb$export$4b194284baed1659), label);
+          return true;
+        }
+        parseChorusDirective(line) {
+          const match = line.match($a5a21ced491ea51f$var$CHORUS_LINE_REGEX);
+          if (!match) return false;
+          this.startNewLine();
+          const label = match[1];
+          this.startSection((0, $dce48cb70c4120bb$export$8db6c706fc9142b2), label);
+          return true;
+        }
+        parseMetadata(line) {
+          const match = line.match($a5a21ced491ea51f$var$OTHER_METADATA_LINE_REGEX);
+          if (!match) return false;
           this.startNewLine();
           this.endSection();
-          const comment = line.match($a5a21ced491ea51f$var$OTHER_METADATA_LINE_REGEX)[1];
           if (!this.songLine) throw new Error("Expected this.songLine to be present");
-          this.songLine.addTag(new (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)((0, $d21c5c7a462f3c34$export$a29989082612d0d9), comment));
+          this.songLine.addTag(new (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)((0, $d21c5c7a462f3c34$export$a29989082612d0d9), match[1]));
+          return true;
         }
         isSectionEnd() {
           return this.songLine !== null && this.songLine.isEmpty() && this.songBuilder.previousLine !== null && !this.songBuilder.previousLine.isEmpty();