From 3d4adb6b044ff1361a970ea049f90d5626ea9888 Mon Sep 17 00:00:00 2001
From: Bogdan Chadkin <trysound@yandex.ru>
Date: Mon, 22 Mar 2021 14:38:06 +0300
Subject: [PATCH] Simplify number rendering and fix -0 in path

Ref https://github.com/svg/svgo/issues/1422
---
 lib/path.js                            | 16 ++++------------
 lib/path.test.js                       | 22 ++++++++++------------
 test/plugins/convertPathData.17.svg    |  2 +-
 test/plugins/convertShapeToPath.05.svg |  2 +-
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/lib/path.js b/lib/path.js
index ef1a3e114..f8d4822b1 100644
--- a/lib/path.js
+++ b/lib/path.js
@@ -241,20 +241,12 @@ exports.parsePathData = parsePathData;
  * @param {StringifyNumberOptions} param
  */
 const stringifyNumber = ({ number, precision }) => {
-  let result;
-  if (precision == null) {
-    result = number.toString();
-  } else {
-    result = number.toFixed(precision);
-    if (result.includes('.')) {
-      result = result.replace(/\.?0+$/, '');
-    }
+  if (precision != null) {
+    const ratio = 10 ** precision;
+    number = Math.round(number * ratio) / ratio;
   }
   // remove zero whole from decimal number
-  if (result !== '0') {
-    result = result.replace(/^0/, '').replace(/^-0/, '-');
-  }
-  return result;
+  return number.toString().replace(/^0\./, '.').replace(/^-0\./, '-.');
 };
 
 /**
diff --git a/lib/path.test.js b/lib/path.test.js
index 8268a7319..879b8f93a 100644
--- a/lib/path.test.js
+++ b/lib/path.test.js
@@ -142,26 +142,24 @@ describe('stringify path data', () => {
     ).to.equal('M0-1.2.3 4 5-.6 7 .8');
   });
   it('should configure precision', () => {
+    const pathData = [
+      { command: 'M', args: [0, -1.9876] },
+      { command: 'L', args: [0.3, 3.14159265] },
+      { command: 'L', args: [-0.3, -3.14159265] },
+      { command: 'L', args: [100, 200] },
+    ];
     expect(
       stringifyPathData({
-        pathData: [
-          { command: 'M', args: [0, -1.9876] },
-          { command: 'L', args: [0.3, 3.14159265] },
-          { command: 'L', args: [100, 200] },
-        ],
+        pathData,
         precision: 3,
       })
-    ).to.equal('M0-1.988.3 3.142 100 200');
+    ).to.equal('M0-1.988.3 3.142-.3-3.142 100 200');
     expect(
       stringifyPathData({
-        pathData: [
-          { command: 'M', args: [0, -1.9876] },
-          { command: 'L', args: [0.3, 3.14159265] },
-          { command: 'L', args: [100, 200] },
-        ],
+        pathData,
         precision: 0,
       })
-    ).to.equal('M0-2 0 3 100 200');
+    ).to.equal('M0-2 0 3 0-3 100 200');
   });
   it('allows to avoid spaces after arc flags', () => {
     const pathData = [
diff --git a/test/plugins/convertPathData.17.svg b/test/plugins/convertPathData.17.svg
index 3e4a87420..e6ddb6839 100644
--- a/test/plugins/convertPathData.17.svg
+++ b/test/plugins/convertPathData.17.svg
@@ -5,7 +5,7 @@
 @@@
 
 <svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path d="m33.027833 1.96545901 5.0135294 5.01352941c.0000001-.00000008-.0319306-2.94431722-.0319306-2.94431722L34 .02523956V0H13v2h20.062374z"/>
+    <path d="m33.027833 1.96545901 5.0135294 5.01352941c1e-7-8e-8-.0319306-2.94431722-.0319306-2.94431722L34 .02523956V0H13v2h20.062374z"/>
 </svg>
 
 @@@
diff --git a/test/plugins/convertShapeToPath.05.svg b/test/plugins/convertShapeToPath.05.svg
index 054905e2a..6f528646d 100644
--- a/test/plugins/convertShapeToPath.05.svg
+++ b/test/plugins/convertShapeToPath.05.svg
@@ -19,7 +19,7 @@ Precision should be applied to all converted shapes
     <path d="M26.614 29.232 34.268 8.176"/>
     <path d="M26.614 29.232 34.268 8.176z"/>
     <path d="M26.614-5.036A34.268 34.268 0 1 0 26.614 63.5 34.268 34.268 0 1 0 26.614-5.036z"/>
-    <path d="M26.614 21.056A34.268 8.176 0 1 0 26.614 37.408 34.268 8.176 0 1 0 26.614 21.056z"/>
+    <path d="M26.614 21.057A34.268 8.176 0 1 0 26.614 37.408 34.268 8.176 0 1 0 26.614 21.057z"/>
 </svg>
 
 @@@