@iconify/tools 2.0.14 → 2.0.17

package/lib/optimise/scale.d.ts

@@ -1,5 +1,10 @@
-import type { SVG } from '../svg';
+import { SVG } from '../svg/index.js';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations';
+
 /**
  * Scale icon
  */
-export declare function scaleSVG(svg: SVG, scale: number): Promise<void>;
+declare function scaleSVG(svg: SVG, scale: number): Promise<void>;
+
+export { scaleSVG };

package/lib/optimise/scale.mjs

@@ -1,5 +1,6 @@
-// src/optimise/scale.ts
-import { runSVGO } from "./svgo.mjs";
+import { runSVGO } from './svgo.mjs';
+import 'svgo';
+
 async function scaleSVG(svg, scale) {
   const viewBox = svg.viewBox;
   const width = viewBox.width * scale;
@@ -17,6 +18,5 @@ async function scaleSVG(svg, scale) {
     ]
   });
 }
-export {
-  scaleSVG
-};
+
+export { scaleSVG };

package/lib/optimise/svgo.cjs

@@ -0,0 +1,85 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const svgo = require('svgo');
+
+function getSVGOPlugins(options) {
+  return [
+    "cleanupAttrs",
+    "mergeStyles",
+    "inlineStyles",
+    "removeComments",
+    "removeUselessDefs",
+    "removeEditorsNSData",
+    "removeEmptyAttrs",
+    "removeEmptyContainers",
+    "convertStyleToAttrs",
+    "convertColors",
+    "convertTransform",
+    "removeUnknownsAndDefaults",
+    "removeNonInheritableGroupAttrs",
+    "removeUnusedNS",
+    "cleanupNumericValues",
+    "cleanupListOfValues",
+    "moveElemsAttrsToGroup",
+    "moveGroupAttrsToElems",
+    "collapseGroups",
+    "sortDefsChildren",
+    "sortAttrs",
+    ...options.animated ? [] : ["removeUselessStrokeAndFill"],
+    ...options.animated || options.keepShapes ? [] : [
+      "removeHiddenElems",
+      "convertShapeToPath",
+      "convertEllipseToCircle",
+      {
+        name: "convertPathData",
+        params: {
+          noSpaceAfterFlags: true
+        }
+      },
+      {
+        name: "mergePaths",
+        params: {
+          noSpaceAfterFlags: true
+        }
+      },
+      "reusePaths"
+    ],
+    ...options.cleanupIDs !== false ? [
+      {
+        name: "cleanupIDs",
+        params: {
+          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
+        }
+      }
+    ] : []
+  ];
+}
+async function runSVGO(svg, options = {}) {
+  const code = svg.toString();
+  const multipass = options.multipass !== false;
+  let plugins;
+  if (options.plugins) {
+    plugins = options.plugins;
+  } else {
+    const animated = code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1;
+    plugins = getSVGOPlugins({
+      ...options,
+      animated
+    });
+  }
+  const pluginOptions = {
+    plugins,
+    multipass
+  };
+  const result = svgo.optimize(code, pluginOptions);
+  if (typeof result.error === "string") {
+    throw new Error(result.error);
+  }
+  const content = result.data.replace(/<defs\/>/g, "");
+  svg.load(content);
+}
+
+exports.getSVGOPlugins = getSVGOPlugins;
+exports.runSVGO = runSVGO;

package/lib/optimise/svgo.d.ts

@@ -1,10 +1,19 @@
-import type { Plugin } from 'svgo';
-import type { SVG } from '../svg';
-export declare const defaultSVGOPlugins: Plugin[];
+import { Plugin } from 'svgo';
+import { SVG } from '../svg/index.js';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations';
+
+interface CleanupIDsOption {
+    cleanupIDs?: string | false;
+}
+interface GetSVGOPluingOptions extends CleanupIDsOption {
+    animated?: boolean;
+    keepShapes?: boolean;
+}
 /**
- * Plugins that modify shapes. Added to plugins list, unless 'keepShapes' option is enabled
+ * Get list of plugins
  */
-export declare const shapeModifiyingSVGOPlugins: Plugin[];
+declare function getSVGOPlugins(options: GetSVGOPluingOptions): Plugin[];
 /**
  * Options
  */
