text-guitar-chart 0.0.2 → 0.0.4

package/index.js

@@ -1,7 +1,7 @@
-import { EditableSVGuitarChord } from "./lib/editableSVGuitar.js";
+import { EditableSVGuitarChord, DOT_COLORS } from "./lib/editableSVGuitar.js";
 import fingeringToString from "./lib/fingeringToString.js";
 import stringToFingering from "./lib/stringToFingering.js";
 import layoutChordStrings from "./lib/layoutChordStrings.js";
 import splitStringInRectangles from "./lib/splitStringInRectangles.js";
 
-export { EditableSVGuitarChord, fingeringToString, stringToFingering, layoutChordStrings, splitStringInRectangles };
+export { EditableSVGuitarChord, fingeringToString, stringToFingering, layoutChordStrings, splitStringInRectangles, DOT_COLORS };

package/lib/stringToFingering.js

@@ -411,8 +411,8 @@ export default function stringToFingering(fingeringStr, options = {}) {
       else if (char === UNICODE_OPEN || char === ASCII_OPEN) {
         fingers.push([stringNum, fretNumber, { text: "", color: blackColor }]);
       }
-      // Check for finger number (digit)
-      else if (/[0-9]/.test(char)) {
+      // Check for finger label (digit or any other character)
+      else if (/\S/.test(char)) {
         fingers.push([stringNum, fretNumber, { text: char, color: blackColor }]);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "text-guitar-chart",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "A JavaScript library to write text based guitar chord charts and convert them to SVG.",
   "main": "index.js",
   "types": "types/index.d.ts",

package/test/stringToFingering.test.js

@@ -440,6 +440,69 @@ describe("stringToFingering", () => {
       );
       assert.deepEqual(result?.barres, [], "Barres should be empty");
     });
+
+    test("parses E dom 7 chord with finger characters", () => {
+      const fingeringStr = `  E dom 7
+  #######
+  x    x
+  ------
+  |||#||
+  |BE|||
+  ||||D|`;
+
+      const result = stringToFingering(fingeringStr);
+      assert.equal(
+        fingersContains(result, [
+          [
+            5,
+            2,
+            {
+              text: "B",
+              color: "#000000",
+            },
+          ],
+          [
+            4,
+            2,
+            {
+              text: "E",
+              color: "#000000",
+            },
+          ],
+          [
+            3,
+            1,
+            {
+              text: "#",
+              color: "#000000",
+            },
+          ],
+          [
+            2,
+            3,
+            {
+              text: "D",
+              color: "#000000",
+            },
+          ],
+          [6, "x", {text: "", color: "#000000"}],
+          [1, "x", {text: "", color: "#000000"}],
+        ]),
+        true, 
+        "Fingering does not match expected E dom 7 chord with finger numbers"
+      );
+      assert.equal(
+        result?.title,
+        "E dom 7",
+        "Title does not match expected E dom 7"
+      );
+      assert.equal(
+        result?.position,
+        undefined,
+        "Position does not match expected undefined"
+      );
+      assert.deepEqual(result?.barres, [], "Barres should be empty");
+    });
   });
 
   describe("Unicode format parsing", () => {
@@ -857,8 +920,76 @@ describe("stringToFingering", () => {
       );
       assert.deepEqual(result?.barres, [], "Barres should be empty");
     });
+
+    test("parses E dom 7 with finger characters (Unicode format)", () => {
+      const fingeringStr = `  E dom 7
+  ‾‾‾‾‾‾‾‾‾‾‾
+  ×         ×
+  ┌─┬─┬─┬─┬─┐
+  │ │ │ # │ │
+  ├─┼─┼─┼─┼─┤
+  │ B E │ │ │
+  ├─┼─┼─┼─┼─┤
+  │ │ │ │ D │
+  └─┴─┴─┴─┴─┘`;
+
+      const result = stringToFingering(fingeringStr);
+      assert.equal(
+        fingersContains(result, [
+          [
+            5,
+            2,
+            {
+              text: "B",
+              color: "#000000",
+            },
+          ],
+          [
+            4,
+            2,
+            {
+              text: "E",
+              color: "#000000",
+            },
+          ],
+          [
+            3,
+            1,
+            {
+              text: "#",
+              color: "#000000",
+            },
+          ],
+          [
+            2,
+            3,
+            {
+              text: "D",
+              color: "#000000",
+            },
+          ],
+          [6, "x", {text: "", color: "#000000"}],
+          [1, "x", {text: "", color: "#000000"}],
+        ]),
+        true, 
+        "Fingering does not match expected E dom 7 chord with finger numbers"
+      );
+      assert.equal(
+        result?.title,
+        "E dom 7",
+        "Title does not match expected E dom 7"
+      );
+      assert.equal(
+        result?.position,
+        undefined,
+        "Position does not match expected undefined"
+      );
+      assert.deepEqual(result?.barres, [], "Barres should be empty");
+    });
+
   });
 
+
   describe("Edge cases and variations", () => {
     test("handles empty fingering string", () => {
       const result = stringToFingering("");