@iconify/tools 2.0.12 → 2.0.15

package/lib/icon-set/index.mjs

@@ -1,37 +1,38 @@
-// src/icon-set/index.ts
-import { fullIcon } from "@iconify/utils/lib/icon";
-import { iconToSVG } from "@iconify/utils/lib/svg/build";
-import {
-  defaults
-} from "@iconify/utils/lib/customisations";
-import { minifyIconSet } from "@iconify/utils/lib/icon-set/minify";
-import { convertIconSetInfo } from "@iconify/utils/lib/icon-set/convert-info";
-import { extraDefaultProps, filterProps } from "./props.mjs";
-import { SVG } from "../svg/index.mjs";
-function assertNever(v) {
-}
-var maxIteration = 6;
-var themeKeys = ["prefixes", "suffixes"];
+import { fullIcon } from '@iconify/utils/lib/icon';
+import { iconToSVG } from '@iconify/utils/lib/svg/build';
+import { defaults } from '@iconify/utils/lib/customisations';
+import { minifyIconSet } from '@iconify/utils/lib/icon-set/minify';
+import { convertIconSetInfo } from '@iconify/utils/lib/icon-set/convert-info';
+import { filterProps, extraDefaultProps } from './props.mjs';
+import { SVG } from '../svg/index.mjs';
+import 'cheerio';
+import '@iconify/utils';
+
+const maxIteration = 6;
+const themeKeys = ["prefixes", "suffixes"];
 function sortThemeKeys(keys) {
   return keys.sort((a, b) => a.length === b.length ? a.localeCompare(b) : b.length - a.length);
 }