@@ -14,14 +23,14 @@ interface SVGOCommonOptions {
 interface SVGOOptionsWithPlugin extends SVGOCommonOptions {
     plugins: Plugin[];
 }
-interface SVGOptionsWithoutPlugin extends SVGOCommonOptions {
+interface SVGOptionsWithoutPlugin extends SVGOCommonOptions, CleanupIDsOption {
     plugins?: undefined;
     keepShapes?: boolean;
-    cleanupIDs?: string | false;
 }
 declare type SVGOOptions = SVGOOptionsWithPlugin | SVGOptionsWithoutPlugin;
 /**
  * Run SVGO on icon
  */
-export declare function runSVGO(svg: SVG, options?: SVGOOptions): Promise<void>;
-export {};
+declare function runSVGO(svg: SVG, options?: SVGOOptions): Promise<void>;
+
+export { getSVGOPlugins, runSVGO };

package/lib/optimise/svgo.mjs

@@ -1,47 +1,57 @@
-// src/optimise/svgo.ts
-import { optimize } from "svgo";
-var defaultSVGOPlugins = [
-  "cleanupAttrs",
-  "mergeStyles",
-  "inlineStyles",
-  "removeComments",
-  "removeUselessDefs",
-  "removeEditorsNSData",
-  "removeEmptyAttrs",
-  "removeEmptyContainers",
-  "convertStyleToAttrs",
-  "convertColors",
-  "convertTransform",
-  "removeUnknownsAndDefaults",
-  "removeNonInheritableGroupAttrs",
-  "removeUselessStrokeAndFill",
-  "removeUnusedNS",
-  "cleanupNumericValues",
-  "cleanupListOfValues",
-  "moveElemsAttrsToGroup",
-  "moveGroupAttrsToElems",
-  "collapseGroups",
-  "sortDefsChildren",
-  "sortAttrs"
-];
-var shapeModifiyingSVGOPlugins = [
-  "removeHiddenElems",
-  "convertShapeToPath",
-  "convertEllipseToCircle",
-  {
-    name: "convertPathData",
-    params: {
-      noSpaceAfterFlags: true
-    }
-  },
-  {
-    name: "mergePaths",
-    params: {
-      noSpaceAfterFlags: true
-    }
-  },
-  "reusePaths"
-];
+import { optimize } from 'svgo';
+
+function getSVGOPlugins(options) {
+  return [
+    "cleanupAttrs",
+    "mergeStyles",
+    "inlineStyles",
+    "removeComments",
+    "removeUselessDefs",
+    "removeEditorsNSData",
+    "removeEmptyAttrs",
+    "removeEmptyContainers",
+    "convertStyleToAttrs",
+    "convertColors",
+    "convertTransform",
+    "removeUnknownsAndDefaults",
+    "removeNonInheritableGroupAttrs",
+    "removeUnusedNS",
+    "cleanupNumericValues",
+    "cleanupListOfValues",
+    "moveElemsAttrsToGroup",
+    "moveGroupAttrsToElems",
+    "collapseGroups",
+    "sortDefsChildren",
+    "sortAttrs",
+    ...options.animated ? [] : ["removeUselessStrokeAndFill"],
+    ...options.animated || options.keepShapes ? [] : [
+      "removeHiddenElems",
+      "convertShapeToPath",
+      "convertEllipseToCircle",
+      {
+        name: "convertPathData",
+        params: {
+          noSpaceAfterFlags: true
+        }
+      },
+      {
+        name: "mergePaths",
+        params: {
+          noSpaceAfterFlags: true
+        }
+      },
+      "reusePaths"
+    ],
+    ...options.cleanupIDs !== false ? [
+      {
+        name: "cleanupIDs",
+        params: {
+          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
+        }
+      }
+    ] : []
+  ];
+}
 async function runSVGO(svg, options = {}) {
   const code = svg.toString();
   const multipass = options.multipass !== false;
@@ -49,18 +59,11 @@ async function runSVGO(svg, options = {}) {
   if (options.plugins) {
     plugins = options.plugins;
   } else {
-    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: {
-          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
-        }
-      }
-    ] : []);
+    const animated = code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1;
+    plugins = getSVGOPlugins({
+      ...options,
+      animated
+    });
   }
   const pluginOptions = {
     plugins,
@@ -73,8 +76,5 @@ async function runSVGO(svg, options = {}) {
   const content = result.data.replace(/<defs\/>/g, "");
   svg.load(content);
 }
-export {
-  defaultSVGOPlugins,
-  runSVGO,
-  shapeModifiyingSVGOPlugins
-};
+
+export { getSVGOPlugins, runSVGO };

package/lib/svg/analyse/error.cjs

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function analyseTagError(element) {
+  let result = "<" + element.tagName;
+  if (element._id) {
+    result += ' id="' + element._id + '"';
+  }
+  const attribs = element.attribs;
+  if (attribs["d"]) {
+    const value = attribs["d"];
+    result += ' d="' + (value.length > 16 ? value.slice(0, 12) + "..." : value) + '"';
+  }
+  return result + ">";
+}
+
+exports.analyseTagError = analyseTagError;

package/lib/svg/analyse/error.d.ts

@@ -1,5 +1,8 @@
-import type { ExtendedTagElement } from './types';
+import { ExtendedTagElement } from './types.js';
+
 /**
  * Get tag for error message
  */
-export declare function analyseTagError(element: ExtendedTagElement): string;
+declare function analyseTagError(element: ExtendedTagElement): string;
+
+export { analyseTagError };

package/lib/svg/analyse/error.mjs

@@ -1,4 +1,3 @@
-// src/svg/analyse/error.ts
 function analyseTagError(element) {
   let result = "<" + element.tagName;
   if (element._id) {
@@ -11,6 +10,5 @@ function analyseTagError(element) {
   }
   return result + ">";
 }
-export {
-  analyseTagError
-};
+
+export { analyseTagError };

package/lib/svg/analyse/types.cjs

@@ -0,0 +1,2 @@
+'use strict';
+

package/lib/svg/analyse/types.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="cheerio" />
 /**
  * Options
  */
-export interface AnalyseSVGStructureOptions {
+interface AnalyseSVGStructureOptions {
     fixErrors?: boolean;
 }
 /**
@@ -11,7 +10,7 @@ export interface AnalyseSVGStructureOptions {
 /**
  * Link to element
  */
-export interface LinkToElementWithID {
+interface LinkToElementWithID {
     id: string;
     usedAsMask: boolean;
     usedByIndex: number;
@@ -19,7 +18,7 @@ export interface LinkToElementWithID {
 /**
  * How element is used by parent elements
  */
-export interface ExtendedTagElementUses {
+interface ExtendedTagElementUses {
     _usedAsMask: boolean;
     _usedAsPaint: boolean;
 }
@@ -36,7 +35,7 @@ interface ReusableElement {
  *
  * Similar to ReusableElement, but not necessary a definition - any element with id. Also contains list of child elements
  */
-export interface ElementWithID {
+interface ElementWithID {
     id: string;
     isMask: boolean;
     indexes: Set<number>;
@@ -51,7 +50,7 @@ interface ExtendedTagElementRelations {
 /**
  * Extended tag
  */
-export interface ExtendedTagElement extends cheerio.TagElement, ExtendedTagElementUses, ExtendedTagElementRelations {
+interface ExtendedTagElement extends cheerio.TagElement, ExtendedTagElementUses, ExtendedTagElementRelations {
     _index: number;
     _id?: string;
     _belongsTo?: ElementWithID[];
@@ -61,13 +60,13 @@ export interface ExtendedTagElement extends cheerio.TagElement, ExtendedTagEleme
 /**
  * Additional stuff for <svg>
  */
-export interface ExtendedRootTagElement extends ExtendedTagElement {
+interface ExtendedRootTagElement extends ExtendedTagElement {
     _parsed?: boolean;
 }
 /**
  * Tree
  */
-export interface ElementsTreeItem {
+interface ElementsTreeItem {
     index: number;
     usedAsMask: boolean;
     parent?: ElementsTreeItem;
@@ -76,14 +75,15 @@ export interface ElementsTreeItem {
 /**
  * Elements map
  */
-export declare type ElementsMap = Map<number, ExtendedTagElement>;
+declare type ElementsMap = Map<number, ExtendedTagElement>;
 /**
  * Result
  */
-export interface AnalyseSVGStructureResult {
+interface AnalyseSVGStructureResult {
     elements: ElementsMap;
     ids: Record<string, number>;
     links: LinkToElementWithID[];
     tree: ElementsTreeItem;
 }
-export {};
+
+export { AnalyseSVGStructureOptions, AnalyseSVGStructureResult, ElementWithID, ElementsMap, ElementsTreeItem, ExtendedRootTagElement, ExtendedTagElement, ExtendedTagElementUses, LinkToElementWithID };

package/lib/svg/analyse/types.mjs

@@ -0,0 +1 @@
+