@iconify/tools 2.0.13 → 2.0.16

package/lib/optimise/global-style.mjs

@@ -1,16 +1,22 @@
-// src/optimise/global-style.ts
-import "../svg/data/attributes.mjs";
-import { allValidTags, animateTags } from "../svg/data/tags.mjs";
-import { parseSVG } from "../svg/parse.mjs";
-import { parseSVGStyle } from "../svg/parse-style.mjs";
+import { allValidTags, animateTags } from '../svg/data/tags.mjs';
+import { parseSVG } from '../svg/parse.mjs';
+import { parseSVGStyle } from '../svg/parse-style.mjs';
+import '../css/parse.mjs';
+import '../css/parser/tokens.mjs';
+import '../css/parser/error.mjs';
+import '../css/parser/strings.mjs';
+import '../css/parser/text.mjs';
+import '../css/parser/export.mjs';
+import '../css/parser/tree.mjs';
+
 function getClassList(value) {
-  return value == null ? void 0 : value.split(/\s+/);
+  return value?.split(/\s+/);
 }
-var tempDataAttrbiute = "data-gstyle-temp";
+const tempDataAttrbiute = "data-gstyle-temp";
 async function cleanupGlobalStyle(svg) {
   const backup = svg.toString();
   let containsTempAttr = false;
-  const animatedClasses = new Set();
+  const animatedClasses = /* @__PURE__ */ new Set();
   await parseSVG(svg, (item) => {
     if (!animateTags.has(item.tagName)) {
       return;
@@ -33,57 +39,72 @@ async function cleanupGlobalStyle(svg) {
   });
   try {
     await parseSVGStyle(svg, async (styleItem) => {
-      var _a;
       const returnValue = styleItem.value;
       if (styleItem.type !== "global") {
         return returnValue;
       }
-      if (styleItem.selectors.length !== 1 || styleItem.selectorTokens.length !== 1) {
-        return returnValue;
-      }
-      const selectorToken = styleItem.selectorTokens[0];
-      if (selectorToken.type !== "selector") {
-        return returnValue;
-      }
-      const selector = styleItem.selectors[0];
-      const firstChar = selector.charAt(0);
-      let matchType;
-      if (firstChar === ".") {
-        matchType = "class";
-      } else if (firstChar === "#") {
-        matchType = "id";
-      } else if (allValidTags.has(selector)) {
-        matchType = "tag";
-      } else {
-        return returnValue;
+      const selectorTokens = styleItem.selectorTokens;
+      for (let i = 0; i < selectorTokens.length; i++) {
+        const selectorToken = selectorTokens[i];
+        if (selectorToken.type !== "selector") {
+          return returnValue;
+        }
       }
-      const valueMatch = matchType === "tag" ? selector : selector.slice(1);
-      if (matchType === "class" && animatedClasses.has(valueMatch)) {
-        return returnValue;
+      const selectors = styleItem.selectors;
+      const matches = [];
+      for (let i = 0; i < selectors.length; i++) {
+        const selector = styleItem.selectors[i];
+        const firstChar = selector.charAt(0);
+        let matchType;
+        if (firstChar === ".") {
+          matchType = "class";
+        } else if (firstChar === "#") {
+          matchType = "id";
+        } else if (allValidTags.has(selector)) {
+          matchType = "tag";
+        } else {
+          return returnValue;
+        }
+        const valueMatch = matchType === "tag" ? selector : selector.slice(1);
+        if (matchType === "class" && animatedClasses.has(valueMatch)) {
+          return returnValue;
+        }
+        matches.push({
+          type: matchType,
+          value: valueMatch
+        });
       }
       const isMatch = (tagName, $element) => {
-        switch (matchType) {
-          case "id":
-            return $element.attr("id") === valueMatch;
-          case "tag":
-            return tagName === valueMatch;
-          case "class": {
-            const className = $element.attr("class");
-            if (!className || getClassList(className).indexOf(valueMatch) === -1) {
-              return false;
+        for (let i = 0; i < matches.length; i++) {
+          const { type, value } = matches[i];
+          switch (type) {
+            case "id":
+              if ($element.attr("id") === value) {
+                return true;
+              }
+              break;
+            case "tag":
+              if (tagName === value) {
+                return true;
+              }
+              break;
+            case "class": {
+              const className = $element.attr("class");
+              if (className && getClassList(className).indexOf(value) !== -1) {
+                return true;
+              }
             }
           }
         }
-        return true;
+        return false;
       };
       await parseSVG(svg, (svgItem) => {
-        var _a2;
         const tagName = svgItem.tagName;
         const $element = svgItem.$element;
         if (!isMatch(tagName, $element)) {
           return;
         }
-        const addedAttributes = new Set((_a2 = $element.attr(tempDataAttrbiute)) == null ? void 0 : _a2.split(/\s+/));
+        const addedAttributes = new Set($element.attr(tempDataAttrbiute)?.split(/\s+/));
         const prop = styleItem.prop;
         if ($element.attr(prop) !== void 0) {
           if (addedAttributes.has(prop)) {
@@ -95,7 +116,8 @@ async function cleanupGlobalStyle(svg) {
         $element.attr(tempDataAttrbiute, Array.from(addedAttributes).join(" "));
         containsTempAttr = true;
       });
-      if (matchType === "class" && ((_a = styleItem.nextTokens[0]) == null ? void 0 : _a.type) === "close") {
+      const classMatches = matches.filter((item) => item.type === "class").map((item) => item.value);
+      if (classMatches.length && styleItem.nextTokens[0]?.type === "close") {
         await parseSVG(svg, (svgItem) => {
           const $element = svgItem.$element;
           if (!isMatch("", $element)) {
@@ -105,7 +127,7 @@ async function cleanupGlobalStyle(svg) {
           if (!classList) {
             return;
           }
-          const filtered = classList.filter((item) => item !== valueMatch);
+          const filtered = classList.filter((item) => classMatches.indexOf(item) === -1);
           if (!filtered.length) {
             $element.removeAttr("class");
           } else {
@@ -124,6 +146,5 @@ async function cleanupGlobalStyle(svg) {
     svg.load(backup);
   }
 }
-export {
-  cleanupGlobalStyle
-};
+
+export { cleanupGlobalStyle };

package/lib/optimise/scale.cjs

@@ -0,0 +1,26 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const optimise_svgo = require('./svgo.cjs');
+require('svgo');
+
+async function scaleSVG(svg, scale) {
+  const viewBox = svg.viewBox;
+  const width = viewBox.width * scale;
+  const height = viewBox.height * scale;
+  const left = viewBox.left * scale;
+  const top = viewBox.top * scale;
+  const content = '<svg width="' + width + '" height="' + height + '" viewBox="' + left + " " + top + " " + width + " " + height + '"><g transform="scale(' + scale + ')">' + svg.getBody() + "</g></svg>";
+  svg.load(content);
+  await optimise_svgo.runSVGO(svg, {
+    plugins: [
+      "collapseGroups",
+      "convertTransform",
+      "convertPathData",
+      "sortAttrs"
+    ]
+  });
+}
+
+exports.scaleSVG = scaleSVG;

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,83 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const svgo = require('svgo');
+
+const defaultSVGOPlugins = [
+  "cleanupAttrs",
+  "mergeStyles",
+  "inlineStyles",
+  "removeComments",
+  "removeUselessDefs",
+  "removeEditorsNSData",
+  "removeEmptyAttrs",
+  "removeEmptyContainers",
+  "convertStyleToAttrs",
+  "convertColors",
+  "convertTransform",
+  "removeUnknownsAndDefaults",
+  "removeNonInheritableGroupAttrs",
+  "removeUselessStrokeAndFill",
+  "removeUnusedNS",
+  "cleanupNumericValues",
+  "cleanupListOfValues",
+  "moveElemsAttrsToGroup",
+  "moveGroupAttrsToElems",
+  "collapseGroups",
+  "sortDefsChildren",
+  "sortAttrs"
+];
+const shapeModifiyingSVGOPlugins = [
+  "removeHiddenElems",
+  "convertShapeToPath",
+  "convertEllipseToCircle",
+  {
+    name: "convertPathData",
+    params: {
+      noSpaceAfterFlags: true
+    }
+  },
+  {
+    name: "mergePaths",
+    params: {
+      noSpaceAfterFlags: true
+    }
+  },
+  "reusePaths"
+];
+async function runSVGO(svg, options = {}) {
+  const code = svg.toString();
+  const multipass = options.multipass !== false;
+  let plugins;
+  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 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.defaultSVGOPlugins = defaultSVGOPlugins;
+exports.runSVGO = runSVGO;
+exports.shapeModifiyingSVGOPlugins = shapeModifiyingSVGOPlugins;

package/lib/optimise/svgo.d.ts

@@ -1,10 +1,13 @@
-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';
+
+declare const defaultSVGOPlugins: Plugin[];
 /**
  * Plugins that modify shapes. Added to plugins list, unless 'keepShapes' option is enabled
  */
-export declare const shapeModifiyingSVGOPlugins: Plugin[];
+declare const shapeModifiyingSVGOPlugins: Plugin[];
 /**
  * Options
  */
@@ -23,5 +26,6 @@ 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 { defaultSVGOPlugins, runSVGO, shapeModifiyingSVGOPlugins };

package/lib/optimise/svgo.mjs

@@ -1,6 +1,6 @@
-// src/optimise/svgo.ts
-import { optimize } from "svgo";
-var defaultSVGOPlugins = [
+import { optimize } from 'svgo';
+
+const defaultSVGOPlugins = [
   "cleanupAttrs",
   "mergeStyles",
   "inlineStyles",
@@ -24,7 +24,7 @@ var defaultSVGOPlugins = [
   "sortDefsChildren",
   "sortAttrs"
 ];
-var shapeModifiyingSVGOPlugins = [
+const shapeModifiyingSVGOPlugins = [
   "removeHiddenElems",
   "convertShapeToPath",
   "convertEllipseToCircle",
@@ -73,8 +73,5 @@ async function runSVGO(svg, options = {}) {
   const content = result.data.replace(/<defs\/>/g, "");
   svg.load(content);
 }
-export {
-  defaultSVGOPlugins,
-  runSVGO,
-  shapeModifiyingSVGOPlugins
-};
+
+export { defaultSVGOPlugins, runSVGO, shapeModifiyingSVGOPlugins };

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 @@
+