chordsheetjs 13.2.2 → 14.0.0

package/lib/bundle.js

@@ -68762,15 +68762,24 @@ AjwCRQJ5AAAAAAABAAAAANpTmfAAAAAA0e+yRgAAAADR77JG
       };
       var $f6d6d454eefadbec$export$2e2bcd8739ae039 = $f6d6d454eefadbec$var$PdfFormatter;
       var $a5a21ced491ea51f$var$VERSE_LINE_REGEX = /^\[(Verse.*)]/i;
-      var $a5a21ced491ea51f$var$CHORUS_LINE_REGEX = /^\[(Chorus)]/i;
+      var $a5a21ced491ea51f$var$CHORUS_LINE_REGEX = /^\[(Chorus.*)]/i;
+      var $a5a21ced491ea51f$var$BRIDGE_LINE_REGEX = /^\[(Bridge.*)]/i;
+      var $a5a21ced491ea51f$var$PART_LINE_REGEX = /^\[(Intro|Outro|Instrumental|Interlude|Solo|Pre-Chorus)( \d+)?]/i;
+      var $a5a21ced491ea51f$var$UG_METADATA_REGEX = /^(\w+):\s*(.+)$/;
       var $a5a21ced491ea51f$var$OTHER_METADATA_LINE_REGEX = /^\[([^\]]+)]/;
