add mergeText plugin

docs/03-plugins/convert-path-data.mdx

@@ -30,6 +30,9 @@ svgo:
     transformPrecision:
       description: Number of decimal places to round to, using conventional rounding rules.
       default: 5
+    smartArcRounding:
+      description: Round the radius of circular arcs when the effective change is under the error. The effective change is determined using the <a href="https://wikipedia.org/wiki/Sagitta_(geometry)" target="_blank">sagitta</a> of the arc.
+      default: true
     removeUseless:
       description: Remove redundant path commands that don't draw anything.
       default: true

docs/03-plugins/merge-text.mdx

@@ -0,0 +1,15 @@
+---
+title: Merge Text
+svgo:
+  pluginId: mergeText
+---
+
+Merge adjacent `<text>` elements and remove `<tspan>` when it is the only child of a `<text>` element.
+
+If the SVG contains any `<style>` elements, it will not be modified.
+
+`<text>` or `<tspan>` elements which have non-inheritable attributes other than `x` or `y` will not be modified.
+
+## Implementation
+
+- https://github.com/svg/svgo/blob/main/plugins/mergeText.js

lib/builtin.js

@@ -20,6 +20,7 @@ exports.builtin = [
   require('../plugins/mergeStyles.js'),
   require('../plugins/inlineStyles.js'),
   require('../plugins/mergePaths.js'),
+  require('../plugins/mergeText.js'),
   require('../plugins/minifyStyles.js'),
   require('../plugins/moveElemsAttrsToGroup.js'),
   require('../plugins/moveGroupAttrsToElems.js'),

lib/parser.js

@@ -100,7 +100,7 @@ const parseSvg = (data, from) => {
    */
   let current = root;
   /**
-   * @type {Array<XastParent>}
+   * @type {XastParent[]}
    */
   const stack = [root];
 

lib/path.js

@@ -135,11 +135,11 @@ const readNumber = (string, cursor) => {
 };
 
 /**
- * @type {(string: string) => Array<PathDataItem>}
+ * @type {(string: string) => PathDataItem[]}
  */
 const parsePathData = (string) => {
   /**
-   * @type {Array<PathDataItem>}
+   * @type {PathDataItem[]}
    */
   const pathData = [];
   /**
@@ -307,7 +307,7 @@ const stringifyArgs = (command, args, precision, disableSpaceAfterFlags) => {
 
 /**
  * @typedef {{
- *   pathData: Array<PathDataItem>;
+ *   pathData: PathDataItem[];
  *   precision?: number;
  *   disableSpaceAfterFlags?: boolean;
  * }} StringifyPathDataOptions

lib/path.test.js

@@ -8,55 +8,55 @@ const { parsePathData, stringifyPathData } = require('./path.js');
 
 describe('parse path data', () => {
   it('should allow spaces between commands', () => {
-    expect(parsePathData('M0 10 L \n\r\t20 30')).toEqual([
+    expect(parsePathData('M0 10 L \n\r\t20 30')).toStrictEqual([
       { command: 'M', args: [0, 10] },
       { command: 'L', args: [20, 30] },
     ]);
   });
   it('should allow spaces and commas between arguments', () => {
-    expect(parsePathData('M0 , 10 L 20 \n\r\t30,40,50')).toEqual([
+    expect(parsePathData('M0 , 10 L 20 \n\r\t30,40,50')).toStrictEqual([
       { command: 'M', args: [0, 10] },
       { command: 'L', args: [20, 30] },
       { command: 'L', args: [40, 50] },
     ]);
   });
   it('should forbid commas before commands', () => {
-    expect(parsePathData(', M0 10')).toEqual([]);
+    expect(parsePathData(', M0 10')).toStrictEqual([]);
   });
   it('should forbid commas between commands', () => {
-    expect(parsePathData('M0,10 , L 20,30')).toEqual([
+    expect(parsePathData('M0,10 , L 20,30')).toStrictEqual([
       { command: 'M', args: [0, 10] },
     ]);
   });
   it('should forbid commas between command name and argument', () => {
-    expect(parsePathData('M0,10 L,20,30')).toEqual([
+    expect(parsePathData('M0,10 L,20,30')).toStrictEqual([
       { command: 'M', args: [0, 10] },
     ]);
   });
   it('should forbid multiple commas in a row', () => {
-    expect(parsePathData('M0 , , 10')).toEqual([]);
+    expect(parsePathData('M0 , , 10')).toStrictEqual([]);
   });
   it('should stop when unknown char appears', () => {
-    expect(parsePathData('M0 10 , L 20 #40')).toEqual([
+    expect(parsePathData('M0 10 , L 20 #40')).toStrictEqual([
       { command: 'M', args: [0, 10] },
     ]);
   });
   it('should stop when not enough arguments', () => {
-    expect(parsePathData('M0 10 L 20 L 30 40')).toEqual([
+    expect(parsePathData('M0 10 L 20 L 30 40')).toStrictEqual([
       { command: 'M', args: [0, 10] },
     ]);
   });
   it('should stop if moveto not the first command', () => {
-    expect(parsePathData('L 10 20')).toEqual([]);
-    expect(parsePathData('10 20')).toEqual([]);
+    expect(parsePathData('L 10 20')).toStrictEqual([]);
+    expect(parsePathData('10 20')).toStrictEqual([]);
   });
   it('should stop on invalid scientific notation', () => {
-    expect(parsePathData('M 0 5e++1 L 0 0')).toEqual([
+    expect(parsePathData('M 0 5e++1 L 0 0')).toStrictEqual([
       { command: 'M', args: [0, 5] },
     ]);
   });
   it('should stop on invalid numbers', () => {
-    expect(parsePathData('M ...')).toEqual([]);
+    expect(parsePathData('M ...')).toStrictEqual([]);
   });
   it('should handle arcs', () => {
     expect(
@@ -71,7 +71,7 @@ describe('parse path data', () => {
           l 50,-25
         `,
       ),
-    ).toEqual([
+    ).toStrictEqual([
       { command: 'M', args: [600, 350] },
       { command: 'l', args: [50, -25] },
       { command: 'a', args: [25, 25, -30, 0, 1, 50, -25] },
@@ -96,7 +96,7 @@ describe('stringify path data', () => {
           { command: 'H', args: [50] },
         ],
       }),
-    ).toEqual('M0 0h10 20 30H40 50');
+    ).toBe('M0 0h10 20 30H40 50');
   });
   it('should not combine sequence of moveto', () => {
     expect(
@@ -108,7 +108,7 @@ describe('stringify path data', () => {
           { command: 'm', args: [40, 50] },
         ],
       }),
-    ).toEqual('M0 0M10 10m20 30m40 50');
+    ).toBe('M0 0M10 10m20 30m40 50');
   });
   it('should combine moveto and sequence of lineto', () => {
     expect(
@@ -122,15 +122,15 @@ describe('stringify path data', () => {
           { command: 'L', args: [10, 10] },
         ],
       }),
-    ).toEqual('m0 0 10 10M0 0l10 10M0 0 10 10');
+    ).toBe('m0 0 10 10M0 0l10 10M0 0 10 10');
     expect(
       stringifyPathData({
         pathData: [
           { command: 'm', args: [0, 0] },
           { command: 'L', args: [10, 10] },
         ],
       }),
-    ).toEqual('M0 0 10 10');
+    ).toBe('M0 0 10 10');
   });
   it('should avoid space before first, negative and decimals', () => {
     expect(
@@ -142,11 +142,11 @@ describe('stringify path data', () => {
           { command: 'L', args: [7, 0.8] },
         ],
       }),
-    ).toEqual('M0-1.2.3 4 5-.6 7 .8');
+    ).toBe('M0-1.2.3 4 5-.6 7 .8');
   });
   it('should configure precision', () => {
     /**
-     * @type {Array<PathDataItem>}
+     * @type {PathDataItem[]}
      */
     const pathData = [
       { command: 'M', args: [0, -1.9876] },
@@ -159,17 +159,17 @@ describe('stringify path data', () => {
         pathData,
         precision: 3,
       }),
-    ).toEqual('M0-1.988.3 3.142-.3-3.142 100 200');
+    ).toBe('M0-1.988.3 3.142-.3-3.142 100 200');
     expect(
       stringifyPathData({
         pathData,
         precision: 0,
       }),
-    ).toEqual('M0-2 0 3 0-3 100 200');
+    ).toBe('M0-2 0 3 0-3 100 200');
   });
   it('allows to avoid spaces after arc flags', () => {
     /**
-     * @type {Array<PathDataItem>}
+     * @type {PathDataItem[]}
      */
     const pathData = [
       { command: 'M', args: [0, 0] },
@@ -182,12 +182,12 @@ describe('stringify path data', () => {
         pathData,
         disableSpaceAfterFlags: false,
       }),
-    ).toEqual('M0 0A50 50 10 1 0 .2 20a50 50 10 1 0 .2 20 50 50 10 1 0 .2 20');
+    ).toBe('M0 0A50 50 10 1 0 .2 20a50 50 10 1 0 .2 20 50 50 10 1 0 .2 20');
     expect(
       stringifyPathData({
         pathData,
         disableSpaceAfterFlags: true,
       }),
-    ).toEqual('M0 0A50 50 10 10.2 20a50 50 10 10.2 20 50 50 10 10.2 20');
+    ).toBe('M0 0A50 50 10 10.2 20a50 50 10 10.2 20 50 50 10 10.2 20');
   });
 });

