chordsheetjs 5.1.3 → 5.2.0

package/d7b54993c4ea66c07a35bd36690482ab620f836e.patch

@@ -0,0 +1,105 @@
+commit d7b54993c4ea66c07a35bd36690482ab620f836e
+Author: Martijn Versluis <martijnversluis@users.noreply.github.com>
+Date:   Sun Jan 30 16:35:24 2022 +0100
+
+    Do not rely on contructor name
+    
+    Due to build tools scrambling constructor names, we can not rely on those
+    for type checking. Thus we have to use `instanceof`. This change removes
+    usages of `constructor.name` and solves the cyclic dependency by moving around
+    some functions.
+    
+    Resolves #421
+
+diff --git a/src/formatter/html_div_formatter.js b/src/formatter/html_div_formatter.js
+index f92f532..b1de230 100644
+--- a/src/formatter/html_div_formatter.js
++++ b/src/formatter/html_div_formatter.js
+@@ -1,6 +1,6 @@
+ import Handlebars from 'handlebars';
+ 
+-import '../handlebars_helpers';
++import '../template_helpers';
+ import HtmlFormatter from './html_formatter';
+ import './templates/html_div_formatter';
+ import { scopeCss } from '../utilities';
+diff --git a/src/formatter/html_table_formatter.js b/src/formatter/html_table_formatter.js
+index 4883fef..7d7e8ea 100644
+--- a/src/formatter/html_table_formatter.js
++++ b/src/formatter/html_table_formatter.js
+@@ -1,6 +1,6 @@
+ import Handlebars from 'handlebars';
+ 
+-import '../handlebars_helpers';
++import '../template_helpers';
+ import HtmlFormatter from './html_formatter';
+ import './templates/html_table_formatter';
+ import { scopeCss } from '../utilities';
+diff --git a/src/formatter/text_formatter.js b/src/formatter/text_formatter.js
+index 61385f1..81fe226 100644
+--- a/src/formatter/text_formatter.js
++++ b/src/formatter/text_formatter.js
+@@ -1,10 +1,10 @@
+ import ChordLyricsPair from '../chord_sheet/chord_lyrics_pair';
+ import Tag from '../chord_sheet/tag';
+ import { renderChord } from '../helpers';
++import { hasTextContents } from '../template_helpers';
+ 
+ import {
+   hasChordContents,
+-  hasTextContents,
+   padLeft,
+ } from '../utilities';
+ 
+diff --git a/src/handlebars_helpers.js b/src/template_helpers.js
+similarity index 87%
+rename from src/handlebars_helpers.js
+rename to src/template_helpers.js
+index 0e5ff98..b330f87 100644
+--- a/src/handlebars_helpers.js
++++ b/src/template_helpers.js
+@@ -7,12 +7,20 @@ import { renderChord } from './helpers';
+ 
+ import {
+   hasChordContents,
+-  hasTextContents,
+   isEvaluatable,
+ } from './utilities';
+ 
+ const lineHasContents = (line) => line.items.some((item) => item.isRenderable());
+ 
++/* eslint import/prefer-default-export: 0 */
++export const hasTextContents = (line) => (
++  line.items.some((item) => (
++    (item instanceof ChordLyricsPair && item.lyrics)
++    || (item instanceof Tag && item.isRenderable())
++    || isEvaluatable(item)
++  ))
++);
++
+ HandleBars.registerHelper('isChordLyricsPair', (item) => item instanceof ChordLyricsPair);
+ 
+ HandleBars.registerHelper('isTag', (item) => item instanceof Tag);
+diff --git a/src/utilities.js b/src/utilities.js
+index 03c69cc..503c811 100644
+--- a/src/utilities.js
++++ b/src/utilities.js
+@@ -8,18 +8,6 @@ export const hasChordContents = (line) => line.items.some((item) => !!item.chord
+ 
+ export const isEvaluatable = (item) => typeof item.evaluate === 'function';
+ 
+-function isInstanceOf(object, constructorName) {
+-  return object?.constructor?.name === constructorName;
+-}
+-
+-export const hasTextContents = (line) => (
+-  line.items.some((item) => (
+-    (isInstanceOf(item, 'ChordLyricsPair') && item.lyrics)
+-      || (isInstanceOf(item, 'Tag') && item.isRenderable())
+-      || isEvaluatable(item)
+-  ))
+-);
+-
+ export const padLeft = (str, length) => {
+   let paddedString = str;
+   for (let l = str.length; l < length; l += 1, paddedString += ' ');

package/lib/parser/chord_pro_peg_parser.js

@@ -529,7 +529,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseLine() {
-    var s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4, s5, s6;
     s0 = peg$currPos;
     s1 = peg$parseLyrics();
 
@@ -561,9 +561,22 @@ function peg$parse(input, options) {
           }
 
           if (s4 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c2(s1, s2, s3, s4);
-            s0 = s1;
+            s5 = [];
+            s6 = peg$parseSpace();
+
+            while (s6 !== peg$FAILED) {
+              s5.push(s6);
+              s6 = peg$parseSpace();
+            }
+
+            if (s5 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$c2(s1, s2, s3, s4);
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1714,13 +1727,9 @@ function peg$parse(input, options) {
     s0 = [];
     s1 = peg$parseTagValueChar();
 
-    if (s1 !== peg$FAILED) {
-      while (s1 !== peg$FAILED) {
-        s0.push(s1);
-        s1 = peg$parseTagValueChar();
-      }
-    } else {
-      s0 = peg$FAILED;
+    while (s1 !== peg$FAILED) {
+      s0.push(s1);
+      s1 = peg$parseTagValueChar();
     }
 
     return s0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "chordsheetjs",
   "author": "Martijn Versluis",
-  "version": "5.1.3",
+  "version": "5.2.0",
   "description": "A JavaScript library for parsing and formatting chord sheets",
   "main": "lib/index.js",
   "repository": {