+      var $a5a21ced491ea51f$var$REPEAT_NOTATION_REGEX = /\s+(x\d+)\s*$/i;
+      var $a5a21ced491ea51f$var$CHORD_LINE_REGEX = /^\s*((([A-G|Do|Re|Mi|Fa|Sol|La|Si])(#|b)?([^/\s]*)(\/([A-G|Do|Re|Mi|Fa|Sol|La|Si])(#|b)?)?)(\s|$)+)+(\s|$)+/;
       var $a5a21ced491ea51f$var$startSectionTags = {
         [(0, $dce48cb70c4120bb$export$4b194284baed1659)]: (0, $d21c5c7a462f3c34$export$deca399f8cd9b7dc),
-        [(0, $dce48cb70c4120bb$export$8db6c706fc9142b2)]: (0, $d21c5c7a462f3c34$export$4f5168acae064e01)
+        [(0, $dce48cb70c4120bb$export$8db6c706fc9142b2)]: (0, $d21c5c7a462f3c34$export$4f5168acae064e01),
+        [(0, $dce48cb70c4120bb$export$78d8c50e853acd10)]: (0, $d21c5c7a462f3c34$export$3550cc87694d54e0),
+        [(0, $dce48cb70c4120bb$export$609cc0ea1637d6a0)]: (0, $d21c5c7a462f3c34$export$2b9510a208875fc9)
       };
       var $a5a21ced491ea51f$var$endSectionTags = {
         [(0, $dce48cb70c4120bb$export$4b194284baed1659)]: (0, $d21c5c7a462f3c34$export$640d294ab83f9040),
-        [(0, $dce48cb70c4120bb$export$8db6c706fc9142b2)]: (0, $d21c5c7a462f3c34$export$473c1a4819e5180b)
+        [(0, $dce48cb70c4120bb$export$8db6c706fc9142b2)]: (0, $d21c5c7a462f3c34$export$473c1a4819e5180b),
+        [(0, $dce48cb70c4120bb$export$78d8c50e853acd10)]: (0, $d21c5c7a462f3c34$export$1c874e9780385ecd),
+        [(0, $dce48cb70c4120bb$export$609cc0ea1637d6a0)]: (0, $d21c5c7a462f3c34$export$189f12065cceb96a)
       };
       var $a5a21ced491ea51f$var$UltimateGuitarParser = class extends (0, $e136d63bbe28a4e0$export$2e2bcd8739ae039) {
         /**
@@ -68781,11 +68790,111 @@ AjwCRQJ5AAAAAAABAAAAANpTmfAAAAAA0e+yRgAAAADR77JG
         constructor({ preserveWhitespace = true } = {}) {
           super({
             preserveWhitespace
-          }, false), this.currentSectionType = null;
+          }, false), this.currentSectionType = null, this.pendingRepeatNotation = null;
         }
         parseLine(line) {
           if (this.isSectionEnd()) this.endSection();
-          if (!(this.parseVerseDirective(line) || this.parseChorusDirective(line) || this.parseMetadata(line))) super.parseLine(line);
+          const { cleanLine, repeatNotation } = this.extractRepeatNotation(line);
+          this.pendingRepeatNotation = repeatNotation;
+          if (!(this.parseVerseDirective(cleanLine) || this.parseChorusDirective(cleanLine) || this.parseBridgeDirective(cleanLine) || this.parsePartDirective(cleanLine) || this.parseUGMetadata(cleanLine) || this.parseMetadata(cleanLine))) this.parseRegularLine(cleanLine);
+        }
+        parseRegularLine(line) {
+          this.songLine = this.songBuilder.addLine();
+          if (line.trim().length === 0) this.chordLyricsPair = null;
+          else this.parseNonEmptyLine(line);
+        }
+        parseNonEmptyLine(line) {
+          if (!this.songLine) throw new Error("Expected this.songLine to be present");
+          this.chordLyricsPair = this.songLine.addChordLyricsPair();
+          const isChordLine = $a5a21ced491ea51f$var$CHORD_LINE_REGEX.test(line);
+          if (isChordLine && this.hasNextLine()) this.parseChordLineWithNextLine(line);
+          else if (isChordLine) this.parseChordsOnly(line);
+          else this.chordLyricsPair.lyrics = `${line}`;
+        }
+        parseChordLineWithNextLine(chordsLine) {
+          const nextLine = this.readLine();
+          if (this.isNonLyricsLine(nextLine)) {
+            this.parseChordsOnly(chordsLine);
+            this.unreadLine();
+          } else this.parseLyricsWithChords(chordsLine, nextLine);
+        }
+        unreadLine() {
+          this.currentLine -= 1;
+        }
+        isNonLyricsLine(line) {
+          return $a5a21ced491ea51f$var$VERSE_LINE_REGEX.test(line) || $a5a21ced491ea51f$var$CHORUS_LINE_REGEX.test(line) || $a5a21ced491ea51f$var$BRIDGE_LINE_REGEX.test(line) || $a5a21ced491ea51f$var$PART_LINE_REGEX.test(line) || $a5a21ced491ea51f$var$OTHER_METADATA_LINE_REGEX.test(line) || $a5a21ced491ea51f$var$CHORD_LINE_REGEX.test(line) || line.trim().length === 0;
+        }
+        parseChordsOnly(chordsLine) {
+          this.parseLyricsWithChords(chordsLine, "");
+          this.applyRepeatNotation();
+        }
+        parseLyricsWithChords(chordsLine, lyricsLine) {
+          this.processCharacters(chordsLine, lyricsLine);
+          if (!this.chordLyricsPair) throw new Error("Expected this.chordLyricsPair to be present");
+          this.chordLyricsPair.lyrics += lyricsLine.substring(chordsLine.length);
+          this.chordLyricsPair.chords = this.chordLyricsPair.chords.trim();
+          if (this.chordLyricsPair.lyrics) this.chordLyricsPair.lyrics = this.chordLyricsPair.lyrics.trim();
+          this.applyRepeatNotation();
+        }
+        processCharacters(chordsLine, lyricsLine) {
+          for (let c4 = 0, charCount = chordsLine.length; c4 < charCount; c4 += 1) {
+            const chr = chordsLine[c4];
+            const nextChar = chordsLine[c4 + 1];
+            const isWhiteSpace = /\s/.test(chr);
+            this.addCharacter(chr, nextChar);
+            if (!this.chordLyricsPair) throw new Error("Expected this.chordLyricsPair to be present");
+            this.chordLyricsPair.lyrics += lyricsLine[c4] || "";
+            this.processingText = !isWhiteSpace;
+          }
+        }
+        addCharacter(chr, nextChar) {
+          const isWhiteSpace = /\s/.test(chr);
+          if (!isWhiteSpace) this.ensureChordLyricsPairInitialized();
+          if (!isWhiteSpace || this.shouldAddCharacterToChords(nextChar)) {
+            if (!this.chordLyricsPair) throw new Error("Expected this.chordLyricsPair to be present");
+            this.chordLyricsPair.chords += chr;
+          }
+        }
+        shouldAddCharacterToChords(nextChar) {
+          return !!(nextChar && /\s/.test(nextChar) && this.preserveWhitespace);
+        }
+        ensureChordLyricsPairInitialized() {
+          if (!this.processingText) {
+            if (!this.songLine) throw new Error("Expected this.songLine to be present");
+            this.chordLyricsPair = this.songLine.addChordLyricsPair();
+            this.processingText = true;
+          }
+        }
+        extractRepeatNotation(line) {
+          const match = line.match($a5a21ced491ea51f$var$REPEAT_NOTATION_REGEX);
+          if (match) return {
+            cleanLine: line.replace($a5a21ced491ea51f$var$REPEAT_NOTATION_REGEX, ""),
+            repeatNotation: match[1]
+          };
+          return {
+            cleanLine: line,
+            repeatNotation: null
+          };
+        }
+        applyRepeatNotation() {
+          if (!this.pendingRepeatNotation || !this.songLine) return;
+          const lastItem = this.songLine.items[this.songLine.items.length - 1];
+          if (lastItem && "lyrics" in lastItem) lastItem.lyrics = (lastItem.lyrics || "") + this.pendingRepeatNotation;
+          this.pendingRepeatNotation = null;
+        }
+        parseUGMetadata(line) {
+          const match = line.match($a5a21ced491ea51f$var$UG_METADATA_REGEX);
+          if (!match) return false;
+          const tagName = match[1].toLowerCase();
+          if (!(0, $7251dad5f4a4c35f$export$57ecf0dc09effb3).includes(tagName)) return false;
+          const value = tagName === (0, $d21c5c7a462f3c34$export$866f445d49bad88e) ? this.extractCapoValue(match[2]) : match[2].trim();
+          this.startNewLine();
+          this.songBuilder.addTag(new (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)(tagName, value));
+          return true;
+        }
+        extractCapoValue(rawValue) {
+          const [, capoNumber] = rawValue.match(/^(\d+)/) || [];
+          return capoNumber || rawValue.trim();
         }
         parseVerseDirective(line) {
           const match = line.match($a5a21ced491ea51f$var$VERSE_LINE_REGEX);
@@ -68803,6 +68912,22 @@ AjwCRQJ5AAAAAAABAAAAANpTmfAAAAAA0e+yRgAAAADR77JG
           this.startSection((0, $dce48cb70c4120bb$export$8db6c706fc9142b2), label);
           return true;
         }
+        parseBridgeDirective(line) {
+          const match = line.match($a5a21ced491ea51f$var$BRIDGE_LINE_REGEX);
+          if (!match) return false;
+          this.startNewLine();
+          const label = match[1];
+          this.startSection((0, $dce48cb70c4120bb$export$78d8c50e853acd10), label);
+          return true;
+        }
+        parsePartDirective(line) {
+          const match = line.match($a5a21ced491ea51f$var$PART_LINE_REGEX);
+          if (!match) return false;
+          this.startNewLine();
+          const label = match[1] + (match[2] || "");
+          this.startSection((0, $dce48cb70c4120bb$export$609cc0ea1637d6a0), label);
+          return true;
+        }
         parseMetadata(line) {
           const match = line.match($a5a21ced491ea51f$var$OTHER_METADATA_LINE_REGEX);
           if (!match) return false;
@@ -68830,7 +68955,11 @@ AjwCRQJ5AAAAAAABAAAAANpTmfAAAAAA0e+yRgAAAADR77JG
         }
         endSection({ addNewLine = true } = {}) {
           if (this.currentSectionType !== null && this.currentSectionType in $a5a21ced491ea51f$var$endSectionTags) {
-            this.songBuilder.addTag(new (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)($a5a21ced491ea51f$var$endSectionTags[this.currentSectionType]));
+            if (this.songLine && this.songLine.isEmpty()) this.songLine.addTag(new (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)($a5a21ced491ea51f$var$endSectionTags[this.currentSectionType]));
+            else {
+              const endTagLine = this.songBuilder.addLine();
+              endTagLine.addTag(new (0, $7251dad5f4a4c35f$export$2e2bcd8739ae039)($a5a21ced491ea51f$var$endSectionTags[this.currentSectionType]));
+            }
             if (addNewLine) this.startNewLine();
           }
           this.songBuilder.setCurrentProperties((0, $dce48cb70c4120bb$export$c53d0f541b41b88e));
@@ -68841,7 +68970,7 @@ AjwCRQJ5AAAAAAABAAAAANpTmfAAAAAA0e+yRgAAAADR77JG
         }
       };
       var $a5a21ced491ea51f$export$2e2bcd8739ae039 = $a5a21ced491ea51f$var$UltimateGuitarParser;
-      var $ae92e002ce14f11a$export$2e2bcd8739ae039 = "13.2.2";
+      var $ae92e002ce14f11a$export$2e2bcd8739ae039 = "14.0.0";
       var $a3816b486f741c00$exports = {};
       var $892913528e7f60f9$export$2e2bcd8739ae039 = {
         CHORUS: $dce48cb70c4120bb$export$8db6c706fc9142b2,