-var IconSet = class {
+class IconSet {
   constructor(data) {
     this.load(data);
   }
   load(data) {
     this.prefix = data.prefix;
-    const defaultProps = filterProps(data);
-    this.entries = Object.create(null);
+    const defaultProps = filterProps(data, true);
+    this.entries = /* @__PURE__ */ Object.create(null);
     const entries = this.entries;
     for (const name in data.icons) {
       const item = data.icons[name];
       const entry = {
         type: "icon",
         body: item.body,
-        props: { ...defaultProps, ...filterProps(item) },
-        chars: new Set(),
-        categories: new Set()
+        props: filterProps({
+          ...defaultProps,
+          ...item
+        }, true),
+        chars: /* @__PURE__ */ new Set(),
+        categories: /* @__PURE__ */ new Set()
       };
       entries[name] = entry;
     }
@@ -39,8 +40,8 @@ var IconSet = class {
       for (const name in data.aliases) {
         const item = data.aliases[name];
         const parent = item.parent;
-        const props = filterProps(item);
-        const chars = new Set();
+        const props = filterProps(item, false);
+        const chars = /* @__PURE__ */ new Set();
         if (Object.keys(props).length) {
           const entry = {
             type: "variation",
@@ -70,7 +71,7 @@ var IconSet = class {
         }
       }
     }
-    this.categories = new Set();
+    this.categories = /* @__PURE__ */ new Set();
     if (data.categories) {
       for (const category in data.categories) {
         const item = {
@@ -79,7 +80,7 @@ var IconSet = class {
         };
         data.categories[category].forEach((iconName) => {
           const icon = entries[iconName];
-          switch (icon == null ? void 0 : icon.type) {
+          switch (icon?.type) {
             case "icon":
               icon.categories.add(item);
           }
@@ -88,8 +89,8 @@ var IconSet = class {
         this.listCategory(item);
       }
     }
-    const prefixes = this.prefixes = Object.create(null);
-    const suffixes = this.suffixes = Object.create(null);
+    const prefixes = this.prefixes = /* @__PURE__ */ Object.create(null);
+    const suffixes = this.suffixes = /* @__PURE__ */ Object.create(null);
     if (data.themes) {
       for (const key in data.themes) {
         const item = data.themes[key];
@@ -110,7 +111,7 @@ var IconSet = class {
     themeKeys.forEach((prop) => {
       const items = data[prop];
       if (items) {
-        this[prop] = Object.create(null);
+        this[prop] = /* @__PURE__ */ Object.create(null);
         for (const key in items) {
           this[prop][key] = items[key];
         }
@@ -186,7 +187,6 @@ var IconSet = class {
           return parent;
         }
         default:
-          assertNever(item);
           return null;
       }
     }
@@ -213,8 +213,8 @@ var IconSet = class {
     return html ? new SVG(html) : null;
   }
   export(validate = true) {
-    const icons = Object.create(null);
-    const aliases = Object.create(null);
+    const icons = /* @__PURE__ */ Object.create(null);
+    const aliases = /* @__PURE__ */ Object.create(null);
     const names = Object.keys(this.entries);
     names.sort((a, b) => a.localeCompare(b));
     names.forEach((name) => {
@@ -241,9 +241,6 @@ var IconSet = class {
           aliases[name] = alias;
           break;
         }
-        default: {
-          assertNever(item);
-        }
       }
     });
     let info;
@@ -265,7 +262,7 @@ var IconSet = class {
     if (Object.keys(chars).length) {
       result.chars = chars;
     }
-    const categories = Object.create(null);
+    const categories = /* @__PURE__ */ Object.create(null);
     Array.from(this.categories).sort((a, b) => a.title.localeCompare(b.title)).forEach((item) => {
       const names2 = this.listCategory(item);
       if (names2) {
@@ -281,7 +278,7 @@ var IconSet = class {
       const keys = Object.keys(items);
       if (keys.length) {
         sortThemeKeys(keys);
-        const sortedTheme = Object.create(null);
+        const sortedTheme = /* @__PURE__ */ Object.create(null);
         const tested = this.checkTheme(prop === "prefixes");
         keys.forEach((key) => {
           if (tested.valid[key].length) {
@@ -297,7 +294,7 @@ var IconSet = class {
     return result;
   }
   chars(names) {
-    const chars = Object.create(null);
+    const chars = /* @__PURE__ */ Object.create(null);
     if (!names) {
       names = Object.keys(this.entries);
     }
@@ -335,7 +332,7 @@ var IconSet = class {
   }
   count() {
     return this._filter((_key, item, icon) => {
-      if (item.type === "alias" || item.props.hidden || (icon == null ? void 0 : icon.hidden)) {
+      if (item.type === "alias" || item.props.hidden || icon?.hidden) {
         return false;
       }
       return true;
@@ -380,7 +377,7 @@ var IconSet = class {
   }
   remove(name, removeDependencies = true) {
     const entries = this.entries;
-    const names = new Set();
+    const names = /* @__PURE__ */ new Set();
     if (typeof removeDependencies === "string") {
       if (name === removeDependencies || !entries[removeDependencies]) {
         return 0;
@@ -410,8 +407,6 @@ var IconSet = class {
                 item.parent = removeDependencies;
               }
               break;
-            default:
-              assertNever(item);
           }
         }
       }
@@ -451,8 +446,6 @@ var IconSet = class {
             item.parent = newName;
           }
           break;
-        default:
-          assertNever(item);
       }
     }
     return true;
@@ -473,16 +466,16 @@ var IconSet = class {
     return this.setItem(name, {
       type: "icon",
       body: icon.body,
-      props: filterProps(icon),
-      chars: new Set(),
-      categories: new Set()
+      props: filterProps(icon, true),
+      chars: /* @__PURE__ */ new Set(),
+      categories: /* @__PURE__ */ new Set()
     });
   }
   setAlias(name, parent) {
     return this.setItem(name, {
       type: "alias",
       parent,
-      chars: new Set()
+      chars: /* @__PURE__ */ new Set()
     });
   }
   setVariation(name, parent, props) {
@@ -490,14 +483,14 @@ var IconSet = class {
       type: "variation",
       parent,
       props,
-      chars: new Set()
+      chars: /* @__PURE__ */ new Set()
     });
   }
   fromSVG(name, svg) {
     const props = svg.viewBox;
     const body = svg.getBody();
     const item = this.entries[name];
-    switch (item == null ? void 0 : item.type) {
+    switch (item?.type) {
       case "icon":
       case "variation": {
         for (const key in extraDefaultProps) {
@@ -511,7 +504,7 @@ var IconSet = class {
           body,
           props,
           chars: item.chars,
-          categories: item.type === "icon" ? item.categories : new Set()
+          categories: item.type === "icon" ? item.categories : /* @__PURE__ */ new Set()
         });
       }
     }
@@ -551,14 +544,14 @@ var IconSet = class {
     const themes = prefix ? this.prefixes : this.suffixes;
     const keys = sortThemeKeys(Object.keys(themes));
     const results = {
-      valid: Object.create(null),
+      valid: /* @__PURE__ */ Object.create(null),
       invalid: []
     };
     keys.forEach((key) => {
       results.valid[key] = [];
     });
     results.invalid = this._filter((name, item, icon) => {
-      if (item.type === "alias" || item.props.hidden || (icon == null ? void 0 : icon.hidden)) {
+      if (item.type === "alias" || item.props.hidden || icon?.hidden) {
         return false;
       }
       for (let i = 0; i < keys.length; i++) {
@@ -579,15 +572,12 @@ var IconSet = class {
     });
     return results;
   }
-};
+}
 function blankIconSet(prefix) {
   return new IconSet({
     prefix,
     icons: {}
   });
 }
-export {
-  IconSet,
-  blankIconSet,
-  sortThemeKeys
-};
+
+export { IconSet, blankIconSet, sortThemeKeys };

package/lib/icon-set/match.cjs

@@ -0,0 +1,58 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const icon = require('@iconify/utils/lib/icon');
+
+const maxIteration = 5;
+function findMatchingIcon(iconSet, icon$1) {
+  const body = icon$1.body;
+  let hiddenMatch = null;
+  function isMatching(data) {
+    for (const key in icon.iconDefaults) {
+      const attr = key;
+      if (data[attr] !== icon$1[attr]) {
+        return false;
+      }
+    }
+    return true;
+  }
+  function test(name, iteration) {
+    const data = iconSet.resolve(name, true);
+    if (!data) {
+      return null;
+    }
+    if (isMatching(data)) {
+      if (data.hidden) {
+        hiddenMatch = name;
+      } else {
+        return name;
+      }
+    }
+    if (iteration > maxIteration) {
+      return null;
+    }
+    for (const key in iconSet.entries) {
+      const item = iconSet.entries[key];
+      if (item.type === "variation" && item.parent === name) {
+        const result = test(key, iteration + 1);
+        if (typeof result === "string") {
+          return result;
+        }
+      }
+    }
+    return null;
+  }
+  for (const key in iconSet.entries) {
+    const item = iconSet.entries[key];
+    if (item.type === "icon" && item.body === body) {
+      const result = test(key, 0);
+      if (typeof result === "string") {
+        return result;
+      }
+    }
+  }
+  return hiddenMatch;
+}
+
+exports.findMatchingIcon = findMatchingIcon;

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

@@ -1,6 +1,13 @@
-import type { FullIconifyIcon } from '@iconify/utils/lib/icon';
-import type { IconSet } from '.';
+import { FullIconifyIcon } from '@iconify/utils/lib/icon';
+import { IconSet } from './index.js';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations';
+import './types.js';
+import '../svg/index.js';
+
 /**
  * Find matching icon in icon set
  */
-export declare function findMatchingIcon(iconSet: IconSet, icon: FullIconifyIcon): string | null;
+declare function findMatchingIcon(iconSet: IconSet, icon: FullIconifyIcon): string | null;
+
+export { findMatchingIcon };

package/lib/icon-set/match.mjs

@@ -1,6 +1,6 @@
-// src/icon-set/match.ts
-import { iconDefaults } from "@iconify/utils/lib/icon";
-var maxIteration = 5;
+import { iconDefaults } from '@iconify/utils/lib/icon';
+
+const maxIteration = 5;
 function findMatchingIcon(iconSet, icon) {
   const body = icon.body;
   let hiddenMatch = null;
@@ -50,6 +50,5 @@ function findMatchingIcon(iconSet, icon) {
   }
   return hiddenMatch;
 }
-export {
-  findMatchingIcon
-};
+
+export { findMatchingIcon };

package/lib/icon-set/merge.cjs

@@ -0,0 +1,83 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const iconSet_index = require('./index.cjs');
+const iconSet_match = require('./match.cjs');
+require('@iconify/utils/lib/icon');
+require('@iconify/utils/lib/svg/build');
+require('@iconify/utils/lib/customisations');
+require('@iconify/utils/lib/icon-set/minify');
+require('@iconify/utils/lib/icon-set/convert-info');
+require('./props.cjs');
+require('../svg/index.cjs');
+require('cheerio');
+require('@iconify/utils');
+
+function mergeIconSets(oldIcons, newIcons) {
+  const mergedIcons = new iconSet_index.IconSet(newIcons.export());
+  const oldEntries = oldIcons.entries;
+  const entries = mergedIcons.entries;
+  function add(name) {
+    if (entries[name]) {
+      return true;
+    }
+    const item = oldEntries[name];
+    switch (item.type) {
+      case "icon": {
+        const fullIcon = oldIcons.resolve(name, true);
+        const parent = fullIcon ? iconSet_match.findMatchingIcon(mergedIcons, fullIcon) : null;
+        if (parent !== null) {
+          mergedIcons.setAlias(name, parent);
+          return true;
+        }
+        const props = item.props;
+        mergedIcons.setItem(name, {
+          ...item,
+          props: {
+            ...props,
+            hidden: true
+          },
+          categories: /* @__PURE__ */ new Set()
+        });
+        return true;
+      }
+      case "variation":
+      case "alias": {
+        let parent = item.parent;
+        if (!add(parent)) {
+          return false;
+        }
+        const parentItem = entries[parent];
+        if (parentItem.type === "alias") {
+          parent = parentItem.parent;
+        }
+        if (item.type === "variation") {
+          const props = item.props;
+          mergedIcons.setItem(name, {
+            ...item,
+            parent,
+            props: {
+              ...props,
+              hidden: true
+            }
+          });
+        } else {
+          mergedIcons.setItem(name, {
+            ...item,
+            parent
+          });
+        }
+        return true;
+      }
+      default:
+        return false;
+    }
+  }
+  for (const name in oldEntries) {
+    add(name);
+  }
+  return mergedIcons;
+}
+
+exports.mergeIconSets = mergeIconSets;

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

@@ -1,5 +1,12 @@
-import { IconSet } from '.';
+import { IconSet } from './index.js';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations';
+import './types.js';
+import '../svg/index.js';
+
 /**
  * Merge icon sets
  */
-export declare function mergeIconSets(oldIcons: IconSet, newIcons: IconSet): IconSet;
+declare function mergeIconSets(oldIcons: IconSet, newIcons: IconSet): IconSet;
+
+export { mergeIconSets };

package/lib/icon-set/merge.mjs

@@ -1,8 +1,15 @@
-// src/icon-set/merge.ts
-import { IconSet } from "./index.mjs";
-import { findMatchingIcon } from "./match.mjs";
-function assertNever(v) {
-}
+import { IconSet } from './index.mjs';
+import { findMatchingIcon } from './match.mjs';
+import '@iconify/utils/lib/icon';
+import '@iconify/utils/lib/svg/build';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/minify';
+import '@iconify/utils/lib/icon-set/convert-info';
+import './props.mjs';
+import '../svg/index.mjs';
+import 'cheerio';
+import '@iconify/utils';
+
 function mergeIconSets(oldIcons, newIcons) {
   const mergedIcons = new IconSet(newIcons.export());
   const oldEntries = oldIcons.entries;
@@ -27,7 +34,7 @@ function mergeIconSets(oldIcons, newIcons) {
             ...props,
             hidden: true
           },
-          categories: new Set()
+          categories: /* @__PURE__ */ new Set()
         });
         return true;
       }
@@ -60,7 +67,6 @@ function mergeIconSets(oldIcons, newIcons) {
         return true;
       }
       default:
-        assertNever(item);
         return false;
     }
   }
@@ -69,6 +75,5 @@ function mergeIconSets(oldIcons, newIcons) {
   }
   return mergedIcons;
 }
-export {
-  mergeIconSets
-};
+
+export { mergeIconSets };

package/lib/icon-set/props.cjs

@@ -0,0 +1,28 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const icon = require('@iconify/utils/lib/icon');
+
+const extraDefaultProps = {
+  hidden: false
+};
+const defaultCommonProps = {
+  ...icon.iconDefaults,
+  ...extraDefaultProps
+};
+const props = Object.keys(defaultCommonProps);
+function filterProps(data, compareDefaultValues) {
+  const result = {};
+  props.forEach((attr) => {
+    const value = data[attr];
+    if (value !== void 0 && (!compareDefaultValues || value !== defaultCommonProps[attr])) {
+      result[attr] = value;
+    }
+  });
+  return result;
+}
+
+exports.defaultCommonProps = defaultCommonProps;
+exports.extraDefaultProps = extraDefaultProps;
+exports.filterProps = filterProps;

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

@@ -1,10 +1,14 @@
-import type { CommonIconProps, ExtraIconProps } from './types';
+import { ExtraIconProps, CommonIconProps } from './types.js';
+import '@iconify/types';
+
 /**
  * Default properties
  */
-export declare const extraDefaultProps: Required<ExtraIconProps>;
-export declare const defaultCommonProps: Required<CommonIconProps>;
+declare const extraDefaultProps: Required<ExtraIconProps>;
+declare const defaultCommonProps: Required<CommonIconProps>;
 /**
  * Filter icon props: copies properties, removing undefined and default entries
  */
-export declare function filterProps(data: CommonIconProps): CommonIconProps;
+declare function filterProps(data: CommonIconProps, compareDefaultValues: boolean): CommonIconProps;
+
+export { defaultCommonProps, extraDefaultProps, filterProps };

package/lib/icon-set/props.mjs

@@ -1,25 +1,22 @@
-// src/icon-set/props.ts
-import { iconDefaults } from "@iconify/utils/lib/icon";
-var extraDefaultProps = {
+import { iconDefaults } from '@iconify/utils/lib/icon';
+
+const extraDefaultProps = {
   hidden: false
 };
-var defaultCommonProps = {
+const defaultCommonProps = {
   ...iconDefaults,
   ...extraDefaultProps
 };
-var props = Object.keys(defaultCommonProps);
-function filterProps(data) {
+const props = Object.keys(defaultCommonProps);
+function filterProps(data, compareDefaultValues) {
   const result = {};
   props.forEach((attr) => {
     const value = data[attr];
-    if (value !== void 0 && value !== defaultCommonProps[attr]) {
+    if (value !== void 0 && (!compareDefaultValues || value !== defaultCommonProps[attr])) {
       result[attr] = value;
     }
   });
   return result;
 }
-export {
-  defaultCommonProps,
-  extraDefaultProps,
-  filterProps
-};
+
+export { defaultCommonProps, extraDefaultProps, filterProps };

package/lib/icon-set/types.cjs

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