@iconify/tools 2.0.2 → 2.0.3

package/lib/optimise/svgo.js

@@ -52,6 +52,8 @@ exports.shapeModifiyingSVGOPlugins = [
  * Run SVGO on icon
  */
 async function runSVGO(svg, options = {}) {
+    // Code
+    const code = svg.toString();
     // Options
     const multipass = options.multipass !== false;
     // Plugins list
@@ -60,7 +62,14 @@ async function runSVGO(svg, options = {}) {
         plugins = options.plugins;
     }
     else {
-        plugins = exports.defaultSVGOPlugins.concat(options.keepShapes ? [] : exports.shapeModifiyingSVGOPlugins, options.cleanupIDs !== false
+        // Check for animations: convertShapeToPath and removeHiddenElems plugins currently might ruin animations
+        let keepShapes = options.keepShapes;
+        if (keepShapes === void 0 &&
+            (code.indexOf('<animate') !== -1 || code.indexOf('<set') !== -1)) {
+            // Do not check animations: just assume they might break
+            keepShapes = true;
+        }
+        plugins = exports.defaultSVGOPlugins.concat(keepShapes ? [] : exports.shapeModifiyingSVGOPlugins, options.cleanupIDs !== false
             ? [
                 {
                     name: 'cleanupIDs',
@@ -79,7 +88,7 @@ async function runSVGO(svg, options = {}) {
         multipass,
     };
     // Load data (changing type because SVGO types do not include error ?????)
-    const result = (0, svgo_1.optimize)(svg.toString(), pluginOptions);
+    const result = (0, svgo_1.optimize)(code, pluginOptions);
     if (typeof result.error === 'string') {
         throw new Error(result.error);
     }

package/lib/optimise/svgo.mjs

@@ -44,12 +44,17 @@ var shapeModifiyingSVGOPlugins = [
   "reusePaths"
 ];
 async function runSVGO(svg, options = {}) {
+  const code = svg.toString();
   const multipass = options.multipass !== false;
   let plugins;
   if (options.plugins) {
     plugins = options.plugins;
   } else {
-    plugins = defaultSVGOPlugins.concat(options.keepShapes ? [] : shapeModifiyingSVGOPlugins, options.cleanupIDs !== false ? [
+    let keepShapes = options.keepShapes;
+    if (keepShapes === void 0 && (code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1)) {
+      keepShapes = true;
+    }
+    plugins = defaultSVGOPlugins.concat(keepShapes ? [] : shapeModifiyingSVGOPlugins, options.cleanupIDs !== false ? [
       {
         name: "cleanupIDs",
         params: {
@@ -62,7 +67,7 @@ async function runSVGO(svg, options = {}) {
     plugins,
     multipass
   };
-  const result = optimize(svg.toString(), pluginOptions);
+  const result = optimize(code, pluginOptions);
   if (typeof result.error === "string") {
     throw new Error(result.error);
   }

package/lib/svg/cleanup/bad-tags.js

@@ -17,8 +17,6 @@ requiredParentTags.set(tags_1.filterTag, tags_1.filterChildTags);
 requiredParentTags.set(tags_1.defsTag, tags_1.tagsInsideDefs);
 // <stop> must be inside gradient
 requiredParentTags.set(tags_1.gradientTags, tags_1.gradientChildTags);
-// Animations must be inside shapes or filters
-requiredParentTags.set(tags_1.tagsBeforeAnimation, tags_1.animateTags);
 // <mpath> must be inside <animateMotion>
 requiredParentTags.set(new Set(['animateMotion']), tags_1.animateMotionChildTags);
 /**

package/lib/svg/cleanup/bad-tags.mjs

@@ -3,7 +3,6 @@ import { parseSVG } from "../parse.mjs";
 import {
   allValidTags,
   animateMotionChildTags,
-  animateTags,
   badTags,
   defsTag,
   feComponentTransferChildTag,
@@ -14,7 +13,6 @@ import {
   filterTag,
   gradientChildTags,
   gradientTags,
-  tagsBeforeAnimation,
   tagsInsideDefs,
   unsupportedTags
 } from "../data/tags.mjs";
@@ -25,7 +23,6 @@ requiredParentTags.set(feLightningTags, feLightningChildTags);
 requiredParentTags.set(filterTag, filterChildTags);
 requiredParentTags.set(defsTag, tagsInsideDefs);
 requiredParentTags.set(gradientTags, gradientChildTags);
-requiredParentTags.set(tagsBeforeAnimation, animateTags);
 requiredParentTags.set(new Set(["animateMotion"]), animateMotionChildTags);
 async function checkBadTags(svg) {
   await parseSVG(svg, (item) => {

package/lib/svg/data/tags.d.ts

@@ -79,10 +79,6 @@ export declare const feMergeChildTags: Set<string>;
  * Tags that can be used only inside <defs>
  */
 export declare const tagsInsideDefs: Set<string>;
-/**
- * Parent tags for animations
- */
-export declare const tagsBeforeAnimation: Set<string>;
 /**
  * All supported tags
  */

package/lib/svg/data/tags.js

@@ -4,7 +4,7 @@
  * Icons cannot have anything that requires external resources, anything that renders inconsistently.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allValidTags = exports.tagsBeforeAnimation = exports.tagsInsideDefs = exports.feMergeChildTags = exports.feLightningChildTags = exports.feComponentTransferChildTag = exports.filterChildTags = exports.feLightningTags = exports.filterTag = exports.patternTag = exports.gradientChildTags = exports.gradientTags = exports.animateMotionChildTags = exports.animateTags = exports.markerTag = exports.groupTag = exports.useTag = exports.shapeTags = exports.maskAndSymbolTags = exports.defsTag = exports.styleTag = exports.unsupportedTags = exports.badTags = void 0;
+exports.allValidTags = exports.tagsInsideDefs = exports.feMergeChildTags = exports.feLightningChildTags = exports.feComponentTransferChildTag = exports.filterChildTags = exports.feLightningTags = exports.filterTag = exports.patternTag = exports.gradientChildTags = exports.gradientTags = exports.animateMotionChildTags = exports.animateTags = exports.markerTag = exports.groupTag = exports.useTag = exports.shapeTags = exports.maskAndSymbolTags = exports.defsTag = exports.styleTag = exports.unsupportedTags = exports.badTags = void 0;
 /**
  * Bad tags
  *
@@ -153,14 +153,6 @@ exports.tagsInsideDefs = new Set([
     ...exports.patternTag,
     ...exports.markerTag,
 ]);
-/**
- * Parent tags for animations
- */
-exports.tagsBeforeAnimation = new Set([
-    ...exports.shapeTags,
-    ...exports.filterChildTags,
-    ...exports.feComponentTransferChildTag,
-]);
 /**
  * All supported tags
  */

package/lib/svg/data/tags.mjs

@@ -85,11 +85,6 @@ var tagsInsideDefs = new Set([
   ...patternTag,
   ...markerTag
 ]);
-var tagsBeforeAnimation = new Set([
-  ...shapeTags,
-  ...filterChildTags,
-  ...feComponentTransferChildTag
-]);
 var allValidTags = new Set([
   ...styleTag,
   ...defsTag,
@@ -129,7 +124,6 @@ export {
   patternTag,
   shapeTags,
   styleTag,
-  tagsBeforeAnimation,
   tagsInsideDefs,
   unsupportedTags,
   useTag

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@iconify/tools",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -31,7 +31,7 @@
 		"extract-zip": "^2.0.1",
 		"node-fetch": "^2.6.6",
 		"pathe": "^0.2.0",
-		"svgo": "^2.7.0",
+		"svgo": "^2.8.0",
 		"tar": "^6.1.11"
 	},
 	"exports": {