lib/style.js

@@ -16,7 +16,6 @@
 const csstree = require('css-tree');
 const csswhat = require('css-what');
 const {
-  // @ts-ignore internal api
   syntax: { specificity },
 } = require('csso');
 const { visit, matches } = require('./xast.js');
@@ -34,7 +33,7 @@ const csstreeWalkSkip = csstree.walk.skip;
  */
 const parseRule = (ruleNode, dynamic) => {
   /**
-   * @type {Array<StylesheetDeclaration>}
+   * @type {StylesheetDeclaration[]}
    */
   const declarations = [];
   // collect declarations
@@ -74,10 +73,10 @@ const parseRule = (ruleNode, dynamic) => {
 };
 
 /**
- * @type {(css: string, dynamic: boolean) => Array<StylesheetRule>}
+ * @type {(css: string, dynamic: boolean) => StylesheetRule[]}
  */
 const parseStylesheet = (css, dynamic) => {
-  /** @type {Array<StylesheetRule>} */
+  /** @type {StylesheetRule[]} */
   const rules = [];
   const ast = csstree.parse(css, {
     parseValue: false,
@@ -108,10 +107,10 @@ const parseStylesheet = (css, dynamic) => {
 };
 
 /**
- * @type {(css: string) => Array<StylesheetDeclaration>}
+ * @type {(css: string) => StylesheetDeclaration[]}
  */
 const parseStyleDeclarations = (css) => {
-  /** @type {Array<StylesheetDeclaration>} */
+  /** @type {StylesheetDeclaration[]} */
   const declarations = [];
   const ast = csstree.parse(css, {
     context: 'declarationList',