Merge pull request #60 from Kaiido/master

return broken path data until the first error
fontello · Oct 28, 2022 · 0a85089 · 0a85089
2 parents 287c612 + 08a7951
commit 0a85089
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/lib/path_parse.js b/lib/path_parse.js
@@ -242,6 +242,7 @@ function scanSegment(state) {
       else scanParam(state);
 
       if (state.err.length) {
+        finalizeSegment(state);
         return;
       }
       state.data.push(state.param);
@@ -291,11 +292,7 @@ module.exports = function pathParse(svgPath) {
     scanSegment(state);
   }
 
-  if (state.err.length) {
-    state.result = [];
-
-  } else if (state.result.length) {
-
+  if (state.result.length) {
     if ('mM'.indexOf(state.result[0][0]) < 0) {
       state.err = 'SvgPath: string should start with `M` or `m`';
       state.result = [];

diff --git a/test/path_parse.js b/test/path_parse.js
@@ -68,4 +68,16 @@ describe('Path parse', function () {
     assert.strictEqual(svgpath('M0 .e3').err, 'SvgPath: invalid float exponent (at pos 4)');
     assert.strictEqual(svgpath('M0 0a2 2 2 2 2 2 2').err, 'SvgPath: arc flag can be 0 or 1 only (at pos 11)');
   });
+
+  it('keeps valid commands', function () {
+    assert.strictEqual(svgpath('M0 0G 1').toString(), 'M0 0');
+    assert.strictEqual(svgpath('z').toString(), '');
+    assert.strictEqual(svgpath('M0 0L+').toString(), 'M0 0');
+    assert.strictEqual(svgpath('M0 0L00').toString(), 'M0 0');
+    assert.strictEqual(svgpath('M0 0L0e').toString(), 'M0 0');
+    assert.strictEqual(svgpath('M0 0L0').toString(), 'M0 0');
+    assert.strictEqual(svgpath('M0,0,').toString(), 'M0 0');
+    assert.strictEqual(svgpath('M0 0L0 .e3').toString(), 'M0 0');
+    assert.strictEqual(svgpath('M0 0a2 2 2 2 2 2 2').toString(), 'M0 0');
+  });
 });