Rewrite removeHiddenElems

lib/docdata.js

@@ -2,6 +2,7 @@ import * as csso from 'csso';
 import {
   attrsGroups,
   elemsGroups,
+  geometryProperties,
   inheritableAttrs,
 } from '../plugins/_collections.js';
 import { parseStylesheet } from './style-css-tree.js';
@@ -97,6 +98,12 @@ export class StyleData {
     for (const [name, value] of Object.entries(element.attributes)) {
       if (attrsGroups.presentation.has(name)) {
         computedStyles.set(name, value);
+      } else {
+        // See if it is a geometry property which applies to this element.
+        const els = geometryProperties[name];
+        if (els && els.has(element.name)) {
+          computedStyles.set(name, value);
+        }
       }
     }
 
@@ -112,6 +119,9 @@ export class StyleData {
             const hasVars = VAR_REGEXP.test(value.value);
             if (hasVars) {
               computedStyles.set(name, null);
+            } else if (geometryProperties[name]) {
+              // Support for geometry properties is inconsistent. Avoid changing these.
+              computedStyles.set(name, null);
             } else {
               computedStyles.set(name, value.value);
               if (value.important) {
@@ -129,7 +139,10 @@ export class StyleData {
     }
     if (declarations) {
       declarations.forEach((value, name) => {
-        if (value.important || !importantProperties.has(name)) {
+        if (geometryProperties[name]) {
+          // Support for geometry properties is inconsistent. Avoid changing these.
+          computedStyles.set(name, null);
+        } else if (value.important || !importantProperties.has(name)) {
           computedStyles.set(name, value.value);
         }
       });

lib/parser.js

@@ -167,7 +167,7 @@ export const parseSvg = (data, from) => {
     const node = {
       type: 'comment',
       parentNode: current,
-      value: foreignLevel > 0 ? comment : comment.trim(),
+      value: comment,
     };
     pushToContent(node);
   };

lib/path.js

@@ -128,6 +128,7 @@ const readNumber = (string, cursor) => {
 /**
  * @param {string} string
  * @returns {PathDataItem[]}
+ * @deprecated
  */
 export const parsePathData = (string) => {
   /** @type {PathDataItem[]} */

lib/svgo/tools.js

@@ -147,6 +147,28 @@ export function exactMul(n, m) {
   return toFixed(n * m, d1 + d2);
 }
 
+/**
+ * @param {Map<string,string|null>} properties
+ * @returns {{rx:string,ry:string}|undefined}
+ */
+export function getEllipseProperties(properties) {
+  let rx = properties.get('rx');
+  let ry = properties.get('ry');
+  if (rx === undefined) {
+    if (ry === undefined) {
+      rx = ry = '0';
+    } else {
+      rx = ry;
+    }
+  } else if (ry === undefined) {
+    ry = rx;
+  }
+  if (rx === null || ry === null) {
+    return;
+  }
+  return { rx: rx, ry: ry };
+}
+
 /**
  * @param {number|string} str
  */

lib/xast.js

@@ -100,6 +100,7 @@ const visitChild = (node, visitor, parents) => {
 /**
  * @param {XastChild} node
  * @param {XastParent} [parentNode]
+ * @deprecated
  */
 // Disable no-unused-vars until all calls to detachNodeFromParent() are updated.
 // eslint-disable-next-line no-unused-vars

plugins/_collections.js

@@ -2381,6 +2381,21 @@ export const colorsProps = new Set([
   'stroke',
 ]);
 
+// See https://www.w3.org/TR/SVG2/geometry.html#geometry-properties
+/** @type {Object<string,Set<string>>} */
+export const geometryProperties = {
+  cx: new Set(['circle', 'ellipse']),
+  cy: new Set(['circle', 'ellipse']),
+  d: new Set(['path']),
+  height: new Set(['foreignObject', 'image', 'rect', 'svg', 'symbol', 'use']),
+  r: new Set(['circle']),
+  rx: new Set(['ellipse', 'rect']),
+  ry: new Set(['ellipse', 'rect']),
+  width: new Set(['foreignObject', 'image', 'rect', 'svg', 'symbol', 'use']),
+  x: new Set(['foreignObject', 'image', 'rect', 'svg', 'symbol', 'use']),
+  y: new Set(['foreignObject', 'image', 'rect', 'svg', 'symbol', 'use']),
+};
+
 /** @see https://developer.mozilla.org/docs/Web/CSS/Pseudo-classes */
 export const pseudoClasses = {
   displayState: new Set(['fullscreen', 'modal', 'picture-in-picture']),

plugins/cleanupStyleAttributes.js

@@ -1,7 +1,11 @@
 import { getStyleDeclarations } from '../lib/css-tools.js';
 import { writeStyleAttribute } from '../lib/css.js';
 import { visitSkip } from '../lib/xast.js';
-import { elemsGroups, uselessShapeProperties } from './_collections.js';
+import {
+  elemsGroups,
+  geometryProperties,
+  uselessShapeProperties,
+} from './_collections.js';
 
 export const name = 'cleanupStyleAttributes';
 export const description = 'removes invalid properties from style attributes';
@@ -76,20 +80,6 @@ const presentationProperties = new Set([
   'writing-mode',
 ]);
 
-/** @type {Object<string,Set<string>>} */
-const limitedProperties = {
-  cx: new Set(['circle', 'ellipse']),
-  cy: new Set(['circle', 'ellipse']),
-  d: new Set(['path']),
-  height: new Set(['foreignObject', 'image', 'rect', 'svg', 'symbol', 'use']),
-  r: new Set(['circle']),
-  rx: new Set(['ellipse', 'rect']),
-  ry: new Set(['ellipse', 'rect']),
-  width: new Set(['foreignObject', 'image', 'rect', 'svg', 'symbol', 'use']),
-  x: new Set(['foreignObject', 'image', 'rect', 'svg', 'symbol', 'use']),
-  y: new Set(['foreignObject', 'image', 'rect', 'svg', 'symbol', 'use']),
-};
-
 /**
  * @type {import('./plugins-types.js').Plugin<'cleanupStyleAttributes'>}
  */
@@ -135,7 +125,7 @@ export const fn = (root, params, info) => {
     }
 
     // See if it is allowed for this element.
-    const allowedElements = limitedProperties[propName];
+    const allowedElements = geometryProperties[propName];
     return allowedElements && allowedElements.has(elName);
   }
 

plugins/combinePaths.js

@@ -122,6 +122,7 @@ function allStylesAreMergeable(styles) {
           continue;
         }
         break;
+      case 'd':
       case 'fill-opacity':
       case 'opacity':
       case 'stroke-linecap':

plugins/minifyPathData.js

@@ -787,9 +787,10 @@ function stringifyCommand(cmdCode, prevCmdChar, lastNumber, args) {
 
 /**
  * @param {string} path
+ * @param {number} [maxCommands]
  * @returns {PathCommand[]}
  */
-export function parsePathCommands(path) {
+export function parsePathCommands(path, maxCommands = Number.MAX_SAFE_INTEGER) {
   function addArg() {
     if (currentArg !== '') {
       args.push(currentArg);
@@ -831,6 +832,9 @@ export function parsePathCommands(path) {
     switch (getCharType(c)) {
       case 'command':
         addCurrentCommand(c);
+        if (commands.length >= maxCommands) {
+          return commands;
+        }
         continue;
       case '.':
         if (currentCommand === '') {
@@ -1088,7 +1092,7 @@ class ExactNum {
   }
 }
 
-class PathParseError extends Error {
+export class PathParseError extends Error {
   /**
    * @param {string} msg
    */

plugins/preset-default.js

@@ -26,7 +26,6 @@ import * as removeMetadata from './removeMetadata.js';
 import * as removeNonInheritableGroupAttrs from './removeNonInheritableGroupAttrs.js';
 import * as removeUnknownsAndDefaults from './removeUnknownsAndDefaults.js';
 import * as removeUnusedNS from './removeUnusedNS.js';
-import * as removeUselessDefs from './removeUselessDefs.js';
 import * as removeUselessStrokeAndFill from './removeUselessStrokeAndFill.js';
 import * as removeXMLProcInst from './removeXMLProcInst.js';
 
@@ -45,7 +44,6 @@ const presetDefault = createPreset({
     inlineStyles,
     minifyStyles,
     cleanupIds,
-    removeUselessDefs,
     convertColors,
     removeUnknownsAndDefaults,
     removeNonInheritableGroupAttrs,

plugins/preset-next.js

@@ -26,7 +26,6 @@ import * as removeMetadata from './removeMetadata.js';
 import * as removeNonInheritableGroupAttrs from './removeNonInheritableGroupAttrs.js';
 import * as removeUnknownsAndDefaults from './removeUnknownsAndDefaults.js';
 import * as removeUnusedNS from './removeUnusedNS.js';
-import * as removeUselessDefs from './removeUselessDefs.js';
 import * as removeUselessStrokeAndFill from './removeUselessStrokeAndFill.js';
 import * as removeXMLProcInst from './removeXMLProcInst.js';
 
@@ -45,7 +44,6 @@ const presetNext = createPreset({
     inlineStyles,
     minifyStyles,
     cleanupIds,
-    removeUselessDefs,
     convertColors,
     removeUnknownsAndDefaults,
     removeNonInheritableGroupAttrs,