@iconify/tools 2.0.15 → 2.0.18

package/lib/icon-set/index.cjs

@@ -42,6 +42,9 @@ class IconSet {
     }
     if (data.aliases) {
       for (const name in data.aliases) {
+        if (entries[name]) {
+          continue;
+        }
         const item = data.aliases[name];
         const parent = item.parent;
         const props = iconSet_props.filterProps(item, false);
@@ -281,7 +284,6 @@ class IconSet {
       const items = this[prop];
       const keys = Object.keys(items);
       if (keys.length) {
-        sortThemeKeys(keys);
         const sortedTheme = /* @__PURE__ */ Object.create(null);
         const tested = this.checkTheme(prop === "prefixes");
         keys.forEach((key) => {
@@ -342,7 +344,7 @@ class IconSet {
       return true;
     }).length;
   }
-  _findCategory(title, add) {
+  findCategory(title, add) {
     const categoryItem = Array.from(this.categories).find((item) => item.title === title);
     if (categoryItem) {
       return categoryItem;
@@ -358,7 +360,7 @@ class IconSet {
     return null;
   }
   listCategory(category) {
-    const categoryItem = typeof category === "string" ? this._findCategory(category, false) : category;
+    const categoryItem = typeof category === "string" ? this.findCategory(category, false) : category;
     if (!categoryItem) {
       return null;
     }
@@ -530,7 +532,7 @@ class IconSet {
   }
   toggleCategory(iconName, category, add) {
     const item = this.entries[iconName];
-    const categoryItem = this._findCategory(category, add);
+    const categoryItem = this.findCategory(category, add);
     if (!item || !categoryItem) {
       return false;
     }

package/lib/icon-set/index.d.ts

@@ -75,7 +75,7 @@ declare class IconSet {
     /**
      * Find category by title
      */
-    _findCategory(title: string, add: boolean): IconCategory | null;
+    findCategory(title: string, add: boolean): IconCategory | null;
     /**
      * Count icons in category, remove category if empty
      *

package/lib/icon-set/index.mjs

@@ -38,6 +38,9 @@ class IconSet {
     }
     if (data.aliases) {
       for (const name in data.aliases) {
+        if (entries[name]) {
+          continue;
+        }
         const item = data.aliases[name];
         const parent = item.parent;
         const props = filterProps(item, false);
@@ -277,7 +280,6 @@ class IconSet {
       const items = this[prop];
       const keys = Object.keys(items);
       if (keys.length) {
-        sortThemeKeys(keys);
         const sortedTheme = /* @__PURE__ */ Object.create(null);
         const tested = this.checkTheme(prop === "prefixes");
         keys.forEach((key) => {
@@ -338,7 +340,7 @@ class IconSet {
       return true;
     }).length;
   }
-  _findCategory(title, add) {
+  findCategory(title, add) {
     const categoryItem = Array.from(this.categories).find((item) => item.title === title);
     if (categoryItem) {
       return categoryItem;
@@ -354,7 +356,7 @@ class IconSet {
     return null;
   }
   listCategory(category) {
-    const categoryItem = typeof category === "string" ? this._findCategory(category, false) : category;
+    const categoryItem = typeof category === "string" ? this.findCategory(category, false) : category;
     if (!categoryItem) {
       return null;
     }
@@ -526,7 +528,7 @@ class IconSet {
   }
   toggleCategory(iconName, category, add) {
     const item = this.entries[iconName];
-    const categoryItem = this._findCategory(category, add);
+    const categoryItem = this.findCategory(category, add);
     if (!item || !categoryItem) {
       return false;
     }

package/lib/import/directory.d.ts

@@ -7,7 +7,7 @@ import '../svg/index.js';
 /**
  * Entry for file
  */
-interface ImportDirectpryFileEntry {
+interface ImportDirectoryFileEntry {
     path: string;
     subdir: string;
     file: string;
@@ -23,7 +23,7 @@ interface ImportDirectpryFileEntry {
  * Callback can be asynchronous
  */
 declare type ImportDirectoryKeywordCallbackResult = string | undefined;
-declare type ImportDirectoryKeywordCallback = (file: ImportDirectpryFileEntry, defaultKeyword: string, iconSet: IconSet) => ImportDirectoryKeywordCallbackResult | Promise<ImportDirectoryKeywordCallbackResult>;
+declare type ImportDirectoryKeywordCallback = (file: ImportDirectoryFileEntry, defaultKeyword: string, iconSet: IconSet) => ImportDirectoryKeywordCallbackResult | Promise<ImportDirectoryKeywordCallbackResult>;
 /**
  * Options
  */
@@ -38,4 +38,4 @@ interface ImportDirectoryOptions {
  */
 declare function importDirectory(path: string, options?: ImportDirectoryOptions): Promise<IconSet>;
 
-export { ImportDirectoryKeywordCallback, ImportDirectpryFileEntry, importDirectory };
+export { ImportDirectoryFileEntry, ImportDirectoryKeywordCallback, importDirectory };

package/lib/index.cjs

@@ -27,6 +27,7 @@ const download_gitlab_hash = require('./download/gitlab/hash.cjs');
 const download_npm_index = require('./download/npm/index.cjs');
 const download_npm_version = require('./download/npm/version.cjs');
 const download_index = require('./download/index.cjs');
+const download_api_download = require('./download/api/download.cjs');
 const colors_parse = require('./colors/parse.cjs');
 const colors_validate = require('./colors/validate.cjs');
 const optimise_svgo = require('./optimise/svgo.cjs');
@@ -74,7 +75,6 @@ require('crypto');
 require('node-fetch');
 require('pathe');
 require('child_process');
-require('./download/api/download.cjs');
 require('util');
 require('stream');
 require('extract-zip');
@@ -115,6 +115,7 @@ exports.downloadNPMPackage = download_npm_index.downloadNPMPackage;
 exports.getNPMVersion = download_npm_version.getNPMVersion;
 exports.getPackageVersion = download_npm_version.getPackageVersion;
 exports.downloadPackage = download_index.downloadPackage;
+exports.downloadFile = download_api_download.downloadFile;
 exports.isEmptyColor = colors_parse.isEmptyColor;
 exports.parseColors = colors_parse.parseColors;
 exports.validateColors = colors_validate.validateColors;

package/lib/index.d.ts

@@ -23,6 +23,7 @@ export { getGitLabRepoHash } from './download/gitlab/hash.js';
 export { downloadNPMPackage } from './download/npm/index.js';
 export { getNPMVersion, getPackageVersion } from './download/npm/version.js';
 export { downloadPackage } from './download/index.js';
+export { downloadFile } from './download/api/download.js';
 export { isEmptyColor, parseColors } from './colors/parse.js';
 export { validateColors } from './colors/validate.js';
 export { runSVGO } from './optimise/svgo.js';
@@ -56,10 +57,10 @@ import './download/types/sources.js';
 import './download/github/types.js';
 import './download/gitlab/types.js';
 import './download/npm/types.js';
+import './download/api/types.js';
 import '@iconify/utils/lib/colors/types';
 import './colors/attribs.js';
 import 'svgo';
 import './export/helpers/custom-files.js';
 import 'fs';
 import 'child_process';
-import './download/api/types.js';

package/lib/index.mjs

@@ -23,6 +23,7 @@ export { getGitLabRepoHash } from './download/gitlab/hash.mjs';
 export { downloadNPMPackage } from './download/npm/index.mjs';
 export { getNPMVersion, getPackageVersion } from './download/npm/version.mjs';
 export { downloadPackage } from './download/index.mjs';
+export { downloadFile } from './download/api/download.mjs';
 export { isEmptyColor, parseColors } from './colors/parse.mjs';
 export { validateColors } from './colors/validate.mjs';
 export { runSVGO } from './optimise/svgo.mjs';
@@ -70,7 +71,6 @@ import 'crypto';
 import 'node-fetch';
 import 'pathe';
 import 'child_process';
-import './download/api/download.mjs';
 import 'util';
 import 'stream';
 import 'extract-zip';

package/lib/optimise/svgo.cjs

@@ -4,48 +4,58 @@ 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"
-];
+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;
@@ -53,18 +63,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,
@@ -78,6 +81,5 @@ async function runSVGO(svg, options = {}) {
   svg.load(content);
 }
 
-exports.defaultSVGOPlugins = defaultSVGOPlugins;
+exports.getSVGOPlugins = getSVGOPlugins;
 exports.runSVGO = runSVGO;
-exports.shapeModifiyingSVGOPlugins = shapeModifiyingSVGOPlugins;

package/lib/optimise/svgo.d.ts

@@ -3,11 +3,17 @@ import { SVG } from '../svg/index.js';
 import '@iconify/types';
 import '@iconify/utils/lib/customisations';
 
-declare const defaultSVGOPlugins: Plugin[];
+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
  */
-declare const shapeModifiyingSVGOPlugins: Plugin[];
+declare function getSVGOPlugins(options: GetSVGOPluingOptions): Plugin[];
 /**
  * Options
  */
@@ -17,10 +23,9 @@ 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;
 /**
@@ -28,4 +33,4 @@ declare type SVGOOptions = SVGOOptionsWithPlugin | SVGOptionsWithoutPlugin;
  */
 declare function runSVGO(svg: SVG, options?: SVGOOptions): Promise<void>;
 
-export { defaultSVGOPlugins, runSVGO, shapeModifiyingSVGOPlugins };
+export { getSVGOPlugins, runSVGO };

package/lib/optimise/svgo.mjs

@@ -1,47 +1,57 @@
 import { optimize } from '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"
-];
+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,
@@ -74,4 +77,4 @@ async function runSVGO(svg, options = {}) {
   svg.load(content);
 }
 
-export { defaultSVGOPlugins, runSVGO, shapeModifiyingSVGOPlugins };
+export { getSVGOPlugins, runSVGO };

package/package.json

@@ -3,7 +3,7 @@
 	"type": "module",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.0.15",
+	"version": "2.0.18",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",